From 709804b9db1eb901e357928a0830b3c65509da69 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 08 七月 2021 10:38:48 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java | 101 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 87 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..72dad4c 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
@@ -7,10 +7,12 @@
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.service_grid.service.EventGridDataService;
+import com.panzhihua.service_grid.service.LcCompareCodeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
*
@@ -26,6 +28,8 @@
@Resource
private EventGridDataService eventGridDataService;
+ @Resource
+ private LcCompareCodeService lcCompareCodeService;
/**
@@ -46,7 +50,7 @@
@PostMapping("/add")
R add(@RequestBody EventGridDataAddDTO eventGridDataAddDTO){
return eventGridDataService.add(eventGridDataAddDTO);
- };
+ }
/**
* 修改区县/街道/社区/网格员网格数据管理
@@ -56,17 +60,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 +70,7 @@
@PostMapping("/delete")
R delete(@RequestBody EventGridDataDeleteDTO EventGridDataDeleteDTO){
return eventGridDataService.delete(EventGridDataDeleteDTO);
- };
+ }
/**
* 查询区县/街道/社区/网格员网格数据管理详细信息
@@ -86,7 +80,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 +121,63 @@
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);
+ }
+
+ /**
+ * 综治后台-查询所有市平台网格列表
+ * @return 市平台网格列表
+ */
+ @GetMapping("/lc/list")
+ public R getLcGridLists(){
+ return lcCompareCodeService.getLcGridLists();
+ }
+
+
}
--
Gitblit v1.7.1