From faa40222f2e15b68a89d2180b57d444de5b67709 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 31 五月 2021 13:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java |   97 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 96 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 8845f86..7511707 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
@@ -546,7 +546,7 @@
      * @param idCard
      * @return
      */
-    @PostMapping("/event/addSpecial")
+    @PostMapping("/event/getSpecialPopulation")
     R getSpecialPopulation(String idCard);
 
     /**
@@ -564,4 +564,99 @@
      */
     @PostMapping("/event/draftRelease")
     R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO);
+
+    /**
+     * 查询随手拍列表
+     * @param easyAppDTO    请求参数
+     * @return  随手拍列表
+     */
+    @PostMapping("/easy/list")
+    R easyList(@RequestBody PageEasyAppDTO easyAppDTO);
+
+    /**
+     * 查询随手拍详情
+     * @param easyId    随手拍id
+     * @return  随手拍详情
+     */
+    @PostMapping("/easy/detail")
+    R easyDetailByApp(@RequestParam("easyId") Long easyId);
+
+    /**
+     * 查询随手拍类型列表
+     * @return  类型列表
+     */
+    @PostMapping("/easy/type/list")
+    R easyTypeListByApp();
+
+    /**
+     * 随手拍处理
+     * @param photoHandleDTO    请求参数
+     * @return  处理结果
+     */
+    @PostMapping("/easy/handle")
+    R easyHandle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);
+
+    /**
+     * 随手拍公示状态切换
+     * @param photoHandleDTO    请求参数
+     * @return  切换结果
+     */
+    @PostMapping("/easy/publicity")
+    R easyPublicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);
+
+    /**
+     * 随手拍上报社区
+     * @param photoHandleDTO    请求参数
+     * @return  上报结果
+     */
+    @PostMapping("/easy/report")
+    R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);
+
+    /**
+     * 添加发布宣传教育事件
+     * @param publicityEventAddDTO   请求参数
+     * @return  添加发布结果
+     */
+    @PostMapping("/event/addPublicity")
+    R addPublicity(@RequestBody PublicityEventAddDTO publicityEventAddDTO);
+
+    /**
+     * 保存宣传教育事件草稿
+     * @param publicityEventEditDTO   请求参数
+     * @return  保存结果
+     */
+    @PostMapping("/event/savePublicityDraft")
+    R savePublicityDraft(@RequestBody PublicityEventEditDTO publicityEventEditDTO);
+
+    /**
+     * 分页查询宣传教育事件
+     * @param pagePublicityEventDTO   请求参数
+     * @return  结果
+     */
+    @PostMapping("/event/queryPublicity")
+    R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);
+
+    /**
+     * 地图模块-根据网格id查询网格详细信息
+     * @param gridId    网格id
+     * @return  网格详细信息
+     */
+    @PostMapping("/map/getGridDetail")
+    R getGridDetail(@RequestParam("gridId") Long gridId);
+
+    /**
+     * 地图模块-根据网格员id查询今日运动轨迹
+     * @param userId    网格员id
+     * @return  运动轨迹
+     */
+    @PostMapping("/map/getTrajectoryByApp")
+    R getTrajectoryByApp(@RequestParam("userId") Long userId);
+
+    /**
+     * 地图模块-根据网格员id查询关联网格列表
+     * @param userId    网格员id
+     * @return  网格列表
+     */
+    @PostMapping("/map/getMapGridListByApp")
+    R getMapGridListByApp(@RequestParam("userId") Long userId);
 }

--
Gitblit v1.7.1