Merge pull request #102 from ShijieWU520/main

新增表情包功能

mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/UserEmojis.java

@@ -0,0 +1,58 @@
+package com.abin.mallchat.common.chat.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户表情包
+ *
+ * @author: WuShiJie
+ * @createTime: 2023/7/2 22:00
+ */
+@Data
+@TableName(value = "user_emojis")
+public class UserEmojis implements Serializable {
+    private static final long serialVersionUID = -7690290707154737263L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 用户表ID
+     */
+    @TableField(value = "uid")
+    private Long uid;
+
+
+    /**
+     * 表情地址
+     */
+    @NotNull
+    @TableField(value = "expression_url")
+    private String expressionUrl;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField(value = "delete_status")
+    @TableLogic(value = "0",delval = "1")
+    private Integer deleteStatus;
+
+
+}

mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/EmojisMsgDTO.java

@@ -0,0 +1,29 @@
+package com.abin.mallchat.common.chat.domain.entity.msg;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * Description: 表情图片消息入参
+ * Author: <a href="https://github.com/zongzibinbin">abin</a>
+ * Date: 2023-06-04
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class EmojisMsgDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("下载地址")
+    @NotBlank
+    private String url;
+}
+
+

mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/MessageExtra.java

@@ -37,4 +37,9 @@ public class MessageExtra implements Serializable {
     private SoundMsgDTO soundMsgDTO;
     //文件消息
     private VideoMsgDTO videoMsgDTO;
+
+    /**
+     * 表情图片信息
+     */
+    private EmojisMsgDTO emojisMsgDTO;
 }

mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageTypeEnum.java

@@ -22,6 +22,7 @@ public enum MessageTypeEnum {
     FILE(4, "文件"),
     SOUND(5, "语音"),
     VIDEO(6, "视频"),
+    EMOJIS(7, "表情"),
     ;
 
     private final Integer type;

mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserEmojisMapper.java

@@ -0,0 +1,13 @@
+package com.abin.mallchat.common.user.mapper;
+
+import com.abin.mallchat.common.chat.domain.entity.UserEmojis;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 用户表情包 Mapper
+ *
+ * @author: WuShiJie
+ * @createTime: 2023/7/3 14:24
+ */
+public interface UserEmojisMapper extends BaseMapper<UserEmojis> {
+}