From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java
index 3d6bdce..588dd7c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java
@@ -1,13 +1,18 @@
package com.panzhihua.service_grid.api;
+import javax.annotation.Resource;
+
+import com.panzhihua.service_grid.dao.EventGridMemberRelationMapper;
+import com.panzhihua.service_grid.service.EventGridMemberRelationService;
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenDrawEventListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.service.EventService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
/**
* @ClasssName BigScreenApi
@@ -23,15 +28,65 @@
@Resource
private EventService eventService;
+ @Resource
+ private EventGridMemberRelationService eventGridMemberRelationService;
/**
* 事件大屏查询事件列表
- * @param eventListDTO 请求参数
- * @return 事件列表
+ *
+ * @param eventListDTO
+ * 请求参数
+ * @return 事件列表
*/
@PostMapping("/event/list")
public R eventList(@RequestBody ScreenEventListDTO eventListDTO) {
return eventService.getScreenEventList(eventListDTO);
}
+ /**
+ * 工作大屏-事件播报数据统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 事件播报数据统计
+ */
+ @GetMapping("/work/event")
+ public R eventWork(@RequestParam("communityId") Long communityId) {
+ return eventService.eventWork(communityId);
+ }
+
+ /**
+ * 绘制多边形统计数据
+ *
+ * @param eventListDTO
+ * 请求参数
+ * @return 统计数据
+ */
+ @PostMapping("/getCivilDrawList")
+ public R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO) {
+ return eventService.getCivilDrawList(eventListDTO);
+ }
+
+ /**
+ * 大屏-根据小区id查询小区统计人数
+ *
+ * @param villageId
+ * 小区id
+ * @return 小区统计数据
+ */
+ @GetMapping("/village/statistics")
+ public R civilVillageStatistics(@RequestParam("villageId") Long villageId) {
+ return eventService.civilVillageStatistics(villageId);
+ }
+
+ /**
+ * 查询社区网格员运动轨迹
+ * @param communityId 社区id
+ * @return 社区网格员运动轨迹
+ */
+ @GetMapping("/member/trajectory")
+ public R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId){
+ return eventGridMemberRelationService.getGridsMemberTrajectory(communityId);
+ }
+
}
--
Gitblit v1.7.1