From 9a79d7efccea1cb0f38e4792e46fc68dedb776ed Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Tue, 12 Jan 2021 18:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=BD=AC=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/IssueServiceImpl.java  | 1 -
 .../epmet/resi/group/feign/ResiGroupOpenFeignClient.java    | 2 +-
 .../feign/fallback/ResiGroupOpenFeignClientFallback.java    | 6 +++---
 .../epmet/modules/topic/controller/ResiTopicController.java | 4 +++-
 .../modules/topic/service/impl/ResiTopicServiceImpl.java    | 1 +
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 5c4ce9d47e..b46f8d8ebf 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -516,7 +516,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());
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
index 1b24c7918a..055a5e22e4 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
@@ -152,5 +152,5 @@ public interface ResiGroupOpenFeignClient {
      * @Date 2021/1/12 11:22
      */
     @PostMapping("resi/group/topic/sendwxmpupdatesubscribe")
-    void sendWxmpUpdateSubscribe(@RequestBody SendWxmpUpdateSubscribeFormDTO fromDTO);
+    Result sendWxmpUpdateSubscribe(@RequestBody SendWxmpUpdateSubscribeFormDTO fromDTO);
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
index cae85b63e0..3da8aea0c7 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
@@ -107,10 +107,10 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<IssueShiftedFromTopicFormDTO> fetchTopicInfoWhenAuditIssue(ResiTopicTurnIssueFromDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "fetchTopicInfoWhenAuditIssue",param);
     }
-    
-    @Override
-    public void sendWxmpUpdateSubscribe(SendWxmpUpdateSubscribeFormDTO fromDTO) {
 
+    @Override
+    public Result sendWxmpUpdateSubscribe(SendWxmpUpdateSubscribeFormDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "sendWxmpUpdateSubscribe",fromDTO);
     }
 
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
index 63ea8efc99..03e555ccaa 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/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.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -356,8 +357,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();
     }
 
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 2f1befa32a..bfc8d7f8a5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -1846,6 +1846,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{