Merge pull request #95 from jamebal/develop

fix: 修复挂载目录下打开空文件夹然后返回上级失败的问题
jamebal · Jun 14, 2024 · d62810e · d62810e
2 parents 7be6506 + 4cbff83
commit d62810e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/main/java/com/jmal/clouddisk/model/UploadApiParamDTO.java b/src/main/java/com/jmal/clouddisk/model/UploadApiParamDTO.java
@@ -10,6 +10,7 @@
 import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description UploadApiParam
@@ -83,7 +84,7 @@ public class UploadApiParamDTO {
      * 目录fileId
      */
     String folder;
-
+    Map<String, Object> props;
     /**
      * 文件id
      */

diff --git a/src/main/java/com/jmal/clouddisk/service/impl/FileServiceImpl.java b/src/main/java/com/jmal/clouddisk/service/impl/FileServiceImpl.java
@@ -151,6 +151,9 @@ public ResponseResult<Object> listFiles(UploadApiParamDTO upload) throws CommonE
         List<FileIntroVO> list = getFileDocuments(upload, criteria);
         result.setData(list);
         result.setCount(getFileDocumentsCount(upload, criteria));
+        if (upload.getProps() != null) {
+            result.setProps(upload.getProps());
+        }
         return result;
     }
 
@@ -170,7 +173,11 @@ private boolean checkMountParam(UploadApiParamDTO upload, String currentDirector
             FileDocument fileDocument = getById(fileId);
             if (fileDocument != null) {
                 upload.setUserId(fileDocument.getUserId());
-                upload.setUsername(userService.getUserNameById(fileDocument.getUserId()));
+                Map<String, Object> props = new HashMap<>(2);
+                String username = userService.getUserNameById(fileDocument.getUserId());
+                props.put("fileUsername", username);
+                upload.setProps(props);
+                upload.setUsername(username);
                 upload.setCurrentDirectory(fileDocument.getPath() + fileDocument.getName());
                 upload.setFolder(null);
                 return true;
@@ -318,6 +325,12 @@ public ResponseResult<Object> searchFileAndOpenDir(UploadApiParamDTO upload, Str
         if (fileDocument == null) {
             return ResultUtil.error(ExceptionType.FILE_NOT_FIND);
         }
+        if (!fileDocument.getUserId().equals(userLoginHolder.getUserId())) {
+            Map<String, Object> props = new HashMap<>(2);
+            String username = userService.getUserNameById(fileDocument.getUserId());
+            props.put("fileUsername", username);
+            result.setProps(props);
+        }
         String currentDirectory = getUserDirectory(fileDocument.getPath() + fileDocument.getName());
 
         // 判断是否为ossPath

diff --git a/src/main/java/com/jmal/clouddisk/util/ResponseResult.java b/src/main/java/com/jmal/clouddisk/util/ResponseResult.java
@@ -4,6 +4,8 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.util.Map;
+
 /**
  * ResponseResult
  *
@@ -17,4 +19,5 @@ public class ResponseResult<T> {
 	private Object message;
 	private T data;
 	private Object count;
+	private Map<String, Object> props;
 }