From ad723be9b0bd0977619caf5ce31b91d04116c70e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 07 七月 2021 10:57:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 73 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..e73810c 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
@@ -11,6 +11,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
*
@@ -46,7 +47,7 @@
@PostMapping("/add")
R add(@RequestBody EventGridDataAddDTO eventGridDataAddDTO){
return eventGridDataService.add(eventGridDataAddDTO);
- };
+ }
/**
* 修改区县/街道/社区/网格员网格数据管理
@@ -56,17 +57,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 +67,7 @@
@PostMapping("/delete")
R delete(@RequestBody EventGridDataDeleteDTO EventGridDataDeleteDTO){
return eventGridDataService.delete(EventGridDataDeleteDTO);
- };
+ }
/**
* 查询区县/街道/社区/网格员网格数据管理详细信息
@@ -86,7 +77,27 @@
@PostMapping("/{id}")
R<EventGridDataDetailsVO> eventGridDataDetails(@PathVariable("id") Long id){
return eventGridDataService.eventGridDataDetails(id);
- };
+ }
+
+ /**
+ * 分页查询网格
+ * @param eventGridDataDTO 请求参数
+ * @return 网格列表
+ */
+ @PostMapping("/data/list")
+ public R getGridMemberList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO){
+ return eventGridDataService.getGridMemberList(eventGridDataDTO);
+ }
+
+ /**
+ * 查询社区下所有网格员
+ * @param communityId 社区id
+ * @return 网格员列表
+ */
+ @PostMapping("/member/list")
+ public R getGridMemberLists(@RequestParam("communityId") Long communityId){
+ return eventGridDataService.getGridMemberLists(communityId);
+ }
/**
* 首页待处理
@@ -107,4 +118,52 @@
R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO){
return R.ok();
}
+
+ /**
+ * 后台新增网格
+ * @param eventGridDataDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/data/add")
+ public R addGridDataByAdmin(@RequestBody EventGridDataAddAdminDTO eventGridDataDTO){
+ return eventGridDataService.addGridDataByAdmin(eventGridDataDTO);
+ }
+
+ /**
+ * 后台修改网格
+ * @param eventGridDataDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/data/edit")
+ public R editGridDataByAdmin(@RequestBody EventGridDataEditAdminDTO eventGridDataDTO){
+ return eventGridDataService.editGridDataByAdmin(eventGridDataDTO);
+ }
+
+
+ /**
+ * 查询网格下所有网格员
+ * @param gridId
+ * @return
+ */
+ @PostMapping("/grid/member")
+ R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId){
+ return eventGridDataService.getGridMemberListsByGrid(gridId);
+ }
+
+ /**
+ * 查询网格下所有网格员
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/communitygrid")
+ R getGridDataListByCommunity(@RequestParam("gridId") Long communityId){
+ return eventGridDataService.getGridDataListByCommunity(communityId);
+ }
+
+
+
+ @PostMapping("/data/delete")
+ public R deleteGridDataByAdmin(@RequestBody List<Long> Ids){
+ return eventGridDataService.deleteGridDataByAdmin(Ids);
+ }
}
--
Gitblit v1.7.1