修改下key

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java

@@ -25,45 +25,51 @@ public interface UserMessageTypeConstant {
      */
     String WARMHEARTED_APPLY_RES="warmhearted_apply_res";
 
+
     /**
      * 居民端认证党员时，补充信息填写完成提交后，通知网格长，人工审核党员申请
      * targetId:partymember_info.id
      */
-    String CERTIFY_PARTY_APPLY="certify_party_apply";
+    String PARTY_CERTIFY_APPLY="party_certify_apply";
 
     /**
      * 工作端审核居民是否是党员，通知居民。
      * targetId:partymember_info.id
      */
-    String CERTIFY_PARTY_APPLY_RES="certify_party_apply_res";
+    String PARTY_CERTIFY_APPLY_RES="party_certify_apply_res";
+
+
 
     /**
      * 居民端用户申请创建小组，提交小组信息后，通知网格长
      * targetId:resi_group.id
      */
-    String CREATE_GROUP_APPLY="create_group_apply";
+    String GROUP_CREATE_GROUP_APPLY="group_create_group_apply";
 
     /**
      * 工作端审核建群申请后，通知建组人结果
      * targetId:resi_group.id
      */
-    String CREATE_GROUP_APPLY_RES="create_group_apply_res";
+    String GROUP_CREATE_GROUP_RES="group_create_group_res";
 
     /**
      * 居民单申请入群，通知组长审核
      * targetId:resi_group.id
      */
-    String APPLY_ENTER_GROUP="apply_enter_group";
+    String GROUP_APPLY_ENTER="group_apply_enter";
 
     /**
      * 组长审核完入群申请，通知居民结果
      * targetId:resi_group.id
      */
-    String APPLY_ENTER_GROUP_RES="apply_enter_group_res";
+    String GROUP_APPLY_ENTER_RES="group_apply_enter_res";
 
     /**
      * 组员通过连接自动入组的，通知组长
      * targetId:resi_group.id
      */
-    String ENTER_GROUP_BY_LINK_RES="enter_group_by_link_res";
+    String GROUP_ENTER_GROUP_BY_LINK_RES="group_enter_group_by_link_res";
+
+
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -721,7 +721,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName()));
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessageFormDTO.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY_RES);
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_CREATE_GROUP_RES);
 		userMessageFormDTO.setTargetId(agreeApplyGroupFormDTO.getGroupId());
 
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
@@ -790,7 +790,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.DISAGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason()));
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessageFormDTO.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY_RES);
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_CREATE_GROUP_RES);
 		userMessageFormDTO.setTargetId(disAgreeApplyGroupFormDTO.getGroupId());
 
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
@@ -1198,7 +1198,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 					msgObj.setUserId(to);
 
 					//21.09.10:记录消息类型和对应的业务id
-					msgObj.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY);
+					msgObj.setMessageType(UserMessageTypeConstant.GROUP_CREATE_GROUP_APPLY);
 					msgObj.setTargetId(groupId);
 
 					msgList.add(msgObj);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -645,7 +645,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessage.setMessageType(UserMessageTypeConstant.ENTER_GROUP_BY_LINK_RES);
+		userMessage.setMessageType(UserMessageTypeConstant.GROUP_ENTER_GROUP_BY_LINK_RES);
 		userMessage.setTargetId(resiGroupDTO.getId());
 
 		//通知群主

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -317,7 +317,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			userMessage.setUserId(groupLeader.getCustomerUserId());
 
 			//21.09.10:记录消息类型和对应的业务id
-			userMessage.setMessageType(UserMessageTypeConstant.APPLY_ENTER_GROUP);
+			userMessage.setMessageType(UserMessageTypeConstant.GROUP_APPLY_ENTER);
 			userMessage.setTargetId(resiGroupDTO.getId());
 
 			epmetMessageOpenFeignClient.saveUserMessage(userMessage);
@@ -741,7 +741,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessage.setMessageType(UserMessageTypeConstant.APPLY_ENTER_GROUP_RES);
+		userMessage.setMessageType(UserMessageTypeConstant.GROUP_APPLY_ENTER_RES);
 		userMessage.setTargetId(resiGroupMemberDTO.getResiGroupId());
 
 		//通知群主
@@ -831,7 +831,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessage.setMessageType(UserMessageTypeConstant.APPLY_ENTER_GROUP_RES);
+		userMessage.setMessageType(UserMessageTypeConstant.GROUP_APPLY_ENTER_RES);
 		userMessage.setTargetId(groupMemeberOperationDTO.getGroupId());
 
 		//通知群主

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -650,7 +650,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		userMessageFormDTO.setTitle(PartyMemberMessageConstant.PARTY_AUTH_TITLE);
 
 		//21.09.10:记录消息类型和对应的业务id
-		userMessageFormDTO.setMessageType(UserMessageTypeConstant.CERTIFY_PARTY_APPLY_RES);
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.PARTY_CERTIFY_APPLY_RES);
 		userMessageFormDTO.setTargetId(formDTO.getId());
 
 		//调用gov-org服务查询网格信息
@@ -733,7 +733,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 					msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
 
 					//21.09.10:记录消息类型和对应的业务id
-					msgDTO.setMessageType(UserMessageTypeConstant.CERTIFY_PARTY_APPLY);
+					msgDTO.setMessageType(UserMessageTypeConstant.PARTY_CERTIFY_APPLY);
 					msgDTO.setTargetId(formDTO.getId());
 					msgList.add(msgDTO);