From 95d336192af530dae4a70d78fcd300048976395d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 05 六月 2021 19:10:09 +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 | 122 ++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 18 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 c6b3520..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
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
-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;
@@ -14,6 +11,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
*
@@ -30,6 +28,17 @@
@Resource
private EventGridDataService eventGridDataService;
+
+ /**
+ * 查询用户网格
+ * @param pageEventGridDataDTO
+ * @return
+ */
+ @PostMapping("/userGrid")
+ R userGrid(@RequestBody PageEventGridDataDTO pageEventGridDataDTO){
+ return eventGridDataService.getUserGrid(pageEventGridDataDTO);
+ }
+
/**
* 新增区县/街道/社区/网格员网格数据管理
* @param eventGridDataAddDTO
@@ -38,7 +47,7 @@
@PostMapping("/add")
R add(@RequestBody EventGridDataAddDTO eventGridDataAddDTO){
return eventGridDataService.add(eventGridDataAddDTO);
- };
+ }
/**
* 修改区县/街道/社区/网格员网格数据管理
@@ -48,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);
- };
+ }
/**
* 删除区县/街道/社区/网格员网格数据管理
@@ -68,7 +67,7 @@
@PostMapping("/delete")
R delete(@RequestBody EventGridDataDeleteDTO EventGridDataDeleteDTO){
return eventGridDataService.delete(EventGridDataDeleteDTO);
- };
+ }
/**
* 查询区县/街道/社区/网格员网格数据管理详细信息
@@ -78,6 +77,93 @@
@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);
+ }
+
+ /**
+ * 首页待处理
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ @PostMapping("/getGridTodoData")
+ R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO){
+ return eventGridDataService.getGridTodoData(eventGridTodoDataDTO);
+ }
+
+ /**
+ * 网格数据待处理统计信息
+ * @param eventGridStatisticsDataDTO
+ * @return
+ */
+ @PostMapping("/eventgriddata/getGridStatisticsdData")
+ 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