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/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java | 153 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 146 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
index 2b8986b..ca9641e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.panzhihua.common.model.dtos.grid.EventAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
@@ -62,12 +59,12 @@
/**
* 删除事件
- * @param EventDeleteDTO
+ * @param commonEventDeleteDTO
* @return 平台用户信息
*/
@PostMapping("/delete")
- R delete(@RequestBody EventDeleteDTO EventDeleteDTO){
- return eventService.delete(EventDeleteDTO);
+ R delete(@RequestBody CommonEventDeleteDTO commonEventDeleteDTO){
+ return eventService.delete(commonEventDeleteDTO);
};
/**
@@ -80,4 +77,146 @@
return eventService.eventDetails(id);
};
+ /**
+ * 添加突发事件
+ * @param commonEventAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/addCommon")
+ R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO){
+ return eventService.addCommon(commonEventAddDTO);
+ };
+ /**
+ * 保存草稿
+ * @param {classNameFirstLower}AddDTO 添加事件传递对象
+ * @return 新增结果
+ */
+ @PostMapping("/saveDraft")
+ R saveDraft(@RequestBody CommonEventEditDTO commonEventEditDTO){
+ return eventService.saveDraft(commonEventEditDTO);
+ }
+
+
+ /**
+ * 突发事件上报社区
+ * @param commonEventReportDTO
+ * @return
+ */
+ @PostMapping("/report")
+ R report(@RequestBody CommonEventReportDTO commonEventReportDTO){
+ return eventService.report(commonEventReportDTO);
+ }
+
+
+ /**
+ * 突发事件撤销
+ * @param eventRevokeDTO
+ * @return
+ */
+ @PostMapping("/emergenciesRevoke")
+ R emergenciesRevoke(@RequestBody EventRevokeDTO eventRevokeDTO){
+ return eventService.emergenciesRevoke(eventRevokeDTO);
+ }
+ /**
+ * 处理事件
+ * @param commonEventDealDTO
+ * @return
+ */
+ @PostMapping("/dealEvent")
+ R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO){
+ return eventService.dealEvent(commonEventDealDTO);
+ }
+
+ /**
+ * 处理事件
+ * @param commonEventVerifyDTO
+ * @return
+ */
+ @PostMapping("/verify")
+ R verifyEvent(@RequestBody CommonEventVerifyDTO commonEventVerifyDTO){
+ return eventService.verifyEvent(commonEventVerifyDTO);
+ }
+
+ /**
+ * 重新发布事件
+ * @param commonEventRepublicDTO
+ * @return
+ */
+ @PostMapping("/republish")
+ R republishEvent(@RequestBody CommonEventRepublicDTO commonEventRepublicDTO){
+ return eventService.republishEvent(commonEventRepublicDTO);
+ }
+
+ /**
+ * 草稿发布
+ * @param commonEventPublicDTO
+ * @return
+ */
+ @PostMapping("/draftRelease")
+ R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO){
+ return eventService.draftRelease(commonEventPublicDTO);
+ }
+
+ /**
+ * 保存殊人群事件上报草稿
+ * @param specialEventEditDTO
+ * @return
+ */
+ @PostMapping("/saveSpecialDraft")
+ R saveSpecialDraft(@RequestBody SpecialEventEditDTO specialEventEditDTO){
+ return eventService.saveSpecialDraft(specialEventEditDTO);
+ }
+
+
+ /**
+ * 特殊人员信息上报
+ * @param specialEventAddDTO
+ * @return
+ */
+ @PostMapping("/addSpecial")
+ R addSpecial(@RequestBody SpecialEventAddDTO specialEventAddDTO){
+ return eventService.addSpecial(specialEventAddDTO);
+ }
+
+ /**
+ * 获取指定特殊人员信息
+ * @param idCard
+ * @return
+ */
+ @PostMapping("/getSpecialPopulation")
+ R getSpecialPopulation(@RequestBody String idCard){
+ return eventService.getSpecialPopulation(idCard);
+ }
+
+
+ /**
+ * 添加发布宣传教育事件
+ * @param publicityEventAddDTO 请求参数
+ * @return 上报结果
+ */
+ @PostMapping("/addPublicity")
+ R addPublicity(@RequestBody PublicityEventAddDTO publicityEventAddDTO){
+ return eventService.addPublicity(publicityEventAddDTO);
+ }
+
+ /**
+ * 保存宣传教育事件草稿
+ * @param publicityEventEditDTO 请求参数
+ * @return 保存结果
+ */
+ @PostMapping("/savePublicityDraft")
+ R savePublicityDraft(@RequestBody PublicityEventEditDTO publicityEventEditDTO) {
+ return eventService.savePublicityDraft(publicityEventEditDTO);
+ }
+ /**
+ * 分页查询宣传教育事件
+ * @param pagePublicityEventDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("/queryPublicity")
+ R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO){
+ return eventService.selectPublicity(pagePublicityEventDTO);
+ }
+
+
}
--
Gitblit v1.7.1