话题转议题未发送订阅消息修复

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

@@ -112,6 +112,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
 
+
 	@Value("${openapi.scan.server.url}")
 	private String scanApiUrl;
 	@Value("${openapi.scan.method.textSyncScan}")
@@ -503,17 +504,22 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
 
         //发送站内信 
-        UserMessageFormDTO msgObj = new UserMessageFormDTO();
-        msgObj.setApp(ModuleConstants.APP_RESI);
-        msgObj.setCustomerId(application.getCustomerId());
-        msgObj.setGridId(application.getGridId());
-        msgObj.setMessageContent(String.format(ModuleConstants.ISSUE_AUDIT_RESULT_MSG_CONTENT_TEMPLATE,application.getIssueTitle(),StringUtils.equals(ModuleConstants.AUDITION_TYPE_REJECT,param.getActionType()) ? ModuleConstants.ISSUE_ACTION_REJECT : ModuleConstants.ISSUE_ACTION_SHIFT));
-        msgObj.setReadFlag(ReadFlagConstant.UN_READ);
-        msgObj.setTitle(ModuleConstants.ISSUE_AUDIT_RESULT_MSG_TITLE_TEMPLATE);
-        msgObj.setUserId(application.getCreatedBy());
-        List<UserMessageFormDTO> msgList = new LinkedList<>();msgList.add(msgObj);
-        epmetMessageOpenFeignClient.saveUserMessageList(msgList);
-
+//        UserMessageFormDTO msgObj = new UserMessageFormDTO();
+//        msgObj.setApp(ModuleConstants.APP_RESI);
+//        msgObj.setCustomerId(application.getCustomerId());
+//        msgObj.setGridId(application.getGridId());
+//        msgObj.setMessageContent(String.format(ModuleConstants.ISSUE_AUDIT_RESULT_MSG_CONTENT_TEMPLATE,application.getIssueTitle(),StringUtils.equals(ModuleConstants.AUDITION_TYPE_REJECT,param.getActionType()) ? ModuleConstants.ISSUE_ACTION_REJECT : ModuleConstants.ISSUE_ACTION_SHIFT));
+//        msgObj.setReadFlag(ReadFlagConstant.UN_READ);
+//        msgObj.setTitle(ModuleConstants.ISSUE_AUDIT_RESULT_MSG_TITLE_TEMPLATE);
+//        msgObj.setUserId(application.getCreatedBy());
+//        List<UserMessageFormDTO> msgList = new LinkedList<>();msgList.add(msgObj);
+//        epmetMessageOpenFeignClient.saveUserMessageList(msgList);
+        //对关注此话题的用户推送订阅
+        try {
+            resiGroupOpenFeignClient.sendWxmpUpdateSubscribe(token,app2update.getIssueId(),"shiftIssue");
+        }catch (Exception e){
+            logger.warn("话题转议题-发送订阅消息失败 错误信息:"+e.getMessage());
+        }
         //}
         //applicationService.update(app2update);
 

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

@@ -2,6 +2,7 @@ package com.epmet.resi.group.feign;
 
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.form.*;
@@ -148,4 +149,16 @@ public interface ResiGroupOpenFeignClient {
      */
     @PostMapping("resi/group/topic/fetchtopicinfowhenauditissue")
     Result<IssueShiftedFromTopicFormDTO> fetchTopicInfoWhenAuditIssue(@RequestBody ResiTopicTurnIssueFromDTO param);
+
+    /**
+     * @Description 发送内容更新类的微信订阅
+     * @param tokenDto
+     * @param sourceId
+     * @param sourceType
+     * @return void
+     * @Author liushaowen
+     * @Date 2021/1/12 11:22
+     */
+    @PostMapping("resi/group/topic/sendwxmpupdatesubscribe")
+    void sendWxmpUpdateSubscribe(TokenDto tokenDto,String sourceId,String sourceType);
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.resi.group.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
@@ -106,4 +107,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<IssueShiftedFromTopicFormDTO> fetchTopicInfoWhenAuditIssue(ResiTopicTurnIssueFromDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "fetchTopicInfoWhenAuditIssue",param);
     }
+
+    @Override
+    public void sendWxmpUpdateSubscribe(TokenDto tokenDto, String sourceId, String sourceType) {
+       //不报错
+    }
 }

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

@@ -349,5 +349,19 @@ public class ResiTopicController {
         return new Result<MyPartIssueResultDTO>().ok(topicService.selectMyPartTopic(myPartIssueFormDTO));
     }
 
+    /**
+     * @Description 发送内容更新类的微信订阅
+     * @param tokenDto
+     * @param sourceId
+     * @param sourceType
+     * @return void
+     * @Author liushaowen
+     * @Date 2021/1/12 11:21
+     */
+    @PostMapping("sendwxmpupdatesubscribe")
+    public void sendWxmpUpdateSubscribe(TokenDto tokenDto,String sourceId,String sourceType){
+        topicService.sendWxmpUpdateSubscribe(tokenDto,sourceId,sourceType);
+    }
+
 
 }

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

@@ -1565,14 +1565,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 
         }else throw new RenException(dataFilterResult.getMsg());
 
-        //对关注此话题的用户推送订阅
-        try {
-            TokenDto tokenDto = new TokenDto();
-            tokenDto.setUserId(topicTurnIssueFromDTO.getUserId());
-            sendWxmpUpdateSubscribe(tokenDto,result.getIssueId(),WxmpSubscribeConstant.TYPE_SHIFT_ISSUE);
-        }catch (Exception e){
-            logger.warn("话题转议题-发送订阅消息失败 错误信息:"+e.getMessage());
-        }
         return result;
 
     }