From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 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 c81b788..866d25f 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,11 @@
package com.panzhihua.service_community.api;
+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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -30,12 +29,12 @@
/**
* 事件大屏统计接口
- * @param communityId 社区id
+ * @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));
}
/**
@@ -48,5 +47,27 @@
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));
+ }
+
}
--
Gitblit v1.7.1