使用 contentId 关联 FileMeta 和 DataBlock

dfs-store/src/main/java/cn/reghao/dfs/store/model/po/DataBlock.java

@@ -15,7 +15,7 @@ import lombok.Setter;
 @Setter
 @Getter
 public class DataBlock extends BaseObject<Integer> {
-    private String sha256sum;
+    private String contentId;
     private int index;
     private String blockId;
     private String absolutePath;
@@ -24,8 +24,8 @@ public class DataBlock extends BaseObject<Integer> {
     @Deprecated
     private String objectId;
 
-    public DataBlock(String sha256sum, int index, String blockId, String absolutePath) {
-        this.sha256sum = sha256sum;
+    public DataBlock(String contentId, int index, String blockId, String absolutePath) {
+        this.contentId = contentId;
         this.index = index;
         this.blockId = blockId;
         this.absolutePath = absolutePath;

dfs-store/src/main/java/cn/reghao/dfs/store/model/po/FileMeta.java

@@ -17,6 +17,7 @@ import lombok.Setter;
 public class FileMeta extends BaseObject<Integer> {
     private String objectName;
     private String objectId;
+    private String contentId;
     private String filename;
     private Long size;
     private Integer fileType;
@@ -31,6 +32,7 @@ public class FileMeta extends BaseObject<Integer> {
     public FileMeta(String objectName, String objectId, String filename, String pid) {
         this.objectName = objectName;
         this.objectId = objectId;
+        this.contentId = "0";
         this.filename = filename;
         this.size = 0L;
         this.fileType = 1000;
@@ -42,10 +44,11 @@ public class FileMeta extends BaseObject<Integer> {
         this.acl = 1;
     }
 
-    public FileMeta(String objectName, String objectId, String filename, long size,
+    public FileMeta(String objectName, String objectId, String contentId, String filename, long size,
                     int fileType, String contentType, String sha256sum, String pid) {
         this.objectName = objectName;
         this.objectId = objectId;
+        this.contentId = contentId;
         this.filename = filename;
         this.size = size;
         this.fileType = fileType;
@@ -60,6 +63,7 @@ public class FileMeta extends BaseObject<Integer> {
     public FileMeta(String objectName, String objectId, String filename, FileMeta fileMeta) {
         this.objectName = objectName;
         this.objectId = objectId;
+        this.contentId = fileMeta.getContentId();
         this.filename = filename;
         this.size = fileMeta.getSize();
         this.fileType = fileMeta.getFileType();

dfs-store/src/main/resources/mapper/DataBlockMapper.xml

@@ -4,30 +4,30 @@
 <mapper namespace="cn.reghao.dfs.store.db.mapper.DataBlockMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into data_block
-        (`id`,`deleted`,`create_time`,`update_time`,`sha256sum`,`index`,`block_id`,`absolute_path`,`start`,`end`)
+        (`id`,`deleted`,`create_time`,`update_time`,`content_id`,`index`,`block_id`,`absolute_path`,`start`,`end`)
         values
-        (#{id},#{deleted},#{createTime},#{updateTime},#{sha256sum},#{index},#{blockId},#{absolutePath},#{start},#{end})
+        (#{id},#{deleted},#{createTime},#{updateTime},#{contentId},#{index},#{blockId},#{absolutePath},#{start},#{end})
     </insert>
     <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
         insert into data_block
-        (`id`,`deleted`,`create_time`,`update_time`,`sha256sum`,`index`,`block_id`,`absolute_path`,`start`,`end`)
+        (`id`,`deleted`,`create_time`,`update_time`,`content_id`,`index`,`block_id`,`absolute_path`,`start`,`end`)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.id},#{item.deleted},#{item.createTime},#{item.updateTime},#{item.sha256sum},#{item.index},#{item.blockId},#{item.absolutePath},#{item.start},#{item.end})
+            (#{item.id},#{item.deleted},#{item.createTime},#{item.updateTime},#{item.contentId},#{item.index},#{item.blockId},#{item.absolutePath},#{item.start},#{item.end})
         </foreach>
     </insert>
 
     <update id="updateContentId">
         update data_block
-        set sha256sum=#{sha256sum}
+        set content_id=#{contentId}
         where object_id=#{objectId}
     </update>
     <update id="updateBatch">
         update data_block
         <trim prefix="set" suffixOverrides=",">
-            <trim prefix="sha256sum =case" suffix="end,">
+            <trim prefix="content_id =case" suffix="end,">
                 <foreach collection="list" item="item" index="index">
-                    when object_id=#{item.objectId} then #{item.sha256sum}
+                    when object_id=#{item.objectId} then #{item.contentId}
                 </foreach>
             </trim>
         </trim>

dfs-store/src/main/resources/mapper/FileMetaMapper.xml

@@ -4,16 +4,16 @@
 <mapper namespace="cn.reghao.dfs.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`,`pid`,`filename`,`size`,`file_type`,`content_type`,`sha256sum`,`upload_by`,`disk_file`,`acl`)
+        (`id`,`deleted`,`create_time`,`update_time`,`object_name`,`object_id`,`content_id`,`pid`,`filename`,`size`,`file_type`,`content_type`,`sha256sum`,`upload_by`,`disk_file`,`acl`)
         values
-        (#{id},#{deleted},#{createTime},#{updateTime},#{objectName},#{objectId},#{pid},#{filename},#{size},#{fileType},#{contentType},#{sha256sum},#{uploadBy},#{diskFile},#{acl})
+        (#{id},#{deleted},#{createTime},#{updateTime},#{objectName},#{objectId},#{contentId},#{pid},#{filename},#{size},#{fileType},#{contentType},#{sha256sum},#{uploadBy},#{diskFile},#{acl})
     </insert>
     <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
         insert into file_meta
-        (`id`,`deleted`,`create_time`,`update_time`,`object_name`,`object_id`,`pid`,`filename`,`size`,`file_type`,`content_type`,`sha256sum`,`upload_by`,`disk_file`,`acl`)
+        (`id`,`deleted`,`create_time`,`update_time`,`object_name`,`object_id`,`content_id`,`pid`,`filename`,`size`,`file_type`,`content_type`,`sha256sum`,`upload_by`,`disk_file`,`acl`)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.id},#{item.deleted},#{item.createTime},#{item.updateTime},#{item.objectName},#{item.objectId},#{item.pid},#{item.filename},#{item.size},#{item.fileType},#{item.contentType},#{item.sha256sum},#{item.uploadBy},#{item.diskFile},#{item.acl})
+            (#{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.diskFile},#{item.acl})
         </foreach>
     </insert>