From 6496d6a229ba8e0acd0777863fb34bee0f5ce717 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 24 十二月 2021 10:42:38 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 778fb00..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,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;
@@ -22,6 +23,8 @@
@Resource
private ComMngPopulationService comMngPopulationService;
+ @Resource
+ private ComActService comActService;
@Resource
private BigScreenService bigScreenService;
@Resource
@@ -88,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")
--
Gitblit v1.7.1