From 0aef57ccab927ea5dfc6c88e52ddd6de5efb23eb Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 26 Oct 2020 13:32:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AE=A2=E9=98=85=EF=BC=9A1.?= =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91=E7=94=B3=E8=AF=B7=203.?= =?UTF-8?q?=E5=BB=BA=E7=BB=84=E7=94=B3=E8=AF=B7=205.=E5=85=A5=E7=BB=84?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=207.=E9=82=80=E8=AF=B7=E8=BF=9B=E7=BB=84?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=208.=E7=BB=84=E5=91=98=E7=A6=81=E8=A8=80=209?= =?UTF-8?q?.=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/constant/UserMessageConstant.java | 5 ++++ .../service/impl/ResiGroupServiceImpl.java | 14 +++++++++++ .../impl/ResiGroupMemberServiceImpl.java | 23 +++++++++++++++++++ .../constant/PartyMemberMessageConstant.java | 5 ++++ .../impl/PartyMemberConfirmServiceImpl.java | 15 ++++++++++++ .../impl/ResiWarmheartedApplyServiceImpl.java | 14 +++++++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 6 ++--- 7 files changed, 79 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java index c55698acc0..880efbac70 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java @@ -69,4 +69,9 @@ public interface UserMessageConstant { */ String WX_APPLY_CREATE_GROUP_BEHAVIOR = "建组审核消息"; + /** + * 申请建组的微信订阅behavior + */ + String WX_CREATE_GROUP_BEHAVIOR = "建组申请消息"; + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 107d96d642..b968d9c9be 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -979,7 +979,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl 0){ List msgList = new ArrayList<>(); + List subscribeList = new ArrayList<>(); for(String to : staffRoles.getData()){ + //站内信 UserMessageFormDTO msgObj = new UserMessageFormDTO(); msgObj.setApp(ModuleConstant.APP_GOV); msgObj.setCustomerId(customerId); @@ -989,6 +991,18 @@ public class ResiGroupServiceImpl extends BaseServiceImpl NumConstant.ZERO){ + epmetMessageOpenFeignClient.sendWxSubscribeMessage(subscribeList); } Result result = epmetMessageFeignClient.saveUserMessageList(msgList); if(result.success()){ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index 7bbec871b4..96a13e6aad 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -271,6 +271,18 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); + msgList.add(subscribeDTO); + epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList); } catch (Exception e) { logger.error("居民申请入群，给组长发送消息通知异常"); e.printStackTrace(); @@ -626,6 +638,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); + msgList.add(subscribeMessageFormDTO); + epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList); result.setMsg(GroupMemberConstant.SLIENT_SUCCESS); return result; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java index 1971a1ac13..7e22178bec 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java @@ -25,4 +25,9 @@ public interface PartyMemberMessageConstant { * 党员申请审核驳回给申请人发送消息：您好，您申请的党员，由于不符合条件的原因，已被驳回。 */ String AUDIT_REJECT_MSG = "您好，您申请的%s党员，由于不符合条件的原因，已被驳回。"; + + /** + * 党员申请behavior + */ + String WX_PARTY_AUTH_BEHAVIOR = "党员申请消息"; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index ea761610fc..d4b9f32914 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -697,9 +697,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService //4:遍历找出当前网格的所有网格长并给网格长发消息 List msgList = new ArrayList<>(); + List subscribeList = new ArrayList<>(); staffList.forEach(staff->{ roleList.forEach(role->{ if(staff.getUserId().equals(role.getStaffId())){ + //站内信 UserMessageFormDTO msgDTO = new UserMessageFormDTO(); msgDTO.setCustomerId(formDTO.getCustomerId()); msgDTO.setGridId(formDTO.getGridId()); @@ -709,9 +711,22 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService msgDTO.setMessageContent(message); msgDTO.setReadFlag(ReadFlagConstant.UN_READ); msgList.add(msgDTO); + //微信订阅 + //微信订阅 + WxSubscribeMessageFormDTO subscribeDTO = new WxSubscribeMessageFormDTO(); + subscribeDTO.setClientType(AppClientConstant.APP_GOV); + subscribeDTO.setUserId(staff.getUserId()); + subscribeDTO.setCustomerId(formDTO.getCustomerId()); + subscribeDTO.setBehaviorType(PartyMemberMessageConstant.WX_PARTY_AUTH_BEHAVIOR); + subscribeDTO.setMessageContent(message); + subscribeDTO.setMessageTime(new Date()); + subscribeList.add(subscribeDTO); } }); }); + if (subscribeList.size() > NumConstant.ZERO){ + epmetMessageOpenFeignClient.sendWxSubscribeMessage(subscribeList); + } if (msgList.size() > NumConstant.ZERO) { result = epmetMessageOpenFeignClient.saveUserMessageList(msgList); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index 901bf4e1cc..35c1b19d26 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -265,9 +265,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl roleList = resultList.getData(); //3:遍历找出当前网格的所有网格长并给网格长发消息 List msgList = new ArrayList<>(); + List subscribeList = new ArrayList<>(); staffList.forEach(staff->{ roleList.forEach(role->{ if(staff.getUserId().equals(role.getStaffId())){ + //站内信 UserMessageFormDTO msgDTO = new UserMessageFormDTO(); msgDTO.setCustomerId(formDTO.getCustomerId()); msgDTO.setGridId(formDTO.getGridId()); @@ -277,9 +279,21 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl NumConstant.ZERO){ + epmetMessageOpenFeignClient.sendWxSubscribeMessage(subscribeList); + } if (msgList.size() > NumConstant.ZERO) { result = epmetMessageFeignClient.saveUserMessageList(msgList); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 5f7c301ad0..7f751a8632 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -20,8 +20,8 @@ import java.util.List; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:09 */ -//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087") -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087") +//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class) public interface EpmetUserOpenFeignClient { /** @@ -50,7 +50,7 @@ public interface EpmetUserOpenFeignClient { * @date 2020/6/2 16:11 */ @PostMapping("/epmetuser/staffrole/staffroles/{staffId}") - Result> getStaffRoles(@PathVariable String staffId); + Result> getStaffRoles(@PathVariable("staffId") String staffId); /** * @param staffId