From 18dd07b6e5da84e35ebe4c74a923eda05fb904a7 Mon Sep 17 00:00:00 2001 From: zxt@theyeasy.com Date: Thu, 28 Dec 2017 19:24:56 +0800 Subject: [PATCH] 添加第二个接口 --- src/com/w1hd/zzhnc/controller/wx/WxMiniController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java b/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java index 91e2e99..68a2f22 100644 --- a/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java +++ b/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java @@ -34,6 +34,7 @@ import com.w1hd.zzhnc.service.ArticleService; import com.w1hd.zzhnc.service.BannerService; import com.w1hd.zzhnc.service.FansService; import com.w1hd.zzhnc.service.GoodsService; +import com.w1hd.zzhnc.util.PageResults; import com.w1hd.zzhnc.util.RedisUtil; import com.w1hd.zzhnc.vo.MiniHomeVO; import com.w1hd.zzhnc.vo.Vo_msg; @@ -272,14 +273,15 @@ public class WxMiniController extends BaseController { @RequestMapping(value = "/second",method=RequestMethod.GET) @ResponseBody - public Object second(@RequestParam("openId") String openId,@RequestParam(value="page")Integer page,@RequestParam(value="size")Integer size) { + public Object second(@RequestParam("openId") String openId,@RequestParam(value="key",defaultValue = "1",required=false)String key,@RequestParam(value="page",defaultValue = "1",required=false)Integer page,@RequestParam(value="size",defaultValue = "20",required=false)Integer size) { try { Map result = Maps.newHashMap(); List bannerList = bannerService.getAll(); List homeData = articleService.getHomeData(); - List homeData2 = goodsService.getHomeData(); + PageResults seacrh = goodsService.seacrh(null, key, null, page, size); + List rows = seacrh.getRows(); result.put("banner", bannerList); - List data = MiniHomeVO.getData(homeData, homeData2); + List data = MiniHomeVO.getData(homeData, rows); result.put("data", data); return new Vo_msg(0, result); } catch (Exception e) { -- libgit2 0.24.0