From db9d95db6f25f95cbc614525adef7dbdeae6478c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 27 七月 2021 16:58:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb

---
 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 1dfa380..74dad69 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
@@ -1,6 +1,7 @@
 package com.panzhihua.common.service.grid;
 
 import com.panzhihua.common.model.dtos.IdDTO;
+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.dtos.grid.*;
 import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
@@ -1217,4 +1218,43 @@
      */
     @PostMapping("/eventgridmemberrelation/cascade/list")
     R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO);
+
+    /**
+     * 综治后台-查询所有市平台网格列表
+     * @return  市平台网格列表
+     */
+    @GetMapping("/eventgriddata/lc/list")
+    R getLcGridLists();
+
+    /**
+     * 首页查询网格级联列表
+     * @param cascadeListDTO    请求参数
+     * @return  网格列表
+     */
+    @PostMapping("/map/getMapGridListsByApp")
+    R getMapGridListsByApp(@RequestBody EventGridCascadeListDTO cascadeListDTO);
+
+    /**
+     * 首页查询网格级联列表2
+     * @param userId    用户id
+     * @return  网格列表
+     */
+    @PostMapping("/map/getMapGridsListsByApp")
+    R getMapGridsListsByApp(@RequestParam("userId") Long userId);
+
+    /**
+     * 绘制多边形统计数据
+     * @param eventListDTO  请求参数
+     * @return  统计数据
+     */
+    @PostMapping("/screen/getCivilDrawList")
+    R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO);
+
+    /**
+     * 大屏-根据小区id查询小区统计人数
+     * @param villageId 小区id
+     * @return  小区统计数据
+     */
+    @GetMapping("/screen/village/statistics")
+    R civilVillageStatistics(@RequestParam("villageId") Long villageId);
 }

--
Gitblit v1.7.1