diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/bizmessage/entity/MessageRaw.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/bizmessage/entity/MessageRaw.java index d13a492..ba8fb2e 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/bizmessage/entity/MessageRaw.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/bizmessage/entity/MessageRaw.java @@ -33,4 +33,6 @@ public class MessageRaw { /* 授权用户列表 */ private List users; + /* 业务参数 */ + private Map servicecode; } diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/bizmessage/publish/BizMessagePublisher.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/bizmessage/publish/BizMessagePublisher.java index ca98dd7..eaa2050 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/bizmessage/publish/BizMessagePublisher.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/bizmessage/publish/BizMessagePublisher.java @@ -25,7 +25,7 @@ public class BizMessagePublisher { /** * 广播消息 * - * @param tilte 消息标题 + * @param title 消息标题 * @param category 消息类别 * @param templateCode 消息模板编码 * @param body 消息内容 @@ -40,7 +40,7 @@ public class BizMessagePublisher { /** * 像指定用户群发布消息 * - * @param tilte 消息标题 + * @param title 消息标题 * @param category 消息类别 * @param templateCode 消息模板编码 * @param body 消息内容 @@ -50,7 +50,24 @@ public class BizMessagePublisher { */ public Optional publishToSpecialUsers(String title, String category, String templateCode, Map body, Map params, List grantUsers) { - return publishMessage(title, category, templateCode, body, params, grantUsers); + return this.publishToSpecialUsers(title,category,templateCode,body,params,grantUsers,null); + } + /** + * 像指定用户群发布消息 + * + * @param title 消息标题 + * @param category 消息类别 + * @param templateCode 消息模板编码 + * @param body 消息内容 + * @param params 消息参数 + * @param grantUsers 目标用户列表 + * @param servicecode 业务参数 + * @return 消息结果 + */ + public Optional publishToSpecialUsers(String title, String category, String templateCode, + Map body, Map params, + List grantUsers,Map servicecode) { + return publishMessage(title, category, templateCode, body, params, grantUsers,servicecode); } /** @@ -70,8 +87,30 @@ public class BizMessagePublisher { Assert.notNull(body, "消息内容为空"); Assert.notNull(params, "消息参数为空"); + return this.publishMessage(title,category,templateCode,body,params,grantUsers,null); + } + /** + * @param title + * @param category + * @param templateCode + * @param body + * @param params + * @param grantUsers + * @param servicecode 业务参数 + * @return + */ + private Optional publishMessage(String title, String category, String templateCode, + Map body, Map params, List grantUsers, + Map servicecode) { + Assert.notNull(title, "消息标题为空"); + Assert.notNull(category, "消息类别编号为空"); + Assert.notNull(templateCode, "模板编号为空"); + Assert.notNull(body, "消息内容为空"); + Assert.notNull(params, "消息参数为空"); + Assert.notNull(servicecode, "业务参数为空"); + return client.postMessage(new MessageRaw().setTitle(title).setCategory(category) - .setTemplateCode(templateCode).setBody(body).setExtra(params).setUsers(grantUsers)); + .setTemplateCode(templateCode).setBody(body).setExtra(params).setUsers(grantUsers).setServicecode(servicecode)); } }