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 | 110 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 87 insertions(+), 23 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 0e01444..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
@@ -462,28 +462,28 @@
R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(@PathVariable("id") Long id);
/**
- * 添加突发事件
- * @param emergenciesEventAddDTO
+ * 添加事件
+ * @param commonEventAddDTO
* @return
*/
- @PostMapping("/event/addEmergencies")
- R addEmergencies(@RequestBody EmergenciesEventAddDTO emergenciesEventAddDTO);
+ @PostMapping("/event/addCommon")
+ R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO);
/**
- * 保存突发事件草稿
- * @param emergenciesEventEditDTO
+ * 保存事件草稿
+ * @param commonEventEditDTO
* @return
*/
- @PostMapping("/event/saveEmergenciesDraft")
- R saveEmergenciesDraft(@RequestBody EmergenciesEventEditDTO emergenciesEventEditDTO);
+ @PostMapping("/event/saveDraft")
+ R saveDraft(@RequestBody CommonEventEditDTO commonEventEditDTO);
/**
* 突发事件上报社区
- * @param emergenciesEventReportDTO
+ * @param commonEventReportDTO
* @return
*/
- @PostMapping("/event/emergenciesReport")
- R emergenciesReport(@RequestBody EmergenciesEventReportDTO emergenciesEventReportDTO);
+ @PostMapping("/event/report")
+ R report(@RequestBody CommonEventReportDTO commonEventReportDTO);
/**
* 突发事件撤销
@@ -494,6 +494,38 @@
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
@@ -502,28 +534,36 @@
R userGrid(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
/**
- * 处理事件
- * @param eventDealDTO
+ * 特殊人员信息上报
+ * @param specialEventAddDTO
* @return
*/
- @PostMapping("/event/dealEvent")
- R dealEvent(@RequestBody EventDealDTO eventDealDTO);
+ @PostMapping("/event/addSpecial")
+ R addSpecial(@RequestBody SpecialEventAddDTO specialEventAddDTO);
/**
- * 处理事件
- * @param eventVerifyDTO
+ * 获取指定特殊人员信息
+ * @param idCard
* @return
*/
- @PostMapping("/event/verify")
- R verifyEvent(@RequestBody EventVerifyDTO eventVerifyDTO);
+ @PostMapping("/event/getSpecialPopulation")
+ R getSpecialPopulation(String idCard);
/**
- * 处理事件
- * @param eventRepublicDTO
+ * 保存殊人群事件上报草稿
+ * @param specialEventEditDTO
* @return
*/
- @PostMapping("/event/republish")
- R republishEvent(@RequestBody EventRepublicDTO eventRepublicDTO);
+ @PostMapping("/event/saveSpecialDraft")
+ R saveSpecialDraft(@RequestBody SpecialEventEditDTO specialEventEditDTO);
+
+ /**
+ * 草稿发布
+ * @param commonEventPublicDTO
+ * @return
+ */
+ @PostMapping("/event/draftRelease")
+ R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO);
/**
* 查询随手拍列表
@@ -573,6 +613,30 @@
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 网格详细信息
--
Gitblit v1.7.1