From 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 05 六月 2021 23:48:28 +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 | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 11 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 4ce743b..4bcffad 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,14 +2,13 @@
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;
import com.panzhihua.service_grid.model.dos.EventGridDataDO;
+
+import java.util.List;
/**
* 区县/街道/社区/网格员网格数据管理 service
@@ -34,13 +33,6 @@
* @return 维护结果
*/
R edit(EventGridDataEditDTO eventGridDataEditDTO);
-
- /**
- * 分页查找区县/街道/社区/网格员网格数据管理
- * @param pageEventGridDataDTO
- * @return 维护结果
- */
- R<IPage<EventGridDataVO>> query(PageEventGridDataDTO pageEventGridDataDTO);
/**
* 删除区县/街道/社区/网格员网格数据管理
@@ -70,4 +62,55 @@
* @return 网格详细信息
*/
R getMapGridDetail(Long gridId);
+
+ /**
+ * 获取网格后台待处理事件统计信息
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ R getGridTodoData(EventGridTodoDataDTO eventGridTodoDataDTO);
+
+ /**
+ * 分页查询网格
+ * @param eventGridDataDTO 请求参数
+ * @return 网格列表
+ */
+ R getGridMemberList(PageEventGridDataAdminDTO eventGridDataDTO);
+
+ /**
+ * 查询社区下所有网格员
+ * @param communityId 社区id
+ * @return 网格员列表
+ */
+ R getGridMemberLists(Long communityId);
+
+ /**
+ * 后台新增网格
+ * @param eventGridDataDTO 请求参数
+ * @return 新增结果
+ */
+ R addGridDataByAdmin(EventGridDataAddAdminDTO eventGridDataDTO);
+
+ /**
+ * 后台修改网格
+ * @param eventGridDataDTO 请求参数
+ * @return 修改结果
+ */
+ R editGridDataByAdmin(EventGridDataEditAdminDTO eventGridDataDTO);
+
+ /**
+ * 查询网格下所有网格员
+ * @param gridId
+ * @return
+ */
+ R getGridMemberListsByGrid(Long gridId);
+
+ /**
+ * 查询网格下所有网格员
+ * @param communityId
+ * @return
+ */
+ R getGridDataListByCommunity(Long communityId);
+
+ R deleteGridDataByAdmin(List<Long> Ids);
}
--
Gitblit v1.7.1