From cb0f216564538ea3fb2ebdaebed545b14d8cb7f6 Mon Sep 17 00:00:00 2001 From: zxt@theyeasy.com Date: Thu, 28 Dec 2017 16:59:48 +0800 Subject: [PATCH] update --- src/com/w1hd/zzhnc/controller/pc/ActivityController.java | 14 ++++---------- src/com/w1hd/zzhnc/controller/pc/FansController.java | 23 +++++++++++++++++++++++ src/com/w1hd/zzhnc/controller/pc/PrizeController.java | 2 +- src/com/w1hd/zzhnc/controller/pc/ReportController.java | 14 -------------- src/com/w1hd/zzhnc/model/Goods.java | 18 ++++++++++++++++++ src/com/w1hd/zzhnc/service/FansService.java | 57 +++++++++++++++++---------------------------------------- 6 files changed, 63 insertions(+), 65 deletions(-) create mode 100644 src/com/w1hd/zzhnc/controller/pc/FansController.java diff --git a/src/com/w1hd/zzhnc/controller/pc/ActivityController.java b/src/com/w1hd/zzhnc/controller/pc/ActivityController.java index 8451b3c..4f85cd6 100644 --- a/src/com/w1hd/zzhnc/controller/pc/ActivityController.java +++ b/src/com/w1hd/zzhnc/controller/pc/ActivityController.java @@ -95,20 +95,14 @@ public class ActivityController extends BaseController { } // 中奖记录 - @RequestMapping(value = "/getLotteryLogList", method = { RequestMethod.POST, RequestMethod.GET }) - public @ResponseBody Object getLotteryLogList(Integer page, Integer pagesize, Integer turn, String keyword, - Integer status) { - return new Vo_msg(0, activityService.getLotteryLogList(page, pagesize, turn, keyword, status)); - } - - // 中奖记录 @RequestMapping(value = "/lotterys", method = { RequestMethod.POST, RequestMethod.GET }) @ResponseBody - public Object lotterys(@RequestParam(value = "page", defaultValue = "1", required = false) Integer page, + public Object lotterys( + @RequestParam(value = "page", defaultValue = "1", required = false) Integer page, @RequestParam(value = "pagesize", defaultValue = "10", required = false) Integer pagesize, - @RequestParam(value = "turn", defaultValue = "0", required = false) Integer turn, + @RequestParam(value = "turn", defaultValue = "1", required = false) Integer turn, @RequestParam(value = "keyword", defaultValue = "", required = false) String keyword, - @RequestParam(value = "status", defaultValue = "", required = false) Integer status) { + @RequestParam(value = "status", defaultValue = "1", required = false) Integer status) { return new Vo_msg(0, activityService.getLotteryLogList(page, pagesize, turn, keyword, status)); } } diff --git a/src/com/w1hd/zzhnc/controller/pc/FansController.java b/src/com/w1hd/zzhnc/controller/pc/FansController.java new file mode 100644 index 0000000..2173439 --- /dev/null +++ b/src/com/w1hd/zzhnc/controller/pc/FansController.java @@ -0,0 +1,23 @@ +package com.w1hd.zzhnc.controller.pc; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.w1hd.zzhnc.service.FansService; + +@RestController +@RequestMapping("/fans") +public class FansController { + + @Autowired + FansService fansService; + + @RequestMapping(value="/search",method= RequestMethod.GET) + public Object search(@RequestParam(value="page",defaultValue ="1")int page,@RequestParam(value="keyword") String keyword) { + return fansService.getFansList(page, keyword); + } +} diff --git a/src/com/w1hd/zzhnc/controller/pc/PrizeController.java b/src/com/w1hd/zzhnc/controller/pc/PrizeController.java index f4d844f..ea432a7 100644 --- a/src/com/w1hd/zzhnc/controller/pc/PrizeController.java +++ b/src/com/w1hd/zzhnc/controller/pc/PrizeController.java @@ -16,7 +16,7 @@ import com.w1hd.zzhnc.model.Prize; import com.w1hd.zzhnc.service.PrizeService; import com.w1hd.zzhnc.vo.Vo_msg; -@Deprecated + @Controller @RequestMapping("/prize") public class PrizeController { diff --git a/src/com/w1hd/zzhnc/controller/pc/ReportController.java b/src/com/w1hd/zzhnc/controller/pc/ReportController.java index 9b63742..6f53b99 100644 --- a/src/com/w1hd/zzhnc/controller/pc/ReportController.java +++ b/src/com/w1hd/zzhnc/controller/pc/ReportController.java @@ -15,12 +15,6 @@ import com.w1hd.zzhnc.vo.Vo_msg; @RequestMapping("/report") public class ReportController extends BaseController { - @Autowired - ChatLogService chatlogService; - - @Autowired - FansService fansService; - @RequestMapping(value = "/goods", method = RequestMethod.GET) public ModelAndView goods() { ModelAndView mv = new ModelAndView("/pc/report/goods"); @@ -88,12 +82,4 @@ public class ReportController extends BaseController { return mv; } - // 聊天记录列表 - @RequestMapping(value = "/getChatLogList", method = RequestMethod.GET) - @ResponseBody - public Object getChatLogList(Integer page, Integer replytype, String date1, String date2, String keyword) { - - return new Vo_msg(0, chatlogService.getChatLogList(page, replytype, date1, date2, keyword)); - } - } \ No newline at end of file diff --git a/src/com/w1hd/zzhnc/model/Goods.java b/src/com/w1hd/zzhnc/model/Goods.java index b46f8ae..820c7ba 100644 --- a/src/com/w1hd/zzhnc/model/Goods.java +++ b/src/com/w1hd/zzhnc/model/Goods.java @@ -20,6 +20,8 @@ public class Goods { private String bannerUrl; private Boolean isHot; private Boolean isHome; + private Integer shareCount; + private Integer pageViews; private Date createtime; private Date updateTime; private Boolean deleted; @@ -287,6 +289,22 @@ public class Goods { public void setSellerPhone(String sellerPhone) { this.sellerPhone = sellerPhone; } + + public Integer getShareCount() { + return shareCount; + } + + public void setShareCount(Integer shareCount) { + this.shareCount = shareCount; + } + + public Integer getPageViews() { + return pageViews; + } + + public void setPageViews(Integer pageViews) { + this.pageViews = pageViews; + } } \ No newline at end of file diff --git a/src/com/w1hd/zzhnc/service/FansService.java b/src/com/w1hd/zzhnc/service/FansService.java index b0c07d4..3a373a5 100644 --- a/src/com/w1hd/zzhnc/service/FansService.java +++ b/src/com/w1hd/zzhnc/service/FansService.java @@ -1,36 +1,8 @@ -/****************************************************************** - * - * Java Lib For JavaWeb, Powered By Shenzhen WEI YI KE JI . - * - * Copyright (c) 2017-2027 Digital Telemedia Co.,Ltd - * http://www.d-telemedia.com/ - * - * Package: com.w1hd.zzhnc.service.impl - * - * Filename: ProjectServiceImpl.java - * - * Description: TODO(用一句话描述该文件做什么) - * - * Copyright: Copyright (c) 2017-2027 - * - * Company: Theyeasy Telemedia Co.,Ltd - * - * @author: hm - * - * @version: 1.0.0 - * - * Create at: 2017年10月22日 下午5:53:36 - * - * Revision: - * - * 2017年10月22日 下午5:53:36 - * - first revision - * - *****************************************************************/ package com.w1hd.zzhnc.service; import java.util.List; +import org.apache.ibatis.session.RowBounds; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.theyeasy.weixin.model.WxMiniSessionInfo; @@ -42,10 +14,9 @@ import com.w1hd.zzhnc.dao.FansDao; import com.w1hd.zzhnc.model.Fans; import com.w1hd.zzhnc.util.CommonUtil; import com.w1hd.zzhnc.util.PageResults; -import com.w1hd.zzhnc.util.StringUtil; -import com.w1hd.zzhnc.vo.Fans_Vo; import tk.mybatis.mapper.entity.Example; +import tk.mybatis.mapper.entity.Example.Criteria; /** * @ClassName ProjectServiceImpl @@ -60,15 +31,21 @@ public class FansService { @Autowired FansDao fansDao; - public PageResults getFansList(Integer page, String keyword) { - List list = fansDao.getFansList((page - 1) * 10, 10, keyword); - int total = fansDao.getFansCount(keyword); - PageResults pageResults = new PageResults<>(); - pageResults.setPage(page); - pageResults.setPageSize(10); - pageResults.setRows(list); - pageResults.setTotal(total); - return pageResults; + public PageResults getFansList(Integer page, String keyword) { + Example ex = new Example(Fans.class); + Criteria criteria = ex.createCriteria(); + if(Strings.isNullOrEmpty(keyword)) { + criteria.andCondition(" ( nickname like \"%" + keyword +"%\")"); + } + RowBounds row = new RowBounds((page - 1) * 10, 10); + List list = fansDao.selectByExampleAndRowBounds(ex, row); + int total = fansDao.selectCountByExample(ex); + PageResults pageresult = new PageResults<>(); + pageresult.setPage(page); + pageresult.setPageSize(10); + pageresult.setRows(list); + pageresult.setTotal(total); + return pageresult; } public Fans getFansByMiniOpenid(String miniOpenid) { -- libgit2 0.24.0