From bd0ac05436fa6195aac2bcc41381a9c154d2990b Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 28 五月 2021 18:18:13 +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 |  104 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 104 insertions(+), 0 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 9f93471..7e36951 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
@@ -462,6 +462,110 @@
     R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(@PathVariable("id") Long id);
 
     /**
+     * 添加事件
+     * @param commonEventAddDTO
+     * @return
+     */
+    @PostMapping("/event/addCommon")
+    R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO);
+
+    /**
+     * 保存事件草稿
+     * @param commonEventEditDTO
+     * @return
+     */
+    @PostMapping("/event/saveDraft")
+    R saveDraft(@RequestBody CommonEventEditDTO commonEventEditDTO);
+
+    /**
+     * 突发事件上报社区
+     * @param commonEventReportDTO
+     * @return
+     */
+    @PostMapping("/event/report")
+    R report(@RequestBody CommonEventReportDTO commonEventReportDTO);
+
+    /**
+     * 突发事件撤销
+     * @param eventRevokeDTO
+     * @return
+     */
+    @PostMapping("/event/emergenciesRevoke")
+    R emergenciesRevoke(@RequestBody EventRevokeDTO eventRevokeDTO);
+
+    /**
+     * 处理事件
+     * @param commonEventDealDTO
+     * @return
+     */
+    @PostMapping("/event/dealEvent")
+    R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO);
+
+    /**
+     * 处理事件
+     * @param commonEventVerifyDTO
+     * @return
+     */
+    @PostMapping("/event/verify")
+    R verifyEvent(@RequestBody CommonEventVerifyDTO commonEventVerifyDTO);
+
+    /**
+     * 处理事件
+     * @param commonEventRepublicDTO
+     * @return
+     */
+    @PostMapping("/event/republish")
+    R republishEvent(@RequestBody CommonEventRepublicDTO commonEventRepublicDTO);
+
+    /**
+     * 网格数据待处理统计信息
+     * @param pageEventGridDataDTO
+     * @return
+     */
+    @PostMapping("/eventgriddata/getGridData")
+    R getGridData(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
+
+    /**
+     * 查询用户网格
+     * @param pageEventGridDataDTO
+     * @return
+     */
+    @PostMapping("/eventgriddata/userGrid")
+    R userGrid(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
+
+    /**
+     * 特殊人员信息上报
+     * @param specialEventAddDTO
+     * @return
+     */
+    @PostMapping("/event/addSpecial")
+    R addSpecial(@RequestBody SpecialEventAddDTO specialEventAddDTO);
+
+    /**
+     * 获取指定特殊人员信息
+     * @param idCard
+     * @return
+     */
+    @PostMapping("/event/addSpecial")
+    R getSpecialPopulation(String idCard);
+
+    /**
+     * 保存殊人群事件上报草稿
+     * @param specialEventEditDTO
+     * @return
+     */
+    @PostMapping("/event/saveSpecialDraft")
+    R saveSpecialDraft(@RequestBody SpecialEventEditDTO specialEventEditDTO);
+
+    /**
+     * 草稿发布
+     * @param commonEventPublicDTO
+     * @return
+     */
+    @PostMapping("/event/draftRelease")
+    R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO);
+
+    /**
      * 查询随手拍列表
      * @param easyAppDTO    请求参数
      * @return  随手拍列表

--
Gitblit v1.7.1