diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/BaseFileDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/BaseFileDTO.java new file mode 100644 index 0000000..1600e7f --- /dev/null +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/BaseFileDTO.java @@ -0,0 +1,34 @@ +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 lombok.experimental.SuperBuilder; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @author: Quan + * @description: 文件基类 + * @date: 2023/10/07 下午 2:47 + */ + + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +public class BaseFileDTO implements Serializable { + private static final long serialVersionUID = 1L; + @ApiModelProperty("大小(字节)") + @NotNull + private Long size; + + @ApiModelProperty("下载地址") + @NotBlank + private String url; +} diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java index 0b487d0..392ac6f 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java @@ -1,10 +1,8 @@ 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 lombok.*; +import lombok.experimental.SuperBuilder; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -15,19 +13,13 @@ import java.io.Serializable; * Author: abin * Date: 2023-06-04 */ +@EqualsAndHashCode(callSuper = true) @Data -@Builder +@SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class FileMsgDTO implements Serializable { +public class FileMsgDTO extends BaseFileDTO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("大小(字节)") - @NotNull - private Long size; - - @ApiModelProperty("下载地址") - @NotBlank - private String url; @ApiModelProperty("文件名(带后缀)") @NotBlank diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/ImgMsgDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/ImgMsgDTO.java index cfa901f..f978bdb 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/ImgMsgDTO.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/ImgMsgDTO.java @@ -1,10 +1,8 @@ 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 lombok.*; +import lombok.experimental.SuperBuilder; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -15,15 +13,13 @@ import java.io.Serializable; * Author: abin * Date: 2023-06-04 */ +@EqualsAndHashCode(callSuper = true) @Data -@Builder +@SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class ImgMsgDTO implements Serializable { +public class ImgMsgDTO extends BaseFileDTO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("大小(字节)") - @NotNull - private Long size; @ApiModelProperty("宽度(像素)") @NotNull @@ -33,9 +29,6 @@ public class ImgMsgDTO implements Serializable { @NotNull private Integer height; - @ApiModelProperty("下载地址") - @NotBlank - private String url; } diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java index e965eea..fe815c7 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java @@ -1,10 +1,8 @@ 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 lombok.*; +import lombok.experimental.SuperBuilder; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -15,21 +13,15 @@ import java.io.Serializable; * Author: abin * Date: 2023-06-04 */ +@EqualsAndHashCode(callSuper = true) @Data -@Builder +@SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class SoundMsgDTO implements Serializable { +public class SoundMsgDTO extends BaseFileDTO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("大小(字节)") - @NotNull - private Long size; @ApiModelProperty("时长(秒)") @NotNull private Integer second; - - @ApiModelProperty("下载地址") - @NotBlank - private String url; } diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java index 49136ac..007800f 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java @@ -1,10 +1,8 @@ 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 lombok.*; +import lombok.experimental.SuperBuilder; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -15,19 +13,13 @@ import java.io.Serializable; * Author: abin * Date: 2023-06-04 */ +@EqualsAndHashCode(callSuper = true) @Data -@Builder +@SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class VideoMsgDTO implements Serializable { +public class VideoMsgDTO extends BaseFileDTO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("大小(字节)") - @NotNull - private Long size; - - @ApiModelProperty("下载地址") - @NotBlank - private String url; @ApiModelProperty("缩略图宽度(像素)") @NotNull