Merge branch 'zxt'

src/com/w1hd/zzhnc/controller/pc/ArticlesController.java

@@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
 
 
@@ -33,15 +34,19 @@ public class ArticlesController extends BaseController {
 	// 列表
 	// 列表
 	@RequestMapping(value = "/getArticlesList", method = RequestMethod.GET)
 	@RequestMapping(value = "/getArticlesList", method = RequestMethod.GET)
 	@ResponseBody
 	@ResponseBody
-	public Object getArticlesList(Integer page, Integer pagesize, String keyword) {
+	public Object getArticlesList(@RequestParam(value = "page", defaultValue = "1", required = false) Integer page,
+			@RequestParam(value = "size", defaultValue = "10", required = false) Integer size,
+			@RequestParam(value = "keyword", required = false) String keyword) {
 
 
-		return new Vo_msg(0, articleService.getArticlesList(page, pagesize, keyword));
+		return new Vo_msg(0, articleService.getArticlesList(page, size, keyword));
 	}
 	}
 
 
 	// 添加
 	// 添加
 	@RequestMapping(value = "/addArticle", method = RequestMethod.POST)
 	@RequestMapping(value = "/addArticle", method = RequestMethod.POST)
 	@ResponseBody
 	@ResponseBody
-	public Object addArticle(String title, String content, String imgurl) {
+	public Object addArticle(@RequestParam(value = "title", required = true) String title,
+			@RequestParam(value = "content", required = true) String content,
+			@RequestParam(value = "imgurl", required = false) String imgurl) {
 		String result = articleService.addArticle(title, content, imgurl);
 		String result = articleService.addArticle(title, content, imgurl);
 		if (result.equals("ok")) {
 		if (result.equals("ok")) {
 			return new Vo_msg(0, null, "添加成功");
 			return new Vo_msg(0, null, "添加成功");
@@ -51,7 +56,7 @@ public class ArticlesController extends BaseController {
 	}
 	}
 
 
 	// 修改
 	// 修改
-	@RequestMapping(value = "/updateArticle",method=RequestMethod.POST)
+	@RequestMapping(value = "/updateArticle", method = RequestMethod.POST)
 	@ResponseBody
 	@ResponseBody
 	public Object updateArticle(Integer id, String title, String content, String imgurl) {
 	public Object updateArticle(Integer id, String title, String content, String imgurl) {
 		String result = articleService.updateArticle(id, title, content, imgurl);
 		String result = articleService.updateArticle(id, title, content, imgurl);
@@ -63,7 +68,7 @@ public class ArticlesController extends BaseController {
 	}
 	}
 
 
 	// 删除
 	// 删除
-	@RequestMapping(value = "/deleteArticle",method=RequestMethod.GET)
+	@RequestMapping(value = "/deleteArticle", method = RequestMethod.GET)
 	@ResponseBody
 	@ResponseBody
 	public Object deleteArticle(Integer id) {
 	public Object deleteArticle(Integer id) {
 		String result = articleService.deleteArticle(id);
 		String result = articleService.deleteArticle(id);
@@ -75,7 +80,7 @@ public class ArticlesController extends BaseController {
 	}
 	}
 
 
 	// 获取
 	// 获取
-	@RequestMapping(value = "/getArticle",method=RequestMethod.GET)
+	@RequestMapping(value = "/getArticle", method = RequestMethod.GET)
 	@ResponseBody
 	@ResponseBody
 	public Object getArticle(Integer id) {
 	public Object getArticle(Integer id) {
 		Articles article = articleService.getArticle(id);
 		Articles article = articleService.getArticle(id);

src/com/w1hd/zzhnc/service/GoodsService.java

@@ -54,7 +54,7 @@ public class GoodsService {
 		}
 		}
 
 
 		c.andEqualTo("deleted", false);
 		c.andEqualTo("deleted", false);
-		RowBounds row = new RowBounds(page-1, size);
+		RowBounds row = new RowBounds((page - 1) * size, size);
 		List<Goods> list = goodsDao.selectByExampleAndRowBounds(ex, row);
 		List<Goods> list = goodsDao.selectByExampleAndRowBounds(ex, row);
 		int count = goodsDao.selectCountByExample(ex);
 		int count = goodsDao.selectCountByExample(ex);
 		PageResults<Goods> pageResults = new PageResults<>();
 		PageResults<Goods> pageResults = new PageResults<>();

src/com/w1hd/zzhnc/service/PrizeService.java

@@ -37,7 +37,7 @@ public class PrizeService {
 			c.andCondition(" (name like \"%" + key + "%\" )");
 			c.andCondition(" (name like \"%" + key + "%\" )");
 		}
 		}
 		c.andEqualTo("deleted", false);
 		c.andEqualTo("deleted", false);
-		RowBounds row = new RowBounds(page, size);
+		RowBounds row = new RowBounds((page - 1) * size, size);
 		List<Prize> list = prizeDao.selectByExampleAndRowBounds(ex, row);
 		List<Prize> list = prizeDao.selectByExampleAndRowBounds(ex, row);
 		int count = prizeDao.selectCountByExample(ex);
 		int count = prizeDao.selectCountByExample(ex);
 		PageResults<Prize> pageResults = new PageResults<>();
 		PageResults<Prize> pageResults = new PageResults<>();

src/com/w1hd/zzhnc/service/SellerService.java

@@ -38,7 +38,7 @@ public class SellerService {
 			c.andEqualTo("sellerId", sellerId);
 			c.andEqualTo("sellerId", sellerId);
 		}
 		}
 		c.andEqualTo("deleted", false);
 		c.andEqualTo("deleted", false);
-		RowBounds row = new RowBounds(page, size);
+		RowBounds row = new RowBounds((page - 1) * size, size);
 		List<Seller> list = sellerDao.selectByExampleAndRowBounds(ex, row);
 		List<Seller> list = sellerDao.selectByExampleAndRowBounds(ex, row);
 		int count = sellerDao.selectCountByExample(ex);
 		int count = sellerDao.selectCountByExample(ex);
 		PageResults<Seller> pageResults = new PageResults<>();
 		PageResults<Seller> pageResults = new PageResults<>();