网盘

ibzdisk-core/src/main/java/cn/ibizlab/core/disk/extensions/service/DiskCoreService.java

@@ -5,6 +5,7 @@ import cn.ibizlab.core.disk.service.ISDFileService;
 import cn.ibizlab.util.domain.FileItem;
 import cn.ibizlab.util.errors.BadRequestAlertException;
 import cn.ibizlab.util.errors.InternalServerErrorException;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,7 +86,7 @@ public class DiskCoreService {
             String fileId = sdFile.getId();
             if(StringUtils.isEmpty(fileId))
             {
-                fileId = simpleDateFormat.format(new Date()).concat("_").concat(digestCode);
+                fileId = simpleDateFormat.format(new Date()).concat("_").concat(IdWorker.getIdStr());
                 sdFile.setId(fileId);
             }
             String folder = sdFile.getFolder();
@@ -150,16 +151,16 @@ public class DiskCoreService {
         throw new InternalServerErrorException("文件未找到");
     }
 
-    public List<FileItem> getFileList(String ownerType,String ownerId)
+    public List<FileItem> getFileList(String folder,String ownerType,String ownerId)
     {
         List<FileItem> fileItems = new ArrayList<>();
-        sdFileService.list(Wrappers.<SDFile>lambdaQuery().eq(SDFile::getOwnerType,ownerType).eq(SDFile::getOwnerId,ownerId).orderByAsc(SDFile::getCreatedate)).forEach(item -> {
+        sdFileService.list(Wrappers.<SDFile>lambdaQuery().eq(SDFile::getFolder,folder).eq(SDFile::getOwnerType,ownerType).eq(SDFile::getOwnerId,ownerId).orderByAsc(SDFile::getCreatedate)).forEach(item -> {
             fileItems.add(new FileItem(item.getId(),item.getName(),item.getId(),item.getName(),item.getFileSize(),item.getExtension(),fileCoreService.getAuthCode(item.getId())));
         });
         return fileItems;
     }
 
-    public void saveFileList(String ownerType,String ownerId,List<FileItem> fileItems)
+    public void saveFileList(String folder,String ownerType,String ownerId,List<FileItem> fileItems)
     {
         List<SDFile> sdFiles = new ArrayList<>();
         fileItems.forEach(item -> {

ibzdisk-provider/ibzdisk-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/DiskCoreResource.java

@@ -135,14 +135,14 @@ public class DiskCoreResource
 		return ResponseEntity.status(HttpStatus.MOVED_PERMANENTLY).header(HttpHeaders.LOCATION, redirectUrl).build();
 	}
 
-	@GetMapping(value = "net-disk/files/{ownertype}/{ownerid}")
-	public ResponseEntity<List<FileItem>> getFiles(@PathVariable("ownertype") String ownertype, @PathVariable("ownerid") String ownerid){
-		return ResponseEntity.ok().body(diskCoreService.getFileList(ownertype,ownerid));
+	@GetMapping(value = "net-disk/files/{folder}")
+	public ResponseEntity<List<FileItem>> getFiles(@PathVariable("folder") String folder,@RequestParam("ownertype") String ownertype, @RequestParam("ownerid") String ownerid){
+		return ResponseEntity.ok().body(diskCoreService.getFileList(folder,ownertype,ownerid));
 	}
 
-	@PostMapping(value = "net-disk/files/{ownertype}/{ownerid}")
-	public ResponseEntity<Boolean> saveFiles(@PathVariable("ownertype") String ownertype, @PathVariable("ownerid") String ownerid, @RequestBody List<FileItem> fileItems){
-		diskCoreService.saveFileList(ownertype,ownerid,fileItems);
+	@PostMapping(value = "net-disk/files/{folder}")
+	public ResponseEntity<Boolean> saveFiles(@PathVariable("folder") String folder,@RequestParam("ownertype") String ownertype, @RequestParam("ownerid") String ownerid, @RequestBody List<FileItem> fileItems){
+		diskCoreService.saveFileList(folder,ownertype,ownerid,fileItems);
 		return ResponseEntity.ok().body(true);
 	}