This commit is contained in:
dimengzhe
2023-09-04 15:21:11 +08:00
parent 45edb13d5b
commit e6eadb4599

View File

@@ -263,7 +263,10 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
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<Future<?>> futures = new ArrayList<Future<?>>();
ExecutorService executor = Executors.newFixedThreadPool(4);
@@ -279,13 +282,15 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
messageList.setRDelStatus(0);
messageList.setSDelStatus(0);
messageList.setReceiverSid(list.get(finalI));
//根据接收人sid查询接收人名称
ResultBean<SysUserInfoVo> 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<SysUserInfoVo> 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<MessageMapper, Message> {
}
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));