事件审核

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
@@ -33,7 +34,6 @@ public class ApiWorkIssueController {
     @GetMapping("issue/statistics")
     public Result<IssueStateStatisticsResultDTO> statistics(@RequestBody IssueStateStatisticsFormDTO formDto) {
         return workIssueService.stateStatistics(formDto);
-
     }
 
     /**
@@ -46,7 +46,6 @@ public class ApiWorkIssueController {
         return workIssueService.listIssuePendingResponse(formDto);
     }
 
-
     /**
      *事件详情
      * @param id
@@ -67,4 +66,12 @@ public class ApiWorkIssueController {
     }
 
 
+    /**
+     *事件审核
+     * @return
+     */
+    @PostMapping("event/review")
+    public Result review(EpdcEventsReviewFormDTO dto) {
+        return workIssueService.review(dto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
 import com.elink.esua.epdc.dto.issue.result.*;
@@ -11,6 +12,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
@@ -49,4 +51,12 @@ public interface WorkIssueFeignClient {
     @GetMapping(value = "events/epdc-app/work/issue/categoryList", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<EventCategoryDTO>> categoryList();
 
+    /**
+     * 事件审核
+     * @param dto
+     * @return
+     */
+    @PostMapping(value = "events/epdc-app/work/event/review", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result review(EpdcEventsReviewFormDTO dto);
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java

@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
 import com.elink.esua.epdc.dto.issue.result.*;
@@ -40,4 +41,9 @@ public class WorkIssueFeignClientFallback implements WorkIssueFeignClient {
     public Result<List<EventCategoryDTO>> categoryList() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "categoryList", "");
     }
+
+    @Override
+    public Result review(EpdcEventsReviewFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "review", dto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
@@ -56,4 +57,11 @@ public interface WorkIssueService {
      * @return
      */
     Result<List<EventCategoryDTO>> categoryList();
+
+    /**
+     * 事件审核
+     * @param dto
+     * @return
+     */
+    Result review(EpdcEventsReviewFormDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
@@ -76,4 +77,14 @@ public class WorkIssueServiceImpl implements WorkIssueService {
     public Result<List<EventCategoryDTO>> categoryList() {
         return workIssueFeignClient.categoryList();
     }
+
+    /**
+     * 事件审核
+     * @param dto
+     * @return
+     */
+    @Override
+    public Result review(EpdcEventsReviewFormDTO dto) {
+        return workIssueFeignClient.review(dto);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java

@@ -21,4 +21,9 @@ public interface ImageConstant {
      * 图片类型-事件拒绝
      */
     public final static String TYPE_IMAGE_BIZ_EVENTS_REJECT = "eventsReject";
+
+    /**
+     * 图片类型-议题处理
+     */
+    public final static String TYPE_IMAGE_BIZ_ISSUE_HANDLE = "issueHandle";
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java

@@ -6,6 +6,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 审核事件提交表单DTO
@@ -35,4 +36,6 @@ public class EpdcEventsReviewFormDTO implements Serializable {
      */
     @Size(min = 1, max = 500, message = "处理意见在500字以内")
     private String advice;
+
+    private List<String> images;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppWorkEventsController.java

@@ -2,13 +2,12 @@ package com.elink.esua.epdc.modules.events.controller;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping(Constant.EPDC_APP + "work/event")
@@ -27,4 +26,17 @@ public class EpdcAppWorkEventsController {
         EpdcEventsDetailDTO data = epdcEventsService.getEvent(id);
         return new Result<EpdcEventsDetailDTO>().ok(data);
     }
+
+    /**
+     * 事件审核
+     * @Params: [dto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: liuchuang
+     * @Date: 2019/9/5 9:02
+     */
+    @PostMapping("review")
+    public Result eventReview(@RequestBody EpdcEventsReviewFormDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        return epdcEventsService.eventReview(dto);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -176,6 +176,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         // 更新事件表审核状态
         updateById(entity);
 
+        String imageType = ImageConstant.TYPE_IMAGE_BIZ_EVENTS_REJECT;
+        String referenceId = dto.getId();
+
         EpdcEventsEntity eventsEntity = baseDao.selectById(dto.getId());
 
         // 组装发送消息内容
@@ -208,7 +211,13 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
 
             // 发送菜单消息-议题待处理
             issueService.sendIssueHandleMenuNotice(issueEntity.getGridId(), null);
+
+            referenceId = issueHandleEntity.getId();
+            imageType = ImageConstant.TYPE_IMAGE_BIZ_ISSUE_HANDLE;
         }
+
+        imgService.saveImages(dto.getImages(),referenceId,imageType);
+
         // 插入部门响应记录
         deptRespondTask.saveEventDeptRespond(dto);
         // 事件来源-友邻社群-话题转议题