From 8dd5c057222ea4f6d22d6bc3fba468600f14a330 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 28 十二月 2021 16:28:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 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 4927e8b..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
@@ -1353,4 +1361,21 @@
      */
     @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