From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java | 78 +++++++++-----------------------------
1 files changed, 19 insertions(+), 59 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 71a6428..24610ac 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
@@ -1,19 +1,14 @@
package com.panzhihua.service_grid.api;
+import javax.annotation.Resource;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-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.PageEventGridMemberRelationDTO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
-import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
-import com.panzhihua.service_grid.service.EventGridMemberRelationService;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_grid.service.EventGridMemberRelationService;
+
+import lombok.extern.slf4j.Slf4j;
/**
*
@@ -21,63 +16,28 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Slf4j
@RestController
@RequestMapping("/eventgridmemberrelation")
-public class EventGridMemberRelationApi{
+public class EventGridMemberRelationApi {
@Resource
private EventGridMemberRelationService eventGridMemberRelationService;
/**
- * 新增网格和网格员的关联关系
- * @param eventGridMemberAddDTO
- * @return 新增结果
+ * 查询市平台网格员列表
+ *
+ * @return 市平台网格员列表
*/
- @PostMapping("/add")
- R add(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO){
- return eventGridMemberRelationService.add(eventGridMemberAddDTO);
- };
+ @GetMapping("/lc/list")
+ public R lcList() {
+ return eventGridMemberRelationService.lcList();
+ }
- /**
- * 修改网格和网格员的关联关系
- * @param eventGridMemberEditDTO
- * @return 维护结果
- */
- @PostMapping("/edit")
- R edit(@RequestBody EventGridMemberEditDTO eventGridMemberEditDTO){
- return eventGridMemberRelationService.edit(eventGridMemberEditDTO);
- };
-
- /**
- * 分页查找网格和网格员的关联关系
- * @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);
- };
+ @PostMapping("/cascade/list")
+ public R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO) {
+ return eventGridMemberRelationService.gridMemberCascadeList(memberCascadeAddDTO);
+ }
}
--
Gitblit v1.7.1