Merge remote-tracking branch 'origin/dev_group_msg' into develop

# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

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

@@ -72,4 +72,54 @@ 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";
+
+
+    /**
+     * 项目流转
+     * targetId:project.id
+     */
+    String PROJECT_TRANSFER="project_transfer";
+
+    /**
+     * 项目结案
+     * targetId:project.id
+     */
+    String PROJECT_CLOSED="project_closed";
+
+    /**
+     * 项目退回
+     * targetId:project.id
+     */
+    String PROJECT_RETURN="project_return";
+
+    /**
+     * 项目立项
+     * targetId:project.id
+     */
+    String PROJECT_APPROVAL="project_approval";
+
+    /**
+     * 事件立项
+     * targetId:project.id
+     */
+    String PROJECT_FROM_RESI_EVENT="project_from_resi_event";
+
+
+    /**
+     * 发布党建声音
+     * targetId:article.DRAFT_ID
+     */
+    String PARTY_VOICE_PUBLISH="party_voice_publish";
 }

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());
             }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@@ -36,13 +36,13 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
+import com.epmet.constant.*;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.ProjectDao;
 import com.epmet.dao.ProjectOrgRelationDao;
-import com.epmet.dao.ProjectDao;
 import com.epmet.dao.ProjectProcessDao;
 import com.epmet.dao.ProjectStaffDao;
 import com.epmet.dto.CustomerStaffDTO;
@@ -453,6 +453,11 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
                 msg.setMessageContent(projectStaffMessage);
                 msg.setReadFlag(ReadFlagConstant.UN_READ);
                 msg.setUserId(staff.getStaffId());
+
+                //21.09.10:记录消息类型和对应的业务id
+                msg.setMessageType(UserMessageTypeConstant.PROJECT_TRANSFER);
+                msg.setTargetId(formDTO.getProjectId());
+
                 msgList.add(msg);
                 map.put(staff.getStaffId(),staff.getStaffId());
             }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -31,10 +31,7 @@ import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.*;
-import com.epmet.constant.ParameterKeyConstant;
+import com.epmet.constant.*;
-import com.epmet.constant.ProjectConstant;
-import com.epmet.constant.SmsTemplateConstant;
-import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.ProjectDao;
 import com.epmet.dao.ProjectOrgRelationDao;
 import com.epmet.dao.ProjectSatisfactionStatisticsDao;
@@ -513,6 +510,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 			messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_CLOSED_MSG, projectEntity.getTitle(), fromDTO.getPublicReply()));
 			messageFormDTO.setReadFlag(Constant.UNREAD);
+
+			//21.09.10:记录消息类型和对应的业务id
+			messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_CLOSED);
+			messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 			msgList.add(messageFormDTO);
 			WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
 			msg.setCustomerId(projectEntity.getCustomerId());
@@ -536,6 +538,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 			messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_CLOSED_MSG, projectEntity.getTitle(), fromDTO.getPublicReply()));
 			messageFormDTO.setReadFlag(Constant.UNREAD);
+
+			//21.09.10:记录消息类型和对应的业务id
+			messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_CLOSED);
+			messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 			msgList.add(messageFormDTO);
 			WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
 			msg.setCustomerId(projectEntity.getCustomerId());
@@ -694,6 +701,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 			messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_CLOSED_MSG, projectEntity.getTitle(), fromDTO.getPublicReply()));
 			messageFormDTO.setReadFlag(Constant.UNREAD);
+
+			//21.09.10:记录消息类型和对应的业务id
+			messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_CLOSED);
+			messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 			msgList.add(messageFormDTO);
 			WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
 			msg.setCustomerId(projectEntity.getCustomerId());
@@ -717,6 +729,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 			messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_CLOSED_MSG, projectEntity.getTitle(), fromDTO.getPublicReply()));
 			messageFormDTO.setReadFlag(Constant.UNREAD);
+
+			//21.09.10:记录消息类型和对应的业务id
+			messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_CLOSED);
+			messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 			msgList.add(messageFormDTO);
 			WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
 			msg.setCustomerId(projectEntity.getCustomerId());
@@ -881,6 +898,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 		messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, projectEntity.getTitle()));
 		messageFormDTO.setReadFlag(Constant.UNREAD);
+
+		//21.09.10:记录消息类型和对应的业务id
+		messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_RETURN);
+		messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 		msgList.add(messageFormDTO);
 		messageFeignClient.saveUserMessageList(msgList);
 		//2020.10.26  添加项目退回给勾选人推送微信订阅消息 sun
@@ -2056,6 +2078,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		messageFormDTO.setTitle(UserMessageConstant.PROJECT_TITLE);
 		messageFormDTO.setMessageContent(String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, projectEntity.getTitle()));
 		messageFormDTO.setReadFlag(Constant.UNREAD);
+
+		//21.09.10:记录消息类型和对应的业务id
+		messageFormDTO.setMessageType(UserMessageTypeConstant.PROJECT_RETURN);
+		messageFormDTO.setTargetId(fromDTO.getProjectId());
+
 		msgList.add(messageFormDTO);
 		messageFeignClient.saveUserMessageList(msgList);
 		//2020.10.26  添加项目退回给勾选人推送微信订阅消息 sun

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

@@ -15,10 +15,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
-import com.epmet.constant.ProjectConstant;
+import com.epmet.constant.*;
-import com.epmet.constant.ReadFlagConstant;
-import com.epmet.constant.SmsTemplateConstant;
-import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.ProjectOrgRelationDao;
 import com.epmet.dao.ProjectProcessAttachmentDao;
 import com.epmet.dao.ProjectProcessDao;
