活动列表

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -168,6 +168,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
     public List<SummitActivityVo> getHostWithSummitActivity(Integer num, Integer location) {
         List<SummitActivityVo> summitActivityVos = new ArrayList<>();
         Example example = new Example(SummitActivity.class);
+        example.setOrderByClause("crt_time DESC");
         Example.Criteria criteria = example.createCriteria();
         //未删除
         criteria.andEqualTo("isDel", 0);
@@ -206,4 +207,38 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         }
         return summitActivityVos;
     }
+
+    public PageDataVO<SummitActivityVo> findSummitActivityWithPage(Integer page, Integer limit, Integer location) {
+        PageDataVO<SummitActivityVo> dataVO = new PageDataVO<>();
+
+        Example example = new Example(SummitActivity.class);
+        Example.Criteria criteria = example.createCriteria();
+        //未删除
+        criteria.andEqualTo("isDel", 0);
+        //已发布
+        criteria.andEqualTo("isPublish", 1);
+        //活动未下架
+        criteria.andEqualTo("isShow", 1);
+        //位置
+        criteria.andIn("location", Arrays.asList(location, 0));
+        PageDataVO<SummitActivity> summitActivityPageDataVO = PageDataVO.pageInfo(page, limit, () -> mapper.selectByExample(example));
+        List<SummitActivity> summitActivities = summitActivityPageDataVO.getData();
+        if (CollectionUtils.isEmpty(summitActivities)){
+            return dataVO;
+        }
+        List<SummitActivityVo> summitActivityVos = new ArrayList<>();
+        SummitActivityVo summitActivityVo;
+        for (SummitActivity summitActivity : summitActivities) {
+            summitActivityVo = new SummitActivityVo();
+            BeanUtils.copyProperties(summitActivity,summitActivityVo);
+            summitActivityVos.add(summitActivityVo);
+        }
+
+        dataVO.setData(summitActivityVos);
+        dataVO.setPageNum(summitActivityPageDataVO.getPageNum());
+        dataVO.setPageSize(summitActivityPageDataVO.getPageSize());
+        dataVO.setTotalCount(summitActivityPageDataVO.getTotalCount());
+        dataVO.setTotalPage(summitActivityPageDataVO.getTotalPage());
+        return dataVO;
+    }
 }
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SummitActivityController.java

 package com.xxfc.platform.uccn.rest;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.uccn.biz.SummitActivityBiz;
 import com.xxfc.platform.uccn.vo.SummitActivityDetailVo;
 import com.xxfc.platform.uccn.vo.SummitActivityVo;
@@ -22,30 +23,41 @@ import java.util.List;
 @RequestMapping("/summitActivity/app/unauth")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 @Api("峰会")
-public class SummitActivityController{
+public class SummitActivityController {
 
     private final SummitActivityBiz summitActivityBiz;
 
     @ApiOperation("官网首页展示")
     @GetMapping("/home")
-     public ObjectRestResponse<List<SummitActivityVo>>  findSummitActivityForHomePage(@RequestParam(defaultValue = "5",required = false) Integer limit,@RequestParam(value = "location",defaultValue = "1",required = false) Integer location){
+    public ObjectRestResponse<List<SummitActivityVo>> findSummitActivityForHomePage(@RequestParam(defaultValue = "5", required = false) Integer limit,
+                                                                                    @RequestParam(value = "location", defaultValue = "1", required = false) Integer location) {
 
-          List<SummitActivityVo> summitActivityVos = summitActivityBiz.findSummitActivityForHomePage(limit,location);
+        List<SummitActivityVo> summitActivityVos = summitActivityBiz.findSummitActivityForHomePage(limit, location);
         return ObjectRestResponse.succ(summitActivityVos);
     }
 
     @ApiOperation("峰会活动详情")
     @GetMapping("/{id}")
-     public ObjectRestResponse<SummitActivityDetailVo> findSummitActivityDetailById(@PathVariable(value = "id") Integer id){
+    public ObjectRestResponse<SummitActivityDetailVo> findSummitActivityDetailById(@PathVariable(value = "id") Integer id) {
         SummitActivityDetailVo summitActivityDetailVo = summitActivityBiz.findSummitActivityDetailById(id);
         return ObjectRestResponse.succ(summitActivityDetailVo);
     }
 
     @ApiOperation("热门推荐获取")
     @GetMapping("/hot")
-     public ObjectRestResponse<List<SummitActivityVo>> findHotWithSummitActivity(@RequestParam(value = "num",required = false,defaultValue = "2") Integer num,@RequestParam(value = "location",defaultValue = "1",required = false) Integer location){
-          List<SummitActivityVo> summitActivityVos = summitActivityBiz.getHostWithSummitActivity(num,location);
+    public ObjectRestResponse<List<SummitActivityVo>> findHotWithSummitActivity(@RequestParam(value = "num", required = false, defaultValue = "2") Integer num,
+                                                                                @RequestParam(value = "location", defaultValue = "1", required = false) Integer location) {
+        List<SummitActivityVo> summitActivityVos = summitActivityBiz.getHostWithSummitActivity(num, location);
         return ObjectRestResponse.succ(summitActivityVos);
     }
 
+    @ApiOperation("官网活动列表")
+    @GetMapping("/list")
+    public ObjectRestResponse<PageDataVO<SummitActivityVo>> findSummitActivityWithPage(@RequestParam(value = "page", defaultValue = "1", required = false) Integer page,
+                                                                                      @RequestParam(value = "limit", defaultValue = "6", required = false) Integer limit,
+                                                                                      @RequestParam(value = "location", defaultValue = "0", required = false) Integer location) {
+        PageDataVO<SummitActivityVo> pageDataVO = summitActivityBiz.findSummitActivityWithPage(page, limit,location);
+        return ObjectRestResponse.succ(pageDataVO);
+    }
+
 }
\ No newline at end of file