From 51ee3c4db2eb49062d3236bf44f95dc22f8f6ac9 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 14 一月 2022 17:59:03 +0800
Subject: [PATCH] 商业街bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java |   99 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
index b7916f3..8ae1dae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
@@ -3,6 +3,7 @@
 import javax.annotation.Resource;
 
 import com.panzhihua.service_community.service.ComActService;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
 import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
 import com.panzhihua.service_community.service.BigScreenStatisticsService;
 import com.panzhihua.service_community.service.BigScreenService;
@@ -142,14 +143,11 @@
 
     /**
      * 首页二级页面-随手拍展示列表
-     * @param communityId
-     * @param classifyId
      * @return
      */
-    @GetMapping("/index/easyPhotoList")
-    public R indexEasyPhotoList(@RequestParam("communityId") Long communityId,
-                                @RequestParam(value = "classifyId", required = false) Long classifyId) {
-        return bigScreenStatisticsService.indexEasyPhotoList(communityId, classifyId);
+    @PostMapping("/index/easyPhotoList")
+    public R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.indexEasyPhotoList(pageBaseDTO);
     }
 
     /**
@@ -174,14 +172,12 @@
 
     /**
      * 首页二级页面-社区动态展示列表
-     * @param communityId
-     * @param type
+     * @param pageBaseDTO
      * @return
      */
-    @GetMapping("/index/dynList")
-    public R indexDynList(@RequestParam("communityId") Long communityId,
-                          @RequestParam(value = "type", required = false) Long type) {
-        return bigScreenStatisticsService.indexDynList(communityId, type);
+    @PostMapping("/index/dynList")
+    public R indexDynList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.indexDynList(pageBaseDTO);
     }
 
     /**
@@ -196,14 +192,12 @@
 
     /**
      * 首页二级页面-邻里圈展示列表
-     * @param communityId
-     * @param topicId
+     * @param pageBaseDTO
      * @return
      */
-    @GetMapping("/index/neighborList")
-    public R indexNeighborList(@RequestParam("communityId") Long communityId,
-                               @RequestParam(value = "topicId", required = false) Long topicId) {
-        return bigScreenStatisticsService.indexNeighborList(communityId, topicId);
+    @PostMapping("/index/neighborList")
+    public R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.indexNeighborList(pageBaseDTO);
     }
 
     /**
@@ -218,14 +212,32 @@
 
     /**
      * 首页二级页面-商家展示列表
-     * @param communityId
-     * @param categoryId
+     * @param pageBaseDTO
      * @return
      */
-    @GetMapping("/index/merchantList")
-    public R indexMerchantList(@RequestParam("communityId") Long communityId,
-                               @RequestParam(value = "categoryId", required = false) Long categoryId) {
-        return bigScreenStatisticsService.indexMerchantList(communityId, categoryId);
+    @PostMapping("/index/merchantList")
+    public R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.indexMerchantList(pageBaseDTO);
+    }
+
+    /**
+     * 首页二级页面-微心愿展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/index/microWishList")
+    public R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.indexMicroWishList(pageBaseDTO);
+    }
+
+    /**
+     * 首页二级页面-社区问卷展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/index/questionnaireList")
+    public R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.indexQuestionnaireList(pageBaseDTO);
     }
 
     /**
@@ -284,4 +296,43 @@
         return bigScreenStatisticsService.getScreenPopularMerchants(pagePopularMerchantDTO);
     }
 
+    /**
+     * 首页二级页面-居民活动
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/index/residentAct")
+    public R indexResidentAct(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.indexResidentAct(communityId);
+    }
+
+    /**
+     * 首页二级页面-居民活动展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/index/residentActList")
+    public R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.indexResidentActList(pageBaseDTO);
+    }
+
+    /**
+     * 首页二级页面-志愿者活动
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/index/volunteerAct")
+    public R indexVolunteerAct(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.indexVolunteerAct(communityId);
+    }
+
+    /**
+     * 首页二级页面-志愿者活动展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/index/volunteerActList")
+    public R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.indexVolunteerActList(pageBaseDTO);
+    }
 }

--
Gitblit v1.7.1