发送订阅：1.热心居民申请 3.建组申请 5.入组申请 7.邀请进组审核 8.组员禁言 9.党员认证申请

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 = "建组申请消息";
+
 }

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<ResiGroupDao, ResiGrou
 			//3.发送消息
 			if(staffRoles.success() && null != staffRoles.getData() && staffRoles.getData().size() > 0){
 				List<UserMessageFormDTO> msgList = new ArrayList<>();
+				List<WxSubscribeMessageFormDTO> 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<ResiGroupDao, ResiGrou
 					msgObj.setTitle(title);
 					msgObj.setUserId(to);
 					msgList.add(msgObj);
+					//微信订阅
+					WxSubscribeMessageFormDTO subscribeDTO = new WxSubscribeMessageFormDTO();
+					subscribeDTO.setClientType(ModuleConstant.APP_GOV);
+					subscribeDTO.setCustomerId(customerId);
+					subscribeDTO.setUserId(to);
+					subscribeDTO.setBehaviorType(UserMessageConstant.WX_CREATE_GROUP_BEHAVIOR);
+					subscribeDTO.setMessageContent(msg);
+					subscribeDTO.setMessageTime(new Date());
+					subscribeList.add(subscribeDTO);
+				}
+				if (subscribeList.size() > NumConstant.ZERO){
+					epmetMessageOpenFeignClient.sendWxSubscribeMessage(subscribeList);
 				}
 				Result result = epmetMessageFeignClient.saveUserMessageList(msgList);
 				if(result.success()){

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<ResiGroupMemberD
 			//通知群主
 			userMessage.setUserId(groupLeader.getCustomerUserId());
 			epmetMessageOpenFeignClient.saveUserMessage(userMessage);
+
+			//微信订阅
+			WxSubscribeMessageFormDTO subscribeDTO = new WxSubscribeMessageFormDTO();
+			subscribeDTO.setClientType(ModuleConstant.APP_RESI);
+			subscribeDTO.setCustomerId(resiGroupDTO.getCustomerId());
+			subscribeDTO.setUserId(currentUserId);
+			subscribeDTO.setBehaviorType(UserMessageConstant.WX_APPLY_JOIN_GROUP_BEHAVIOR);
+			subscribeDTO.setMessageContent(messageContent);
+			subscribeDTO.setMessageTime(new Date());
+			List<WxSubscribeMessageFormDTO> 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<ResiGroupMemberD
 		userMessageFormDTO.setMessageContent(messageContent);
 		userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
 		epmetMessageOpenFeignClient.saveUserMessage(userMessageFormDTO);
+		//发送微信订阅
+		WxSubscribeMessageFormDTO subscribeMessageFormDTO =  new WxSubscribeMessageFormDTO();
+		subscribeMessageFormDTO.setClientType(ModuleConstant.APP_RESI);
+		subscribeMessageFormDTO.setCustomerId(resiGroupEntity.getCustomerId());
+		subscribeMessageFormDTO.setUserId(resiGroupMemberEntity.getCustomerUserId());
+		subscribeMessageFormDTO.setBehaviorType(UserMessageConstant.WX_APPLY_JOIN_GROUP_BEHAVIOR);
+		subscribeMessageFormDTO.setMessageContent(messageContent);
+		subscribeMessageFormDTO.setMessageTime(new Date());
+		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
+		msgList.add(subscribeMessageFormDTO);
+		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
 		result.setMsg(GroupMemberConstant.SLIENT_SUCCESS);
         return result;
     }

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 = "党员申请消息";
 }

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<UserMessageFormDTO> msgList = new ArrayList<>();
+		List<WxSubscribeMessageFormDTO> 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);
 		}

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<ResiWarmhea
 		List<GovStaffRoleResultDTO> roleList = resultList.getData();
 		//3:遍历找出当前网格的所有网格长并给网格长发消息
 		List<UserMessageFormDTO> msgList = new ArrayList<>();
+		List<WxSubscribeMessageFormDTO> 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<ResiWarmhea
 					msgDTO.setMessageContent(formDTO.getMessageText());
 					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(ResiWarmUserMessageConstant.WX_WARMHEARTED_BEHAVIOR);
+					subscribeDTO.setMessageContent(formDTO.getMessageText());
+					subscribeDTO.setMessageTime(new Date());
+					subscribeList.add(subscribeDTO);
 				}
 			});
 		});
+		if (subscribeList.size() > NumConstant.ZERO){
+			epmetMessageOpenFeignClient.sendWxSubscribeMessage(subscribeList);
+		}
 		if (msgList.size() > NumConstant.ZERO) {
 			result = epmetMessageFeignClient.saveUserMessageList(msgList);
 		}

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, url = "localhost:8087")
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
+//@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<List<CustomerStaffRoleResultDTO>> getStaffRoles(@PathVariable String staffId);
+    Result<List<CustomerStaffRoleResultDTO>> getStaffRoles(@PathVariable("staffId") String staffId);
 
     /**
      * @param staffId