From 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 18 八月 2021 18:53:24 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java | 59 +++++++++++++----------------------------------------------
1 files changed, 13 insertions(+), 46 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java
index 5f27136..97f9880 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java
@@ -2,10 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
+import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
@@ -31,53 +32,19 @@
private EventGridMemberRelationService eventGridMemberRelationService;
/**
- * 新增网格和网格员的关联关系
- * @param eventGridMemberRelationAddDTO
- * @return 新增结果
+ * 查询市平台网格员列表
+ * @return 市平台网格员列表
*/
- @PostMapping("/add")
- R add(@RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
- return eventGridMemberRelationService.add(eventGridMemberRelationAddDTO);
- };
+ @GetMapping("/lc/list")
+ public R lcList(){
+ return eventGridMemberRelationService.lcList();
+ }
- /**
- * 修改网格和网格员的关联关系
- * @param eventGridMemberRelationEditDTO
- * @return 维护结果
- */
- @PostMapping("/edit")
- R edit(@RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
- return eventGridMemberRelationService.edit(eventGridMemberRelationEditDTO);
- };
+ @PostMapping("/cascade/list")
+ public R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO){
+ return eventGridMemberRelationService.gridMemberCascadeList(memberCascadeAddDTO);
+ }
- /**
- * 分页查找网格和网格员的关联关系
- * @param pageEventGridMemberRelationDTO
- * @return 维护结果
- */
- @PostMapping("/page")
- R<IPage<EventGridMemberRelationVO>> query(@RequestBody PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO){
- return eventGridMemberRelationService.query(pageEventGridMemberRelationDTO);
- };
- /**
- * 删除网格和网格员的关联关系
- * @param EventGridMemberRelationDeleteDTO
- * @return 平台用户信息
- */
- @PostMapping("/delete")
- R delete(@RequestBody EventGridMemberRelationDeleteDTO EventGridMemberRelationDeleteDTO){
- return eventGridMemberRelationService.delete(EventGridMemberRelationDeleteDTO);
- };
-
- /**
- * 查询网格和网格员的关联关系详细信息
- * @param id 网格和网格员的关联关系 id
- * @return 查找结果
- */
- @PostMapping("/{id}")
- R<EventGridMemberRelationDetailsVO> eventGridMemberRelationDetails(@PathVariable("id") Long id){
- return eventGridMemberRelationService.eventGridMemberRelationDetails(id);
- };
}
--
Gitblit v1.7.1