From 3a5655d1124cb56d7b7f045d18dd4855451507cc Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 十二月 2021 17:54:32 +0800
Subject: [PATCH] Merge branch 'bigscreen_dev'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 9ad35a6..880a211 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -7534,12 +7535,10 @@
/**
* 首页二级页面-随手拍展示列表
- * @param communityId
- * @param classifyId
* @return
*/
- @GetMapping("/screen/index/easyPhotoList")
- R indexEasyPhotoList(@RequestParam("communityId") Long communityId, @RequestParam(value = "classifyId", required = false) Long classifyId);
+ @PostMapping("/screen/index/easyPhotoList")
+ R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);
/**
* 首页二级页面-社区问卷
@@ -7559,12 +7558,11 @@
/**
* 首页二级页面-社区动态展示列表
- * @param communityId
- * @param type
+ * @param pageBaseDTO
* @return
*/
- @GetMapping("/screen/index/dynList")
- R indexDynList(@RequestParam("communityId") Long communityId, @RequestParam(value = "type", required = false) Long type);
+ @PostMapping("/screen/index/dynList")
+ R indexDynList(@RequestBody PageBaseDTO pageBaseDTO);
/**
* 首页二级页面-邻里圈
@@ -7576,12 +7574,11 @@
/**
* 首页二级页面-邻里圈展示列表
- * @param communityId
- * @param topicId
+ * @param pageBaseDTO
* @return
*/
- @GetMapping("/screen/index/neighborList")
- R indexNeighborList(@RequestParam("communityId") Long communityId, @RequestParam(value = "topicId", required = false) Long topicId);
+ @PostMapping("/screen/index/neighborList")
+ R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO);
/**
* 首页二级页面-便民商家
@@ -7593,10 +7590,25 @@
/**
* 首页二级页面-商家展示列表
- * @param communityId
- * @param categoryId
+ * @param pageBaseDTO
* @return
*/
- @GetMapping("/screen/index/merchantList")
- R indexMerchantList(@RequestParam("communityId") Long communityId, @RequestParam(value = "categoryId", required = false) Long categoryId);
+ @PostMapping("/screen/index/merchantList")
+ R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-微心愿展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/microWishList")
+ R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-社区问卷展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/questionnaireList")
+ R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);
}
--
Gitblit v1.7.1