From b5d8898396f21b0729618a9be3f02fe47a6f2687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=BE=E4=B9=BE?= <1046762075@qq.com> Date: Wed, 9 Apr 2025 22:36:26 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=BC=BA=E5=9B=9E=E5=A4=8D=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hula/core/chat/domain/entity/msg/EmojisMsgDTO.java | 3 +++ .../java/com/hula/core/chat/domain/entity/msg/FileMsgDTO.java | 2 ++ .../java/com/hula/core/chat/domain/entity/msg/ImgMsgDTO.java | 2 ++ .../java/com/hula/core/chat/domain/entity/msg/SoundMsgDTO.java | 3 +++ .../java/com/hula/core/chat/domain/entity/msg/VideoMsgDTO.java | 2 ++ .../hula/core/chat/service/strategy/msg/EmojisMsgHandler.java | 1 + .../hula/core/chat/service/strategy/msg/FileMsgHandler.java | 1 + .../com/hula/core/chat/service/strategy/msg/ImgMsgHandler.java | 1 + .../hula/core/chat/service/strategy/msg/SoundMsgHandler.java | 1 + .../hula/core/chat/service/strategy/msg/TextMsgHandler.java | 1 - .../hula/core/chat/service/strategy/msg/VideoMsgHandler.java | 1 + 11 files changed, 17 insertions(+), 1 deletion(-) diff --git a/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/EmojisMsgDTO.java b/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/EmojisMsgDTO.java index 3faec4d8..2706e148 100644 --- a/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/EmojisMsgDTO.java +++ b/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/EmojisMsgDTO.java @@ -25,6 +25,9 @@ public class EmojisMsgDTO implements Serializable { @Schema(description ="下载地址") @NotBlank private String url; + + @Schema(description ="回复的消息id") + private Long replyMsgId; } diff --git a/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/FileMsgDTO.java b/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/FileMsgDTO.java index d929ebbf..21d7e26c 100644 --- a/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/FileMsgDTO.java +++ b/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/FileMsgDTO.java @@ -28,4 +28,6 @@ public class FileMsgDTO extends BaseFileDTO implements Serializable { @NotBlank private String fileName; + @Schema(description ="回复的消息id") + private Long replyMsgId; } diff --git a/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/ImgMsgDTO.java b/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/ImgMsgDTO.java index bcdfdba3..54bbf4bf 100644 --- a/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/ImgMsgDTO.java +++ b/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/ImgMsgDTO.java @@ -33,6 +33,8 @@ public class ImgMsgDTO extends BaseFileDTO implements Serializable { @NotNull private Integer height; + @Schema(description ="回复的消息id") + private Long replyMsgId; } diff --git a/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/SoundMsgDTO.java b/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/SoundMsgDTO.java index 6e6cfdf5..2c0be3b0 100644 --- a/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/SoundMsgDTO.java +++ b/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/SoundMsgDTO.java @@ -28,4 +28,7 @@ public class SoundMsgDTO extends BaseFileDTO implements Serializable { @Schema(description ="时长（秒）") @NotNull private Integer second; + + @Schema(description ="回复的消息id") + private Long replyMsgId; } diff --git a/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/VideoMsgDTO.java b/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/VideoMsgDTO.java index 7b2be712..c61fff24 100644 --- a/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/VideoMsgDTO.java +++ b/hula-im-service/src/main/java/com/hula/core/chat/domain/entity/msg/VideoMsgDTO.java @@ -41,4 +41,6 @@ public class VideoMsgDTO extends BaseFileDTO implements Serializable { @NotBlank private String thumbUrl; + @Schema(description ="回复的消息id") + private Long replyMsgId; } diff --git a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/EmojisMsgHandler.java b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/EmojisMsgHandler.java index 6ac8eab1..1d27483d 100644 --- a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/EmojisMsgHandler.java +++ b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/EmojisMsgHandler.java @@ -30,6 +30,7 @@ public class EmojisMsgHandler extends AbstractMsgHandler { Message update = new Message(); update.setId(msg.getId()); update.setExtra(extra); + update.setReplyMsgId(body.getReplyMsgId()); extra.setEmojisMsgDTO(body); messageDao.updateById(update); } diff --git a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/FileMsgHandler.java b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/FileMsgHandler.java index 5836d4cb..95bb066c 100644 --- a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/FileMsgHandler.java +++ b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/FileMsgHandler.java @@ -30,6 +30,7 @@ public class FileMsgHandler extends AbstractMsgHandler { Message update = new Message(); update.setId(msg.getId()); update.setExtra(extra); + update.setReplyMsgId(body.getReplyMsgId()); extra.setFileMsg(body); messageDao.updateById(update); } diff --git a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/ImgMsgHandler.java b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/ImgMsgHandler.java index de0a8fd5..7be91fd4 100644 --- a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/ImgMsgHandler.java +++ b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/ImgMsgHandler.java @@ -30,6 +30,7 @@ public class ImgMsgHandler extends AbstractMsgHandler { Message update = new Message(); update.setId(msg.getId()); update.setExtra(extra); + update.setReplyMsgId(body.getReplyMsgId()); extra.setImgMsgDTO(body); messageDao.updateById(update); } diff --git a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/SoundMsgHandler.java b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/SoundMsgHandler.java index 8b528d7c..b92e5e0b 100644 --- a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/SoundMsgHandler.java +++ b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/SoundMsgHandler.java @@ -29,6 +29,7 @@ public class SoundMsgHandler extends AbstractMsgHandler { Message update = new Message(); update.setId(msg.getId()); update.setExtra(extra); + update.setReplyMsgId(body.getReplyMsgId()); extra.setSoundMsgDTO(body); messageDao.updateById(update); } diff --git a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/TextMsgHandler.java b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/TextMsgHandler.java index 259033f5..823ac6b8 100644 --- a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/TextMsgHandler.java +++ b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/TextMsgHandler.java @@ -86,7 +86,6 @@ public class TextMsgHandler extends AbstractMsgHandler { Integer gapCount = messageDao.getGapCount(msg.getRoomId(), body.getReplyMsgId(), msg.getId()); update.setGapCount(gapCount); update.setReplyMsgId(body.getReplyMsgId()); - } //判断消息url跳转 Map urlContentMap = URL_TITLE_DISCOVER.getUrlContentMap(body.getContent()); diff --git a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/VideoMsgHandler.java b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/VideoMsgHandler.java index 9f9335e3..18dbec1a 100644 --- a/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/VideoMsgHandler.java +++ b/hula-im-service/src/main/java/com/hula/core/chat/service/strategy/msg/VideoMsgHandler.java @@ -30,6 +30,7 @@ public class VideoMsgHandler extends AbstractMsgHandler { Message update = new Message(); update.setId(msg.getId()); update.setExtra(extra); + update.setReplyMsgId(body.getReplyMsgId()); extra.setVideoMsgDTO(body); messageDao.updateById(update); }