修改bug

esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml

@@ -33,11 +33,6 @@
             <artifactId>epdc-websocket-client</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-group-client</artifactId>
-            <version>1.0.0</version>
-        </dependency>
     </dependencies>
 
 

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

@@ -34,13 +34,11 @@ import com.elink.esua.epdc.constant.ImageConstant;
 import com.elink.esua.epdc.constants.MenuCodeConstant;
 import com.elink.esua.epdc.dto.MenuNoticeDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
-import com.elink.esua.epdc.dto.enums.TopicStateEnum;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.events.*;
 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.topic.form.TopicReviewFormDTO;
 import com.elink.esua.epdc.modules.async.DeptRespondTask;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.events.dao.EpdcEventsDao;
@@ -233,17 +231,17 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
      * @since 2019/11/11 10:28
      */
     private void reviewCallback(String topicId, EpdcEventsReviewFormDTO dto) {
-        TopicReviewFormDTO formDto = new TopicReviewFormDTO();
+        Map<String, String> callbackMap = new HashMap<>();
-        formDto.setTopicId(topicId);
+        callbackMap.put("topicId", topicId);
-        formDto.setProcessingOpinions(dto.getAdvice());
+        callbackMap.put("processingOpinions", dto.getAdvice());
-        formDto.setEventId(dto.getId());
+        callbackMap.put("eventId", dto.getId());
         if (dto.getEventState().equals(EventIssueItemState.EVENT_REVIEW_REJECT)) {
-            formDto.setState(TopicStateEnum.TOPIC_STATE_IN_CONVERSATION.getValue());
+            callbackMap.put("state", NumConstant.ZERO_STR);
         } else if (dto.getEventState().equals(EventIssueItemState.EVENT_REVIEW_PASS)) {
-            formDto.setState(TopicStateEnum.TOPIC_STATE_CHANGED_ISSUE.getValue());
+            callbackMap.put("state", "10");
         }
 
-        groupFeignClient.reviewCallback(formDto);
+        groupFeignClient.reviewCallback(callbackMap);
     }
 
     @Override

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/GroupFeignClient.java

@@ -2,13 +2,13 @@ package com.elink.esua.epdc.modules.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.topic.TopicDTO;
-import com.elink.esua.epdc.dto.topic.form.TopicReviewFormDTO;
 import com.elink.esua.epdc.modules.feign.fallback.GroupFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 
+import java.util.Map;
+
 /**
  *
  * 社群模块调用
@@ -29,7 +29,7 @@ public interface GroupFeignClient {
      * @since 2019/11/11 10:36
      */
     @PostMapping(value = "group/topic/reviewCallback", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result reviewCallback(TopicReviewFormDTO formDto);
+    Result reviewCallback(Map<String, String> callbackMap);
 
     /**
      *
@@ -41,6 +41,6 @@ public interface GroupFeignClient {
      * @since 2019/11/11 13:31
      */
     @PostMapping(value = "group/topic/modifyState", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result modifyTopicState(TopicDTO formDto);
+    Result modifyTopicState(Map<String, String> map);
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/GroupFeignClientFallback.java

@@ -3,11 +3,11 @@ package com.elink.esua.epdc.modules.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.topic.TopicDTO;
-import com.elink.esua.epdc.dto.topic.form.TopicReviewFormDTO;
 import com.elink.esua.epdc.modules.feign.GroupFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * @Author：liuchuang
  * @Date：2019/11/11 10:31
@@ -16,12 +16,12 @@ import org.springframework.stereotype.Component;
 public class GroupFeignClientFallback implements GroupFeignClient {
 
     @Override
-    public Result reviewCallback(TopicReviewFormDTO formDto) {
+    public Result reviewCallback(Map<String, String> callbackMap) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "reviewCallback", formDto);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "reviewCallback", callbackMap);
     }
 
     @Override
-    public Result modifyTopicState(TopicDTO formDto) {
+    public Result modifyTopicState(Map<String, String> map) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "modifyTopicState", formDto);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "modifyTopicState", map);
     }
 }

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

@@ -33,14 +33,12 @@ import com.elink.esua.epdc.constant.EventIssueItemState;
 import com.elink.esua.epdc.constant.EventsNoticeConstant;
 import com.elink.esua.epdc.constants.MenuCodeConstant;
 import com.elink.esua.epdc.dto.MenuNoticeDTO;
-import com.elink.esua.epdc.dto.enums.TopicStateEnum;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.*;
 import com.elink.esua.epdc.dto.issue.form.*;
 import com.elink.esua.epdc.dto.issue.result.*;
