删除 SubDirCount.java, 使用 cn.reghao.jutil.jdk.store.SubDirCount 替换

oss-store/src/main/java/cn/reghao/oss/store/config/spring/FileLifecycle.java

@@ -1,9 +1,9 @@
 package cn.reghao.oss.store.config.spring;
 
 import cn.reghao.jutil.jdk.store.LocalStores;
+import cn.reghao.jutil.jdk.store.SubDirCount;
 import cn.reghao.oss.store.config.OssProperties;
 import cn.reghao.oss.store.db.mapper.DataBlockMapper;
-import cn.reghao.oss.store.model.vo.SubDirCount;
 import cn.reghao.oss.store.task.FileTask;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.DisposableBean;

oss-store/src/main/java/cn/reghao/oss/store/db/mapper/DataBlockMapper.java

@@ -1,8 +1,8 @@
 package cn.reghao.oss.store.db.mapper;
 
+import cn.reghao.jutil.jdk.store.SubDirCount;
 import cn.reghao.oss.store.model.po.DataBlock;
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.oss.store.model.vo.SubDirCount;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

oss-store/src/main/java/cn/reghao/oss/store/model/vo/SubDirCount.java

@@ -1,13 +0,0 @@
-package cn.reghao.oss.store.model.vo;
-
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2023-11-01 21:38:59
- */
-@Getter
-public class SubDirCount {
-    private String relativeDir;
-    private int total;
-}

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

@@ -34,7 +34,7 @@
         from data_block
         where content_id=#{contentId}
     </select>
-    <select id="findSubDirCount" resultType="cn.reghao.oss.store.model.vo.SubDirCount">
+    <select id="findSubDirCount" resultType="cn.reghao.jutil.jdk.store.SubDirCount">
         select relative_dir,count(*) as total
         from data_block
         group by relative_dir

oss-store/src/test/java/FileMetaTest.java

@@ -3,7 +3,7 @@ import cn.reghao.oss.store.db.mapper.DataBlockMapper;
 import cn.reghao.oss.store.db.mapper.FileMetaMapper;
 import cn.reghao.oss.store.model.po.DataBlock;
 import cn.reghao.oss.store.model.po.FileMeta;
-import cn.reghao.oss.store.model.vo.SubDirCount;
+import cn.reghao.jutil.jdk.store.SubDirCount;
 import cn.reghao.oss.store.service.ObjectNameService;
 import cn.reghao.oss.store.util.UserContext;
 import cn.reghao.jutil.jdk.db.Page;