Forráskód Böngészése

调整 oss/oss-store 的 dto 和 po 数据约束, 以及 po 的数据库表结构

reghao 4 hónapja
szülő
commit
74079dcfde

+ 14 - 1
oss/oss-store/src/main/java/cn/reghao/tnb/oss/store/model/po/DataBlock.java

@@ -5,6 +5,10 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
 /**
  * @author reghao
  * @date 2022-11-24 10:25:18
@@ -13,11 +17,20 @@ import lombok.Setter;
 @Setter
 @Getter
 public class DataBlock extends BaseObject<Integer> {
+    @NotBlank
+    @Size(max = 255)
     private String contentId;
+    @NotBlank
+    @Size(max = 255)
     private String blockId;
+    @NotBlank
+    @Size(max = 255)
     private String host;
+    @NotBlank
+    @Size(max = 255)
     private String absolutePath;
-    private long size;
+    @NotNull
+    private Long size;
     //private String baseDir;
     //private String relativeDir;
     //private int index;

+ 22 - 0
oss/oss-store/src/main/java/cn/reghao/tnb/oss/store/model/po/FileMeta.java

@@ -6,6 +6,10 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
 /**
  * 文件元数据
  *
@@ -16,16 +20,34 @@ import lombok.Setter;
 @Setter
 @Getter
 public class FileMeta extends BaseObject<Integer> {
+    @NotBlank
+    @Size(max = 255)
     private String objectName;
+    @NotBlank
+    @Size(max = 255)
     private String objectId;
+    @NotBlank
+    @Size(max = 255)
     private String pid;
+    @NotBlank
+    @Size(max = 255)
     private String contentId;
+    @NotBlank
+    @Size(max = 255)
     private String sha256sum;
+    @NotBlank
+    @Size(max = 255)
     private String filename;
+    @NotNull
     private Long size;
+    @NotNull
     private Integer fileType;
+    @NotBlank
+    @Size(max = 255)
     private String contentType;
+    @NotNull
     private Integer scope;
+    @NotNull
     private Integer uploadBy;
 
     // 目录对象

+ 17 - 0
oss/oss-store/src/main/java/cn/reghao/tnb/oss/store/model/po/FileMultipart.java

@@ -6,20 +6,37 @@ import cn.reghao.tnb.oss.api.rest.UploadFilePart;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
 /**
+ * 文件分片详情
+ *
  * @author reghao
  * @date 2024-10-24 16:33:16
  */
 @NoArgsConstructor
 @Getter
 public class FileMultipart extends BaseObject<Integer> {
+    @NotBlank
+    @Size(max = 255)
     private String contentId;
+    @NotBlank
+    @Size(max = 255)
     private String sha256sum;
+    @NotBlank
+    @Size(max = 255)
     private String absolutePath;
+    @NotNull
     private Long totalSize;
+    @NotNull
     private Integer chunkSize;
+    @NotNull
     private Integer totalChunks;
+    @NotNull
     private Boolean uploaded;
+    @NotNull
     private Integer uploadBy;
 
     public FileMultipart(String contentId, UploadFilePart uploadFilePart, String absolutePath) {

+ 10 - 0
oss/oss-store/src/main/java/cn/reghao/tnb/oss/store/model/po/FilePart.java

@@ -5,15 +5,25 @@ import cn.reghao.tnb.oss.api.rest.UploadFilePart;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
 /**
+ * 文件的每一个分片
+ *
  * @author reghao
  * @date 2024-10-24 16:33:24
  */
 @NoArgsConstructor
 @Getter
 public class FilePart extends BaseObject<Integer> {
+    @NotBlank
+    @Size(max = 255)
     private String contentId;
+    @NotNull
     private Integer chunkNumber;
+    @NotNull
     private Integer currentChunkSize;
 
     public FilePart(String contentId, UploadFilePart uploadFilePart) {

+ 4 - 4
oss/oss-store/src/main/resources/mapper/FileMetaMapper.xml

@@ -4,16 +4,16 @@
 <mapper namespace="cn.reghao.tnb.oss.store.db.mapper.FileMetaMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_meta
-        (`id`,`deleted`,`create_time`,`update_time`,`object_name`,`object_id`,`content_id`,`pid`,`filename`,`size`,`file_type`,`content_type`,`sha256sum`,`upload_by`,`scope`)
+        (`object_name`,`object_id`,`content_id`,`pid`,`filename`,`size`,`file_type`,`content_type`,`sha256sum`,`upload_by`,`scope`)
         values
-        (#{id},#{deleted},#{createTime},#{updateTime},#{objectName},#{objectId},#{contentId},#{pid},#{filename},#{size},#{fileType},#{contentType},#{sha256sum},#{uploadBy},#{scope})
+        (#{objectName},#{objectId},#{contentId},#{pid},#{filename},#{size},#{fileType},#{contentType},#{sha256sum},#{uploadBy},#{scope})
     </insert>
     <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
         insert into file_meta
-        (`id`,`deleted`,`create_time`,`update_time`,`object_name`,`object_id`,`content_id`,`pid`,`filename`,`size`,`file_type`,`content_type`,`sha256sum`,`upload_by`,`scope`)
+        (`object_name`,`object_id`,`content_id`,`pid`,`filename`,`size`,`file_type`,`content_type`,`sha256sum`,`upload_by`,`scope`)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.id},#{item.deleted},#{item.createTime},#{item.updateTime},#{item.objectName},#{item.objectId},#{item.contentId},#{item.pid},#{item.filename},#{item.size},#{item.fileType},#{item.contentType},#{item.sha256sum},#{item.uploadBy},#{item.scope})
+            (#{item.objectName},#{item.objectId},#{item.contentId},#{item.pid},#{item.filename},#{item.size},#{item.fileType},#{item.contentType},#{item.sha256sum},#{item.uploadBy},#{item.scope})
         </foreach>
     </insert>