From ecde7a30a43e3d45be2f0f9e271d0abf02c7d58e Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 14 十二月 2021 13:58:17 +0800
Subject: [PATCH] Merge branch 'west_bigscreen_dev' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java | 111 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 30 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 0d9e81a..48a1e3d 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
@@ -1,17 +1,18 @@
package com.panzhihua.service_grid.api;
+import java.util.List;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
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.service.EventGridDataService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import com.panzhihua.service_grid.service.LcCompareCodeService;
-import javax.annotation.Resource;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
/**
*
@@ -19,128 +20,178 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Slf4j
@RestController
@RequestMapping("/eventgriddata")
-public class EventGridDataApi{
+public class EventGridDataApi {
@Resource
private EventGridDataService eventGridDataService;
-
+ @Resource
+ private LcCompareCodeService lcCompareCodeService;
/**
* 查询用户网格
+ *
* @param pageEventGridDataDTO
* @return
*/
@PostMapping("/userGrid")
- R userGrid(@RequestBody PageEventGridDataDTO pageEventGridDataDTO){
+ R userGrid(@RequestBody PageEventGridDataDTO pageEventGridDataDTO) {
return eventGridDataService.getUserGrid(pageEventGridDataDTO);
}
/**
* 新增区县/街道/社区/网格员网格数据管理
+ *
* @param eventGridDataAddDTO
* @return 新增结果
*/
@PostMapping("/add")
- R add(@RequestBody EventGridDataAddDTO eventGridDataAddDTO){
+ R add(@RequestBody EventGridDataAddDTO eventGridDataAddDTO) {
return eventGridDataService.add(eventGridDataAddDTO);
}
/**
* 修改区县/街道/社区/网格员网格数据管理
+ *
* @param eventGridDataEditDTO
* @return 维护结果
*/
@PostMapping("/edit")
- R edit(@RequestBody EventGridDataEditDTO eventGridDataEditDTO){
+ R edit(@RequestBody EventGridDataEditDTO eventGridDataEditDTO) {
return eventGridDataService.edit(eventGridDataEditDTO);
}
/**
* 删除区县/街道/社区/网格员网格数据管理
+ *
* @param EventGridDataDeleteDTO
* @return 平台用户信息
*/
@PostMapping("/delete")
- R delete(@RequestBody EventGridDataDeleteDTO EventGridDataDeleteDTO){
+ R delete(@RequestBody EventGridDataDeleteDTO EventGridDataDeleteDTO) {
return eventGridDataService.delete(EventGridDataDeleteDTO);
}
/**
* 查询区县/街道/社区/网格员网格数据管理详细信息
- * @param id 区县/街道/社区/网格员网格数据管理 id
+ *
+ * @param id
+ * 区县/街道/社区/网格员网格数据管理 id
* @return 查找结果
*/
@PostMapping("/{id}")
- R<EventGridDataDetailsVO> eventGridDataDetails(@PathVariable("id") Long id){
+ R<EventGridDataDetailsVO> eventGridDataDetails(@PathVariable("id") Long id) {
return eventGridDataService.eventGridDataDetails(id);
}
/**
* 分页查询网格
- * @param eventGridDataDTO 请求参数
- * @return 网格列表
+ *
+ * @param eventGridDataDTO
+ * 请求参数
+ * @return 网格列表
*/
@PostMapping("/data/list")
- public R getGridMemberList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO){
+ public R getGridMemberList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO) {
return eventGridDataService.getGridMemberList(eventGridDataDTO);
}
/**
* 查询社区下所有网格员
- * @param communityId 社区id
- * @return 网格员列表
+ *
+ * @param communityId
+ * 社区id
+ * @return 网格员列表
*/
@PostMapping("/member/list")
- public R getGridMemberLists(@RequestParam("communityId") Long communityId){
+ public R getGridMemberLists(@RequestParam(value = "communityId", required = false) Long communityId) {
return eventGridDataService.getGridMemberLists(communityId);
}
/**
* 首页待处理
+ *
* @param eventGridTodoDataDTO
* @return
*/
@PostMapping("/getGridTodoData")
- R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO){
+ R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO) {
return eventGridDataService.getGridTodoData(eventGridTodoDataDTO);
}
/**
* 网格数据待处理统计信息
+ *
* @param eventGridStatisticsDataDTO
* @return
*/
@PostMapping("/eventgriddata/getGridStatisticsdData")
- R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO){
+ R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO) {
return R.ok();
}
/**
* 后台新增网格
- * @param eventGridDataDTO 请求参数
- * @return 新增结果
+ *
+ * @param eventGridDataDTO
+ * 请求参数
+ * @return 新增结果
*/
@PostMapping("/data/add")
- public R addGridDataByAdmin(@RequestBody EventGridDataAddAdminDTO eventGridDataDTO){
+ public R addGridDataByAdmin(@RequestBody EventGridDataAddAdminDTO eventGridDataDTO) {
return eventGridDataService.addGridDataByAdmin(eventGridDataDTO);
}
/**
* 后台修改网格
- * @param eventGridDataDTO 请求参数
- * @return 修改结果
+ *
+ * @param eventGridDataDTO
+ * 请求参数
+ * @return 修改结果
*/
@PostMapping("/data/edit")
- public R editGridDataByAdmin(@RequestBody EventGridDataEditAdminDTO eventGridDataDTO){
+ 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){
+ 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