From 66e1cf4dfd18daa6504b4865aa085c542e40493b Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Tue, 12 Jan 2021 11:27:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=BD=AC=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E6=9C=AA=E5=8F=91=E9=80=81=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IssueServiceImpl.java | 30 +++++++++++-------- .../group/feign/ResiGroupOpenFeignClient.java | 13 ++++++++ .../ResiGroupOpenFeignClientFallback.java | 6 ++++ .../topic/controller/ResiTopicController.java | 16 +++++++++- .../service/impl/ResiTopicServiceImpl.java | 8 ----- 5 files changed, 52 insertions(+), 21 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 f36ffe907b..9f0cf45799 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 @@ -112,6 +112,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; + @Value("${openapi.scan.server.url}") private String scanApiUrl; @Value("${openapi.scan.method.textSyncScan}") @@ -502,18 +503,23 @@ public class IssueServiceImpl extends BaseServiceImpl imp }else throw new RenException(topicInfo.getInternalMsg()); - //发送站内信 - 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 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 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); 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 574af0884f..6871e36cd9 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 @@ -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 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); } 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 7df5d859cf..e9af18fab0 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 @@ -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 fetchTopicInfoWhenAuditIssue(ResiTopicTurnIssueFromDTO param) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "fetchTopicInfoWhenAuditIssue",param); } + + @Override + public void sendWxmpUpdateSubscribe(TokenDto tokenDto, String sourceId, String sourceType) { + //不报错 + } } 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 820dbc5821..f00a1a24ef 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 @@ -250,7 +250,7 @@ public class ResiTopicController { ValidatorUtils.validateEntity(topicTurnIssueFromDTO); return new Result().ok(topicService.shiftIssueV2(topicTurnIssueFromDTO)); } - + /** * @Description 话题转议题-重新编辑提交 * @param tokenDto @@ -349,5 +349,19 @@ public class ResiTopicController { return new Result().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); + } + } 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 8f6a1d76b2..2f1befa32a 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 @@ -1565,14 +1565,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl