summit activity

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

@@ -20,10 +20,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 峰会活动
@@ -36,7 +33,7 @@ import java.util.Objects;
 public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActivity> {
 
 
-    public List<SummitActivityVo> findSummitActivityForHomePage(Integer limit) {
+    public List<SummitActivityVo> findSummitActivityForHomePage(Integer limit,Integer location) {
         Example example = new Example(SummitActivity.class);
         example.setOrderByClause("rank");
         Example.Criteria criteria = example.createCriteria();
@@ -47,9 +44,10 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         //已发布
         criteria.andEqualTo("isPublish", 1);
         //活动未下架
-        criteria.andEqualTo("isShow", 0);
-        //结束时间大于当前时间
-        //criteria.andGreaterThanOrEqualTo("endTime", Instant.now().toEpochMilli());
+        criteria.andEqualTo("isShow", 1);
+        //位置
+        criteria.andIn("location", Arrays.asList(location,0));
+
         PageDataVO<SummitActivity> dataVO = PageDataVO.pageInfo(1, limit, () -> mapper.selectByExample(example));
         List<SummitActivity> summitActivities = dataVO.getData();
         if (CollectionUtils.isEmpty(summitActivities)) {

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

@@ -28,9 +28,9 @@ public class SummitActivityController{
 
      @ApiOperation("官网首页展示")
      @GetMapping("/home")
-     public ObjectRestResponse<List<SummitActivityVo>>  findSummitActivityForHomePage(@RequestParam(defaultValue = "5",required = false) Integer limit){
+     public ObjectRestResponse<List<SummitActivityVo>>  findSummitActivityForHomePage(@RequestParam(defaultValue = "5",required = false) Integer limit,@RequestParam("location") Integer location){
 
-          List<SummitActivityVo> summitActivityVos = summitActivityBiz.findSummitActivityForHomePage(limit);
+          List<SummitActivityVo> summitActivityVos = summitActivityBiz.findSummitActivityForHomePage(limit,location);
           return ObjectRestResponse.succ(summitActivityVos);
      }
 
@@ -40,4 +40,6 @@ public class SummitActivityController{
            SummitActivityDetailVo summitActivityDetailVo = summitActivityBiz.findSummitActivityDetailById(id);
           return ObjectRestResponse.succ(summitActivityDetailVo);
      }
+
+
 }
\ No newline at end of file

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

@@ -7,6 +7,7 @@ import com.xxfc.platform.uccn.biz.SummitActivityBiz;
 import com.xxfc.platform.uccn.dto.SummitActivityFindDTO;
 import com.xxfc.platform.uccn.dto.SummitActivitySaveDTO;
 import com.xxfc.platform.uccn.vo.SummitActivityAdminVo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/admin/summitActivity")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Api("峰会活动*后台")
 public class SummitActivityAdminController {
 
      private final  SummitActivityBiz summitActivityBiz;