From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +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 |   75 +++++++++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 5 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 322b251..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;
 
 /**
  *
@@ -87,7 +85,7 @@
      * @return  网格列表
      */
     @PostMapping("/data/list")
-    public R getGridMemberList(@RequestBody PageEventGridDataDTO eventGridDataDTO){
+    public R getGridMemberList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO){
         return eventGridDataService.getGridMemberList(eventGridDataDTO);
     }
 
@@ -101,4 +99,71 @@
         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