From a17ecc00944301903780023a2bdec7715bd3cd95 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Mon, 24 Oct 2022 16:55:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=BD=A6=E3=80=81=E7=9B=98=E5=BA=93?= =?UTF-8?q?=E3=80=81=E5=B7=A1=E6=A3=80=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/AppScmMessageFlowableQuery.java | 29 +++++++---------- .../biz/message/MessageService.java | 32 ++++++++++++------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/AppScmMessageFlowableQuery.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/AppScmMessageFlowableQuery.java index d6cea37..879a990 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/AppScmMessageFlowableQuery.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/AppScmMessageFlowableQuery.java @@ -5,42 +5,35 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; +import java.util.Map; @Data public class AppScmMessageFlowableQuery implements Query { private static final long serialVersionUID = -264602388959108722L; - @ApiModelProperty("盘库sid") - private String mainSid; - - @ApiModelProperty("接收人sid") - private List list; - - @ApiModelProperty("接收人id") - private List receiveIdList; + @ApiModelProperty("业务sid") + private String businessSid; + @ApiModelProperty("app所需参数") + private Map appMap; @ApiModelProperty("消息标题") private String msgTitle; - - //+ "提交的月度盘库报告,请查阅" @ApiModelProperty("消息内容") private String msgContent; - @ApiModelProperty("来源（资源名称）") private String msgSource; - - //MsgTargetUriEnum.GYLPKBG.getUri() @ApiModelProperty("推送的消息打开的action（APP），推送参数对应class_name") private String msgTargetUri; - - //"2" @ApiModelProperty("0.内置Activity 1.内置WebView 2.RePlugin插件") private String app_type; - - //"98ff0724-5df4-4fc7-ab6d-3996e7706acd" @ApiModelProperty("插件Sid") private String moduleSid; - @ApiModelProperty("名称") private String name; + @ApiModelProperty("接收人sid") + private List recipientSidList; +// +// @ApiModelProperty("接收人id") +// private List receiveIdList; + } 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 ef30818..060df33 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 @@ -361,6 +361,16 @@ public class MessageService extends MybatisBaseService { public ResultBean sendMessage(AppScmMessageFlowableQuery query) { ResultBean 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 recipientSidList = query.getRecipientSidList(); + Map appMap = query.getAppMap(); + ResultBean stringList = sysUserFeign.selectIdBySid(recipientSidList); + List reveiveIdList = Arrays.asList(stringList.getData().split(",")); // 1、保存消息体 AppMessageDto messageDto = new AppMessageDto(); List typeVoList = messageTypeService.selectMsgTypeList(IDENTIFIER); @@ -372,23 +382,21 @@ public class MessageService extends MybatisBaseService { } } } - messageDto.setMsgTitle(query.getMsgTitle()); - messageDto.setMsgContent(query.getMsgContent()); - messageDto.setMsgSource(query.getMsgSource()); - messageDto.setMsgTargetUri(query.getMsgTargetUri()); - messageDto.setApp_type(query.getApp_type()); - messageDto.setModuleSid(query.getModuleSid()); - JSONObject json = new JSONObject(); - json.put("sid", query.getMainSid()); + 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 list = query.getList(); // 使用多线程保存 List> futures = new ArrayList>(); ExecutorService executor = Executors.newFixedThreadPool(4); - for (String sid : list) { + for (String sid : recipientSidList) { Future f = executor.submit(new Runnable() { @Override public void run() { @@ -411,12 +419,12 @@ public class MessageService extends MybatisBaseService { futures.add(f); } executor.shutdown(); - for (int i = 0; i < query.getReceiveIdList().size(); i++) { + for (int i = 0; i < reveiveIdList.size(); i++) { /** * msgTitle:排产申请 * 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、推送 // JPushServer.sendPushAll(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, messageDto.getMsgType()); // JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgSid, messageDto.getMsgType(), "23","26","66"); // 别名