From 995321721460f2c1183a55e22b4c35ca78bd6339 Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Tue, 12 Jan 2021 13:49:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IssueServiceImpl.java | 14 +++++++---- .../form/SendWxmpUpdateSubscribeFormDTO.java | 23 +++++++++++++++++++ .../group/feign/ResiGroupOpenFeignClient.java | 10 +------- .../ResiGroupOpenFeignClientFallback.java | 7 +++--- .../topic/controller/ResiTopicController.java | 7 ++---- 5 files changed, 39 insertions(+), 22 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/SendWxmpUpdateSubscribeFormDTO.java 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 9f0cf45799..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 @@ -26,6 +26,8 @@ import com.epmet.dao.IssueProcessDao; import com.epmet.dao.IssueProjectRelationDao; import com.epmet.dto.*; import com.epmet.dto.form.*; +import com.epmet.dto.form.IssueAuditionFormDTO; +import com.epmet.dto.form.IssueShiftedFromTopicFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IssueEntity; import com.epmet.entity.IssueProcessEntity; @@ -40,10 +42,8 @@ import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO; import com.epmet.resi.group.dto.group.result.GroupShiftProjectListResultDTO; import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.form.*; import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; -import com.epmet.resi.group.dto.topic.form.ResiTopicTurnIssueFromDTO; -import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO; -import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.service.*; @@ -503,7 +503,7 @@ 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()); @@ -516,7 +516,11 @@ public class IssueServiceImpl extends BaseServiceImpl imp // epmetMessageOpenFeignClient.saveUserMessageList(msgList); //对关注此话题的用户推送订阅 try { - resiGroupOpenFeignClient.sendWxmpUpdateSubscribe(token,app2update.getIssueId(),"shiftIssue"); + SendWxmpUpdateSubscribeFormDTO formDTO = new SendWxmpUpdateSubscribeFormDTO(); + formDTO.setTokenDto(token); + formDTO.setSourceId(app2update.getIssueId()); + formDTO.setSourceType("shiftIssue"); + resiGroupOpenFeignClient.sendWxmpUpdateSubscribe(formDTO); }catch (Exception e){ logger.warn("话题转议题-发送订阅消息失败 错误信息:"+e.getMessage()); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/SendWxmpUpdateSubscribeFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/SendWxmpUpdateSubscribeFormDTO.java new file mode 100644 index 0000000000..4247d7c266 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/SendWxmpUpdateSubscribeFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.resi.group.dto.topic.form; + +import com.epmet.commons.tools.security.dto.TokenDto; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @description: + * @author: liushaowen + * @date: 2021/1/12 13:44 + */ +@Data +public class SendWxmpUpdateSubscribeFormDTO implements Serializable { + @NotNull + private TokenDto tokenDto; + @NotBlank + private String sourceId; + @NotBlank + private String sourceType; +} 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 6871e36cd9..1b24c7918a 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,7 +2,6 @@ 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.*; @@ -18,7 +17,6 @@ import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO; import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO; import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; -import com.epmet.commons.tools.utils.Result; import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -27,9 +25,6 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.HashMap; import java.util.List; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -152,13 +147,10 @@ public interface ResiGroupOpenFeignClient { /** * @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); + void 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 e9af18fab0..cae85b63e0 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,9 +107,10 @@ 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) { - //不报错 + public void sendWxmpUpdateSubscribe(SendWxmpUpdateSubscribeFormDTO 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 f00a1a24ef..63ea8efc99 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 @@ -351,16 +351,13 @@ public class ResiTopicController { /** * @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); + public void sendWxmpUpdateSubscribe(@RequestBody SendWxmpUpdateSubscribeFormDTO fromDTO){ + topicService.sendWxmpUpdateSubscribe(fromDTO.getTokenDto(),fromDTO.getSourceId(),fromDTO.getSourceType()); }