From b3f04e40450d64c669feeb3cbdeb25063a223e45 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 04 六月 2021 18:28:07 +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 | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 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 70f8633..be0823f 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
@@ -62,7 +62,7 @@
R report(CommonEventReportDTO commonEventReportDTO);
/**
- * 突发事件撤销
+ * 事件撤销
* @param eventRevokeDTO
* @return
*/
@@ -83,10 +83,10 @@
/**
* 重新发布事件
- * @param commonEventRepublicDTO
+ * @param commonEventRepublishDTO
* @return
*/
- R republishEvent(CommonEventRepublicDTO commonEventRepublicDTO);
+ R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO);
/**
* 草稿发布
@@ -143,4 +143,32 @@
* @return
*/
R<ComActVO> actList();
+
+ /**
+ * 查询事件管理
+ * @param pageEventManageDTO
+ * @return
+ */
+ R eventToManage(PageEventManageDTO pageEventManageDTO);
+
+ /**
+ * 社区网格后台标记事件无效
+ * @param eventRevokeDTO
+ * @return
+ */
+ R markEventInvalid(EventRevokeDTO eventRevokeDTO);
+
+ /**
+ * 社区在网格后台重新发布已标记失效的事件
+ * @param commonEventRepublishDTO
+ * @return
+ */
+ R republishInvalidEvent(CommonEventRepublishDTO commonEventRepublishDTO);
+
+ /**
+ * 社区后台处理事件
+ * @param commonEventDealDTO
+ * @return
+ */
+ R communityDealEvent(CommonEventDealDTO commonEventDealDTO);
}
--
Gitblit v1.7.1