From d7ea73196c8eb7df71c20b4fdccbc1ef9eff96fe Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 14 十二月 2021 16:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 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 c3025bd..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,33 +33,68 @@
/**
* 事件大屏统计接口
- * @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) {
return R.ok(comMngPopulationService.getScreenCivil(communityId));
}
+ /**
+ * 获取社区网格
+ *
+ * @param communityId
+ * 社区id
+ * @return 网格数据
+ */
@GetMapping("/getScreenGirds")
public R grids(@RequestParam("communityId") Long communityId) {
return R.ok(comMngPopulationService.getScreenGirds(communityId));
}
+ /**
+ * 事件大屏查询事件详情
+ *
+ * @param eventDetailDTO
+ * 请求参数
+ * @return 事件详情
+ */
@PostMapping("/getScreenEventDetail")
public R eventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO) {
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