@@ -488,7 +485,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 
 		//4.推送站内信、微信、短信消息
 		//4-1.调用epmet-message服务，给工作端勾选的工作人员发送消息
-		if (!shiftProjectMessage(formDTO).success()) {
+		if (!shiftProjectMessage(formDTO,projectEntity.getId()).success()) {
 			throw new RenException("项目立项，推送站内信失败");
 		}
 
@@ -565,7 +562,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 	 * @Description 项目立项给勾选的工作人员推送站内信消息
 	 * @author sun
 	 */
-	private Result shiftProjectMessage(ProjectApprovalFormDTO formDTO) {
+	private Result shiftProjectMessage(ProjectApprovalFormDTO formDTO,String projectId) {
 		List<UserMessageFormDTO> msgList = new ArrayList<>();
 		//1.创建项目工作人员消息对象
 		String projectStaffMessage = String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, formDTO.getTitle());
@@ -581,6 +578,11 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 				msg.setMessageContent(projectStaffMessage);
 				msg.setReadFlag(ReadFlagConstant.UN_READ);
 				msg.setUserId(staff.getStaffId());
+
+				//21.09.10:记录消息类型和对应的业务id
+				msg.setMessageType(UserMessageTypeConstant.PROJECT_APPROVAL);
+				msg.setTargetId(projectId);
+
 				msgList.add(msg);
 				map.put(staff.getStaffId(),staff.getStaffId());
 			}
@@ -789,7 +791,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 
 		//4.推送站内信、微信、短信消息
 		//4-1.调用epmet-message服务，给工作端勾选的工作人员发送消息
-		if (!shiftProjectMessage(formDTO.getStaffList(),formDTO.getCustomerId(),formDTO.getTitle()).success()) {
+		if (!shiftProjectMessage(formDTO.getStaffList(),formDTO.getCustomerId(),formDTO.getTitle(),projectEntity.getId()).success()) {
 			throw new RenException("事件转为项目，推送站内信失败");
 		}
 
@@ -919,7 +921,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 	 * @Description 项目立项给勾选的工作人员推送站内信消息
 	 * @author yinzuomei
 	 */
-	private Result shiftProjectMessage(List<TickStaffFormDTO> staffList,String customerId,String title) {
+	private Result shiftProjectMessage(List<TickStaffFormDTO> staffList,String customerId,String title,String projectId) {
 		List<UserMessageFormDTO> msgList = new ArrayList<>();
 		//1.创建项目工作人员消息对象
 		String projectStaffMessage = String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, title);
@@ -935,6 +937,11 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 				msg.setMessageContent(projectStaffMessage);
 				msg.setReadFlag(ReadFlagConstant.UN_READ);
 				msg.setUserId(staff.getStaffId());
+
+				//21.09.10:记录消息类型和对应的业务id
+				msg.setTargetId(projectId);
+				msg.setMessageType(UserMessageTypeConstant.PROJECT_FROM_RESI_EVENT);
+
 				msgList.add(msg);
 				map.put(staff.getStaffId(),staff.getStaffId());
 			}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -976,7 +976,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 
 		if (!isOk) {
-			this.sendMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
+			//发布文章内容审核
+			this.sendMsg(draftEntity.getId(),draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
 			this.wxmpMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
 			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null);
 			return null;
@@ -1054,7 +1055,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			}
 		} catch (Exception e) {
 			log.error("scanContent exception", e);
-			this.sendMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
+			//发布文章内容审核
+			this.sendMsg(draftEntity.getId(),draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
 			this.wxmpMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
 			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null);
 		}
@@ -1092,7 +1094,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			}
 		} catch (Exception e) {
 			log.error("scanAllPassPublishArticle update db exception", e);
-			this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
+			//发布文章内容审核
+			this.sendMsg(draft.getId(),draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
 			this.wxmpMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
@@ -1157,12 +1160,14 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 				} else if (titleFail) {
 					auditMsg = ModuleConstant.DRAFT_TITLE;
 				}
-				this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_AUDIT_CONTENT, draft.getTitle(), auditMsg));
+				//发布文章内容审核
+				this.sendMsg(draft.getId(),draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_AUDIT_CONTENT, draft.getTitle(), auditMsg));
 				this.wxmpMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_AUDIT_CONTENT, draft.getTitle(), auditMsg));
 			}
 		} catch (Exception e) {
 			log.error("scanAllPassPublishArticle update db exception", e);
-			this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
+			//发布文章内容审核
+			this.sendMsg(draft.getId(),draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
 			this.wxmpMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
@@ -1174,7 +1179,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		return this.saveOrUpdateContent(tokenDto, fromDTO, false);
 	}
 
-	public Result sendMsg(String customerId, String title, String content) {
+	public Result sendMsg(String draftId,String customerId, String title, String content) {
 		UserMessageFormDTO formDTO = new UserMessageFormDTO();
 		formDTO.setCustomerId(customerId);
 		formDTO.setGridId("");
@@ -1183,6 +1188,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		formDTO.setTitle(String.format(ModuleConstant.MSG_TITLE, title));
 		formDTO.setMessageContent(content);
 		formDTO.setReadFlag(ReadFlagConstant.UN_READ);
+
+		//21.09.10:记录消息类型和对应的业务id
+		formDTO.setMessageType(UserMessageTypeConstant.PARTY_VOICE_PUBLISH);
+		formDTO.setTargetId(draftId);
+
 		return epmetMessageOpenFeignClient.saveUserMessage(formDTO);
 	}
 	/**