将 content-service/disk 中的 NetDisk 名字修改为 DiskFile

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/controller/DiskAlbumController.java

@@ -7,7 +7,7 @@ import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.content.app.disk.model.dto.AlbumAdd;
 import cn.reghao.tnb.content.app.disk.model.dto.AlbumCreate;
 import cn.reghao.tnb.content.app.disk.model.po.DiskAlbum;
-import cn.reghao.tnb.content.app.disk.model.vo.NetDiskDetail;
+import cn.reghao.tnb.content.app.disk.model.vo.DiskFileDetail;
 import cn.reghao.tnb.content.app.disk.service.DiskAlbumService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -63,7 +63,7 @@ public class DiskAlbumController {
     @Operation(summary = "获取相册详情", description = "N")
     @GetMapping(value = "/detail/{albumId}", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getDiskAlbumDetail(@PathVariable("albumId") long albumId) {
-        PageList<NetDiskDetail> pageList = diskAlbumService.getDiskAlbumDetail(albumId);
+        PageList<DiskFileDetail> pageList = diskAlbumService.getDiskAlbumDetail(albumId);
         return WebResult.success(pageList);
     }
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/controller/DiskFileController.java

@@ -6,7 +6,7 @@ import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.disk.model.dto.RenameFile;
 import cn.reghao.tnb.content.app.disk.model.dto.SearchForm;
-import cn.reghao.tnb.content.app.disk.model.po.NetDisk;
+import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
 import cn.reghao.tnb.content.app.disk.model.query.DiskQuery;
 import cn.reghao.tnb.content.app.disk.model.vo.*;
 import cn.reghao.tnb.content.app.disk.service.DiskFileService;
@@ -43,11 +43,11 @@ public class DiskFileController {
         Integer fileType = searchForm.getFileType();
         String pid = "0";
         if (!"/".equals(path)) {
-            NetDisk netDisk = diskFileService.findByPath(path);
-            if (netDisk == null) {
+            DiskFile diskFile = diskFileService.findByPath(path);
+            if (diskFile == null) {
                 return WebResult.failWithMsg("not found diskFile");
             }
-            pid = netDisk.getFileId();
+            pid = diskFile.getFileId();
         }
 
 
@@ -71,8 +71,8 @@ public class DiskFileController {
     @Operation(summary = "预览文件", description = "N")
     @GetMapping(value = "/preview", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getPreviewFile(@RequestParam("fileId") String fileId) {
-        NetDiskDetail netDiskDetail = diskFileService.getNetDiskDetail(fileId);
-        return WebResult.success(netDiskDetail);
+        DiskFileDetail diskFileDetail = diskFileService.getDiskFileDetail(fileId);
+        return WebResult.success(diskFileDetail);
     }
 
     @Operation(summary = "重命名文件", description = "N")
@@ -81,7 +81,7 @@ public class DiskFileController {
         /*long owner = UserContext.getUserId();
         String fileId = renameFile.getFileId();
         String newFilename = renameFile.getNewFilename();
-        Result result = netDiskService.rename(fileId, newFilename, owner);
+        Result result = diskFileService.rename(fileId, newFilename, owner);
         return WebResult.result(result);*/
         return WebResult.successWithMsg("尚未实现");
     }
@@ -90,7 +90,7 @@ public class DiskFileController {
     @PostMapping(value = "/copy", produces = MediaType.APPLICATION_JSON_VALUE)
     public String copyFiles(@RequestParam("fileId") List<String> fileIds, String pid) throws IOException {
         /*long owner = UserContext.getUserId();
-        netDiskService.move(pid, fileIds, true, owner);*/
+        diskFileService.move(pid, fileIds, true, owner);*/
         return WebResult.successWithMsg("尚未实现");
     }
 
@@ -98,14 +98,14 @@ public class DiskFileController {
     @PostMapping(value = "/move", produces = MediaType.APPLICATION_JSON_VALUE)
     public String moveFiles(@RequestParam("fileId") List<String> fileIds, String pid) throws IOException {
         /*long owner = UserContext.getUserId();
-        netDiskService.move(pid, fileIds, false, owner);*/
+        diskFileService.move(pid, fileIds, false, owner);*/
         return WebResult.successWithMsg("尚未实现");
     }
 
     @Operation(summary = "删除文件", description = "N")
     @PostMapping(value = "/delete", produces = MediaType.APPLICATION_JSON_VALUE)
     public String deleteFiles(@RequestParam("fileId") List<String> fileIds) throws IOException {
-        //netDiskService.delete(fileIds);
+        //diskFileService.delete(fileIds);
         return WebResult.successWithMsg("尚未实现");
     }
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/db/mapper/NetDiskMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/db/mapper/DiskFileMapper.java

@@ -2,9 +2,9 @@ package cn.reghao.tnb.content.app.disk.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.jutil.jdk.db.Page;
-import cn.reghao.tnb.content.app.disk.model.po.NetDisk;
+import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
 import cn.reghao.tnb.content.app.disk.model.query.DiskQuery;
-import cn.reghao.tnb.content.app.disk.model.vo.NetDiskCount;
+import cn.reghao.tnb.content.app.disk.model.vo.DiskFileCount;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,9 +15,9 @@ import java.util.List;
  * @date 2025-08-28 22:47:28
  */
 @Mapper
-public interface NetDiskMapper extends BaseMapper<NetDisk> {
-    List<NetDiskCount> findFileTypeCountByGroup(long owner);
+public interface DiskFileMapper extends BaseMapper<DiskFile> {
+    List<DiskFileCount> findFileTypeCountByGroup(long owner);
     int countByDiskQuery(DiskQuery diskQuery);
-    List<NetDisk> findDiskQueryByPage(@Param("page") Page page, @Param("diskQuery") DiskQuery diskQuery);
-    List<NetDisk> findByFileIds(List<String> list);
+    List<DiskFile> findDiskQueryByPage(@Param("page") Page page, @Param("diskQuery") DiskQuery diskQuery);
+    List<DiskFile> findByFileIds(List<String> list);
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/NetDisk.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/DiskFile.java

@@ -19,7 +19,7 @@ import java.util.List;
 @AllArgsConstructor
 @Setter
 @Getter
-public class NetDisk extends BaseObject<Integer> {
+public class DiskFile extends BaseObject<Integer> {
     private Integer channelCode;
     private String fileId;
     private String pid;
@@ -29,9 +29,9 @@ public class NetDisk extends BaseObject<Integer> {
     private String sha256sum;
     private Long size;
     private Long owner;
-    private transient List<NetDisk> children = new ArrayList<>();
+    private transient List<DiskFile> children = new ArrayList<>();
 
-    public NetDisk(String fileId, String pid, String path, String filename) {
+    public DiskFile(String fileId, String pid, String path, String filename) {
         this.channelCode = 0;
         this.fileId = fileId;
         this.pid = pid;
@@ -43,8 +43,8 @@ public class NetDisk extends BaseObject<Integer> {
         this.owner = UserContext.getUserId();
     }
 
-    public NetDisk(int channelCode, String fileId, String pid, String path, String filename,
-                   int fileType, String sha256sum, long size) {
+    public DiskFile(int channelCode, String fileId, String pid, String path, String filename,
+                    int fileType, String sha256sum, long size) {
         this.channelCode = channelCode;
         this.fileId = fileId;
         this.pid = pid;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/NetDiskCount.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/DiskFileCount.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 @NoArgsConstructor
 @Setter
 @Getter
-public class NetDiskCount {
+public class DiskFileCount {
     private int fileType;
     private long total;
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/NetDiskDetail.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/DiskFileDetail.java

@@ -12,13 +12,13 @@ import lombok.Setter;
 @NoArgsConstructor
 @Setter
 @Getter
-public class NetDiskDetail {
+public class DiskFileDetail {
     private String fileId;
     private int fileType;
     private String filename;
     private String url;
 
-    public NetDiskDetail(ObjectInfo objectInfo, String signedUrl) {
+    public DiskFileDetail(ObjectInfo objectInfo, String signedUrl) {
         this.fileId = objectInfo.getObjectId();
         this.fileType = objectInfo.getFileType();
         this.filename = objectInfo.getFilename();

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/FileInfo.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.content.app.disk.model.vo;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.oss.sdk.model.constant.ObjectType;
 import cn.reghao.oss.sdk.model.dto.ObjectInfo;
-import cn.reghao.tnb.content.app.disk.model.po.NetDisk;
+import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -30,12 +30,12 @@ public class FileInfo {
         this.fileTypeStr = ObjectType.getDescByCode(objectInfo.getFileType());
     }
 
-    public FileInfo(NetDisk netDisk, String size) {
-        this.fileId = netDisk.getFileId();
-        this.filename = netDisk.getFilename();
-        this.updateTime = DateTimeConverter.format(netDisk.getUpdateTime());
+    public FileInfo(DiskFile diskFile, String size) {
+        this.fileId = diskFile.getFileId();
+        this.filename = diskFile.getFilename();
+        this.updateTime = DateTimeConverter.format(diskFile.getUpdateTime());
         this.size = size;
-        this.fileType = netDisk.getFileType();
-        this.fileTypeStr = ObjectType.getDescByCode(netDisk.getFileType());
+        this.fileType = diskFile.getFileType();
+        this.fileTypeStr = ObjectType.getDescByCode(diskFile.getFileType());
     }
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/FileTree.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.disk.model.vo;
 
-import cn.reghao.tnb.content.app.disk.model.po.NetDisk;
+import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
 import lombok.Getter;
 
 import java.util.ArrayList;
@@ -17,10 +17,10 @@ public class FileTree {
     private int fileType;
     private List<FileTree> children;
 
-    public FileTree(NetDisk netDisk) {
-        this.pid = netDisk.getPid();
-        this.fileId = netDisk.getFileId();
-        this.fileType = netDisk.getFileType();
+    public FileTree(DiskFile diskFile) {
+        this.pid = diskFile.getPid();
+        this.fileId = diskFile.getFileId();
+        this.fileType = diskFile.getFileType();
         this.children = new ArrayList<>();
     }
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskAlbumService.java

@@ -8,7 +8,7 @@ import cn.reghao.oss.sdk.model.dto.ObjectInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.content.app.disk.db.mapper.DiskAlbumMapper;
-import cn.reghao.tnb.content.app.disk.db.mapper.NetDiskMapper;
+import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;
 import cn.reghao.tnb.content.app.disk.model.dto.AlbumAdd;
 import cn.reghao.tnb.content.app.disk.model.dto.AlbumCreate;
 import cn.reghao.tnb.content.app.disk.model.po.DiskAlbum;
@@ -33,14 +33,14 @@ public class DiskAlbumService {
     @DubboReference(check = false, timeout = 60_000)
     private OssService ossService;
     private final int channelCode = 111;
-    private final NetDiskMapper netDiskMapper;
+    private final DiskFileMapper diskFileMapper;
     private final DiskAlbumMapper diskAlbumMapper;
     private final DiskFileService diskFileService;
     private final SnowFlake idGenerator;
 
-    public DiskAlbumService(NetDiskMapper netDiskMapper, DiskAlbumMapper diskAlbumMapper,
+    public DiskAlbumService(DiskFileMapper diskFileMapper, DiskAlbumMapper diskAlbumMapper,
                             DiskFileService diskFileService) {
-        this.netDiskMapper = netDiskMapper;
+        this.diskFileMapper = diskFileMapper;
         this.diskAlbumMapper = diskAlbumMapper;
         this.diskFileService = diskFileService;
         this.idGenerator = new SnowFlake(1, 1);
@@ -65,13 +65,13 @@ public class DiskAlbumService {
         }
 
         long loginUser = UserContext.getUserId();
-        List<DiskAlbumFile> list = netDiskMapper.findByFileIds(fileIds).stream()
-                .filter(netDisk -> netDisk.getFileType() == ObjectType.Image.getCode()
-                        || netDisk.getFileType() == ObjectType.Video.getCode())
-                .filter(netDisk -> netDisk.getOwner() == loginUser)
-                .map(netDisk -> {
-                    String fileId = netDisk.getFileId();
-                    int fileType = netDisk.getFileType();
+        List<DiskAlbumFile> list = diskFileMapper.findByFileIds(fileIds).stream()
+                .filter(diskFile -> diskFile.getFileType() == ObjectType.Image.getCode()
+                        || diskFile.getFileType() == ObjectType.Video.getCode())
+                .filter(diskFile -> diskFile.getOwner() == loginUser)
+                .map(diskFile -> {
+                    String fileId = diskFile.getFileId();
+                    int fileType = diskFile.getFileType();
                     return new DiskAlbumFile(albumId, fileId, fileType);
                 })
                 .collect(Collectors.toList());
@@ -116,7 +116,7 @@ public class DiskAlbumService {
         return diskAlbumList;
     }
 
-    public PageList<NetDiskDetail> getDiskAlbumDetail(long albumId) {
+    public PageList<DiskFileDetail> getDiskAlbumDetail(long albumId) {
         long loginUser = UserContext.getUserId();
         DiskAlbum diskAlbum = diskAlbumMapper.findDiskAlbum(albumId);
         long createBy = diskAlbum.getCreateBy();
@@ -127,13 +127,13 @@ public class DiskAlbumService {
         List<DiskAlbumFile> diskAlbumFileList = diskAlbumMapper.findByAlbumId(albumId);
         List<String> fileIds = diskAlbumFileList.stream().map(DiskAlbumFile::getFileId).collect(Collectors.toList());
         if (!fileIds.isEmpty()) {
-            List<NetDiskDetail> netDiskDetailList = netDiskMapper.findByFileIds(fileIds).stream().map(netDisk -> {
-                String objectId = netDisk.getFileId();
-                return diskFileService.getNetDiskDetail(channelCode, objectId);
+            List<DiskFileDetail> diskFileDetailList = diskFileMapper.findByFileIds(fileIds).stream().map(diskFile -> {
+                String objectId = diskFile.getFileId();
+                return diskFileService.getDiskFileDetail(channelCode, objectId);
             }).filter(Objects::nonNull).collect(Collectors.toList());
 
-            int total = netDiskDetailList.size();
-            return PageList.pageList(1, 10, total, netDiskDetailList);
+            int total = diskFileDetailList.size();
+            return PageList.pageList(1, 10, total, diskFileDetailList);
         }
 
         return PageList.empty();

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskFileService.java

@@ -11,16 +11,15 @@ import cn.reghao.oss.sdk.model.constant.ObjectType;
 import cn.reghao.oss.sdk.model.dto.ObjectInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.StringUtil;
-import cn.reghao.tnb.content.app.disk.db.mapper.NetDiskMapper;
-import cn.reghao.tnb.content.app.disk.model.dto.CreateDir;
+import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;
 import cn.reghao.tnb.content.app.disk.model.dto.CreateFile;
 import cn.reghao.tnb.content.app.disk.model.dto.MoveFile;
-import cn.reghao.tnb.content.app.disk.model.po.NetDisk;
+import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
 import cn.reghao.tnb.content.app.disk.model.query.DiskQuery;
 import cn.reghao.tnb.content.app.disk.model.vo.FileInfo;
 import cn.reghao.tnb.content.app.disk.model.vo.NamePath;
-import cn.reghao.tnb.content.app.disk.model.vo.NetDiskCount;
-import cn.reghao.tnb.content.app.disk.model.vo.NetDiskDetail;
+import cn.reghao.tnb.content.app.disk.model.vo.DiskFileCount;
+import cn.reghao.tnb.content.app.disk.model.vo.DiskFileDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
@@ -39,12 +38,12 @@ import java.util.stream.Collectors;
 public class DiskFileService {
     @DubboReference(check = false, timeout = 60_000)
     private OssService ossService;
-    private final NetDiskMapper netDiskMapper;
+    private final DiskFileMapper diskFileMapper;
     private final DiskSyncService diskSyncService;
     private final ByteConverter byteConverter;
 
-    public DiskFileService(NetDiskMapper netDiskMapper, DiskSyncService diskSyncService) {
-        this.netDiskMapper = netDiskMapper;
+    public DiskFileService(DiskFileMapper diskFileMapper, DiskSyncService diskSyncService) {
+        this.diskFileMapper = diskFileMapper;
         this.diskSyncService = diskSyncService;
         this.byteConverter = new ByteConverter();
     }
@@ -55,14 +54,14 @@ public class DiskFileService {
         String filename = createFile.getFilename();
         String path = String.format("%s/%s", file.getAbsolutePath(), filename);
 
-        NetDisk netDisk1 = diskSyncService.checkFile(parentPath);
-        if (netDisk1 == null) {
+        DiskFile diskFile1 = diskSyncService.checkFile(parentPath);
+        if (diskFile1 == null) {
             return Result.fail("folder not exist");
         }
-        String pid = netDisk1.getFileId();
+        String pid = diskFile1.getFileId();
 
-        NetDisk netDisk2 = diskSyncService.checkFile(path);
-        if (netDisk2 != null) {
+        DiskFile diskFile2 = diskSyncService.checkFile(path);
+        if (diskFile2 != null) {
             return Result.fail("file exist");
         }
 
@@ -73,8 +72,8 @@ public class DiskFileService {
             long size = objectInfo.getSize();
             int fileType = objectInfo.getFileType();
             String sha256sum = objectInfo.getSha256sum();
-            NetDisk netDisk = new NetDisk(channelCode, uploadId, pid, path, filename, fileType, sha256sum, size);
-            netDiskMapper.save(netDisk);
+            DiskFile diskFile = new DiskFile(channelCode, uploadId, pid, path, filename, fileType, sha256sum, size);
+            diskFileMapper.save(diskFile);
             return Result.success();
         } catch (Exception e) {
             e.printStackTrace();
@@ -87,8 +86,8 @@ public class DiskFileService {
                 .fileId(fileId)
                 .build();
         Page page = new Page(1, 10);
-        List<NetDisk> netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-        NetDisk current = netDiskList.get(0);
+        List<DiskFile> diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+        DiskFile current = diskFileList.get(0);
         if (current == null) {
             String msg = String.format("file %s not exist", fileId);
             return Result.fail(msg);
@@ -102,18 +101,17 @@ public class DiskFileService {
                 .path(newPath)
                 .build();
         page = new Page(1, 10);
-        netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-        NetDisk netDisk = netDiskList.get(0);
-        if (netDisk != null) {
+        diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+        DiskFile diskFile = diskFileList.get(0);
+        if (diskFile != null) {
             String msg = String.format("filename %s exist", newFilename);
             return Result.fail(msg);
         }
 
         current.setPath(newPath);
         current.setFilename(newFilename);
-        List<NetDisk> diskFileList = new ArrayList<>();
-        diskFileList.add(current);
-
+        List<DiskFile> diskFiles = new ArrayList<>();
+        diskFiles.add(current);
         if (current.getFileType() == ObjectType.Dir.getCode()) {
             getChildren(current.getPath()).stream()
                     .filter(childFile -> !childFile.getFileId().equals(fileId))
@@ -123,11 +121,11 @@ public class DiskFileService {
 
                         childFile.setPath(namePath.getPath());
                         childFile.setFilename(namePath.getFilename());
-                        diskFileList.add(childFile);
+                        diskFiles.add(childFile);
                     });
         }
 
-        if (!diskFileList.isEmpty()) {
+        if (!diskFiles.isEmpty()) {
             //diskFile1Repository.updateFilenames(diskFileList);
         }
 
@@ -143,8 +141,8 @@ public class DiskFileService {
                 .fileId(pid)
                 .build();
         Page page = new Page(1, 10);
-        List<NetDisk> netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-        NetDisk parentFile = netDiskList.get(0);
+        List<DiskFile> diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+        DiskFile parentFile = diskFileList.get(0);
         if (parentFile == null) {
             String msg = "文件被移动/复制到的位置不存在";
             return Result.fail(msg);
@@ -163,8 +161,8 @@ public class DiskFileService {
                     .fileId(pid1)
                     .build();
             page = new Page(1, 10);
-            netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-            pid1 = netDiskList.get(0).getPid();
+            diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+            pid1 = diskFileList.get(0).getPid();
             parents.add(pid1);
         }
 
@@ -175,7 +173,7 @@ public class DiskFileService {
             }
         }
 
-        List<NetDisk> list = findByFileIdContains(fileIds);
+        List<DiskFile> list = findByFileIdContains(fileIds);
         if (list.isEmpty()) {
             String msg = "被移动/复制的文件不存在";
             return Result.fail(msg);
@@ -189,7 +187,7 @@ public class DiskFileService {
             }
         }
 
-        List<NetDisk> copiedFiles = list.stream()
+        List<DiskFile> copiedFiles = list.stream()
                 .filter(diskFile -> diskFile.getFileType() != ObjectType.Dir.getCode())
                 .peek(diskFile -> {
                     setRootPath(diskFile, parentFile, owner);
@@ -198,15 +196,15 @@ public class DiskFileService {
                     }
                 }).collect(Collectors.toList());
 
-        List<NetDisk> list1 = new ArrayList<>();
+        List<DiskFile> list1 = new ArrayList<>();
         list.stream()
                 .filter(diskFile -> diskFile.getFileType() == ObjectType.Dir.getCode())
                 .forEach(dirFile -> {
-                    List<NetDisk> results = getChildren(dirFile.getPath());
-                    NetDisk diskFile = list2tree(dirFile.getFileId(), results);
+                    List<DiskFile> results = getChildren(dirFile.getPath());
+                    DiskFile diskFile = list2tree(dirFile.getFileId(), results);
 
                     moveRoot(diskFile, parentFile, copy, owner);
-                    List<NetDisk> list2 = new ArrayList<>();
+                    List<DiskFile> list2 = new ArrayList<>();
                     tree2List(diskFile, list2);
                     list1.addAll(list2);
                 });
@@ -227,8 +225,8 @@ public class DiskFileService {
                 .fileId(pid)
                 .build();
         Page page = new Page(1, 10);
-        List<NetDisk> netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-        NetDisk parentFile = netDiskList.get(0);
+        List<DiskFile> diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+        DiskFile parentFile = diskFileList.get(0);
         if (parentFile == null) {
             String msg = "文件被移动/复制到的位置不存在";
             return Result.fail(msg);
@@ -247,8 +245,8 @@ public class DiskFileService {
                     .fileId(pid1)
                     .build();
             page = new Page(1, 10);
-            netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-            pid1 = netDiskList.get(0).getPid();
+            diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+            pid1 = diskFileList.get(0).getPid();
             parents.add(pid1);
         }
 
@@ -259,7 +257,7 @@ public class DiskFileService {
             }
         }
 
-        List<NetDisk> list = findByFileIdContains(fileIds);
+        List<DiskFile> list = findByFileIdContains(fileIds);
         if (list.isEmpty()) {
             String msg = "被移动/复制的文件不存在";
             return Result.fail(msg);
@@ -273,7 +271,7 @@ public class DiskFileService {
             }
         }
 
-        List<NetDisk> copiedFiles = list.stream()
+        List<DiskFile> copiedFiles = list.stream()
                 .filter(diskFile -> diskFile.getFileType() != ObjectType.Dir.getCode())
                 .peek(diskFile -> {
                     setRootPath(diskFile, parentFile, owner);
@@ -282,15 +280,15 @@ public class DiskFileService {
                     }
                 }).collect(Collectors.toList());
 
-        List<NetDisk> list1 = new ArrayList<>();
+        List<DiskFile> list1 = new ArrayList<>();
         list.stream()
                 .filter(diskFile -> diskFile.getFileType() == ObjectType.Dir.getCode())
                 .forEach(dirFile -> {
-                    List<NetDisk> results = getChildren(dirFile.getPath());
-                    NetDisk diskFile = list2tree(dirFile.getFileId(), results);
+                    List<DiskFile> results = getChildren(dirFile.getPath());
+                    DiskFile diskFile = list2tree(dirFile.getFileId(), results);
 
                     moveRoot(diskFile, parentFile, copy, owner);
-                    List<NetDisk> list2 = new ArrayList<>();
+                    List<DiskFile> list2 = new ArrayList<>();
                     tree2List(diskFile, list2);
                     list1.addAll(list2);
                 });
@@ -298,7 +296,7 @@ public class DiskFileService {
         copiedFiles.addAll(list1);
         if (!copiedFiles.isEmpty()) {
             if (copy) {
-                netDiskMapper.saveAll(copiedFiles);
+                diskFileMapper.saveAll(copiedFiles);
             } else {
                 //diskFile1Repository.updateDiskFiles(list1);
             }
@@ -306,37 +304,37 @@ public class DiskFileService {
         return Result.success();
     }
 
-    private void moveRoot(NetDisk current, NetDisk parent, boolean reset, long owner) {
+    private void moveRoot(DiskFile current, DiskFile parent, boolean reset, long owner) {
         String oldParentPath1 = current.getPath();
         setRootPath(current, parent, owner);
         if (reset) {
             reinitDiskFile(current);
         }
 
-        List<NetDisk> list = current.getChildren();
+        List<DiskFile> list = current.getChildren();
         if (!list.isEmpty()) {
-            for (NetDisk child : list) {
+            for (DiskFile child : list) {
                 moveNode(child, current, oldParentPath1, reset);
             }
         }
     }
 
-    private void moveNode(NetDisk current, NetDisk parent, String oldParentPath, boolean reset) {
+    private void moveNode(DiskFile current, DiskFile parent, String oldParentPath, boolean reset) {
         String oldParentPath1 = current.getPath();
         setNodePath(current, parent, oldParentPath, reset);
         if (reset) {
             reinitDiskFile(current);
         }
 
-        List<NetDisk> list = current.getChildren();
+        List<DiskFile> list = current.getChildren();
         if (!list.isEmpty()) {
-            for (NetDisk child : list) {
+            for (DiskFile child : list) {
                 moveNode(child, current, oldParentPath1, reset);
             }
         }
     }
 
-    private void setRootPath(NetDisk current, NetDisk parent, long owner) {
+    private void setRootPath(DiskFile current, DiskFile parent, long owner) {
         String pid = parent.getFileId();
         String parentPath = parent.getPath();
 
@@ -347,7 +345,7 @@ public class DiskFileService {
         current.setFilename(namePath.getFilename());
     }
 
-    private void setNodePath(NetDisk current, NetDisk parent, String oldParentPath, boolean resetPid) {
+    private void setNodePath(DiskFile current, DiskFile parent, String oldParentPath, boolean resetPid) {
         String pid = parent.getFileId();
         String parentPath = parent.getPath();
         String newPath = current.getPath().replace(oldParentPath, parentPath);
@@ -365,7 +363,7 @@ public class DiskFileService {
      * @return
      * @date 2023-11-17 13:38:20
      */
-    private void reinitDiskFile(NetDisk diskFile) {
+    private void reinitDiskFile(DiskFile diskFile) {
         String fileId = UUID.randomUUID().toString().replace("-", "");
         diskFile.setFileId(fileId);
         diskFile.setId(null);
@@ -374,10 +372,10 @@ public class DiskFileService {
     }
 
     public void delete(List<String> fileIds) {
-        List<NetDisk> list = findByFileIdContains(fileIds);
+        List<DiskFile> list = findByFileIdContains(fileIds);
         List<String> files = list.stream()
                 .filter(diskFile -> diskFile.getFileType() != ObjectType.Dir.getCode())
-                .map(NetDisk::getFileId)
+                .map(DiskFile::getFileId)
                 .collect(Collectors.toList());
         if (!files.isEmpty()) {
             //diskFile1Repository.updateDeleteFiles(files);
@@ -387,7 +385,7 @@ public class DiskFileService {
                 .filter(diskFile -> diskFile.getFileType() == ObjectType.Dir.getCode())
                 .map(diskFile1 -> getChildren(diskFile1.getPath()))
                 .flatMap(Collection::stream)
-                .map(NetDisk::getFileId)
+                .map(DiskFile::getFileId)
                 .collect(Collectors.toList());
         if (!files1.isEmpty()) {
             //diskFile1Repository.updateDeleteFiles(files1);
@@ -395,10 +393,10 @@ public class DiskFileService {
     }
 
     public void restore(List<String> fileIds) {
-        List<NetDisk> list = findByFileIdContains(fileIds);
+        List<DiskFile> list = findByFileIdContains(fileIds);
         List<String> files = list.stream()
                 .filter(diskFile -> diskFile.getFileType() != ObjectType.Dir.getCode())
-                .map(NetDisk::getFileId)
+                .map(DiskFile::getFileId)
                 .collect(Collectors.toList());
 
         list.stream()
@@ -415,10 +413,10 @@ public class DiskFileService {
     }
 
     public void erase(List<String> fileIds) {
-        List<NetDisk> list = findByFileIdContains(fileIds);
+        List<DiskFile> list = findByFileIdContains(fileIds);
         List<String> files = list.stream()
                 .filter(diskFile -> diskFile.getFileType() != ObjectType.Dir.getCode())
-                .map(NetDisk::getFileId)
+                .map(DiskFile::getFileId)
                 .collect(Collectors.toList());
 
         list.stream()
@@ -434,18 +432,18 @@ public class DiskFileService {
         }
     }
 
-    public List<NetDisk> getChildren(String path) {
+    public List<DiskFile> getChildren(String path) {
         return findByPathPrefix(path);
     }
 
-    public NetDisk list2tree(String rootId, List<NetDisk> list) {
-        Map<String, NetDisk> map = list.stream()
-                .collect(Collectors.toMap(NetDisk::getFileId, diskFile -> diskFile));
+    public DiskFile list2tree(String rootId, List<DiskFile> list) {
+        Map<String, DiskFile> map = list.stream()
+                .collect(Collectors.toMap(DiskFile::getFileId, diskFile -> diskFile));
         list.forEach(diskFile -> {
             String pid = diskFile.getPid();
             String fileId = diskFile.getFileId();
             if (!fileId.equals(rootId)) {
-                NetDisk parent = map.get(pid);
+                DiskFile parent = map.get(pid);
                 parent.getChildren().add(diskFile);
             }
         });
@@ -453,9 +451,9 @@ public class DiskFileService {
         return map.get(rootId);
     }
 
-    public void tree2List(NetDisk root, List<NetDisk> list) {
+    public void tree2List(DiskFile root, List<DiskFile> list) {
         list.add(root);
-        for (NetDisk child : root.getChildren()) {
+        for (DiskFile child : root.getChildren()) {
             tree2List(child, list);
         }
     }
@@ -467,8 +465,8 @@ public class DiskFileService {
                 .path(path)
                 .build();
         Page page = new Page(1, 10);
-        List<NetDisk> netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-        NetDisk diskFile = netDiskList.get(0);
+        List<DiskFile> diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+        DiskFile diskFile = diskFileList.get(0);
         if (diskFile != null) {
             filename = getNewFilename(filename);
             path = getPath(parentPath, filename);
@@ -511,8 +509,8 @@ public class DiskFileService {
         return path.substring(0, index);
     }
 
-    private List<NetDisk> findByPathPrefix(String pathPrefix) {
-        /*Specification<NetDisk> specification = (root, query, cb) -> {
+    private List<DiskFile> findByPathPrefix(String pathPrefix) {
+        /*Specification<DiskFile> specification = (root, query, cb) -> {
             List<Predicate> predicates = new ArrayList<>();
             predicates.add(cb.like(root.get("path"), "%" + pathPrefix + "%"));
 
@@ -520,10 +518,10 @@ public class DiskFileService {
             return cb.and(predicates.toArray(new Predicate[0]));
         };*/
 
-        return netDiskMapper.findAll();
+        return diskFileMapper.findAll();
     }
     
-    private List<NetDisk> findByFileIdContains(List<String> fileIds) {
+    private List<DiskFile> findByFileIdContains(List<String> fileIds) {
         return Collections.emptyList();
     }
 
@@ -554,34 +552,34 @@ public class DiskFileService {
         return pathList;
     }
 
-    public NetDisk findByPath(String path) {
+    public DiskFile findByPath(String path) {
         long owner = UserContext.getUserId();
         DiskQuery diskQuery = new DiskQuery.Builder()
                 .path(path)
                 .owner(owner)
                 .build();
         Page page = new Page(1, 10);
-        List<NetDisk> netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-        return netDiskList.isEmpty() ? null : netDiskList.get(0);
+        List<DiskFile> diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+        return diskFileList.isEmpty() ? null : diskFileList.get(0);
     }
 
     public PageList<FileInfo> findByDiskQuery(DiskQuery diskQuery) {
         int pageNumber = diskQuery.getPageNumber();
         int pageSize = diskQuery.getPageSize();
         Page page = new Page(pageNumber, pageSize);
-        int total = netDiskMapper.countByDiskQuery(diskQuery);
-        List<NetDisk> netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
+        int total = diskFileMapper.countByDiskQuery(diskQuery);
+        List<DiskFile> diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
 
-        List<FileInfo> list = netDiskList.stream().map(netDisk -> {
-            String sizeStr = byteConverter.convert(ByteType.Bytes, netDisk.getSize());
-            return new FileInfo(netDisk, sizeStr);
+        List<FileInfo> list = diskFileList.stream().map(diskFile -> {
+            String sizeStr = byteConverter.convert(ByteType.Bytes, diskFile.getSize());
+            return new FileInfo(diskFile, sizeStr);
         }).collect(Collectors.toList());
 
         return PageList.pageList(pageNumber, pageSize, total, list);
     }
 
-    // @Cacheable(cacheNames = "netdisk", key = "#owner + '-' + #path")
-    public NetDiskDetail getNetDiskDetail(String fileId) {
+    // @Cacheable(cacheNames = "diskFiles", key = "#owner + '-' + #path")
+    public DiskFileDetail getDiskFileDetail(String fileId) {
         long loginUser = UserContext.getUserId();
         DiskQuery diskQuery = new DiskQuery.Builder()
                 .fileId(fileId)
@@ -589,27 +587,27 @@ public class DiskFileService {
                 .build();
 
         Page page = new Page(1, 10);
-        List<NetDisk> netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-        if (!netDiskList.isEmpty()) {
-            NetDisk netDisk = netDiskList.get(0);
-            long owner = netDisk.getOwner();
+        List<DiskFile> diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+        if (!diskFileList.isEmpty()) {
+            DiskFile diskFile = diskFileList.get(0);
+            long owner = diskFile.getOwner();
             if (owner != loginUser) {
                 return null;
             }
 
             int channelCode = 111;
-            String objectId = netDisk.getFileId();
-            return getNetDiskDetail(channelCode, objectId);
+            String objectId = diskFile.getFileId();
+            return getDiskFileDetail(channelCode, objectId);
         }
 
         return null;
     }
 
-    public NetDiskDetail getNetDiskDetail(int channelCode, String objectId) {
+    public DiskFileDetail getDiskFileDetail(int channelCode, String objectId) {
         try {
             ObjectInfo objectInfo = ossService.getObjectInfo(channelCode, objectId);
             String signedUrl = ossService.getSignedUrl(channelCode, objectId);
-            return new NetDiskDetail(objectInfo, signedUrl);
+            return new DiskFileDetail(objectInfo, signedUrl);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -617,9 +615,9 @@ public class DiskFileService {
         return null;
     }
 
-    public Map<Integer, NetDiskCount> getFileTypeCount() {
+    public Map<Integer, DiskFileCount> getFileTypeCount() {
         long loginUser = UserContext.getUserId();
-        List<NetDiskCount> list = netDiskMapper.findFileTypeCountByGroup(loginUser);
-        return list.stream().collect(Collectors.toMap(NetDiskCount::getFileType, k -> k));
+        List<DiskFileCount> list = diskFileMapper.findFileTypeCountByGroup(loginUser);
+        return list.stream().collect(Collectors.toMap(DiskFileCount::getFileType, k -> k));
     }
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskFolderService.java

@@ -1,12 +1,10 @@
 package cn.reghao.tnb.content.app.disk.service;
 
 import cn.reghao.jutil.jdk.db.Page;
-import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.disk.db.mapper.NetDiskMapper;
-import cn.reghao.tnb.content.app.disk.model.dto.CreateFile;
+import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;
 import cn.reghao.tnb.content.app.disk.model.dto.CreateFolder;
-import cn.reghao.tnb.content.app.disk.model.po.NetDisk;
+import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
 import cn.reghao.tnb.content.app.disk.model.query.DiskQuery;
 import org.springframework.stereotype.Service;
 
@@ -22,10 +20,10 @@ import java.util.UUID;
  */
 @Service
 public class DiskFolderService {
-    private final NetDiskMapper netDiskMapper;
+    private final DiskFileMapper diskFileMapper;
 
-    public DiskFolderService(NetDiskMapper netDiskMapper) {
-        this.netDiskMapper = netDiskMapper;
+    public DiskFolderService(DiskFileMapper diskFileMapper) {
+        this.diskFileMapper = diskFileMapper;
     }
 
     public void createFolder(CreateFolder createFolder) {
@@ -48,9 +46,9 @@ public class DiskFolderService {
                 .owner(owner)
                 .build();
         Page page = new Page(1, 1);
-        List<NetDisk> netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-        if (!netDiskList.isEmpty()) {
-            return netDiskList.get(0).getFileId();
+        List<DiskFile> diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+        if (!diskFileList.isEmpty()) {
+            return diskFileList.get(0).getFileId();
         }
 
         String savedDirPath = dirPath;
@@ -67,20 +65,20 @@ public class DiskFolderService {
 
         for (String parent : list) {
             diskQuery.setPath(parent);
-            netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-            if (!netDiskList.isEmpty()) {
-                pid = netDiskList.get(0).getFileId();
+            diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+            if (!diskFileList.isEmpty()) {
+                pid = diskFileList.get(0).getFileId();
             } else {
                 String fileId = UUID.randomUUID().toString().replace("-", "");
                 String path = parent;
                 String dirname = parent.substring(parent.lastIndexOf("/")+1);
-                netDiskMapper.save(new NetDisk(fileId, pid, path, dirname));
+                diskFileMapper.save(new DiskFile(fileId, pid, path, dirname));
                 pid = fileId;
             }
         }
 
         diskQuery.setPath(savedDirPath);
-        netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-        return netDiskList.get(0).getFileId();
+        diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+        return diskFileList.get(0).getFileId();
     }
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskSyncService.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.disk.service;
 
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.disk.db.mapper.NetDiskMapper;
-import cn.reghao.tnb.content.app.disk.model.po.NetDisk;
+import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;
+import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
 import cn.reghao.tnb.content.app.disk.model.query.DiskQuery;
 import cn.reghao.tnb.content.app.disk.model.vo.FileTree;
 import org.springframework.stereotype.Service;
@@ -19,21 +19,21 @@ import java.util.stream.Collectors;
  */
 @Service
 public class DiskSyncService {
-    private final NetDiskMapper netDiskMapper;
+    private final DiskFileMapper diskFileMapper;
 
-    public DiskSyncService(NetDiskMapper netDiskMapper) {
-        this.netDiskMapper = netDiskMapper;
+    public DiskSyncService(DiskFileMapper diskFileMapper) {
+        this.diskFileMapper = diskFileMapper;
     }
 
-    public NetDisk checkFile(String path) {
+    public DiskFile checkFile(String path) {
         long loginUser = UserContext.getUserId();
         DiskQuery diskQuery = new DiskQuery.Builder()
                 .path(path)
                 .owner(loginUser)
                 .build();
         Page page = new Page(1, 1);
-        List<NetDisk> netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-        return netDiskList.isEmpty() ? null : netDiskList.get(0);
+        List<DiskFile> diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+        return diskFileList.isEmpty() ? null : diskFileList.get(0);
     }
 
     public List<FileTree> getFileTree() {
@@ -44,15 +44,15 @@ public class DiskSyncService {
                 .owner(loginUser)
                 .build();
 
-        int total = netDiskMapper.countByDiskQuery(diskQuery);
+        int total = diskFileMapper.countByDiskQuery(diskQuery);
         Page page = new Page(1, total);
-        List<NetDisk> netDiskList = netDiskMapper.findDiskQueryByPage(page, diskQuery);
-        Map<String, FileTree> map = netDiskList.stream()
+        List<DiskFile> diskFileList = diskFileMapper.findDiskQueryByPage(page, diskQuery);
+        Map<String, FileTree> map = diskFileList.stream()
                 .map(FileTree::new)
                 .collect(Collectors.toMap(FileTree::getFileId, diskFile -> diskFile));
 
         Map<String, FileTree> tree = new TreeMap<>();
-        netDiskList.forEach(diskFile -> {
+        diskFileList.forEach(diskFile -> {
             String pid = diskFile.getPid();
             String fileId = diskFile.getFileId();
             FileTree fileTree = map.get(fileId);

content/content-service/src/main/resources/mapper/disk/NetDiskMapper.xml → content/content-service/src/main/resources/mapper/disk/DiskFileMapper.xml

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.content.app.disk.db.mapper.NetDiskMapper">
+<mapper namespace="cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into my_net_disk
-        (`album_id`,`post_id`,`pos`,`added_at`)
+        insert into my_disk_file
+        (`channel_code`,`file_id`,`pid`,`path`,`filename`,`file_type`,`sha256sum`,`size`,`owner`)
         values
-        (#{albumId},#{postId},#{pos},#{addedAt})
+        (#{channelCode},#{fileId},#{pid},#{path},#{filename},#{fileType},#{sha256sum},#{size},#{owner})
     </insert>
     <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
-        insert into my_net_disk
-        (`album_id`,`post_id`,`pos`,`added_at`)
+        insert into my_disk_file
+        (`channel_code`,`file_id`,`pid`,`path`,`filename`,`file_type`,`sha256sum`,`size`,`owner`)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.albumId},#{item.postId},#{item.pos},#{item.addedAt})
+            (#{item.channelCode},#{item.fileId},#{item.pid},#{item.path},#{item.filename},#{item.fileType},#{item.sha256sum},#{item.size},#{item.owner})
         </foreach>
     </insert>
 
     <delete id="deleteByAlbumIdAndPostId">
-        delete from my_net_disk
+        delete from my_disk_file
         where album_id=#{albumId} and post_id=#{postId}
     </delete>
 
     <select id="countByDiskQuery" resultType="java.lang.Integer">
         select count(*)
-        from my_net_disk
+        from my_disk_file
         <where>
             deleted=0
             <if test="fileType != null">
@@ -47,9 +47,9 @@
             </if>
         </where>
     </select>
-    <select id="findDiskQueryByPage" resultType="cn.reghao.tnb.content.app.disk.model.po.NetDisk">
+    <select id="findDiskQueryByPage" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskFile">
         select *
-        from my_net_disk
+        from my_disk_file
         <where>
             deleted=0
             <if test="diskQuery.fileType != null">
@@ -73,16 +73,16 @@
         </where>
         order by file_type,filename
     </select>
-    <select id="findFileTypeCountByGroup" resultType="cn.reghao.tnb.content.app.disk.model.vo.NetDiskCount">
+    <select id="findFileTypeCountByGroup" resultType="cn.reghao.tnb.content.app.disk.model.vo.DiskFileCount">
         select file,count(*) as total
-        from my_net_disk
+        from my_disk_file
         group by file_type
         order by total desc
     </select>
 
-    <select id="findByFileIds" resultType="cn.reghao.tnb.content.app.disk.model.po.NetDisk">
+    <select id="findByFileIds" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskFile">
         select *
-        from my_net_disk
+        from my_disk_file
         where file_id in
         <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
             #{id}