From a5ebd7103f2375c8c241c6f14c586c7d75b0dd79 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 05 六月 2021 18:44:36 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 insertions(+), 1 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 7ccc5b0..a4b80c0 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
@@ -84,7 +84,7 @@
      * @return  网格列表
      */
     @PostMapping("/data/list")
-    public R getGridMemberList(@RequestBody PageEventGridDataDTO eventGridDataDTO){
+    public R getGridMemberList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO){
         return eventGridDataService.getGridMemberList(eventGridDataDTO);
     }
 
@@ -117,4 +117,47 @@
     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);
+    }
+
+
 }

--
Gitblit v1.7.1