Merge branch 'dev_mess_party' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ProjectSendMsgFormDTO.java

@@ -32,7 +32,7 @@ public class ProjectSendMsgFormDTO implements Serializable {
     private String customerId;
 
     /**
-     * 参数KEY
+     * 参数KEY(发短信:send_msg;)
      */
     @NotBlank(message = "参数KEY不能为空", groups = {AddUserInternalGroup.class})
     private String parameterKey;

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -524,7 +524,6 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 //        epmetMessageOpenFeignClient.saveUserMessageList(msgList);
         //对关注此话题的用户推送订阅
         try {
-            logger.info("话题转议题-调用发送");
             SendWxmpUpdateSubscribeFormDTO formDTO = new SendWxmpUpdateSubscribeFormDTO();
             formDTO.setTokenDto(token);
             formDTO.setSourceId(app2update.getIssueId());

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@@ -376,6 +376,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
                 sms.setCustomerId(staffResult.getData().getCustomerId());
                 sms.setMobile(staffResult.getData().getMobile());
                 sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER);
+                sms.setParameterKey("send_msg");
                 smsList.add(sms);
             }
         });
@@ -709,6 +710,26 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
             logger.error("项目流转，推送微信订阅消息失败");
             //throw new RenException(ProjectConstant.SAVE_WXMP_MSG_EXCEPTION);
         }
+
+        //短信消息
+        List<ProjectSendMsgFormDTO> smsList = new ArrayList<>();
+        staffList.forEach(staff -> {
+            CustomerStaffDTO staffDTO = new CustomerStaffDTO();
+            staffDTO.setUserId(staff.getStaffId());
+            Result<CustomerStaffDTO> staffResult = epmetUserFeignClient.getCustomerStaffInfoByUserId(staffDTO);
+            if (staffResult.success() && null != staffResult.getData()) {
+                ProjectSendMsgFormDTO sms = new ProjectSendMsgFormDTO();
+                sms.setCustomerId(staffResult.getData().getCustomerId());
+                sms.setMobile(staffResult.getData().getMobile());
+                sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER);
+                sms.setParameterKey("send_msg");
+                smsList.add(sms);
+            }
+        });
+        Result result = epmetMessageOpenFeignClient.projectSendMsg(smsList);
+        if (!result.success()) {
+            logger.error("项目流转，发送手机短信失败" + JSON.toJSONString(result));
+        }
     }
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -783,6 +783,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			sms.setCustomerId(staffResult.getData().getCustomerId());
 			sms.setMobile(staffResult.getData().getMobile());
 			sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER);
+			sms.setParameterKey("send_msg");
 			smsList.add(sms);
 		}
 		result = epmetMessageOpenFeignClient.projectSendMsg(smsList);
@@ -1054,6 +1055,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				sms.setCustomerId(staffDTOResult.getData().getCustomerId());
 				sms.setMobile(staffDTOResult.getData().getMobile());
 				sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER);
+				sms.setParameterKey("send_msg");
 				smsList.add(sms);
 			}
 		});
@@ -1510,6 +1512,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				sms.setCustomerId(staffDTOResult.getData().getCustomerId());
 				sms.setMobile(staffDTOResult.getData().getMobile());
 				sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_OVERDUE);
+				sms.setParameterKey("send_msg");
 				smsList.add(sms);
 			}
 		});
@@ -1846,6 +1849,24 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		if (!result.success()) {
 			logger.error("项目退回成功，发送微信订阅消息失败" + JSON.toJSONString(result));
 		}
