From c7c38dfd96047930999bcd7cf62d18d6d8651108 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 18:50:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java |   50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 49 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
index e85c05d..d4a6152 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -689,7 +689,7 @@
      * @return  网格列表
      */
     @PostMapping("/eventgriddata/data/list")
-    R getGridDataList(@RequestBody PageEventGridDataDTO eventGridDataDTO);
+    R getGridDataList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO);
 
     /**
      * 查询社区下所有网格员
@@ -722,4 +722,52 @@
      */
     @PostMapping("/event/republishInvalid")
     R republishInvalidEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO);
+
+    /**
+     * 后台新增网格
+     * @param eventGridDataDTO  请求参数
+     * @return  新增结果
+     */
+    @PostMapping("/eventgriddata/data/add")
+    R addGridDataByAdmin(@RequestBody EventGridDataAddAdminDTO eventGridDataDTO);
+
+    /**
+     * 后台修改网格
+     * @param eventGridDataDTO  请求参数
+     * @return  修改结果
+     */
+    @PostMapping("/eventgriddata/data/edit")
+    R editGridDataByAdmin(@RequestBody EventGridDataEditAdminDTO eventGridDataDTO);
+
+    /**
+     * 后台管理-分页查询随手拍列表
+     * @param easyAppDTO    请求参数
+     * @return  随手拍列表
+     */
+    @PostMapping("/easy/admin/list")
+    R easyListByAdmin(@RequestBody PageEasyAdminDTO easyAppDTO);
+
+    /**
+     * 后台管理-随手拍详情
+     * @param easyId    随手拍id
+     * @return  随手拍详情
+     */
+    @PostMapping("/easy/admin/detail")
+    R easyDetailByAdmin(@RequestParam("easyId") Long easyId);
+
+    /**
+     * 后台管理-随手拍处理
+     * @param photoHandleDTO    请求参数
+     * @return  处理结果
+     */
+    @PostMapping("/easy/admin/handle")
+    R easyHandleByAdmin(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);
+
+    /**
+     * 后台管理-批量修改随手拍公示状态/删除随手拍
+     * @param photoHandleDTO    请求参数
+     * @return  修改/删除结果
+     */
+    @PostMapping("/easy/admin/publicity")
+    R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoHandleDTO);
 }

--
Gitblit v1.7.1