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/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java |   86 +++++++++++++++++++++++++++++++------------
 1 files changed, 62 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 ae3b4ed..0fd0d86 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
@@ -2,6 +2,8 @@
 
 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;
@@ -21,6 +23,8 @@
 
     @Resource
     private ComMngPopulationService comMngPopulationService;
+    @Resource
+    private ComActService comActService;
     @Resource
     private BigScreenService bigScreenService;
     @Resource
@@ -87,6 +91,29 @@
     }
 
     /**
+     * 西区大屏治理数据
+     */
+    @GetMapping("/getWestScreenStatics")
+    public R westScreenStatics(){
+        return comMngPopulationService.westScreenStatics();
+    }
+
+    @GetMapping("/getComprehensivePopulationStatics")
+    public R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId){
+        return comMngPopulationService.getComprehensivePopulationStatics(streetId);
+    }
+
+    @GetMapping("/getComprehensiveStreetList")
+    public R getComprehensiveStreetList(){
+        return comMngPopulationService.getComprehensiveStreetList();
+    }
+
+
+    @GetMapping("/getCommunityPassword")
+    public R getCommunityPassword(@RequestParam("communityId") Long communityId){
+        return comActService.getCommunityPassword(communityId);
+    }
+    /**
      * 新版大屏首页接口
      */
     @GetMapping("/indexInfo")
@@ -116,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);
     }
 
     /**
@@ -148,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);
     }
 
     /**
@@ -170,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);
     }
 
     /**
@@ -192,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);
     }
 
     /**

--
Gitblit v1.7.1