+
+		//短信消息
+		List<ProjectSendMsgFormDTO> smsList = new ArrayList<>();
+		CustomerStaffDTO staffDTO = new CustomerStaffDTO();
+		staffDTO.setUserId(projectStaffDTO.getStaffId());
+		Result<CustomerStaffDTO> staffResult = epmetUserFeignClient.getCustomerStaffInfoByUserId(staffDTO);
+		if (staffResult.success() && null != staffResult.getData()) {
+			ProjectSendMsgFormDTO sms = new ProjectSendMsgFormDTO();
+			sms.setCustomerId(staffResult.getData().getCustomerId());
+			sms.setMobile(staffResult.getData().getMobile());
+			sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER);
+			sms.setParameterKey("send_msg");
+			smsList.add(sms);
+		}
+		result = epmetMessageOpenFeignClient.projectSendMsg(smsList);
+		if (!result.success()) {
+			logger.error("项目退回，发送手机短信失败" + JSON.toJSONString(result));
+		}
 	}
 
 	/**

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -145,6 +145,15 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("resi/group/topic/fetchtopicinfowhenauditissue")
     Result<IssueShiftedFromTopicFormDTO> fetchTopicInfoWhenAuditIssue(@RequestBody ResiTopicTurnIssueFromDTO param);
 
+    /**
+     * @Description 发送内容更新类的微信订阅
+     * @return void
+     * @Author liushaowen
+     * @Date 2021/1/12 11:22
+     */
+    @PostMapping("resi/group/topic/sendwxmpupdatesubscribe")
+    Result sendWxmpUpdateSubscribe(@RequestBody SendWxmpUpdateSubscribeFormDTO fromDTO);
+
     /**
      * @Description  查询话题所属小组
      * @Param formDTO

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -105,6 +105,12 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "fetchTopicInfoWhenAuditIssue",param);
     }
 
+    @Override
+    public Result sendWxmpUpdateSubscribe(SendWxmpUpdateSubscribeFormDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "sendWxmpUpdateSubscribe",fromDTO);
+    }
+
+
     @Override
     public Result<TopicBelongGroupResultDTO> selectTopicBelongGroup(TopicBelongGroupFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectTopicBelongGroup",formDTO);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java

@@ -1,5 +1,6 @@
 package com.epmet.modules.topic.controller;
 
+import com.baomidou.mybatisplus.extension.api.R;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.epmet.commons.tools.annotation.LoginUser;
@@ -364,8 +365,9 @@ public class ResiTopicController {
      * @Date 2021/1/12 11:21
      */
     @PostMapping("sendwxmpupdatesubscribe")
-    public void sendWxmpUpdateSubscribe(@RequestBody SendWxmpUpdateSubscribeFormDTO fromDTO){
+    public Result sendWxmpUpdateSubscribe(@RequestBody SendWxmpUpdateSubscribeFormDTO fromDTO){
         topicService.sendWxmpUpdateSubscribe(fromDTO.getTokenDto(),fromDTO.getSourceId(),fromDTO.getSourceType());
+        return new Result();
     }
 
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java

@@ -340,6 +340,7 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @date 2021.01.04 16:41
     */
     void sendTopicPointEventByEventType(TopicEventFormDTO param);
+    /**
     /**
      * @Description 向关注话题的人发送微信订阅
      * @param tokenDto

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

@@ -233,6 +233,8 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
         comment.setCreatedBy(tokenDto.getUserId());
         baseDao.insertOne(comment);
 
+        //对所有关注这个话题的人发送微信订阅
+        resiTopicService.sendWxmpUpdateSubscribe(tokenDto,topic.getId(), WxmpSubscribeConstant.TYPE_COMMENT);
         // 话题评论前3次，加积分【对小组内话题进行15字以上评论】
         Integer commentCount = baseDao.selectCommentCountByUserId(tokenDto.getUserId());
         if (null == commentCount || commentCount <= NumConstant.THREE){

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -2078,6 +2078,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     @Override
     public void sendWxmpUpdateSubscribe(TokenDto tokenDto, String topicId, String type) {
         if (StringUtils.isBlank(type) || StringUtils.isBlank(topicId)) {
+            logger.warn("话题转议题-sourceType活sourceId为空");
             return;
         }
         try{
@@ -2135,6 +2136,44 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             logger.warn("话题相关 发送微信订阅失败,"+e.getMessage()+",topicId="+topicId+" 类型="+type);
         }
     }
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 获取话题附件信息
+     **/
+    @Override
+    public TopicAttachmentResultDTO topicAttachmentList(TopicAttachmentFormDTO formDTO) {
+        TopicAttachmentResultDTO resultDTO = new TopicAttachmentResultDTO();
+        //1.根据话题id查询所有的附件数据
+        List<ResiTopicAttachmentDTO> list = resiTopicAttachmentDao.selectTopicAttachmentList(formDTO.getTopicId());
+        if(list.size()<NumConstant.ONE){
+            return resultDTO;
+        }
+        //2.封装数据并返回
+        LinkedList<TopicFileResultDTO> docList = new LinkedList<>();
+        LinkedList<TopicFileResultDTO> voiceList = new LinkedList<>();
+        LinkedList<TopicFileResultDTO> videoList = new LinkedList<>();
+        list.forEach(l->{
+            TopicFileResultDTO dto = new TopicFileResultDTO();
+            dto.setUrl(l.getAttachmentUrl());
+            dto.setDuration(l.getDuration());
+            if(TopicConstant.FILE_DOC.equals(l.getAttachmentType())){
+                docList.add(dto);
+            }
+            if(TopicConstant.FILE_VOICE.equals(l.getAttachmentType())){
+                voiceList.add(dto);
+            }
+            if(TopicConstant.FILE_VIDEO.equals(l.getAttachmentType())){
+                videoList.add(dto);
+            }
+        });
+        resultDTO.setDocList(docList);
+        resultDTO.setVoiceList(voiceList);
+        resultDTO.setVideoList(videoList);
+        return resultDTO;
+    }
+
 }