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/api/EventApi.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 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 d2b8abc..ba1e1da 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
@@ -79,7 +79,7 @@
/**
- * 突发事件上报社区
+ * 事件上报社区
* @param commonEventReportDTO
* @return
*/
@@ -90,7 +90,7 @@
/**
- * 突发事件撤销
+ * 事件撤销
* @param eventRevokeDTO
* @return
*/
@@ -105,7 +105,14 @@
*/
@PostMapping("/dealEvent")
R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO){
- return eventService.dealEvent(commonEventDealDTO);
+ switch (commonEventDealDTO.getOperateType()){
+ case 1:
+ return eventService.communityDealEvent(commonEventDealDTO);
+ case 0:
+ return eventService.dealEvent(commonEventDealDTO);
+ default:
+ return R.fail("参数错误");
+ }
}
/**
@@ -120,12 +127,12 @@
/**
* 重新发布事件
- * @param commonEventRepublicDTO
+ * @param commonEventRepublishDTO
* @return
*/
@PostMapping("/republish")
- R republishEvent(@RequestBody CommonEventRepublicDTO commonEventRepublicDTO){
- return eventService.republishEvent(commonEventRepublicDTO);
+ R republishEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO){
+ return eventService.republishEvent(commonEventRepublishDTO);
}
/**
@@ -208,4 +215,34 @@
return eventService.actList();
}
+ /**
+ * 查询管理事件
+ * @param pageEventManageDTO
+ * @return
+ */
+ @PostMapping("/manage/list")
+ R queryEventToManage(@RequestBody PageEventManageDTO pageEventManageDTO){
+ return eventService.eventToManage(pageEventManageDTO);
+ }
+
+ /**
+ * 社区网格后台标记事件无效
+ * @param eventRevokeDTO
+ * @return
+ */
+ @PostMapping("/markInvalid")
+ R markEventInvalid(@RequestBody EventRevokeDTO eventRevokeDTO){
+ return eventService.markEventInvalid(eventRevokeDTO);
+ }
+
+ /**
+ * 社区网格后台重新发布已标记无效的事件
+ * @param commonEventRepublishDTO
+ * @return
+ */
+ @PostMapping("/republishInvalid")
+ R republishInvalidEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO){
+ return eventService.republishInvalidEvent(commonEventRepublishDTO);
+ }
+
}
--
Gitblit v1.7.1