居民端用户申请创建小组，提交小组信息后，通知网格长，存储targetId，messageType

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

@@ -36,4 +36,10 @@ public interface UserMessageTypeConstant {
      * targetId:partymember_info.id
      */
     String CERTIFY_PARTY_APPLY_RES="certify_party_apply_res";
+
+    /**
+     * 居民端用户申请创建小组，提交小组信息后，通知网格长
+     * targetId:resi_group.id
+     */
+    String CREATE_GROUP_APPLY="create_group_apply";
 }

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

@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.*;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -40,7 +41,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
-import com.epmet.dto.BizPointTotalDetailDTO;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -48,7 +49,6 @@ import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
-import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.modules.feign.EpmetMessageFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
@@ -84,9 +84,7 @@ import com.epmet.resi.group.dto.member.result.AchievementResultDTO;
 import com.epmet.resi.group.dto.member.result.GroupAchievementDTO;
 import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 import com.epmet.send.SendMqMsgUtil;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import kotlin.jvm.internal.Lambda;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -527,7 +525,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 		resiGroupStatisticalService.save(resiGroupStatisticalDTO);
 		//发送消息：创建小组
-		sendMsgResi2Gov(UserMessageConstant.CREATE_GROUP_APPLYING_MSG_TITLE,msg,applyCreateGroupFormDTO.getGridId(),applyCreateGroupFormDTO.getUserId(),applyCreateGroupFormDTO.getCustomerId());
+		sendMsgResi2Gov(UserMessageConstant.CREATE_GROUP_APPLYING_MSG_TITLE,msg,applyCreateGroupFormDTO.getGridId(),applyCreateGroupFormDTO.getUserId(),applyCreateGroupFormDTO.getCustomerId(), resiGroupEntity.getId());
 	}
 
 
@@ -1157,7 +1155,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @author wangc
 	 * @date 2020.04.29 22:49
 	 **/
-	private void sendMsgResi2Gov(String title,String msg,String gridId,String userId,String customerId){
+	private void sendMsgResi2Gov(String title,String msg,String gridId,String userId,String customerId,String groupId){
 		//1.查询加入当前网格下的人员 customer_staff_grid
 		CommonGridIdFormDTO commonGridIdFormDTO = new CommonGridIdFormDTO();
 		commonGridIdFormDTO.setGridId(gridId);
@@ -1188,6 +1186,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 					msgObj.setReadFlag(ReadFlagConstant.UN_READ);
 					msgObj.setTitle(title);
 					msgObj.setUserId(to);
+
+					//21.09.10:记录消息类型和对应的业务id
+					msgObj.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY);
+					msgObj.setTargetId(groupId);
+
 					msgList.add(msgObj);
 					//微信订阅
 					WxSubscribeMessageFormDTO subscribeDTO = new WxSubscribeMessageFormDTO();