From 79e0d3094c1fcf9025938479b6e46d2e9dfebdb6 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 08 十二月 2022 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
index fc51579..d2956e4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -1320,6 +1320,14 @@
R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO);
/**
+ * 新版绘制多边形统计数据
+ * @param eventListDTO
+ * @return
+ */
+ @PostMapping("/screen/getCivilDrawListNew")
+ R getCivilDrawListNew(@RequestBody ScreenDrawEventListDTO eventListDTO);
+
+ /**
* 大屏-根据小区id查询小区统计人数
*
* @param villageId
@@ -1338,4 +1346,36 @@
*/
@PostMapping("/statistics/admin/gridMemberStatisticsAll")
R gridMemberStatisticsAll(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO);
+
+ /**
+ * 定时任务-给上月已走访的人员创建定时任务
+ * @return 执行结果
+ */
+ @PostMapping("/eventvisitingtasks/timedTaskVisitingJobHandler")
+ R timedTaskVisitingJobHandler();
+
+ /**
+ * 查询社区网格员运动轨迹
+ * @param communityId 社区id
+ * @return 社区网格员运动轨迹
+ */
+ @GetMapping("/screen/member/trajectory")
+ R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 西区大数据分析平台-综合治理栏
+ * @return
+ */
+ @GetMapping("/screen/comprehensive/governance")
+ R getComprehensiveGovernanceStatics();
+
+ /**
+ * 大屏-新根据小区id查询小区统计人数
+ *
+ * @param villageId
+ * 小区id
+ * @return 小区统计数据
+ */
+ @GetMapping("/screen/village/statistics-new")
+ R civilVillageStatisticsNew(@RequestParam("villageId") Long villageId);
}
--
Gitblit v1.7.1