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-10-24 16:55:13 +08:00
parent bd7b267022
commit a17ecc0094
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
message-center-api/src/main/java/com/yxt/messagecenter/api/message/AppScmMessageFlowableQuery.java
View File

@@ -5,42 +5,35 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
import java.util.Map;
@Data @Data
public class AppScmMessageFlowableQuery implements Query { public class AppScmMessageFlowableQuery implements Query {
private static final long serialVersionUID = -264602388959108722L; private static final long serialVersionUID = -264602388959108722L;
@ApiModelProperty("盘库sid")
private String mainSid;
@ApiModelProperty("接收人sid")
private List<String> list;
@ApiModelProperty("接收人id")
private List<String> receiveIdList;
@ApiModelProperty("业务sid")
private String businessSid;
@ApiModelProperty("app所需参数")
private Map<String,Object> appMap;
@ApiModelProperty("消息标题") @ApiModelProperty("消息标题")
private String msgTitle; private String msgTitle;
//+ "提交的月度盘库报告,请查阅"
@ApiModelProperty("消息内容") @ApiModelProperty("消息内容")
private String msgContent; private String msgContent;
@ApiModelProperty("来源（资源名称）") @ApiModelProperty("来源（资源名称）")
private String msgSource; private String msgSource;
//MsgTargetUriEnum.GYLPKBG.getUri()
@ApiModelProperty("推送的消息打开的action（APP），推送参数对应class_name") @ApiModelProperty("推送的消息打开的action（APP），推送参数对应class_name")
private String msgTargetUri; private String msgTargetUri;
//"2"
@ApiModelProperty("0.内置Activity 1.内置WebView 2.RePlugin插件") @ApiModelProperty("0.内置Activity 1.内置WebView 2.RePlugin插件")
private String app_type; private String app_type;
//"98ff0724-5df4-4fc7-ab6d-3996e7706acd"
@ApiModelProperty("插件Sid") @ApiModelProperty("插件Sid")
private String moduleSid; private String moduleSid;
@ApiModelProperty("名称") @ApiModelProperty("名称")
private String name; private String name;
@ApiModelProperty("接收人sid")
private List<String> recipientSidList;
//
// @ApiModelProperty("接收人id")
// private List<String> receiveIdList;
} }

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

@@ -361,6 +361,16 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
public ResultBean<String> sendMessage(AppScmMessageFlowableQuery query) { public ResultBean<String> sendMessage(AppScmMessageFlowableQuery query) {
ResultBean<String> rb = ResultBean.fireFail(); 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、保存消息体 // 1、保存消息体
AppMessageDto messageDto = new AppMessageDto(); AppMessageDto messageDto = new AppMessageDto();
List<MessageTypeVo> typeVoList = messageTypeService.selectMsgTypeList(IDENTIFIER); List<MessageTypeVo> typeVoList = messageTypeService.selectMsgTypeList(IDENTIFIER);
@@ -372,23 +382,21 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
} }
} }
} }
messageDto.setMsgTitle(query.getMsgTitle()); messageDto.setMsgTitle(msgTitle);
messageDto.setMsgContent(query.getMsgContent()); messageDto.setMsgContent(msgContent);
messageDto.setMsgSource(query.getMsgSource()); messageDto.setMsgSource(msgSource);
messageDto.setMsgTargetUri(query.getMsgTargetUri()); messageDto.setMsgTargetUri(msgTargetUri);
messageDto.setApp_type(query.getApp_type()); messageDto.setApp_type(app_type);
messageDto.setModuleSid(query.getModuleSid()); messageDto.setModuleSid(moduleSid);
JSONObject json = new JSONObject(); JSONObject json = new JSONObject(appMap);
json.put("sid", query.getMainSid());
messageDto.setArgs_json(json.toJSONString()); messageDto.setArgs_json(json.toJSONString());
String msgSid = (String) saveOrUpdateAppMessage(messageDto).getData(); String msgSid = (String) saveOrUpdateAppMessage(messageDto).getData();
String msgTypeSid = messageDto.getMsgTypeSid(); String msgTypeSid = messageDto.getMsgTypeSid();
// 2、保存至消息列表 // 2、保存至消息列表
List<String> list = query.getList();
// 使用多线程保存 // 使用多线程保存
List<Future<?>> futures = new ArrayList<Future<?>>(); List<Future<?>> futures = new ArrayList<Future<?>>();
ExecutorService executor = Executors.newFixedThreadPool(4); ExecutorService executor = Executors.newFixedThreadPool(4);
for (String sid : list) { for (String sid : recipientSidList) {
Future<?> f = executor.submit(new Runnable() { Future<?> f = executor.submit(new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -411,12 +419,12 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
futures.add(f); futures.add(f);
} }
executor.shutdown(); executor.shutdown();
for (int i = 0; i < query.getReceiveIdList().size(); i++) { for (int i = 0; i < reveiveIdList.size(); i++) {
/** /**
* msgTitle:排产申请 * msgTitle:排产申请
* content:xxx的排产申请 * content:xxx的排产申请
*/ */
JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, query.getName(), query.getReceiveIdList().get(i)); JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, query.getName(), reveiveIdList.get(i));
} // 3、推送 } // 3、推送
// JPushServer.sendPushAll(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, messageDto.getMsgType()); // JPushServer.sendPushAll(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, messageDto.getMsgType());
// JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgSid, messageDto.getMsgType(), "23","26","66"); // 别名 // JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgSid, messageDto.getMsgType(), "23","26","66"); // 别名