From 3038ffd3494d765e3ea48aa6b341c3c32f2b342e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 5 May 2025 17:46:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E8=81=8A=E5=A4=A9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E8=AF=AD=E9=9F=B3=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/mobilebroken/admin/controller/TicketController.java | 3 ++- .../com/nflg/mobilebroken/admin/service/SsePushService.java | 2 ++ .../nflg/mobilebroken/cfs/controller/TiketController.java | 3 ++- .../com/nflg/mobilebroken/cfs/service/SsePushService.java | 2 ++ .../nflg/mobilebroken/common/pojo/dto/ChatMessageDTO.java | 3 +++ .../common/pojo/request/AddChatMessageRequest.java | 3 +++ .../com/nflg/mobilebroken/common/pojo/vo/ChatMessageVO.java | 3 +++ .../mobilebroken/repository/service/TicketChatService.java | 5 ++++- 8 files changed, 21 insertions(+), 3 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index a56ba1cf..6a1d579d 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -734,7 +734,8 @@ public class TicketController extends ControllerBase { .setCreateTime(Instant.now()) .setAttachments(request.getAttachments()) .setImages(request.getImages()) - .setRemindUsers(request.getRemindUsers()); + .setRemindUsers(request.getRemindUsers()) + .setAudioUrl(request.getAudioUrl()); if(Objects.nonNull(request.getQuoteId())){ ChatMessageDTO quoteMessage = ticketChatService.getMessage(request.getTicketId(), request.getQuoteId()); message.setQuote(quoteMessage); diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/SsePushService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/SsePushService.java index f617c30f..73215e09 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/SsePushService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/SsePushService.java @@ -89,6 +89,7 @@ public class SsePushService { .setImages(message.getImages()) .setAttachments(message.getAttachments()) .setRemindUsers(message.getRemindUsers()) + .setAudioUrl(message.getAudioUrl()) .setQuote(Objects.isNull(message.getQuote()) ? null : new ChatMessageVO() .setId(message.getQuote().getId()) .setFrom(message.getQuote().getFrom()) @@ -101,6 +102,7 @@ public class SsePushService { .setImages(message.getQuote().getImages()) .setRemindUsers(message.getQuote().getRemindUsers()) .setCreateTime(formatter.format(message.getQuote().getCreateTime())) + .setAudioUrl(message.getQuote().getAudioUrl()) ) ); } diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java index c620d5b3..36eaaf72 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java @@ -341,7 +341,8 @@ public class TiketController extends ControllerBase { .setCreateTime(Instant.now()) .setAttachments(request.getAttachments()) .setImages(request.getImages()) - .setRemindUsers(request.getRemindUsers()); + .setRemindUsers(request.getRemindUsers()) + .setAudioUrl(request.getAudioUrl()); if(Objects.nonNull(request.getQuoteId())){ ChatMessageDTO quoteMessage = ticketChatService.getMessage(request.getTicketId(), request.getQuoteId()); message.setQuote(quoteMessage); diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/service/SsePushService.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/service/SsePushService.java index 81b667a9..0d3cc001 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/service/SsePushService.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/service/SsePushService.java @@ -91,6 +91,7 @@ public class SsePushService { .setImages(message.getImages()) .setAttachments(message.getAttachments()) .setRemindUsers(message.getRemindUsers()) + .setAudioUrl(message.getAudioUrl()) .setQuote(Objects.isNull(message.getQuote()) ? null : new ChatMessageVO() .setId(message.getQuote().getId()) .setFrom(message.getQuote().getFrom()) @@ -103,6 +104,7 @@ public class SsePushService { .setImages(message.getQuote().getImages()) .setRemindUsers(message.getQuote().getRemindUsers()) .setCreateTime(formatter.format(message.getQuote().getCreateTime())) + .setAudioUrl(message.getQuote().getAudioUrl()) ) ); } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/ChatMessageDTO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/ChatMessageDTO.java index b2e7cdd2..0ad044a8 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/ChatMessageDTO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/ChatMessageDTO.java @@ -30,6 +30,9 @@ public class ChatMessageDTO { // 消息内容 private String content; + //语音消息URL地址 + private String audioUrl; + // 附件列表 private List attachments; diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AddChatMessageRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AddChatMessageRequest.java index 3d496eb7..1f17105f 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AddChatMessageRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AddChatMessageRequest.java @@ -16,6 +16,9 @@ public class AddChatMessageRequest { //消息内容 private String content; + //语音消息URL地址 + private String audioUrl; + //附件列表 private List attachments; diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ChatMessageVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ChatMessageVO.java index 5fa2394f..97bebc10 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ChatMessageVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ChatMessageVO.java @@ -27,6 +27,9 @@ public class ChatMessageVO { // 消息内容 private String content; + //语音消息URL地址 + private String audioUrl; + // 附件列表 private List attachments; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java index 98b10feb..c17f3229 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java @@ -65,6 +65,7 @@ public class TicketChatService { .setCreateTime(formatter.format(m.getCreateTime())) .setRemindUsers(m.getRemindUsers()) .setReminded(Objects.nonNull(m.getRemindUsers()) && m.getRemindUsers().stream().anyMatch(r -> r.getId().equals(userId))) + .setAudioUrl(m.getAudioUrl()) .setQuote(Objects.isNull(m.getQuote()) ? null : new ChatMessageVO() .setId(m.getQuote().getId()) .setFrom(m.getQuote().getFrom()) @@ -76,7 +77,9 @@ public class TicketChatService { .setAttachments(m.getQuote().getAttachments()) .setImages(m.getQuote().getImages()) .setRemindUsers(m.getQuote().getRemindUsers()) - .setCreateTime(formatter.format(m.getQuote().getCreateTime()))) + .setCreateTime(formatter.format(m.getQuote().getCreateTime())) + .setAudioUrl(m.getQuote().getAudioUrl()) + ) ) .collect(Collectors.toList()); }