elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

订阅消息发送添加gridId入参

dev_shibei_match
sunyuchao 5 years ago
parent
765f1c7046
commit
7eed693973
10 changed files with 20 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java
  2. 1
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
  3. 1
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
  4. 8
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/UserMessageConstant.java
  5. 5
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
  6. 4
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/UserMessageConstant.java
  7. 1
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
  8. 3
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  9. 1
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
  10. 4
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/utils/ModuleConstant.java

2
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java
View File

@ -30,5 +30,5 @@ public interface ActMessageConstant {
/**
* 工作端-重新发布活动，通知待审核+已经审核通过的用户
*/
String RE_PUBLISH_ACT="您好,您参与的%s活动,%s,请注意查看";
String RE_PUBLISH_ACT="您参与的%s活动,%s,请注意查看";
}

1
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
View File

@ -703,6 +703,7 @@ public class WorkActServiceImpl implements WorkActService {
dto.setBehaviorType(ActMessageConstant.WXMP_TITLE);
dto.setMessageContent(String.format(ActMessageConstant.ACT_CANCELED, actInfoDTO.getTitle(), formDTO.getCancelReason()));
dto.setMessageTime(new Date());
dto.setGridId("*");
msgList.add(dto);
}
Result sendMessageRes= epmetMessageOpenFeignClient.saveUserMessageList(userMessageFormDTOS);

1
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
View File

@ -664,6 +664,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
msg.setUserId(actUserRelationEntity.getUserId());
msg.setBehaviorType(ActMessageConstant.WXMP_TITLE);
msg.setMessageTime(new Date());
msg.setGridId("*");
if (ActConstant.ACT_USER_STATUS_PASSED.equals(type)) {
msg.setMessageContent(String.format(ActMessageConstant.AUDIT_PASSED, actInfo.getTitle()));
} else if (ActConstant.ACT_USER_STATUS_REFUSED.equals(type)) {

8
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/UserMessageConstant.java
View File

@ -19,21 +19,21 @@ public interface UserMessageConstant {
/**
* 议题关闭时，选择已解决
*/
String ISSUE_RESOLVED_MSG = "您好，您发表的话题\"%s\"问题已解决，解决方案是：%s";
String ISSUE_RESOLVED_MSG = "您发表的话题\"%s\"问题已解决，解决方案是：%s";
/**
* 议题关闭时，选择无需解决
*/
String ISSUE_UNRESOLVED_MSG = "您好，您发表的话题\"%s\"问题无需解决，原因：%s";
String ISSUE_UNRESOLVED_MSG = "您发表的话题\"%s\"问题无需解决，原因：%s";
/**
* 议题转项目消息模板
*/
String ISSUE_SHIFT_PROJECT_MSG = "您好，您发表的话题\"%s\"的问题,已由%s部门处理，请查看。";
String ISSUE_SHIFT_PROJECT_MSG = "您发表的话题\"%s\"的问题,已由%s部门处理，请查看。";
/**
* 议题转项目消息模板
*/
String PROJECT_RESOLVED_MSG = "您好。您收到一条【%s】的新信息，请您尽快处理。";
String PROJECT_RESOLVED_MSG = "您收到一条【%s】的新信息，请您尽快处理。";
}

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

@ -488,6 +488,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
msgDTO.setBehaviorType(UserMessageConstant.WXMP_ISSUE_TITLE);
msgDTO.setMessageContent(messageContent);
msgDTO.setMessageTime(new Date());
msgDTO.setGridId(entity.getGridId());
msgList.add(msgDTO);
//话题人和议题人是同一个人时则只发送一条居民消息
if (!topicDTO.getCreatedBy().equals(entity.getCreatedBy())) {
@ -612,7 +613,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
if (!shiftProjectMessage(issueProjectResultDTO, formDTO, entity).success()) {
throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION);
}
//5-1:2020.10.26 添加推送微信订阅消息功能 sun
//5-1:2020.10.26 添加给居民端话题创建人、议题发起人以及政府端工作人员推送微信订阅消息功能 sun
if (!wxmpShiftProjectMessage(issueProjectResultDTO, formDTO, entity).success()) {
logger.error("议题转项目，推送微信订阅消息失败！");
}
@ -685,6 +686,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
String topicIssueMessage = String.format(UserMessageConstant.ISSUE_SHIFT_PROJECT_MSG, formDTO.getTopicDTO().getTopicContent(), issueProjectResultDTO.getOrgName());
msgDTO.setMessageContent(topicIssueMessage);
msgDTO.setMessageTime(new Date());
msgDTO.setGridId(entity.getGridId());
msgList.add(msgDTO);
//话题人和议题人是同一个人时则只发送一条居民消息
if (!formDTO.getTopicDTO().getCreatedBy().equals(entity.getCreatedBy())) {
@ -705,6 +707,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
msg.setBehaviorType(UserMessageConstant.WXMP_ISSUE_TITLE);
msg.setMessageContent(projectStaffMessage);
msg.setMessageTime(new Date());
msg.setGridId("*");
msgList.add(msg);
map.put(staff.getStaffId(),staff.getStaffId());
}

4
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/UserMessageConstant.java
View File

@ -19,11 +19,11 @@ public interface UserMessageConstant {
/**
* 议题转项目、项目流转、项目退回消息模板
*/
String PROJECT_RESOLVED_MSG = "您好。您收到一条【%s】的新信息，请您尽快处理。";
String PROJECT_RESOLVED_MSG = "您收到一条【%s】的新信息，请您尽快处理。";
/**
* 项目结案消息模板
*/
String PROJECT_CLOSED_MSG = "您好，您参与的【%s】项目已结案，原因：%s";
String PROJECT_CLOSED_MSG = "您参与的【%s】项目已结案，原因：%s";
}

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

@ -351,6 +351,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
msg.setBehaviorType(UserMessageConstant.WXMP_PROJECT_TITLE);
msg.setMessageContent(projectStaffMessage);
msg.setMessageTime(new Date());
msg.setGridId("*");
msgList.add(msg);
map.put(staff.getStaffId(),staff.getStaffId());
}

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

