From f495b3389331dac4f5c66a9383a8a0c7ff82e37d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 28 五月 2021 18:14:15 +0800
Subject: [PATCH] none

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java |   61 ++++++++++++++++--------------
 1 files changed, 32 insertions(+), 29 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 c50ad2a..a2cf206 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
@@ -6,14 +6,8 @@
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.grid.EventDetailsVO;
 import com.panzhihua.common.model.vos.grid.EventVO;
-import com.panzhihua.service_grid.model.dos.EventResourceDO;
-import com.panzhihua.service_grid.service.EventResourceService;
 import com.panzhihua.service_grid.service.EventService;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -65,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);
     };
 
     /**
@@ -85,32 +79,32 @@
 
     /**
      * 添加突发事件
-     * @param emergenciesEventAddDTO
+     * @param commonEventAddDTO
      * @return 新增结果
      */
-    @PostMapping("/addEmergencies")
-    R addEmergencies(@RequestBody EmergenciesEventAddDTO emergenciesEventAddDTO){
-        return eventService.addEmergencies(emergenciesEventAddDTO);
+    @PostMapping("/addCommon")
+    R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO){
+        return eventService.addCommon(commonEventAddDTO);
     };
     /**
      * 保存草稿
      * @param {classNameFirstLower}AddDTO 添加事件传递对象
      * @return 新增结果
      */
-    @PostMapping("/saveEmergenciesDraft")
-    R saveEmergenciesDraft(@RequestBody EmergenciesEventEditDTO emergenciesEventEditDTO){
-        return eventService.saveEmergenciesDraft(emergenciesEventEditDTO);
+    @PostMapping("/saveDraft")
+    R saveDraft(@RequestBody CommonEventEditDTO commonEventEditDTO){
+        return eventService.saveDraft(commonEventEditDTO);
     }
 
 
     /**
      * 突发事件上报社区
-     * @param emergenciesEventReportDTO
+     * @param commonEventReportDTO
      * @return
      */
-    @PostMapping("/emergenciesReport")
-    R emergenciesReport(@RequestBody EmergenciesEventReportDTO emergenciesEventReportDTO){
-        return eventService.emergenciesReport(emergenciesEventReportDTO);
+    @PostMapping("/report")
+    R report(@RequestBody CommonEventReportDTO commonEventReportDTO){
+        return eventService.report(commonEventReportDTO);
     }
 
 
@@ -125,32 +119,41 @@
     }
     /**
      * 处理事件
-     * @param eventDealDTO
+     * @param commonEventDealDTO
      * @return
      */
     @PostMapping("/dealEvent")
-    R dealEvent(@RequestBody EventDealDTO eventDealDTO){
-        return eventService.dealEvent(eventDealDTO);
+    R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO){
+        return eventService.dealEvent(commonEventDealDTO);
     }
 
     /**
      * 处理事件
-     * @param eventVerifyDTO
+     * @param commonEventVerifyDTO
      * @return
      */
     @PostMapping("/verify")
-    R verifyEvent(@RequestBody EventVerifyDTO eventVerifyDTO){
-        return eventService.verifyEvent(eventVerifyDTO);
+    R verifyEvent(@RequestBody CommonEventVerifyDTO commonEventVerifyDTO){
+        return eventService.verifyEvent(commonEventVerifyDTO);
     }
 
     /**
      * 重新发布事件
-     * @param eventRepublicDTO
+     * @param commonEventRepublicDTO
      * @return
      */
     @PostMapping("/republish")
-    R republishEvent(@RequestBody EventRepublicDTO eventRepublicDTO){
-        return eventService.republishEvent(eventRepublicDTO);
+    R republishEvent(@RequestBody CommonEventRepublicDTO commonEventRepublicDTO){
+        return eventService.republishEvent(commonEventRepublicDTO);
     }
 
+    /**
+     * 草稿发布
+     * @param commonEventPublicDTO
+     * @return
+     */
+    @PostMapping("/event/draftRelease")
+    R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO){
+        return eventService.draftRelease(commonEventPublicDTO);
+    }
 }

--
Gitblit v1.7.1