From ecde7a30a43e3d45be2f0f9e271d0abf02c7d58e Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 14 十二月 2021 13:58:17 +0800
Subject: [PATCH] Merge branch 'west_bigscreen_dev' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 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 7f3b3f0..7104796 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
@@ -1,12 +1,15 @@
package com.panzhihua.service_community.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngPopulationService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@@ -18,8 +21,10 @@
/**
* 首页大屏统计接口
- * @param communityId 社区id
- * @return 统计结果
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
*/
@GetMapping("/getScreenIndex")
public R index(@RequestParam("communityId") Long communityId) {
@@ -28,18 +33,22 @@
/**
* 事件大屏统计接口
- * @param communityId 社区id
- * @return 统计结果
+ *
+ * @param screenEventDTO
+ * 请求参数
+ * @return 统计结果
*/
- @GetMapping("/getScreenEvent")
- public R event(@RequestParam("communityId") Long communityId) {
- return R.ok(comMngPopulationService.getScreenEvent(communityId));
+ @PostMapping("/getScreenEvent")
+ public R event(@RequestBody BigScreenEventDTO screenEventDTO) {
+ return R.ok(comMngPopulationService.getScreenEvent(screenEventDTO));
}
/**
* 民生大屏统计接口
- * @param communityId 社区id
- * @return 统计结果
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
*/
@GetMapping("/getScreenCivil")
public R civil(@RequestParam("communityId") Long communityId) {
@@ -49,7 +58,8 @@
/**
* 获取社区网格
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 网格数据
*/
@GetMapping("/getScreenGirds")
@@ -60,7 +70,8 @@
/**
* 事件大屏查询事件详情
*
- * @param eventDetailDTO 请求参数
+ * @param eventDetailDTO
+ * 请求参数
* @return 事件详情
*/
@PostMapping("/getScreenEventDetail")
@@ -68,5 +79,22 @@
return R.ok(comMngPopulationService.getScreenEventDetail(eventDetailDTO));
}
+ /**
+ * 西区大屏治理数据
+ */
+ @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();
+ }
}
--
Gitblit v1.7.1