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/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 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 588dd7c..d0abb1e 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
@@ -68,6 +68,16 @@
     }
 
     /**
+     * 新版绘制多边形统计数据
+     * @param eventListDTO
+     * @return
+     */
+    @PostMapping("/getCivilDrawListNew")
+    public R getCivilDrawListNew(@RequestBody ScreenDrawEventListDTO eventListDTO) {
+        return eventService.getCivilDrawListNew(eventListDTO);
+    }
+
+    /**
      * 大屏-根据小区id查询小区统计人数
      * 
      * @param villageId
@@ -89,4 +99,25 @@
         return eventGridMemberRelationService.getGridsMemberTrajectory(communityId);
     }
 
+    /**
+     * 西区大数据分析平台-综合治理栏
+     * @return
+     */
+    @GetMapping("/comprehensive/governance")
+    public R getComprehensiveGovernanceStatics() {
+        return eventService.getComprehensiveGovernanceStatics();
+    }
+
+    /**
+     * 大屏-新根据小区id查询小区统计人数
+     *
+     * @param villageId
+     *            小区id
+     * @return 小区统计数据
+     */
+    @GetMapping("/village/statistics-new")
+    public R civilVillageStatisticsNew(@RequestParam("villageId") Long villageId) {
+        return eventService.civilVillageStatisticsNew(villageId);
+    }
+
 }

--
Gitblit v1.7.1