解决发现的问题

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

@@ -158,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));
@@ -170,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));
@@ -181,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

@@ -30,7 +30,7 @@ public class UserEdFileRelationController {
      * @return
      */
     @RequestMapping(value = "/create", method = RequestMethod.POST)
-    @UserOperation(value="创建了文件关系", modelName = UserOperationModuleEnum.DATABASE)
+    @UserOperation(value="创建文件关系", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> createRelation(@RequestBody EdFileRelation relation) {
         return ElectromagneticResultUtil.success(edFileRelationService.createRelation(relation));
     }
@@ -42,7 +42,7 @@ public class UserEdFileRelationController {
      * @return
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    @UserOperation(value="更新了文件关系", modelName = UserOperationModuleEnum.DATABASE)
+    @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());
@@ -60,7 +60,7 @@ public class UserEdFileRelationController {
      * @return
      */
     @RequestMapping(value = "/cancel/{relationId}", method = RequestMethod.GET)
-    @UserOperation(value="取消了文件关系", modelName = UserOperationModuleEnum.DATABASE)
+    @UserOperation(value="取消文件关系", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> cancelRelation(@PathVariable("relationId") String relationId) {
         return ElectromagneticResultUtil.success(edFileRelationService.cancelRelation(relationId));
     }
@@ -69,7 +69,7 @@ public class UserEdFileRelationController {
      * 展示文件关系
      */
     @RequestMapping(value = "listRelations/{id}", method = RequestMethod.GET)
-    @UserOperation(value="查看了文件关系", modelName = UserOperationModuleEnum.DATABASE)
+    @UserOperation(value="查看文件关系", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> listRelations(@PathVariable("id") String id) {
         return ElectromagneticResultUtil.success(edFileRelationService.listRelations(id));
     }
@@ -87,7 +87,7 @@ public class UserEdFileRelationController {
      * 本地上传并建立关系
      */
     @RequestMapping(value = "/upload", method = RequestMethod.POST)
-    @UserOperation(value="上传了文件并创建了文件关系", modelName = UserOperationModuleEnum.DATABASE)
+    @UserOperation(value="上传了文件并创建文件关系", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> uploadRelation(@RequestParam("parentId") String parentId,
                                                    @RequestParam("file") MultipartFile file,
                                                    @RequestParam("description") String description,

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");
@@ -84,6 +85,14 @@ public class CommonService {
         return elePropertyConfig.getEleDataPath();
     }
 
+    @PostConstruct
+    public void init() {
+        PATH_MAP.put(DataOwnEnum.COMMON.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 +110,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) {

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

@@ -5,7 +5,7 @@ import lombok.AllArgsConstructor;
 @AllArgsConstructor
 public enum DataOwnEnum {
 
-    COMMON(0, "上传的文件或者新建的文件夹"),
+    COMMON(0, "数据库上传的文件或者新建的文件夹"),
     SYS_PRJ(1, "系统管理员创建的层级"),
     USER_PRJ(2, "用户自定义的层级"),
     REPO_FILE(3, "库文件"),