-import com.elink.esua.epdc.dto.topic.TopicDTO;
 import com.elink.esua.epdc.modules.async.DeptRespondTask;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.comment.service.EventCommentService;
@@ -62,10 +60,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 议题表 议题表
@@ -222,10 +217,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 // 事件来源-友邻社群
                 if (StringUtils.isNotEmpty(entity.getGroupId())) {
                     // 更新话题状态
-                    TopicDTO formDto = new TopicDTO();
+                    Map<String, String> map = new HashMap<>();
-                    formDto.setId(entity.getTopicId());
+                    map.put("topicId", entity.getTopicId());
-                    formDto.setState(TopicStateEnum.TOPIC_STATE_CHANGED_ITEM.getValue());
+                    map.put("state", "15");
-                    groupFeignClient.modifyTopicState(formDto);
+                    groupFeignClient.modifyTopicState(map);
                 }
                 // 发送菜单消息-待处理项目
                 itemService.sendItemHandleMenuNotice(itemEntity.getGridId(), null);

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/ReplyCommentDto.java

@@ -1,24 +0,0 @@
-package com.elink.esua.epdc.dto.comment;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 被回复的评论
- * @Author LC
- * @Date 2019/9/6 17:25
- */
-@Data
-public class ReplyCommentDto implements Serializable {
-    private static final long serialVersionUID = 3501567846629315395L;
-
-    /**
-     * 用户名
-     */
-    private String userName;
-    /**
-     * 内容
-     */
-    private String content;
-}

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentListDTO.java

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.comment;
 
+import com.elink.esua.epdc.dto.topic.ReplyCommentDto;
+import com.elink.esua.epdc.dto.topic.UserBaseInfoDto;
 import lombok.Data;
 
 import java.io.Serializable;

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentStatementFormDTO.java

@@ -18,7 +18,6 @@
 package com.elink.esua.epdc.dto.comment;
 
 import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
 

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentUserAttitudeDTO.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.dto.comment;
 
 import java.io.Serializable;
 import java.util.Date;

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/UserBaseInfoDto.java

@@ -1,28 +0,0 @@
-package com.elink.esua.epdc.dto.comment;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 用户基础信息DTO
- * @Author LC
- * @Date 2019/9/6 17:23
- */
-@Data
-public class UserBaseInfoDto implements Serializable {
-    private static final long serialVersionUID = -6564298463849924671L;
-
-    /**
-     * 用户ID
-     */
-    private String userId;
-    /**
-     * 用户名
-     */
-    private String userName;
-    /**
-     * 用户头像
-     */
-    private String userFace;
-}

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/UserReviewDto.java

@@ -2,7 +2,6 @@ package com.elink.esua.epdc.dto.group;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/ReplyCommentDto.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.events;
+package com.elink.esua.epdc.dto.topic;
 
 import lombok.Data;
 

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/TopicCommentsDTO.java

@@ -1,7 +1,5 @@
 package com.elink.esua.epdc.dto.topic;
 
-import com.elink.esua.epdc.dto.events.ReplyCommentDto;
-import com.elink.esua.epdc.dto.events.UserBaseInfoDto;
 import lombok.Data;
 
 import java.io.Serializable;

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/UserBaseInfoDto.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.events;
+package com.elink.esua.epdc.dto.topic;
 
 import lombok.Data;
 

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicListFormDTO.java

@@ -3,7 +3,6 @@ package com.elink.esua.epdc.dto.topic.form;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/async/TopicChangeToIssueTask.java

