From 5b8c4a374f5bd7a737e1f7f3004090be13758892 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 17:19:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=86=85=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E3=80=81=E7=BC=96=E8=BE=91=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=AD=98=E5=82=A8targetId=EF=BC=8CmessageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/UserMessageTypeConstant.java | 13 +++++++++++++
 .../act/service/impl/GroupActInfoServiceImpl.java   |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 1de4d926f6..435bb82903 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -70,6 +70,19 @@ public interface UserMessageTypeConstant {
      */
     String GROUP_ENTER_GROUP_BY_LINK_RES="group_enter_group_by_link_res";
 
+    /**
+     * 组内发布活动
+     * targetId:group_act_info.id
+     */
+    String GROUP_ACT_PUBLISH="group_act_publish";
+    /**
+     * 组内发布活动,进行编辑
+     * targetId:group_act_info.id
+     */
+    String GROUP_ACT_CHANGE="group_act_change";
+
+
+
 
 
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 48334bac4e..a12a281396 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -35,6 +35,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.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
@@ -262,9 +263,17 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
                 if(StringUtils.isNotBlank(formDTO.getGroupActId())){
                     // 活动修改后，站内信通知全组成员“您有一条小组消息   【某某小组】更新了********活动详情，请查看。
                     userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.CHANGED_GROUP_ACT, resiGroupDTO.getGroupName(), groupActInfoEntity.getTitle()));
+
+                    //21.09.10:记录消息类型和对应的业务id
+                    userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_ACT_PUBLISH);
+                    userMessageFormDTO.setTargetId(groupActInfoEntity.getId());
                 }else{
                     // 活动发布，站内信通知全组成员“您有一条小组消息   【某某小组】发布了*******活动，请查看。
                     userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.PUBLISH_GROUP_ACT, resiGroupDTO.getGroupName(), groupActInfoEntity.getTitle()));
+
+                    //21.09.10:记录消息类型和对应的业务id
+                    userMessageFormDTO.setMessageType(UserMessageTypeConstant.GROUP_ACT_CHANGE);
+                    userMessageFormDTO.setTargetId(groupActInfoEntity.getId());
                 }
                 list.add(userMessageFormDTO);
             }