diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 24489f5e69..534810e8b9 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -510,7 +510,17 @@ public class IssueServiceImpl extends BaseServiceImpl imp }else throw new RenException(topicInfo.getInternalMsg()); - + //发送站内信 + UserMessageFormDTO msgObj = new UserMessageFormDTO(); + msgObj.setApp(ModuleConstants.APP_RESI); + msgObj.setCustomerId(application.getCustomerId()); + msgObj.setGridId(application.getGridId()); + msgObj.setMessageContent(String.format(ModuleConstants.ISSUE_AUDIT_RESULT_MSG_CONTENT_TEMPLATE,application.getIssueTitle(),StringUtils.equals(ModuleConstants.AUDITION_TYPE_REJECT,param.getActionType()) ? ModuleConstants.ISSUE_ACTION_REJECT : ModuleConstants.ISSUE_ACTION_SHIFT)); + msgObj.setReadFlag(ReadFlagConstant.UN_READ); + msgObj.setTitle(ModuleConstants.ISSUE_AUDIT_RESULT_MSG_TITLE_TEMPLATE); + msgObj.setUserId(application.getCreatedBy()); + List msgList = new LinkedList<>();msgList.add(msgObj); + epmetMessageOpenFeignClient.saveUserMessageList(msgList); //} //applicationService.update(app2update); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java index 9cc727dc1d..7aa596b986 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java @@ -9,17 +9,17 @@ public interface ModuleConstants { /** * 议题状态：表决中 - * */ + */ String ISSUE_STATUS_VOTING = "voting"; /** * 议题状态：已转项目 - * */ + */ String ISSUE_STATUS_SHIFT_PROJECT = "shift_project"; /** * 议题状态：已关闭 - * */ + */ String ISSUE_STATUS_CLOSED = "closed"; /** @@ -28,47 +28,47 @@ public interface ModuleConstants { String ISSUE_APPLICATION_STATUS_UNDER_AUDITING = "under_auditing"; /** * 议题来源：居民段话题 - * */ + */ String ISSUE_FROM_TOPIC = "resi_topic"; /** * 议题进展-当前操作组织类型-机构 不要与数据权限混淆！！！ - * */ + */ String ISSUE_PROCESS_ORG_TYPE_AGENCY = "agency"; /** * 议题进展-当前操作组织类型-部门 不要与数据权限混淆！！！ - * */ + */ String ISSUE_PROCESS_ORG_TYPE_DEPT = "dept"; /** * 议题进展-当前操作组织类型-网格 不要与数据权限混淆！！！ - * */ + */ String ISSUE_PROCESS_ORG_TYPE_GRID = "grid"; /** * 话题转议题流程的操作文案模板 - * */ + */ String ISSUE_PROCESS_VOTING_OPERATION_EXPLAIN_TEMPLATE = "【%s】%s发表的话题被组长%s转为议题:【%s】"; /** * 新增议题流程记录失败日志模板 - * */ + */ String FAILURE_TO_ADD_ISSUE_PROCESS_LOG_TEMPLATE = "新增议题流程记录失败，议题Id：【%s】"; /** * 新增议题记录失败日志模板 - * */ + */ String FAILURE_TO_ADD_ISSUE_LOG_TEMPLATE = "新增议题记录失败，议题来源：【%s】，议题来源Id：【%s】"; /** * 新增议题流程记录失败日志模板 - * */ + */ String FAILURE_TO_ADD_ISSUE_PROCESS = "新增议题流程记录失败】"; /** * 新增议题记录失败日志模板 - * */ + */ String FAILURE_TO_ADD_ISSUE = "新增议题记录失败，议题来源"; String EMPTY_STR = ""; @@ -91,30 +91,29 @@ public interface ModuleConstants { /** * 议题表决态度 赞成 - * */ + */ String ISSUE_VOTING_ATTITUDE_SUPPORT = "support"; /** * 议题表决态度 反对 - * */ + */ String ISSUE_VOTING_ATTITUDE_OPPOSITION = "opposition"; String CREATED_OR_UPDATED_BY_SYSTEM = "system"; /** * 缓存中应表决数 - * */ String SHOULD_VOTE_COUNT = "shouldVoteCount"; /** * 没有找到指定议题异常模板 - * */ + */ String ISSUE_NOT_FOUND_EXCEPTION_TEMPLATE = "没有找到指定议题，议题Id:【%s】"; /** * 定时任务创建的数据 created_by - * */ + */ String CREATED_BY_SYSTEM = "system"; /** @@ -144,4 +143,15 @@ public interface ModuleConstants { */ String AUDIT_SWITCH_CLOSE = "close"; + String APP_GOV = "gov"; + + String APP_RESI = "resi"; + + String ISSUE_AUDIT_RESULT_MSG_TITLE_TEMPLATE = "您有一条议题审核消息"; + + String ISSUE_AUDIT_RESULT_MSG_CONTENT_TEMPLATE = "您好，您的%s话题已%s，请查看。"; + + String ISSUE_ACTION_SHIFT = "转议题"; + + String ISSUE_ACTION_REJECT = "驳回"; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java index 34b172e372..669f1a2edb 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java @@ -79,11 +79,11 @@ public class GroupIssueServiceImpl implements GroupIssueService { } listResult.getData().forEach(user -> { if (user.getUserId().equals(data.getUserId())){ - data.setIssuePublisher(user.getDistrict().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender()))); + data.setIssuePublisher(user.getStreet().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender()))); data.setIssuePublisherMobile(user.getMobile()); } if (user.getUserId().equals(topicInfoResultDTO.getTopicUserId())){ - topicInfoResultDTO.setPublishedUser(user.getDistrict().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender()))); + topicInfoResultDTO.setPublishedUser(user.getStreet().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender()))); topicInfoResultDTO.setTopicPublishMobile(user.getMobile()); } });