议题关闭、议题转项目，存储targetId，messageType

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

@@ -72,4 +72,17 @@ public interface UserMessageTypeConstant {
 
 
 
+
+    /**
+     * 关闭议题时，已解决或者无需解决，通知议题发起人、话题创建人
+     * targetId:issue.id
+     */
+    String ISSUE_CLOSE_ISSUE="issue_close_issue";
+
+    /**
+     * 议题转项目时给话题创建人、议题发起人、勾选的工作人员分别推送消息
+     * targetId:居民端用户：issue.id工作端：project.id
+     */
+    String ISSUE_SHIFT_PROJECT="issue_shift_project";
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -24,6 +24,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.IssueConstant;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.IssueDao;
 import com.epmet.dao.IssueProcessDao;
 import com.epmet.dao.IssueProjectRelationDao;
@@ -755,6 +756,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         msgDTO.setMessageContent(messageContent);
         msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
         msgDTO.setUserId(topicDTO.getCreatedBy());
+
+        //21.09.10:记录消息类型和对应的业务id
+        msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_CLOSE_ISSUE);
+        msgDTO.setTargetId(entity.getId());
+
         msgList.add(msgDTO);
         //话题人和议题人是同一个人时则只发送一条居民消息
         if (!topicDTO.getCreatedBy().equals(entity.getCreatedBy())) {
@@ -1067,11 +1073,21 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         msgDTO.setMessageContent(topicIssueMessage);
         msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
         msgDTO.setUserId(formDTO.getTopicDTO().getCreatedBy());
+
+        //21.09.10:记录消息类型和对应的业务id
+        msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT);
+        msgDTO.setTargetId(entity.getId());
+
         msgList.add(msgDTO);
         //话题人和议题人是同一个人时则只发送一条居民消息
         if (!formDTO.getTopicDTO().getCreatedBy().equals(entity.getCreatedBy())) {
             UserMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO, UserMessageFormDTO.class);
             msgIssue.setUserId(entity.getCreatedBy());
+
+            //21.09.10:记录消息类型和对应的业务id
+            msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT);
+            msgDTO.setTargetId(entity.getId());
+
             msgList.add(msgIssue);
         }
         //2:创建项目工作人员消息对象
@@ -1088,6 +1104,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 msg.setMessageContent(projectStaffMessage);
                 msg.setReadFlag(ReadFlagConstant.UN_READ);
                 msg.setUserId(staff.getStaffId());
+
+                //21.09.10:记录消息类型和对应的业务id
+                msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT);
+                msgDTO.setTargetId(issueProjectResultDTO.getProjectId());
+
                 msgList.add(msg);
                 map.put(staff.getStaffId(),staff.getStaffId());
             }