@ -408,6 +408,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
msg.setBehaviorType("项目消息");
msg.setMessageContent(String.format(UserMessageConstant.PROJECT_CLOSED_MSG, projectEntity.getTitle(), fromDTO.getPublicReply()));
msg.setMessageTime(new Date());
msg.setGridId(p.getGridId());
wxmpMsgList.add(msg);
});
//通知项目关联的部门人员
@ -430,6 +431,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
msg.setBehaviorType("项目消息");
msg.setMessageContent(String.format(UserMessageConstant.PROJECT_CLOSED_MSG, projectEntity.getTitle(), fromDTO.getPublicReply()));
msg.setMessageTime(new Date());
msg.setGridId("*");
wxmpMsgList.add(msg);
});
messageFeignClient.saveUserMessageList(msgList);
@ -514,6 +516,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
msg.setBehaviorType("项目消息");
msg.setMessageContent(String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, projectEntity.getTitle()));
msg.setMessageTime(new Date());
msg.setGridId("*");
wxmpMsgList.add(msg);
//发送微信订阅消息 sun
Result result = epmetMessageOpenFeignClient.sendWxSubscribeMessage(wxmpMsgList);

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

@ -1189,6 +1189,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
formDTO.setBehaviorType(String.format(ModuleConstant.WXMP_MSG_TITLE, title));
formDTO.setMessageContent(content);
formDTO.setMessageTime(new Date());
formDTO.setGridId("*");
msgList.add(formDTO);
return epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
}

4
epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/utils/ModuleConstant.java
View File

@ -91,12 +91,12 @@ public interface ModuleConstant {
/**
* 文章未审核通过 消息内容模版
*/
String MSG_AUDIT_CONTENT = "您好，您发布的【%s】文章%s审核未通过，请重新编辑后发布，谢谢。";
String MSG_AUDIT_CONTENT = "您发布的【%s】文章%s审核未通过，请重新编辑后发布，谢谢。";
/**
* 文章发布失败 内部错误导致
* */
String MSG_ARTICLE_PUBLISH_ERROR = "您好，你发布的【%s】文章由于网络错误未发布成功，请重新发布，谢谢。";
String MSG_ARTICLE_PUBLISH_ERROR = "您发布的【%s】文章由于网络错误未发布成功，请重新发布，谢谢。";
/**
* 草稿Id不存在

Write Preview
Loading…
Cancel
Save