优化
This commit is contained in:
@@ -263,7 +263,10 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
|
|||||||
messageDto.setMsgTargetUri(dto.getModuleAction());
|
messageDto.setMsgTargetUri(dto.getModuleAction());
|
||||||
String msgSid = saveOrUpdateAppMessage(messageDto).getData();
|
String msgSid = saveOrUpdateAppMessage(messageDto).getData();
|
||||||
String msgTypeSid = messageDto.getMsgTypeSid();
|
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<?>>();
|
List<Future<?>> futures = new ArrayList<Future<?>>();
|
||||||
ExecutorService executor = Executors.newFixedThreadPool(4);
|
ExecutorService executor = Executors.newFixedThreadPool(4);
|
||||||
@@ -279,13 +282,15 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
|
|||||||
messageList.setRDelStatus(0);
|
messageList.setRDelStatus(0);
|
||||||
messageList.setSDelStatus(0);
|
messageList.setSDelStatus(0);
|
||||||
messageList.setReceiverSid(list.get(finalI));
|
messageList.setReceiverSid(list.get(finalI));
|
||||||
//根据接收人sid查询接收人名称
|
if ("pro".equals(properties.get("spring.profiles.active"))) {
|
||||||
ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(list.get(finalI));
|
//根据接收人sid查询接收人名称
|
||||||
if (sysUserInfoVoResultBean.getData() != null) {
|
ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(list.get(finalI));
|
||||||
messageList.setReceiverName(sysUserInfoVoResultBean.getData().getStaffName());
|
if (sysUserInfoVoResultBean.getData() != null) {
|
||||||
String content = "您有" + messageDto.getMsgContent() + "。请及时登录平台办理。于"+ DateUtil.format(new Date(),"HH:mm:ss")+"平台发。";
|
messageList.setReceiverName(sysUserInfoVoResultBean.getData().getStaffName());
|
||||||
String res = MsgWs.SendWaitWorkMsg(sysUserInfoVoResultBean.getData().getMobile(), content);
|
String content = "您有" + messageDto.getMsgContent() + "。请及时登录平台办理。于" + DateUtil.format(new Date(), "HH:mm:ss") + "平台发。";
|
||||||
System.out.println("审批发送短信:" + res);
|
String res = MsgWs.SendWaitWorkMsg(sysUserInfoVoResultBean.getData().getMobile(), content);
|
||||||
|
System.out.println("审批发送短信:" + res);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (orgPathList.size() > 0) {
|
if (orgPathList.size() > 0) {
|
||||||
messageList.setReceiverDeptSid(orgPathList.get(finalI));
|
messageList.setReceiverDeptSid(orgPathList.get(finalI));
|
||||||
@@ -301,9 +306,6 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
|
|||||||
}
|
}
|
||||||
executor.shutdown();
|
executor.shutdown();
|
||||||
//标题、内容、消息类别key、消息类别名称、
|
//标题、内容、消息类别key、消息类别名称、
|
||||||
YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean();
|
|
||||||
factoryBean.setResources(new ClassPathResource("application.yml"));
|
|
||||||
Properties properties = factoryBean.getObject();
|
|
||||||
if ("pro".equals(properties.get("spring.profiles.active"))) {
|
if ("pro".equals(properties.get("spring.profiles.active"))) {
|
||||||
for (int i = 0; i < receiveIdList.size(); i++) {
|
for (int i = 0; i < receiveIdList.size(); i++) {
|
||||||
JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "审批中心", receiveIdList.get(i));
|
JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "审批中心", receiveIdList.get(i));
|
||||||
|
|||||||
Reference in New Issue
Block a user