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/service/EventService.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 100 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
index 8ae708f..3b8acdf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-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;
@@ -44,10 +41,10 @@
/**
* 删除事件
- * @param EventDeleteDTO
+ * @param commonEventDeleteDTO
* @return 平台用户信息
*/
- R delete(EventDeleteDTO EventDeleteDTO);
+ R delete(CommonEventDeleteDTO commonEventDeleteDTO);
/**
* 查询事件详细信息
@@ -56,5 +53,102 @@
*/
R<EventDetailsVO> eventDetails(Long id);
+ /**
+ * 添加事件
+ * @param commonEventAddDTO
+ * @return
+ */
+ R addCommon(CommonEventAddDTO commonEventAddDTO);
+
+ /**
+ * 保存事件草稿
+ * @param commonEventEditDTO
+ * @return
+ */
+ R saveDraft(CommonEventEditDTO commonEventEditDTO);
+
+ /**
+ * 突发事件上报
+ * @param commonEventReportDTO
+ * @return
+ */
+ R report(CommonEventReportDTO commonEventReportDTO);
+
+ /**
+ * 突发事件撤销
+ * @param eventRevokeDTO
+ * @return
+ */
+ R emergenciesRevoke(EventRevokeDTO eventRevokeDTO);
+ /**
+ * 处理事件
+ * @param commonEventDealDTO
+ * @return
+ */
+ R dealEvent(CommonEventDealDTO commonEventDealDTO);
+
+ /**
+ * 确认事件
+ * @param commonEventVerifyDTO
+ * @return
+ */
+ R verifyEvent(CommonEventVerifyDTO commonEventVerifyDTO);
+
+ /**
+ * 重新发布事件
+ * @param commonEventRepublicDTO
+ * @return
+ */
+ R republishEvent(CommonEventRepublicDTO commonEventRepublicDTO);
+
+ /**
+ * 草稿发布
+ * @param commonEventPublicDTO
+ * @return
+ */
+ R draftRelease(CommonEventPublicDTO commonEventPublicDTO);
+
+ /**
+ * 保存殊人群事件上报草稿
+ * @param specialEventEditDTO
+ * @return
+ */
+ R saveSpecialDraft(SpecialEventEditDTO specialEventEditDTO);
+
+ /**
+ * 特殊人员信息上报
+ * @param specialEventAddDTO
+ * @return
+ */
+ R addSpecial(SpecialEventAddDTO specialEventAddDTO);
+
+
+ /**
+ * 获取指定特殊人员信息
+ * @param idCard
+ * @return
+ */
+ R getSpecialPopulation(String idCard);
+
+ /**
+ * 添加发布宣传教育事件
+ * @param publicityEventAddDTO 请求参数
+ * @return 上报结果
+ */
+ R addPublicity(PublicityEventAddDTO publicityEventAddDTO);
+
+ /**
+ * 保存宣传教育事件草稿
+ * @param publicityEventEditDTO 请求参数
+ * @return 保存结果
+ */
+ R savePublicityDraft(PublicityEventEditDTO publicityEventEditDTO);
+
+ /**
+ * 分页查询宣传教育事件
+ * @param pagePublicityEventDTO
+ * @return
+ */
+ R selectPublicity(PagePublicityEventDTO pagePublicityEventDTO);
}
--
Gitblit v1.7.1