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/EdFileInfoController.java

@@ -41,21 +41,21 @@ public class EdFileInfoController {
     @UserOperation(value = "创建文件夹", modelName = UserOperationModuleEnum.DATABASE)
     @RequestMapping("createFolder")
     public ElectromagneticResult<?> createFolder(@RequestBody CreateFolderDTO createFolderDTO) {
-        return edFileInfoService.createFolder(createFolderDTO, DataOwnEnum.COMMON.code);
+        return edFileInfoService.createFolder(createFolderDTO, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "作废", modelName = UserOperationModuleEnum.DATABASE)
     @RequiredPermission(value = FilePermission.DELETE)
     @RequestMapping("delete")
     public ElectromagneticResult<?> delete(@RequestParam String id) {
-        return edFileInfoService.delete(id, DataOwnEnum.COMMON.code);
+        return edFileInfoService.delete(id, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "查询文件", modelName = UserOperationModuleEnum.DATABASE)
     @RequiredPermission(value = FilePermission.VIEW)
     @RequestMapping("info")
     public ElectromagneticResult<?> info(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
-        return edFileInfoService.queryEdFileInfo(fileInfoQueryDTO, DataOwnEnum.COMMON.code);
+        return edFileInfoService.queryEdFileInfo(fileInfoQueryDTO, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "上传文件", modelName = UserOperationModuleEnum.DATABASE)
@@ -64,21 +64,21 @@ public class EdFileInfoController {
     public ElectromagneticResult<?> upload(@RequestParam("parentId") String parentId,
                                            @RequestParam("file") MultipartFile file,
                                            @RequestParam("strategy") Integer strategy) {
-        return edFileInfoService.upload(parentId, file, strategy, DataOwnEnum.COMMON.code);
+        return edFileInfoService.upload(parentId, file, strategy, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "下载文件", modelName = UserOperationModuleEnum.DATABASE)
     @RequiredPermission(value = FilePermission.DOWNLOAD)
     @RequestMapping("download")
     public ResponseEntity<InputStreamResource> download(@RequestParam String id, HttpServletResponse response) {
-        return edFileInfoService.download(id, response, DataOwnEnum.COMMON.code);
+        return edFileInfoService.download(id, response, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "更新文件信息", modelName = UserOperationModuleEnum.DATABASE)
     @RequiredPermission(value = FilePermission.EDIT)
     @RequestMapping("updateFileInfo")
     public ElectromagneticResult<?> updateFileInfo(@RequestBody UpdateFileInfoDTO updateFileInfoDTO) {
-        return edFileInfoService.updateFileInfo(updateFileInfoDTO, DataOwnEnum.COMMON.code);
+        return edFileInfoService.updateFileInfo(updateFileInfoDTO, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "移动文件", modelName = UserOperationModuleEnum.DATABASE)
@@ -87,7 +87,7 @@ public class EdFileInfoController {
     public ElectromagneticResult<?> moveFile(@RequestParam("id") String id,
                                              @RequestParam("targetFolderId") String targetFolderId,
                                              @RequestParam("strategy") Integer strategy) {
-        return edFileInfoService.moveFile(id, targetFolderId, strategy, DataOwnEnum.COMMON.code);
+        return edFileInfoService.moveFile(id, targetFolderId, strategy, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "复制文件", modelName = UserOperationModuleEnum.DATABASE)
@@ -96,7 +96,7 @@ public class EdFileInfoController {
     public ElectromagneticResult<?> copyFile(@RequestParam("id") String id,
                                              @RequestParam("targetFolderId") String targetFolderId,
                                              @RequestParam("strategy") Integer strategy) {
-        return edFileInfoService.copyFile(id, targetFolderId, strategy, DataOwnEnum.COMMON.code);
+        return edFileInfoService.copyFile(id, targetFolderId, strategy, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "查看文件历史版本信息", modelName = UserOperationModuleEnum.DATABASE)
@@ -116,7 +116,7 @@ public class EdFileInfoController {
     @UserOperation(value = "导出数据库", modelName = UserOperationModuleEnum.DATABASE)
     @RequestMapping("batchExport")
     public ResponseEntity<InputStreamResource> batchExport(@RequestParam String fileIds, HttpServletResponse response) throws IOException {
-        return edFileInfoService.batchExport(fileIds, response, DataOwnEnum.COMMON.code);
+        return edFileInfoService.batchExport(fileIds, response, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.DATABASE)
@@ -124,7 +124,7 @@ public class EdFileInfoController {
     public ElectromagneticResult<?> mergeChunks(@RequestParam String identifier,
                                                 @RequestParam String fileName,
                                                 @RequestParam Integer totalChunks) {
-        return edFileInfoService.mergeChunks(identifier, fileName, totalChunks, DataOwnEnum.COMMON.code);
+        return edFileInfoService.mergeChunks(identifier, fileName, totalChunks, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.DATABASE)
@@ -142,7 +142,7 @@ public class EdFileInfoController {
     @UserOperation(value = "查询发布管理", modelName = UserOperationModuleEnum.DATABASE)
     @RequestMapping(value = "/uploadRecord", method = RequestMethod.GET)
     public ElectromagneticResult<?> uploadRecord(@RequestParam int pageNum, @RequestParam int pageSize) {
-        return edFileInfoService.uploadRecord(pageNum, pageSize, DataOwnEnum.COMMON.code);
+        return edFileInfoService.uploadRecord(pageNum, pageSize, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "查询文件详细信息", modelName = UserOperationModuleEnum.DATABASE)
@@ -156,14 +156,14 @@ public class EdFileInfoController {
     @RequiredPermission(value = FilePermission.VIEW)
     @RequestMapping(value = "/queryChildFolder", method = RequestMethod.GET)
     public ElectromagneticResult<?> queryChildFolder(@RequestParam String parentId) {
-        return edFileInfoService.queryChildFolder(parentId, DataOwnEnum.COMMON.code);
+        return edFileInfoService.queryChildFolder(parentId, DataOwnEnum.SYS_FILE.code);
     }
 
     @UserOperation(value = "预览文件", modelName = UserOperationModuleEnum.DATABASE)
     @RequiredPermission(value = FilePermission.DOWNLOAD)
     @RequestMapping(value = "preview", method = RequestMethod.GET)
     public ResponseEntity<InputStreamResource> preview(@RequestParam String id, HttpServletResponse response) {
-        return edFileInfoService.preview(id, response, DataOwnEnum.COMMON.code);
+        return edFileInfoService.preview(id, response, DataOwnEnum.SYS_FILE.code);
     }
 
     /**

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.electromagnetic.industry.software.common.annotations.UserOperation;
 import com.electromagnetic.industry.software.common.enums.DataOwnEnum;
 import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
-import com.electromagnetic.industry.software.common.exception.BizException;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;
@@ -93,6 +92,6 @@ public class EdFileRelationController {
                                                    @RequestParam("file") MultipartFile file,
                                                    @RequestParam("description") String description,
                                                    @RequestParam("id") String id) {
-        return ElectromagneticResultUtil.success(edFileRelationService.uploadFileAndRelation(parentId, id, file, description, DataOwnEnum.COMMON.code));
+        return ElectromagneticResultUtil.success(edFileRelationService.uploadFileAndRelation(parentId, id, file, description, DataOwnEnum.SYS_FILE.code));
     }
 }

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

@@ -27,25 +27,25 @@ public class ProjectController {
     @Resource
     private PermissionService permissionService;
 
-    @UserOperation(value = "创建工程", modelName = UserOperationModuleEnum.PRJ_SETTING)
+    @UserOperation(value = "创建层级", modelName = UserOperationModuleEnum.PRJ_SETTING)
     @RequestMapping("create")
     public ElectromagneticResult<?> create(@RequestParam String prjName) {
         return edPrjService.createNewPrj(prjName, DataOwnEnum.SYS_PRJ.code);
     }
 
-    @UserOperation(value = "删除工程", modelName = UserOperationModuleEnum.PRJ_SETTING)
+    @UserOperation(value = "删除层级", modelName = UserOperationModuleEnum.PRJ_SETTING)
     @RequestMapping("delete")
     public ElectromagneticResult<?> delete(@RequestParam String prjId) {
         return edPrjService.delete(prjId, DataOwnEnum.SYS_PRJ.code);
     }
 
-    @UserOperation(value = "修改工程名", modelName = UserOperationModuleEnum.PRJ_SETTING)
+    @UserOperation(value = "修改层级名", modelName = UserOperationModuleEnum.PRJ_SETTING)
     @RequestMapping("modify")
     public ElectromagneticResult<?> modifyPrjName(@RequestParam String newPrjName, @RequestParam String prjId) {
         return edPrjService.modifyPrjName(prjId, newPrjName, DataOwnEnum.SYS_PRJ.code);
     }
 
-    @UserOperation(value = "查询所有工程", modelName = UserOperationModuleEnum.PRJ_SETTING)
+    @UserOperation(value = "查询所有层级", modelName = UserOperationModuleEnum.PRJ_SETTING)
     @RequestMapping("queryAll")
     public ElectromagneticResult<?> queryAll() {
         return edPrjService.queryAllPrjInfo(DataOwnEnum.SYS_PRJ.code);
@@ -75,7 +75,7 @@ public class ProjectController {
         return edPrjService.folderResort(folderResortDTOList);
     }
 
-    @UserOperation(value = "发布工程", modelName = UserOperationModuleEnum.PRJ_SETTING)
+    @UserOperation(value = "发布层级", modelName = UserOperationModuleEnum.PRJ_SETTING)
     @RequestMapping("publish")
     public ElectromagneticResult<?> publish(@RequestParam String prjId) {
         edPrjService.publish(prjId, DataOwnEnum.SYS_PRJ.code);
@@ -84,13 +84,13 @@ public class ProjectController {
         return ElectromagneticResultUtil.success(true);
     }
 
-    @UserOperation(value = "引用工程", modelName = UserOperationModuleEnum.PRJ_SETTING)
+    @UserOperation(value = "引用层级", modelName = UserOperationModuleEnum.PRJ_SETTING)
     @RequestMapping("follow")
     public ElectromagneticResult<?> follow(@RequestParam String sourceId, @RequestParam String targetId) {
         return edPrjService.follow(sourceId, targetId, DataOwnEnum.SYS_PRJ.code);
     }
 
-    @UserOperation(value = "查询工程发布状态", modelName = UserOperationModuleEnum.PRJ_SETTING)
+    @UserOperation(value = "查询层级发布状态", modelName = UserOperationModuleEnum.PRJ_SETTING)
     @RequestMapping("publishStatus")
     public ElectromagneticResult<?> publishStatus(@RequestBody QueryPublishStatus queryPublishStatus) {
         return edPrjService.publishStatus(queryPublishStatus, DataOwnEnum.SYS_PRJ.code);

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

@@ -21,56 +21,56 @@ public class RoleController {
     private RoleService roleService;
 
     @RequiredRole(AdminTypeEnum.SECURITY)
-    @UserOperation(value="新建了角色", modelName = UserOperationModuleEnum.PERMISSION)
+    @UserOperation(value="新建角色", modelName = UserOperationModuleEnum.PERMISSION)
     @RequestMapping(value = "/createRole", method = RequestMethod.POST)
     public ElectromagneticResult<?> createRole(@RequestBody RoleDTO roleDTO) {
         return ElectromagneticResultUtil.success(roleService.createRole(roleDTO));
     }
 
     @RequiredRole(AdminTypeEnum.SECURITY)
-    @UserOperation(value="更新了角色", modelName = UserOperationModuleEnum.PERMISSION)
+    @UserOperation(value="更新角色", modelName = UserOperationModuleEnum.PERMISSION)
     @RequestMapping(value = "/updateRole", method = RequestMethod.POST)
     public ElectromagneticResult<?> updateRole(@RequestBody RoleDTO roleDTO) {
         return ElectromagneticResultUtil.success(roleService.updateRole(roleDTO));
     }
 
     @RequiredRole(AdminTypeEnum.SECURITY)
-    @UserOperation(value="删除了角色", modelName = UserOperationModuleEnum.PERMISSION)
+    @UserOperation(value="删除角色", modelName = UserOperationModuleEnum.PERMISSION)
     @GetMapping(value = "/deleteRole/{roleId}")
     public ElectromagneticResult<?> deleteRole(@PathVariable("roleId") String roleId) {
         return ElectromagneticResultUtil.success(roleService.deleteRole(roleId));
     }
 
     @RequiredRole(AdminTypeEnum.SECURITY)
-    @UserOperation(value="查看了某一角色", modelName = UserOperationModuleEnum.PERMISSION)
+    @UserOperation(value="查看指定角色", modelName = UserOperationModuleEnum.PERMISSION)
     @GetMapping(value = "/getSingleRole/{roleId}")
     public ElectromagneticResult<?> getRole(@PathVariable("roleId") String roleId) {
         return ElectromagneticResultUtil.success(roleService.getRole(roleId));
     }
 
     @RequiredRole(AdminTypeEnum.SECURITY)
-    @UserOperation(value="查看了角色", modelName = UserOperationModuleEnum.PERMISSION)
+    @UserOperation(value="查看角色", modelName = UserOperationModuleEnum.PERMISSION)
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public ElectromagneticResult<?> getRoles(@RequestBody RolePageDTO rolePageDTO) {
         return ElectromagneticResultUtil.success(roleService.getRoles(rolePageDTO));
     }
 
     @RequiredRole(AdminTypeEnum.SECURITY)
-    @UserOperation(value="查看了某一角色的权限", modelName = UserOperationModuleEnum.PERMISSION)
+    @UserOperation(value="查看某一角色的权限", modelName = UserOperationModuleEnum.PERMISSION)
     @GetMapping(value = "/getRoleByName")
     public ElectromagneticResult<?> getRoleByName(@RequestParam("roleName") String roleName) {
         return ElectromagneticResultUtil.success(roleService.getRoleByName(roleName));
     }
 
     @RequiredRole(AdminTypeEnum.SECURITY)
-    @UserOperation(value="获取了角色名列表", modelName = UserOperationModuleEnum.PERMISSION)
+    @UserOperation(value="获取角色名列表", modelName = UserOperationModuleEnum.PERMISSION)
     @GetMapping(value = "/getRoleNames")
     public ElectromagneticResult<?> getRoleNames() {
         return ElectromagneticResultUtil.success(roleService.getAllRoleNames());
     }
 
     @RequiredRole(AdminTypeEnum.SECURITY)
-    @UserOperation(value="获取了角色配置模版", modelName = UserOperationModuleEnum.PERMISSION)
+    @UserOperation(value="获取角色配置模版", modelName = UserOperationModuleEnum.PERMISSION)
     @GetMapping(value = "/getRoleTemplate")
     public ElectromagneticResult<?> getRoleTemplate() {
         return ElectromagneticResultUtil.success(roleService.getRoleTemplate());

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

@@ -31,48 +31,48 @@ public class UserController {
 
     @RequiredRole(AdminTypeEnum.SYSTEM)
     @PostMapping("/createUser")
-    @UserOperation(value="新增了用户信息", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="新增用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> createUser(@RequestBody UserRequest userRequest) {
         return userService.createUser(userRequest);
     }
 
     @RequiredRole(AdminTypeEnum.SYSTEM)
     @PutMapping("/updateUser")
-    @UserOperation(value="编辑了用户信息", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="编辑用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> updateUser(@RequestBody UserModiRequest userModiRequest) {
         return userService.modifyUser(userModiRequest);
     }
 
     @RequiredRole(AdminTypeEnum.SYSTEM)
     @RequestMapping(value = "/publish", method = RequestMethod.POST)
-    @UserOperation(value="发布了用户信息", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="发布用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> publishUser(@RequestBody UserPublishRequest userPublishRequest) {
         return userService.publishUser(userPublishRequest);
     }
 
     @RequiredRole(AdminTypeEnum.SYSTEM)
     @RequestMapping(value = "/getInfo", method = RequestMethod.GET)
-    @UserOperation(value="获取了某一用户信息", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="获取某一用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> getSingleUser(GetSingleUserRequest getSingleUserRequest) {
         return userService.getSingleUser(getSingleUserRequest);
     }
 
     @RequiredRole(AdminTypeEnum.SYSTEM)
-    @UserOperation(value="查询了用户信息", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="查询用户信息", modelName = UserOperationModuleEnum.USER)
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public ElectromagneticResult<?> searchUser(@RequestBody SearchUserRequest searchUserRequest) {
         return userService.searchUser(searchUserRequest);
     }
 
     @RequestMapping(value = "/validateWorkNumber", method = RequestMethod.POST)
-    @UserOperation(value="校验了工号唯一性", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="校验工号唯一性", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> validateWorkNum(@RequestBody UserWorkNumRequest userWorkNumRequest) {
         return userService.validateWorkNum(userWorkNumRequest);
     }
 
     @RequiredRole(AdminTypeEnum.SYSTEM)
     @PostMapping(value = "/deleteUser")
-    @UserOperation(value="删除了用户信息", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="删除用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> deleteUser(@RequestBody UserDeleteRequest userDeleteRequest) {
         return userService.deleteUser(userDeleteRequest);
     }
@@ -85,7 +85,7 @@ public class UserController {
 
     @RequiredRole(AdminTypeEnum.SECURITY)
     @RequestMapping(value = "/bindRole/list", method = RequestMethod.POST)
-    @UserOperation(value="查询了用户信息", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="查询用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> getPublishedUsers(@RequestBody SearchUserRequest searchUserRequest) {
         searchUserRequest.setIsPublished(PublishEnum.PUBLISHED.getCode().toString());
         return userService.searchUser(searchUserRequest);
@@ -93,7 +93,7 @@ public class UserController {
 
     @RequiredRole(AdminTypeEnum.SECURITY)
     @RequestMapping(value = "/bindRoles", method = RequestMethod.POST)
-    @UserOperation(value="绑定了人员与角色", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="绑定人员与角色", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> bindRoles(@RequestBody List<UserBindRoleDTO> list) {
         if (userService.bindRoles(list)) {
             return ElectromagneticResultUtil.success(true);
@@ -104,20 +104,20 @@ public class UserController {
 
     @RequiredRole(AdminTypeEnum.SYSTEM)
     @PutMapping("/changePassword")
-    @UserOperation(value="修改了用户密码", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="修改用户密码", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> changePassword(@RequestBody ChangePasswordRequest request) {
         return userService.changePassword(request.getUserId(), request.getNewPassword());
     }
 
     @RequiredRole(AdminTypeEnum.SECURITY)
     @GetMapping(value = "/resetPassword/{userId}")
-    @UserOperation(value="重置了密码", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="重置密码", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> resetPassword(@PathVariable("userId") String userId) {
         return ElectromagneticResultUtil.success(userService.resetPassword(userId));
     }
 
     @GetMapping(value = "/getAdminType")
-    @UserOperation(value="获取了当前用户的管理员类型", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value="获取当前用户的管理员类型", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> getAdminType() {
         String adminType = UserThreadLocal.getAdminType();
         if (adminType == null || adminType.isEmpty()) {
@@ -127,7 +127,7 @@ public class UserController {
         }
     }
     @PostMapping("/validateOldPassword")
-    @UserOperation(value = "校验了原始密码", modelName = UserOperationModuleEnum.USER)
+    @UserOperation(value = "校验原始密码", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> validateOldPassword(@RequestBody ValidateOldPasswordRequest request) {
         return userService.validateOldPassword(request.getUserId(), request.getOldPassword());
     }

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

@@ -7,6 +7,7 @@ import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;
 import com.electromagnetic.industry.software.manage.pojo.req.CreateFolderDTO;
+import com.electromagnetic.industry.software.manage.pojo.req.FileChunkDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.FileInfoQueryDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.UpdateFileInfoDTO;
 import com.electromagnetic.industry.software.manage.service.EdFileFavoriteService;
@@ -18,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 @RestController
 @RequestMapping("/data/ed/user/file")
@@ -66,6 +68,32 @@ public class UserEdFileInfoController {
         return edFileInfoService.download(id, response, DataOwnEnum.USER_FILE.code);
     }
 
+    @UserOperation(value = "导出数据库", modelName = UserOperationModuleEnum.USER_PRJ)
+    @RequestMapping("batchExport")
+    public ResponseEntity<InputStreamResource> batchExport(@RequestParam String fileIds, HttpServletResponse response) throws IOException {
+        return edFileInfoService.batchExport(fileIds, response, DataOwnEnum.USER_FILE.code);
+    }
+
+    @UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.USER_PRJ)
+    @RequestMapping(value = "/mergeChunks", method = RequestMethod.GET)
+    public ElectromagneticResult<?> mergeChunks(@RequestParam String identifier,
+                                                @RequestParam String fileName,
+                                                @RequestParam Integer totalChunks) {
+        return edFileInfoService.mergeChunks(identifier, fileName, totalChunks, DataOwnEnum.USER_FILE.code);
+    }
+
+    @UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.USER_PRJ)
+    @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
+    public ElectromagneticResult<?> batchImport(FileChunkDTO fileChunkDTO) {
+        return edFileInfoService.batchImport(fileChunkDTO);
+    }
+
+    @UserOperation(value = "批量上传数据库")
+    @RequestMapping(value = "/batchImport", method = RequestMethod.GET)
+    public ElectromagneticResult<?> checkChunkExist(FileChunkDTO fileChunkDTO) {
+        return edFileInfoService.checkChunkExist(fileChunkDTO);
+    }
+
     @UserOperation(value = "更新文件信息", modelName =UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("updateFileInfo")
     public ElectromagneticResult<?> updateFileInfo(@RequestBody UpdateFileInfoDTO updateFileInfoDTO) {
@@ -130,7 +158,7 @@ public class UserEdFileInfoController {
      * @return
      */
     @GetMapping("/collection")
-    @UserOperation(value="收藏了文件", modelName = UserOperationModuleEnum.DATABASE)
+    @UserOperation(value="收藏文件", modelName = UserOperationModuleEnum.USER_PRJ)
     public ElectromagneticResult<?> addFavorite(@RequestParam String id) {
         String userId = UserThreadLocal.getUserId();
         return ElectromagneticResultUtil.success(edFileFavoriteService.addFavorite(userId, id));
@@ -142,7 +170,7 @@ public class UserEdFileInfoController {
      * @return
      */
     @GetMapping("/removeCollection")
-    @UserOperation(value="从收藏夹移除了文件", modelName = UserOperationModuleEnum.DATABASE)
+    @UserOperation(value="从收藏夹移除文件", modelName = UserOperationModuleEnum.USER_PRJ)
     public ElectromagneticResult<?> removeFavorite(@RequestParam String id) {
         String userId = UserThreadLocal.getUserId();
         return ElectromagneticResultUtil.success(edFileFavoriteService.removeFavorite(userId, id));
@@ -153,7 +181,7 @@ public class UserEdFileInfoController {
      * @return
      */
     @PostMapping("/listCollection")
-    @UserOperation(value="查看了收藏夹", modelName = UserOperationModuleEnum.DATABASE)
+    @UserOperation(value="查看收藏夹", modelName = UserOperationModuleEnum.USER_PRJ)
     public ElectromagneticResult<?> listFavorite(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
         String userId = UserThreadLocal.getUserId();
         return ElectromagneticResultUtil.success(edFileFavoriteService.findFavorite(userId, fileInfoQueryDTO));

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

@@ -0,0 +1,97 @@
+package com.electromagnetic.industry.software.manage.controller;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.electromagnetic.industry.software.common.annotations.UserOperation;
+import com.electromagnetic.industry.software.common.enums.DataOwnEnum;
+import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
+import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
+import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
+import com.electromagnetic.industry.software.common.util.UserThreadLocal;
+import com.electromagnetic.industry.software.manage.pojo.models.EdFileRelation;
+import com.electromagnetic.industry.software.manage.pojo.req.CheckNameUniqueRequest;
+import com.electromagnetic.industry.software.manage.pojo.req.UpdateRelationDTO;
+import com.electromagnetic.industry.software.manage.service.serviceimpl.EdFileRelationServiceImpl;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/data/ed/user/relation")
+public class UserEdFileRelationController {
+
+    @Resource
+    EdFileRelationServiceImpl edFileRelationService;
+
+    /**
+     * 创建文件关系
+     *
+     * @param relation
+     * @return
+     */
+    @RequestMapping(value = "/create", method = RequestMethod.POST)
+    @UserOperation(value="创建文件关系", modelName = UserOperationModuleEnum.DATABASE)
+    public ElectromagneticResult<?> createRelation(@RequestBody EdFileRelation relation) {
+        return ElectromagneticResultUtil.success(edFileRelationService.createRelation(relation));
+    }
+
+    /**
+     * 更新文件关系
+     *
+     * @param updateRelation
+     * @return
+     */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @UserOperation(value="更新文件关系", modelName = UserOperationModuleEnum.DATABASE)
+    public ElectromagneticResult<?> updateRelation(@RequestBody UpdateRelationDTO updateRelation) {
+        LambdaUpdateWrapper<EdFileRelation> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(EdFileRelation::getId, updateRelation.getRelationId()).set(EdFileRelation::getRelationship, updateRelation.getRelationship());
+        boolean isUpdated = edFileRelationService.update(wrapper);
+        if (isUpdated) {
+            UserThreadLocal.setSuccessInfo("", updateRelation.getRelationId(), "更新了文件关系");
+        }
+        return ElectromagneticResultUtil.success(isUpdated);
+    }
+
+    /**
+     * 取消文件关系
+     *
+     * @param relationId 关系主键id
+     * @return
+     */
+    @RequestMapping(value = "/cancel/{relationId}", method = RequestMethod.GET)
+    @UserOperation(value="取消文件关系", modelName = UserOperationModuleEnum.DATABASE)
+    public ElectromagneticResult<?> cancelRelation(@PathVariable("relationId") String relationId) {
+        return ElectromagneticResultUtil.success(edFileRelationService.cancelRelation(relationId));
+    }
+
+    /**
+     * 展示文件关系
+     */
+    @RequestMapping(value = "listRelations/{id}", method = RequestMethod.GET)
+    @UserOperation(value="查看文件关系", modelName = UserOperationModuleEnum.DATABASE)
+    public ElectromagneticResult<?> listRelations(@PathVariable("id") String id) {
+        return ElectromagneticResultUtil.success(edFileRelationService.listRelations(id));
+    }
+
+    /**
+     * 检验文件名是否唯一
+     */
+    @RequestMapping(value = "/checkFileNameExist", method = RequestMethod.POST)
+    @UserOperation(value="校验文件名唯一性", modelName = UserOperationModuleEnum.DATABASE)
+    public ElectromagneticResult<?> checkFileNameExist(@RequestBody CheckNameUniqueRequest checkNameUniqueRequest) {
+        return ElectromagneticResultUtil.success(edFileRelationService.checkNameExist(checkNameUniqueRequest));
+    }
+
+    /**
+     * 本地上传并建立关系
+     */
+    @RequestMapping(value = "/upload", method = RequestMethod.POST)
+    @UserOperation(value="上传了文件并创建文件关系", modelName = UserOperationModuleEnum.DATABASE)
+    public ElectromagneticResult<?> uploadRelation(@RequestParam("parentId") String parentId,
+                                                   @RequestParam("file") MultipartFile file,
+                                                   @RequestParam("description") String description,
+                                                   @RequestParam("id") String id) {
+        return ElectromagneticResultUtil.success(edFileRelationService.uploadFileAndRelation(parentId, id, file, description, DataOwnEnum.SYS_FILE.code));
+    }
+}

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

@@ -22,25 +22,25 @@ public class UserPrjController {
     @Resource
     private EdPrjService edPrjService;
 
-    @UserOperation(value = "创建工程", modelName = UserOperationModuleEnum.USER_PRJ)
+    @UserOperation(value = "创建层级", modelName = UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("create")
     public ElectromagneticResult<?> create(@RequestParam String prjName) {
         return edPrjService.createNewPrj(prjName, DataOwnEnum.USER_PRJ.code);
     }
 
-    @UserOperation(value = "删除工程", modelName = UserOperationModuleEnum.USER_PRJ)
+    @UserOperation(value = "删除层级", modelName = UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("delete")
     public ElectromagneticResult<?> delete(@RequestParam String prjId) {
         return edPrjService.delete(prjId, DataOwnEnum.USER_PRJ.code);
     }
 
-    @UserOperation(value = "修改工程名", modelName = UserOperationModuleEnum.USER_PRJ)
+    @UserOperation(value = "修改层级名", modelName = UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("modify")
     public ElectromagneticResult<?> modifyPrjName(@RequestParam String newPrjName, @RequestParam String prjId) {
         return edPrjService.modifyPrjName(prjId, newPrjName, DataOwnEnum.USER_PRJ.code);
     }
 
-    @UserOperation(value = "查询所有工程", modelName = UserOperationModuleEnum.USER_PRJ)
+    @UserOperation(value = "查询所有层级", modelName = UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("queryAll")
     public ElectromagneticResult<?> queryAll() {
         return edPrjService.queryAllPrjInfo(DataOwnEnum.USER_PRJ.code);
@@ -70,19 +70,19 @@ public class UserPrjController {
         return edPrjService.folderResort(folderResortDTOList);
     }
 
-    @UserOperation(value = "发布工程", modelName = UserOperationModuleEnum.USER_PRJ)
+    @UserOperation(value = "发布层级", modelName = UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("publish")
     public ElectromagneticResult<?> publish(@RequestParam String prjId) {
         return edPrjService.publish(prjId, DataOwnEnum.USER_PRJ.code);
     }
 
-    @UserOperation(value = "引用工程", modelName = UserOperationModuleEnum.USER_PRJ)
+    @UserOperation(value = "引用层级", modelName = UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("follow")
     public ElectromagneticResult<?> follow(@RequestParam String sourceId, @RequestParam String targetId) {
         return edPrjService.follow(sourceId, targetId, DataOwnEnum.USER_PRJ.code);
     }
 
-    @UserOperation(value = "查询工程发布状态", modelName = UserOperationModuleEnum.USER_PRJ)
+    @UserOperation(value = "查询层级发布状态", modelName = UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("publishStatus")
     public ElectromagneticResult<?> publishStatus(@RequestBody QueryPublishStatus queryPublishStatus) {
         return edPrjService.publishStatus(queryPublishStatus, DataOwnEnum.USER_PRJ.code);

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java

@@ -25,7 +25,6 @@ import com.electromagnetic.industry.software.manage.pojo.resp.FileProjectVO;
 import com.electromagnetic.industry.software.manage.pojo.resp.ProjectVO;
 import com.electromagnetic.industry.software.manage.service.FileSystemService;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +41,8 @@ public class CommonService {
 
     private static final Map<String, String> FILE_TYPE_ENUM = new HashMap<>();
 
+    private static final Map<Integer, String> PATH_MAP = new HashMap<>();
+
     static {
         FILE_TYPE_ENUM.put(EleDataTypeEnum.FOLDER.desc, "01");
         FILE_TYPE_ENUM.put("py", "02");
@@ -78,10 +79,15 @@ public class CommonService {
     private FileSystemService fileSystemService;
 
     public String getEleDataPath(int dataOwnCode) {
-        if (dataOwnCode == DataOwnEnum.USER_PRJ.code) {
+        return PATH_MAP.get(dataOwnCode);
-            return elePropertyConfig.getUserDataPath();
     }
-        return elePropertyConfig.getEleDataPath();
+
+    @PostConstruct
+    public void init() {
+        PATH_MAP.put(DataOwnEnum.SYS_FILE.code, elePropertyConfig.getPrjDir());
+        PATH_MAP.put(DataOwnEnum.SYS_PRJ.code, elePropertyConfig.getPrjDir());
+        PATH_MAP.put(DataOwnEnum.USER_PRJ.code, elePropertyConfig.getUserDataPath());
+        PATH_MAP.put(DataOwnEnum.USER_FILE.code, elePropertyConfig.getUserDataPath());
     }
 
     /**
@@ -101,8 +107,7 @@ public class CommonService {
     public String getFileSysPath(String dbPath, int dataOwnCode) {
         ArrayList<String> paths = CollUtil.newArrayList(dbPath.split(MYSQL_FILE_PATH_SPLIT));
         String path = getDbPath(paths);
-        String prePath = dataOwnCode == DataOwnEnum.USER_PRJ.code ? elePropertyConfig.getUserDataPath() : elePropertyConfig.getEleDataPath();
+        return PATH_MAP.get(dataOwnCode) + File.separator + path;
-        return prePath + File.separator + path;
     }
 
     public String getDbPath(String dbPath) {
@@ -145,7 +150,7 @@ public class CommonService {
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
                 .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
                 .likeRight(EdFileInfo::getFilePath, id);
-        if (dataOwnCode == DataOwnEnum.COMMON.code) {
+        if (dataOwnCode == DataOwnEnum.SYS_FILE.code) {
             queryWrapper.eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code);
             queryWrapper.in(EdFileInfo::getId, accessibleIds);
         } else {
@@ -228,10 +233,11 @@ public class CommonService {
                     .eq(EdFileInfo::getParentId, PRJ_PARENT_ID)
                     .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code);
 
-            if (dataOwnCode == DataOwnEnum.COMMON.code) {
+            if (dataOwnCode == DataOwnEnum.SYS_FILE.code) {
                 queryWrapper.eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code);
             } else if (dataOwnCode == DataOwnEnum.USER_FILE.code) {
                 queryWrapper.eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_PRJ.code);
+                queryWrapper.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId());
             }
 
             if (dataOwnCode == DataOwnEnum.SYS_PRJ.code || dataOwnCode == DataOwnEnum.USER_PRJ.code) {
@@ -302,7 +308,7 @@ public class CommonService {
             String parentId = fileInfo.getParentId();
             if (fileInfo.getDataOwn().equals(DataOwnEnum.SYS_PRJ.code)) { // 删除的是层级目录
                 long count = edFileInfoMapper.selectCount(Wrappers.<EdFileInfo>lambdaQuery()
-                        .eq(EdFileInfo::getDataOwn, DataOwnEnum.COMMON.code)
+                        .eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_FILE.code)
                         .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
                         .like(EdFileInfo::getFilePath, MYSQL_FILE_PATH_SPLIT + id + MYSQL_FILE_PATH_SPLIT));
                 if (count > 0) {

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java

@@ -76,6 +76,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
 
     @Resource
     private ElePropertyConfig elePropertyConfig;
+
     /**
      * 查询文件列表
      *
@@ -87,13 +88,14 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
 
         String parentId = pars.getParentId();
         List<String> accessibleTree = permissionService.getAccessibleTree();
-        if (!accessibleTree.contains(parentId) && parentId.length() == PRJ_ID_LENGTH) {
+        if ((dataOwnCode != DataOwnEnum.USER_FILE.code) && (!accessibleTree.contains(parentId) && parentId.length() == PRJ_ID_LENGTH)) {
             throw new PermissionDeniedException();
         }
 
+
+
         LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
                 .select(EdFileInfo.class, file -> !file.getColumn().equals("file_content"))
-                .select()
                 .eq(EdFileInfo::getSaveStatus, EleDataSaveStatusEnum.SUCCESS.code)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
                 .eq(EdFileInfo::getParentId, pars.getParentId())
@@ -123,6 +125,10 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 .orderByAsc(ObjUtil.equals(pars.getFileTypeSort(), 0), EdFileInfo::getSort)
                 .orderByDesc(ObjUtil.equals(pars.getFileTypeSort(), 1), EdFileInfo::getSort);
 
+        if (dataOwnCode == DataOwnEnum.USER_FILE.code) {
+            queryWrapper.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId());
+        }
+
         if (StrUtil.isNotEmpty(pars.getKeyword())) {
             queryWrapper.and(qr -> qr.like(EdFileInfo::getFileName, pars.getKeyword())
                     .or()
@@ -161,10 +167,22 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
      */
     @Override
     public ElectromagneticResult<?> tree(int dataOwnCode) {
-        List<String> prjIds = permissionService.getAccessibleTree();
+
+        List<String> prjIds;
+
+        if (dataOwnCode != DataOwnEnum.USER_FILE.code) {
+            prjIds = permissionService.getAccessibleTree();
             if (CollUtil.isEmpty(prjIds) && dataOwnCode != DataOwnEnum.USER_FILE.code ) {
                 return ElectromagneticResultUtil.success(new ArrayList<>());
             }
+        } else {
+            prjIds = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
+                    .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
+                    .eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_PRJ.code)
+                    .eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId())
+                    .eq(EdFileInfo::getParentId, PRJ_PARENT_ID)).stream().map(EdFileInfo::getId).collect(Collectors.toList());
+        }
+
         List<String> strings = commonService.queryAllPrjInfo(prjIds, dataOwnCode);
         List<FileProjectVO> res = new ArrayList<>();
         strings.forEach(e -> {
@@ -620,8 +638,10 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
     public ResponseEntity<InputStreamResource> batchExport(String dataIdArr, HttpServletResponse response, int dataOwnCode) throws IOException {
         String userDownloadDataDir = elePropertyConfig.getDownloadDataDir() + File.separator + UserThreadLocal.getUserId();
         String[] ids = dataIdArr.split(",");
+        if (dataOwnCode == DataOwnEnum.SYS_FILE.code) {
             Map<String, Boolean> map = permissionService.filterExportIds(ids);
             Assert.isTrue(!map.containsValue(Boolean.FALSE), "有未授权的层级目录，禁止导出");
+        }
         Map<String, EdFileInfo> maps = new HashMap<>();
         for (String id : ids) {
             Map<String, EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
@@ -633,7 +653,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         String prjId = resFiles.get(0).getFilePath().split(MYSQL_FILE_PATH_SPLIT)[0];
         List<EdFileInfo> prjFolders = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
                 .likeRight(EdFileInfo::getFilePath, prjId + MYSQL_FILE_PATH_SPLIT)
-                .eq(EdFileInfo::getDataOwn, dataOwnCode)
+                .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
+                .eq(EdFileInfo::getDataOwn, dataOwnCode == DataOwnEnum.SYS_FILE.code ? DataOwnEnum.SYS_PRJ.code : DataOwnEnum.USER_PRJ.code)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code));
         EdFileInfo prjFileInfo = this.baseMapper.selectById(prjId);
         Map<String, EdFileInfo> prjFoldersMap = prjFolders.stream().collect(Collectors.toMap(EdFileInfo::getId, e -> e));
@@ -650,7 +671,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             fileSystemService.createDirectory(destFolderPath);
         }
         for (EdFileInfo edFileInfo : files) {
-            String filePath = commonService.getFileSysPath(edFileInfo.getFilePath(), dataOwnCode); // file
+            String filePath = commonService.getFileSysPath(edFileInfo.getFilePath(), dataOwnCode == DataOwnEnum.SYS_FILE.code ? DataOwnEnum.SYS_PRJ.code : DataOwnEnum.USER_PRJ.code); // file
             String destPath = userDownloadDataDir + File.separator + prjName + File.separator + commonService.getDbPath(edFileInfo.getFilePath());
             fileSystemService.copyFile(filePath, destPath);
         }
@@ -716,11 +737,16 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         Assert.isTrue(!file.isEmpty(), StrFormatter.format("文件 {} 为空，文件上传到 {} 失败，同名同后缀的处理方式为 {}", fileName, destPath, strategyStr));
         Assert.isTrue(EleCommonUtil.isFileNameValid(file.getOriginalFilename()), StrFormatter.format("文件 {} {}，上传到 {} 失败，同名同后缀的处理方式为 {}", fileName, NAME_VALID_MSG, destPath, strategyStr));
         // 查找下一层，看是否存在顶级定义相关文件，如果存在，则该层属于管理员层级定义的，不允许上传文件
-        long dirCount = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class)
+        LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
                 .eq(EdFileInfo::getParentId, parentId)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
-                .eq(EdFileInfo::getDataOwn, dataOwnCode)
+                .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code);
-                .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code));
+        if (dataOwnCode == DataOwnEnum.USER_FILE.code) {
+            queryWrapper.eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_PRJ.code);
+        } else {
+            queryWrapper.eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code);
+        }
+        long dirCount = this.baseMapper.selectCount(queryWrapper);
         Assert.isTrue(dirCount == 0, "文件 {} 上传到 {} 失败，层级结构不允许上传文件，同名同后缀的处理方式为 {}", fileName, destPath, strategyStr);
 
         String mainName = FileUtil.mainName(fileName);
@@ -760,7 +786,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                         .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
                         .setDataOwn(dataOwnCode);
                 this.saveOrUpdate(newEdFileInfo);
-                String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode);
+                String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode == DataOwnEnum.SYS_FILE.code ? DataOwnEnum.SYS_PRJ.code : DataOwnEnum.USER_PRJ.code);
                 FileUtil.writeFromStream(file.getInputStream(), fileDestPath);
                 EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes()));
                 finalEdFileInfo = newEdFileInfo;
@@ -856,7 +882,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             throw new BizException(info);
         }
 
-        if (strategy == 2) {
+        if (strategy == 1) {
+            return srcFileInfo;
+        } else if (strategy == 2) {
             // 做版本更新
             List<EdFileInfo> sameFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
                     .eq(EdFileInfo::getParentId, targetFolderId)
@@ -885,7 +913,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
                     .eq(EdFileInfo::getId, fileInfoTmp.getId()));
             return destSaveFileInfo;
-        } else if (strategy == 3) {
+        } else {
             // 文件名加“_1”，版本号从100开始
             // 处理MySQL相关逻辑
             EdFileInfo newEdFileInfo = BeanUtil.copyProperties(srcFileInfo, EdFileInfo.class);
@@ -906,7 +934,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             this.baseMapper.deleteById(srcFileInfo.getId());
             return newEdFileInfo;
         }
-        return null;
     }
 
     /**
@@ -964,6 +991,15 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
     @Override
     public ElectromagneticResult<?> uploadRecord(int pageNum, int pageSize, int dataOwnCode) {
 
+        LambdaQueryWrapper<EdFileInfo> lambdaQuery = Wrappers.lambdaQuery(EdFileInfo.class)
+                .select(EdFileInfo::getId, EdFileInfo::getFileName, EdFileInfo::getSaveStatus, EdFileInfo::getCreatedTime, EdFileInfo::getFileType)
+                .eq(EdFileInfo::getDataOwn, dataOwnCode)
+                .eq(EdFileInfo::getDataType, EleDataTypeEnum.FILE.code)
+                .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code);
+
+        if (dataOwnCode == DataOwnEnum.USER_FILE.code) {
+            lambdaQuery.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId());
+        } else {
             List<String> accessibleIds = permissionService.getAccessibleTree();
             Set<String> allLeafIds = commonService.selectPrjLeafs(dataOwnCode);
             List<String> list = new ArrayList<>();
@@ -975,16 +1011,14 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             if (CollUtil.isEmpty(list)) {
                 return ElectromagneticResultUtil.success(new UploadRecordVO(0, new ArrayList<>()));
             }
-        LambdaQueryWrapper<EdFileInfo> lambdaQuery = Wrappers.lambdaQuery(EdFileInfo.class)
+
-                .select(EdFileInfo::getId, EdFileInfo::getFileName, EdFileInfo::getSaveStatus, EdFileInfo::getCreatedTime, EdFileInfo::getFileType)
-                .eq(EdFileInfo::getDataOwn, dataOwnCode)
-                .eq(EdFileInfo::getDataType, EleDataTypeEnum.FILE.code)
-                .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code);
             lambdaQuery.or(qr -> {
                 for (String id : list) {
                     qr.likeRight(EdFileInfo::getFileCode, id);
                 }
             });
+        }
+
         Page<EdFileInfo> edFileInfoPage = this.baseMapper.selectPage(new Page<>(pageNum, pageSize), lambdaQuery);
         long total = edFileInfoPage.getTotal();
         List<UploadRecordDTO> uploadRecordDTOS = BeanUtil.copyToList(edFileInfoPage.getRecords(), UploadRecordDTO.class);
@@ -1015,7 +1049,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             log.info(info);
             throw new BizException(info);
         }
-
+        if (strategy == 1) {
+            return destFolderInfo;
+        }
         if (strategy == 2) {
             // 做版本更新
             LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
@@ -1291,4 +1327,5 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         Assert.notNull(fileInfo, StrFormatter.format("文件不存在，ID为{}", id));
         return fileInfo.getDataType().equals(EleDataTypeEnum.FOLDER.code);
     }
+
 }

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

@@ -5,11 +5,12 @@ import lombok.AllArgsConstructor;
 @AllArgsConstructor
 public enum DataOwnEnum {
 
-    COMMON(0, "上传的文件或者新建的文件夹"),
+    SYS_FILE(0, "数据库上传的文件或者新建的文件夹"),
     SYS_PRJ(1, "系统管理员创建的层级"),
     USER_PRJ(2, "用户自定义的层级"),
+    USER_FILE(4, "用户上传的文件或创建的文件夹"),
     REPO_FILE(3, "库文件"),
-    USER_FILE(4, "用户上传的文件或创建的文件夹");
+    REPO_PRJ(5, "库工程");
 
     public int code;
     public String desc;

electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/UserThreadLocal.java

@@ -26,8 +26,8 @@ public class UserThreadLocal {
 
     public static String getUserId() {
 
-        return "1859514019333836800";
+//        return "1876888149980930048";
-//        return userThread.get().getUserId();
+        return userThread.get().getUserId();
     }
 
     public static String getAdminType() {