小组内发布通知、编辑通知，存储targetId，messageType

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

@@ -102,6 +102,18 @@ public interface UserMessageTypeConstant {
      */
     String GROUP_SLIENT_MEMBER="group_slient_member";
 
+    /**
+     * 发布小组内通知
+     * targetId:notice.id
+     */
+    String GROUP_MESSAGE_PUBLISH="group_message_publish";
+    /**
+     * 发布小组内通知
+     * targetId:notice.id
+     */
+    String GROUP_MESSAGE_EDIT="group_message_edit";
+
+
 
 
     /**

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

@@ -33,6 +33,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
@@ -58,7 +59,10 @@ import com.epmet.modules.notice.service.NoticeService;
 import com.epmet.resi.group.constant.TopicConstant;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.notice.NoticeDTO;
-import com.epmet.resi.group.dto.notice.form.*;
+import com.epmet.resi.group.dto.notice.form.AddNoticeFormDTO;
+import com.epmet.resi.group.dto.notice.form.EditNoticeFormDTO;
+import com.epmet.resi.group.dto.notice.form.NoticeDetailFormDTO;
+import com.epmet.resi.group.dto.notice.form.NoticeFileDTO;
 import com.epmet.resi.group.dto.notice.result.NoticeDetailResultDTO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.logging.Log;
@@ -272,6 +276,10 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
                 userMessageFormDTO.setTitle(UserMessageConstant.GROUP_TITLE);
                 userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
                 userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.GROUP_NOTICE_ADD, groupEntity.getGroupName(), formDTO.getTitle()));
+
+                //21.09.10:记录消息类型和对应的业务id
+                userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_MESSAGE_PUBLISH);
+                userMessageFormDTO.setTargetId(messageEntity.getMessageId());
                 userMessageFormDTOS.add(userMessageFormDTO);
             }
         });
@@ -430,6 +438,11 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
                 userMessageFormDTO.setTitle(UserMessageConstant.GROUP_TITLE);
                 userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
                 userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.GROUP_NOTICE_EDIT, groupEntity.getGroupName(), formDTO.getTitle()));
+
+                //21.09.10:记录消息类型和对应的业务id
+                userMessageFormDTO.setTargetId(entity.getId());
+                userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_MESSAGE_EDIT);
+
                 userMessageFormDTOS.add(userMessageFormDTO);
             }
         });