From 79f76bd108aae3a6bb0c7b66150e1ac69a6563a3 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 03 六月 2021 17:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
index 6a60bb2..48584b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
+import com.panzhihua.common.model.dtos.grid.*;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
 import com.panzhihua.common.model.vos.grid.EventGridDataVO;
@@ -57,4 +54,24 @@
     R<EventGridDataDetailsVO> eventGridDataDetails(Long id);
 
 
+    /**
+     * 查询用户网格数据管理
+     * @param pageEventGridDataDTO dto
+     * @return 查找结果
+     */
+    R getUserGrid(PageEventGridDataDTO pageEventGridDataDTO);
+
+    /**
+     * 地图模块-根据网格id查询网格详细信息
+     * @param gridId    网格id
+     * @return  网格详细信息
+     */
+    R getMapGridDetail(Long gridId);
+
+    /**
+     * 获取网格后台待处理事件统计信息
+     * @param eventGridTodoDataDTO
+     * @return
+     */
+    R getGridTodoData(EventGridTodoDataDTO eventGridTodoDataDTO);
 }

--
Gitblit v1.7.1