other_project/message-center
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

提前开票消息推送完善

Browse Source 
巡检盘库问题修改
This commit is contained in:
hp
2022-11-02 17:25:58 +08:00
parent ac6322a233
commit 364b3e29c4
5 changed files with 126 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java
View File

@@ -72,4 +72,9 @@ public interface MessageFeign {
@PostMapping("/sendMessage")
ResultBean<String> sendMessage(@RequestBody AppScmMessageFlowableQuery query);
@ApiOperation("业务流程审批推送消息")
@PostMapping("/sendAutoserviceMessage")
ResultBean<String> sendAutoserviceMessage(@RequestBody AppScmMessageFlowableQuery query);
}

5
message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeignFallback.java
View File

@@ -68,4 +68,9 @@ public class MessageFeignFallback implements MessageFeign {
public ResultBean<String> sendMessage(AppScmMessageFlowableQuery query) {
return null;
}
@Override
public ResultBean<String> sendAutoserviceMessage(AppScmMessageFlowableQuery query) {
return null;
}
}

1
message-center-api/src/main/java/com/yxt/messagecenter/api/message/MsgTargetUriEnum.java
View File

@@ -11,6 +11,7 @@ public enum MsgTargetUriEnum {
CUSTOMERREMIND("客户提醒", "com.anrui.android.plugin.autoservice.activity.DetailCustomerActivity"),
GYLPKBG("供应链-盘库报告", "com.anrui.android.plugin.supplychain.activity.DetailInventoryCarReportActivity"),
GYLXJWT("供应链-巡检问题", "com.anrui.android.plugin.supplychain.activity.DetailInspectionCarReportActivity"),
TQKPSQTS("业务-提前开票推送", "com.anrui.android.plugin.autoservice.activity.DetailAdvanceInvoiceActivity"),
;
/**

5
message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageRest.java
View File

@@ -125,4 +125,9 @@ public class MessageRest implements MessageFeign {
public ResultBean<String> sendMessage(AppScmMessageFlowableQuery query) {
return messageService.sendMessage(query);
}
@Override
public ResultBean<String> sendAutoserviceMessage(AppScmMessageFlowableQuery query) {
return messageService.sendAutoserviceMessage(query);
}
}

119
message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
View File

@@ -250,7 +250,7 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
// 使用多线程保存
List<Future<?>> futures = new ArrayList<Future<?>>();
ExecutorService executor = Executors.newFixedThreadPool(4);
for (int i = 0;i<list.size();i++) {
for (int i = 0; i < list.size(); i++) {
int finalI = i;
Future<?> f = executor.submit(new Runnable() {
@Override
@@ -262,7 +262,7 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
messageList.setRDelStatus(0);
messageList.setSDelStatus(0);
messageList.setReceiverSid(list.get(finalI));
if(orgPathList.size()>0){
if (orgPathList.size() > 0) {
messageList.setReceiverDeptSid(orgPathList.get(finalI));
}
messageListService.saveOrUpdateDto(messageList);
@@ -427,13 +427,114 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
futures.add(f);
}
executor.shutdown();
for (int i = 0; i < reveiveIdList.size(); i++) {
/**
* msgTitle:排产申请
* content:xxx的排产申请
*/
JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, query.getName(), reveiveIdList.get(i));
} // 3、推送
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 < reveiveIdList.size(); i++) {
/**
* msgTitle:排产申请
* content:xxx的排产申请
*/
JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "供应链", reveiveIdList.get(i));
}
} else {
for (int i = 0; i < reveiveIdList.size(); i++) {
/**
* msgTitle:排产申请
* content:xxx的排产申请
*/
JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "供应链", "T" + reveiveIdList.get(i));
}
}
// 3、推送
// JPushServer.sendPushAll(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, messageDto.getMsgType());
// JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgSid, messageDto.getMsgType(), "23","26","66"); // 别名
System.out.println("process end");
return rb.success().setMsg(msgSid);
}
public ResultBean<String> sendAutoserviceMessage(AppScmMessageFlowableQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
String msgTitle = query.getMsgTitle();
String msgContent = query.getMsgContent();
String msgSource = query.getMsgSource();
String msgTargetUri = query.getMsgTargetUri();
String app_type = query.getApp_type();
String moduleSid = query.getModuleSid();
List<String> recipientSidList = query.getRecipientSidList();
Map<String, Object> appMap = query.getAppMap();
ResultBean<String> stringList = sysUserFeign.selectIdBySid(recipientSidList);
List<String> reveiveIdList = Arrays.asList(stringList.getData().split(","));
// 1、保存消息体
AppMessageDto messageDto = new AppMessageDto();
List<MessageTypeVo> typeVoList = messageTypeService.selectMsgTypeList(IDENTIFIER);
if (typeVoList != null) {
for (MessageTypeVo message : typeVoList) {
if (message.getMsgType().equals("业务")) {
messageDto.setMsgTypeSid(message.getMsgTypeSid());
messageDto.setMsgType(message.getMsgType());
}
}
}
messageDto.setMsgTitle(msgTitle);
messageDto.setMsgContent(msgContent);
messageDto.setMsgSource(msgSource);
messageDto.setMsgTargetUri(msgTargetUri);
messageDto.setApp_type(app_type);
messageDto.setModuleSid(moduleSid);
JSONObject json = new JSONObject(appMap);
messageDto.setArgs_json(json.toJSONString());
String msgSid = (String) saveOrUpdateAppMessage(messageDto).getData();
String msgTypeSid = messageDto.getMsgTypeSid();
// 2、保存至消息列表
// 使用多线程保存
List<Future<?>> futures = new ArrayList<Future<?>>();
ExecutorService executor = Executors.newFixedThreadPool(4);
for (String sid : recipientSidList) {
Future<?> f = executor.submit(new Runnable() {
@Override
public void run() {
try {
System.out.println("run start-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName());
// MessageListDto messageList = new MessageListDto();
MessageList messageList = new MessageList();
messageList.setMsgSid(msgSid);
messageList.setRDelStatus(0);
messageList.setSDelStatus(0);
messageList.setReceiverSid(sid);
messageListService.save(messageList);
// Thread.sleep(5 * 1000);
System.out.println("run end-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName());
} catch (Exception e) {
e.printStackTrace();
}
}
});
futures.add(f);
}
executor.shutdown();
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 < reveiveIdList.size(); i++) {
/**
* msgTitle:排产申请
* content:xxx的排产申请
*/
JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "业务", reveiveIdList.get(i));
}
} else {
for (int i = 0; i < reveiveIdList.size(); i++) {
/**
* msgTitle:排产申请
* content:xxx的排产申请
*/
JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "业务", "T" + reveiveIdList.get(i));
}
}
// 3、推送
// JPushServer.sendPushAll(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, messageDto.getMsgType());
// JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgSid, messageDto.getMsgType(), "23","26","66"); // 别名
System.out.println("process end");