From 10887d2e345348d1870069ee37a42c85d941a102 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 14 十二月 2021 15:52:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 eb29161..54d9b55 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
@@ -2,6 +2,8 @@
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;
@@ -26,6 +28,8 @@
@Resource
private EventService eventService;
+ @Resource
+ private EventGridMemberRelationService eventGridMemberRelationService;
/**
* 事件大屏查询事件列表
@@ -75,4 +79,23 @@
return eventService.civilVillageStatistics(villageId);
}
+ /**
+ * 查询社区网格员运动轨迹
+ * @param communityId 社区id
+ * @return 社区网格员运动轨迹
+ */
+ @GetMapping("/member/trajectory")
+ public R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId){
+ return eventGridMemberRelationService.getGridsMemberTrajectory(communityId);
+ }
+
+ /**
+ * 西区大数据分析平台-综合治理栏
+ * @return
+ */
+ @GetMapping("/comprehensive/governance")
+ public R getComprehensiveGovernanceStatics() {
+ return eventService.getComprehensiveGovernanceStatics();
+ }
+
}
--
Gitblit v1.7.1