Merge pull request #139 from HildaM/main

fix: 代码优化
zongzibinbin · Oct 10, 2023 · 51aa919 · 51aa919
2 parents 0eec325 + f334b43
commit 51aa919
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 51 deletions.
diff --git a/...hat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/BaseFileDTO.java b/...hat-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/...chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java b/...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 @@
  * Author: <a href="https://github.com/zongzibinbin">abin</a>
  * 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/...-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/ImgMsgDTO.java b/...-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 @@
  * Author: <a href="https://github.com/zongzibinbin">abin</a>
  * 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/...hat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java b/...hat-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 @@
  * Author: <a href="https://github.com/zongzibinbin">abin</a>
  * 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/...hat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java b/...hat-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 @@
  * Author: <a href="https://github.com/zongzibinbin">abin</a>
  * 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