diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java index ddea16e..df2c573 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java @@ -263,7 +263,10 @@ public class MessageService extends MybatisBaseService { messageDto.setMsgTargetUri(dto.getModuleAction()); String msgSid = saveOrUpdateAppMessage(messageDto).getData(); String msgTypeSid = messageDto.getMsgTypeSid(); - // 2、保存至消息列表 + //标题、内容、消息类别key、消息类别名称、 + YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean(); + factoryBean.setResources(new ClassPathResource("application.yml")); + Properties properties = factoryBean.getObject(); // 使用多线程保存 List> futures = new ArrayList>(); ExecutorService executor = Executors.newFixedThreadPool(4); @@ -279,13 +282,15 @@ public class MessageService extends MybatisBaseService { messageList.setRDelStatus(0); messageList.setSDelStatus(0); messageList.setReceiverSid(list.get(finalI)); - //根据接收人sid查询接收人名称 - ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(list.get(finalI)); - if (sysUserInfoVoResultBean.getData() != null) { - messageList.setReceiverName(sysUserInfoVoResultBean.getData().getStaffName()); - String content = "您有" + messageDto.getMsgContent() + "。请及时登录平台办理。于"+ DateUtil.format(new Date(),"HH:mm:ss")+"平台发。"; - String res = MsgWs.SendWaitWorkMsg(sysUserInfoVoResultBean.getData().getMobile(), content); - System.out.println("审批发送短信:" + res); + if ("pro".equals(properties.get("spring.profiles.active"))) { + //根据接收人sid查询接收人名称 + ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(list.get(finalI)); + if (sysUserInfoVoResultBean.getData() != null) { + messageList.setReceiverName(sysUserInfoVoResultBean.getData().getStaffName()); + String content = "您有" + messageDto.getMsgContent() + "。请及时登录平台办理。于" + DateUtil.format(new Date(), "HH:mm:ss") + "平台发。"; + String res = MsgWs.SendWaitWorkMsg(sysUserInfoVoResultBean.getData().getMobile(), content); + System.out.println("审批发送短信:" + res); + } } if (orgPathList.size() > 0) { messageList.setReceiverDeptSid(orgPathList.get(finalI)); @@ -301,9 +306,6 @@ public class MessageService extends MybatisBaseService { } executor.shutdown(); //标题、内容、消息类别key、消息类别名称、 - YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean(); - factoryBean.setResources(new ClassPathResource("application.yml")); - Properties properties = factoryBean.getObject(); if ("pro".equals(properties.get("spring.profiles.active"))) { for (int i = 0; i < receiveIdList.size(); i++) { JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "审批中心", receiveIdList.get(i));