From f825c6ce3bd13f799d5aa4ca7a18eb2feaa2f14f Mon Sep 17 00:00:00 2001
From: luofu <luofu@axzo.cn>
Date: Wed, 11 Oct 2023 16:17:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-1138):=20=E7=AE=A1=E7=90=86=E7=AB=AFAp?=
 =?UTF-8?q?p=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

背景：
  https://jira.axzo.cn/browse/REQ-1138?goToView=7

修改：
  新增代办分页查询的接口

影响：
  无
---
 .../notices/service/impl/IYouMengMessageServiceImpl.java    | 4 ++--
 .../notices/service/impl/MessageRecordServiceImpl.java      | 1 +
 .../center/inside/notices/service/umeng/UpushService.java   | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/IYouMengMessageServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/IYouMengMessageServiceImpl.java
index 7ff16e42..6bf46670 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/IYouMengMessageServiceImpl.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/IYouMengMessageServiceImpl.java
@@ -39,9 +39,9 @@ public class IYouMengMessageServiceImpl implements IYouMengMessageService {
     msg.setMsgId(extraData.getLong("msgId"));
     msg.setType(extraData.getInteger("type"));
     try {
-      upushService.sendAndroidCustomizedcast(msg, msgFromClient);
+      upushService.sendAndroidCustomizedcast(msg, msgFromClient, extraData);
       msg.setRouter(extraData.getString("ir"));
-      upushService.sendIOSCustomizedcast(msg, msgFromClient);
+      upushService.sendIOSCustomizedcast(msg, msgFromClient, extraData);
     } catch (Exception e) {
       log.error("推送消息发送失败:{}", e.getMessage());
     }
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java
index 77d4b860..e7b77032 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java
@@ -309,6 +309,7 @@ public class MessageRecordServiceImpl implements MessageRecordService {
         }
       });
     }
+    extra.put("terminalId", message.getTerminalId());
     extra.put("msgId", message.getId());
     extra.put("p", message.getRouterParams());
     extra.put("t", message.getTitle());
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/umeng/UpushService.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/umeng/UpushService.java
index 414649a2..372346ca 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/umeng/UpushService.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/umeng/UpushService.java
@@ -163,7 +163,7 @@ public class UpushService {
     client.send(groupcast);
   }
 
-  public void sendAndroidCustomizedcast(Message message, MsgBody4Guest msgFromClient)
+  public void sendAndroidCustomizedcast(Message message, MsgBody4Guest msgFromClient, com.alibaba.fastjson.JSONObject extraData)
       throws Exception {
 
     AndroidCustomizedcast customizedcast;
@@ -214,6 +214,7 @@ public class UpushService {
     customizedcast.setExtraField("fromGrade", message.getFromGrade());
     customizedcast.setExtraField("router", message.getRouter());
     customizedcast.setExtraField("msgId", String.valueOf(message.getMsgId()));
+    customizedcast.setExtraField("terminalId", extraData.getString("terminalId"));
     String audio = message.getAudio();
     if (audio != null) {
       customizedcast.setExtraField("audio", message.getAudio());
@@ -227,7 +228,7 @@ public class UpushService {
   }
 
 
-  public void sendIOSCustomizedcast(Message message, MsgBody4Guest msgFromClient)
+  public void sendIOSCustomizedcast(Message message, MsgBody4Guest msgFromClient, com.alibaba.fastjson.JSONObject extraData)
       throws Exception {
     IOSCustomizedcast customizedcast;
     if (Objects.nonNull(msgFromClient.getAppClient()) && "cmp".equals(msgFromClient.getAppClient())) {
@@ -272,6 +273,7 @@ public class UpushService {
         .setCustomizedField("conversationId", String.valueOf(message.getConversationId()));
     customizedcast.setCustomizedField("params", message.getParams());
     customizedcast.setCustomizedField("msgId", String.valueOf(message.getMsgId()));
+    customizedcast.setCustomizedField("terminalId", extraData.getString("terminalId"));
     // TODO Set your alias and alias_type here, and use comma to split them if there are multiple alias.
     // And if you have many alias, you can also upload a file containing these alias, then
     // use file_id to send customized notification.