Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java

@@ -31,25 +31,25 @@ public class UserEdFileInfoController {
     @UserOperation(value = "查看工程树", modelName =UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("tree")
     public ElectromagneticResult<?> tree() {
-        return edFileInfoService.tree(DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.tree(DataOwnEnum.USER_FILE.code);
     }
 
     @UserOperation(value = "创建文件夹", modelName =UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("createFolder")
     public ElectromagneticResult<?> createFolder(@RequestBody CreateFolderDTO createFolderDTO) {
-        return edFileInfoService.createFolder(createFolderDTO, DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.createFolder(createFolderDTO, DataOwnEnum.USER_FILE.code);
     }
 
     @UserOperation(value = "作废文件夹", modelName =UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("delete")
     public ElectromagneticResult<?> delete(@RequestParam String id) {
-        return edFileInfoService.delete(id, DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.delete(id, DataOwnEnum.USER_FILE.code);
     }
 
     @UserOperation(value = "查询文件", modelName =UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("info")
     public ElectromagneticResult<?> info(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
-        return edFileInfoService.queryEdFileInfo(fileInfoQueryDTO, DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.queryEdFileInfo(fileInfoQueryDTO, DataOwnEnum.USER_FILE.code);
     }
 
     @UserOperation(value = "上传文件", modelName =UserOperationModuleEnum.USER_PRJ)
@@ -57,19 +57,19 @@ public class UserEdFileInfoController {
     public ElectromagneticResult<?> upload(@RequestParam("parentId") String parentId,
                                            @RequestParam("file") MultipartFile file,
                                            @RequestParam("strategy") Integer strategy) {
-        return edFileInfoService.upload(parentId, file, strategy, DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.upload(parentId, file, strategy, DataOwnEnum.USER_FILE.code);
     }
 
     @UserOperation(value = "下载文件", modelName =UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("download")
     public ResponseEntity<InputStreamResource> download(@RequestParam String id, HttpServletResponse response) {
-        return edFileInfoService.download(id, response, DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.download(id, response, DataOwnEnum.USER_FILE.code);
     }
 
     @UserOperation(value = "更新文件信息", modelName =UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("updateFileInfo")
     public ElectromagneticResult<?> updateFileInfo(@RequestBody UpdateFileInfoDTO updateFileInfoDTO) {
-        return edFileInfoService.updateFileInfo(updateFileInfoDTO, DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.updateFileInfo(updateFileInfoDTO, DataOwnEnum.USER_FILE.code);
     }
 
     @UserOperation(value = "移动文件", modelName =UserOperationModuleEnum.USER_PRJ)
@@ -77,7 +77,7 @@ public class UserEdFileInfoController {
     public ElectromagneticResult<?> moveFile(@RequestParam("id") String id,
                                              @RequestParam("targetFolderId") String targetFolderId,
                                              @RequestParam("strategy") Integer strategy) {
-        return edFileInfoService.moveFile(id, targetFolderId, strategy, DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.moveFile(id, targetFolderId, strategy, DataOwnEnum.USER_FILE.code);
     }
 
     @UserOperation(value = "复制文件", modelName =UserOperationModuleEnum.USER_PRJ)
@@ -85,7 +85,7 @@ public class UserEdFileInfoController {
     public ElectromagneticResult<?> copyFile(@RequestParam("id") String id,
                                              @RequestParam("targetFolderId") String targetFolderId,
                                              @RequestParam("strategy") Integer strategy) {
-        return edFileInfoService.copyFile(id, targetFolderId, strategy, DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.copyFile(id, targetFolderId, strategy, DataOwnEnum.USER_FILE.code);
     }
 
     @UserOperation(value = "查看文件历史版本信息", modelName =UserOperationModuleEnum.USER_PRJ)
@@ -103,7 +103,7 @@ public class UserEdFileInfoController {
     @UserOperation(value = "查询发布管理", modelName =UserOperationModuleEnum.USER_PRJ)
     @RequestMapping(value = "/uploadRecord", method = RequestMethod.GET)
     public ElectromagneticResult<?> uploadRecord(@RequestParam int pageNum, @RequestParam int pageSize) {
-        return edFileInfoService.uploadRecord(pageNum, pageSize, DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.uploadRecord(pageNum, pageSize, DataOwnEnum.USER_FILE.code);
     }
 
     @UserOperation(value = "查询文件详细信息", modelName =UserOperationModuleEnum.USER_PRJ)
@@ -115,13 +115,13 @@ public class UserEdFileInfoController {
     @UserOperation(value = "查询子文件集", modelName =UserOperationModuleEnum.USER_PRJ)
     @RequestMapping(value = "/queryChildFolder", method = RequestMethod.GET)
     public ElectromagneticResult<?> queryChildFolder(@RequestParam String parentId) {
-        return edFileInfoService.queryChildFolder(parentId, DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.queryChildFolder(parentId, DataOwnEnum.USER_FILE.code);
     }
 
     @UserOperation(value = "预览文件", modelName =UserOperationModuleEnum.USER_PRJ)
     @RequestMapping(value = "preview", method = RequestMethod.GET)
     public ResponseEntity<InputStreamResource> preview(@RequestParam String id, HttpServletResponse response) {
-        return edFileInfoService.preview(id, response, DataOwnEnum.USER_PRJ.code);
+        return edFileInfoService.preview(id, response, DataOwnEnum.USER_FILE.code);
     }
 
     /**

electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java

@@ -8,7 +8,8 @@ public enum DataOwnEnum {
     COMMON(0, "上传的文件或者新建的文件夹"),
     SYS_PRJ(1, "系统管理员创建的层级"),
     USER_PRJ(2, "用户自定义的层级"),
-    REPO_FILE(3, "库文件");
+    REPO_FILE(3, "库文件"),
+    USER_FILE(4, "用户上传的文件或创建的文件夹");
 
     public int code;
     public String desc;