From eb3920d7d07bbe8c85ef41c0b7f05fb4073d6226 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 09:34:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
index d70b3ef..7ccc5b0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
@@ -46,7 +46,7 @@
@PostMapping("/add")
R add(@RequestBody EventGridDataAddDTO eventGridDataAddDTO){
return eventGridDataService.add(eventGridDataAddDTO);
- };
+ }
/**
* 修改区县/街道/社区/网格员网格数据管理
@@ -56,17 +56,7 @@
@PostMapping("/edit")
R edit(@RequestBody EventGridDataEditDTO eventGridDataEditDTO){
return eventGridDataService.edit(eventGridDataEditDTO);
- };
-
- /**
- * 分页查找区县/街道/社区/网格员网格数据管理
- * @param pageEventGridDataDTO
- * @return 维护结果
- */
- @PostMapping("/page")
- R<IPage<EventGridDataVO>> query(@RequestBody PageEventGridDataDTO pageEventGridDataDTO){
- return eventGridDataService.query(pageEventGridDataDTO);
- };
+ }
/**
* 删除区县/街道/社区/网格员网格数据管理
@@ -76,7 +66,7 @@
@PostMapping("/delete")
R delete(@RequestBody EventGridDataDeleteDTO EventGridDataDeleteDTO){
return eventGridDataService.delete(EventGridDataDeleteDTO);
- };
+ }
/**
* 查询区县/街道/社区/网格员网格数据管理详细信息
@@ -86,7 +76,27 @@
@PostMapping("/{id}")
R<EventGridDataDetailsVO> eventGridDataDetails(@PathVariable("id") Long id){
return eventGridDataService.eventGridDataDetails(id);
- };
+ }
+
+ /**
+ * 分页查询网格
+ * @param eventGridDataDTO 请求参数
+ * @return 网格列表
+ */
+ @PostMapping("/data/list")
+ public R getGridMemberList(@RequestBody PageEventGridDataDTO eventGridDataDTO){
+ return eventGridDataService.getGridMemberList(eventGridDataDTO);
+ }
+
+ /**
+ * 查询社区下所有网格员
+ * @param communityId 社区id
+ * @return 网格员列表
+ */
+ @PostMapping("/member/list")
+ public R getGridMemberLists(@RequestParam("communityId") Long communityId){
+ return eventGridDataService.getGridMemberLists(communityId);
+ }
/**
* 首页待处理
--
Gitblit v1.7.1