@@ -22,9 +22,6 @@ import java.util.List;
 @Component
 public class TopicChangeToIssueTask {
 
-    @Autowired
-    private TopicCommentService topicCommentService;
-
     @Autowired
     private EventFeignClient eventFeignClient;
 
@@ -38,16 +35,7 @@ public class TopicChangeToIssueTask {
      * @since 2019/11/12 13:32
      */
     @Async
-    public void copyCommentsAndAttitudeToEvents(TopicReviewFormDTO formDto) {
+    public void copyCommentsAndAttitudeToEvents(EpdcCommentsAndAttitudeFromTopicFormDTO eventFormDto) {
-        // 获取话题下所有评论
-        List<EventCommentDTO> comments = topicCommentService.listCommentForEvent(formDto);
-        // 获取话题下所有评论的表态
-        List<EventCommentUserAttitudeDTO> attitudes = topicCommentService.listCommentAttitudeForEvent(formDto.getTopicId());
-
-        EpdcCommentsAndAttitudeFromTopicFormDTO eventFormDto = new EpdcCommentsAndAttitudeFromTopicFormDTO();
-        eventFormDto.setComments(comments);
-        eventFormDto.setAttitudes(attitudes);
-
         eventFeignClient.receiveTopicCommentAndAttitude(eventFormDto);
     }
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/controller/TopicCommentUserAttitudeController.java

@@ -25,7 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.TopicCommentUserAttitudeDTO;
+import com.elink.esua.epdc.dto.comment.TopicCommentUserAttitudeDTO;
 import com.elink.esua.epdc.modules.comment.excel.TopicCommentUserAttitudeExcel;
 import com.elink.esua.epdc.modules.comment.service.TopicCommentUserAttitudeService;
 import org.springframework.beans.factory.annotation.Autowired;

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/TopicCommentUserAttitudeService.java

@@ -19,8 +19,8 @@ package com.elink.esua.epdc.modules.comment.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.dto.TopicCommentUserAttitudeDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
+import com.elink.esua.epdc.dto.comment.TopicCommentUserAttitudeDTO;
 import com.elink.esua.epdc.modules.comment.entity.TopicCommentUserAttitudeEntity;
 
 import java.util.List;

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java

@@ -24,9 +24,9 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-import com.elink.esua.epdc.dto.TopicCommentUserAttitudeDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
+import com.elink.esua.epdc.dto.comment.TopicCommentUserAttitudeDTO;
 import com.elink.esua.epdc.dto.constant.TopicNoticeConstant;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.modules.async.NewsTask;

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java

@@ -122,7 +122,12 @@ public class TopicController {
      * @since 2019/11/11 10:48
      */
     @PostMapping("reviewCallback")
-    public Result reviewCallback(@RequestBody TopicReviewFormDTO formDto) {
+    public Result reviewCallback(@RequestBody Map<String, String> callbackMap) {
+        TopicReviewFormDTO formDto = new TopicReviewFormDTO();
+        formDto.setTopicId(callbackMap.get("topicId"));
+        formDto.setProcessingOpinions(callbackMap.get("processingOpinions"));
+        formDto.setEventId(callbackMap.get("eventId"));
+        formDto.setState(Integer.valueOf(callbackMap.get("state")));
         return topicService.reviewCallback(formDto);
     }
 

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java

@@ -26,6 +26,9 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO;
+import com.elink.esua.epdc.dto.comment.EventCommentDTO;
+import com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeDTO;
 import com.elink.esua.epdc.dto.constant.GroupNoticeConstant;
 import com.elink.esua.epdc.dto.constant.TopicImageConstant;
 import com.elink.esua.epdc.dto.enums.GroupStateEnum;
@@ -47,6 +50,7 @@ import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.async.TopicChangeToIssueTask;
+import com.elink.esua.epdc.modules.comment.service.TopicCommentService;
 import com.elink.esua.epdc.modules.feign.EventFeignClient;
 import com.elink.esua.epdc.modules.group.service.GroupService;
 import com.elink.esua.epdc.modules.group.service.UserGroupService;
@@ -90,6 +94,9 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
     @Autowired
     private EventFeignClient eventFeignClient;
 
+    @Autowired
+    private TopicCommentService topicCommentService;
+
     @Autowired
     private TopicChangeToIssueTask topicChangeToIssueTask;
 
@@ -310,7 +317,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
             noticeList.add(topicUserNotice);
 
             // 拷贝评论、评论的支持反对到事件
-            topicChangeToIssueTask.copyCommentsAndAttitudeToEvents(formDto);
+            this.copyCommentsAndAttitudeToEvents(formDto);
         } else {
             auditRecordEntity.setState(NumConstant.ZERO);
             lordNotice.setTitle(GroupNoticeConstant.NOTICE_TOPIC_TO_ISSUE_NOT_PASS);
@@ -363,4 +370,25 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
         return new Result();
     }
 
+    /**
+     *
+     * 拷贝评论、评论的支持反对到事件
+     *
+     * @params [formDto]
+     * @return void
+     * @author liuchuang
+     * @since 2019/11/13 11:18
+     */
+    private void copyCommentsAndAttitudeToEvents(TopicReviewFormDTO formDto) {
+        // 获取话题下所有评论
+        List<EventCommentDTO> comments = topicCommentService.listCommentForEvent(formDto);
+        // 获取话题下所有评论的表态
+        List<EventCommentUserAttitudeDTO> attitudes = topicCommentService.listCommentAttitudeForEvent(formDto.getTopicId());
+
+        EpdcCommentsAndAttitudeFromTopicFormDTO eventFormDto = new EpdcCommentsAndAttitudeFromTopicFormDTO();
+        eventFormDto.setComments(comments);
+        eventFormDto.setAttitudes(attitudes);
+        topicChangeToIssueTask.copyCommentsAndAttitudeToEvents(eventFormDto);
+    }
+
 }