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 e9f6380e4e..3202f539cd 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 @@ -120,6 +120,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp private IssueProjectTagDictService issueProjectTagDictService; + @Value("${openapi.scan.server.url}") private String scanApiUrl; @Value("${openapi.scan.method.textSyncScan}") @@ -510,18 +511,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 5f4c2afdea..09257d7234 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.form.*; import com.epmet.resi.group.dto.group.ResiGroupDTO; @@ -185,4 +186,16 @@ public interface ResiGroupOpenFeignClient { */ @PostMapping("resi/group/topic/sendevent") Result sendEvent(@RequestBody TopicEventFormDTO 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 9802959ecc..a6913d6df1 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.form.*; @@ -130,4 +131,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien public Result sendEvent(TopicEventFormDTO param) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "sendEvent",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 ebd0bf7b0d..27dda6234c 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 @@ -258,7 +258,7 @@ public class ResiTopicController { ValidatorUtils.validateEntity(topicTurnIssueFromDTO); return new Result().ok(topicService.shiftIssueV2(topicTurnIssueFromDTO)); } - + /** * @Description 话题转议题-重新编辑提交 * @param tokenDto @@ -357,6 +357,20 @@ 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); + } + /** * @return com.epmet.commons.tools.utils.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 94069e668b..5fdaf458b8 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 @@ -1653,14 +1653,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl