From bd59d91776a9c94a4144b1e9fbb36f72a5a7caa7 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 4 Mar 2025 10:57:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EdFileInfoController.java | 26 +++++++++---------- .../controller/EdFileRelationController.java | 3 +-- .../UserEdFileRelationController.java | 2 +- .../service/serviceimpl/CommonService.java | 13 ++++------ .../serviceimpl/EdFileInfoServiceImpl.java | 8 +++--- .../software/common/enums/DataOwnEnum.java | 5 ++-- 6 files changed, 27 insertions(+), 30 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java index d4115b5..4ad52cb 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java +++ b/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 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 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 preview(@RequestParam String id, HttpServletResponse response) { - return edFileInfoService.preview(id, response, DataOwnEnum.COMMON.code); + return edFileInfoService.preview(id, response, DataOwnEnum.SYS_FILE.code); } /** diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java index e0f5b55..57feed5 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java +++ b/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)); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileRelationController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileRelationController.java index 0226dc3..50c8e84 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileRelationController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileRelationController.java @@ -92,6 +92,6 @@ public class UserEdFileRelationController { @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)); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index 91c94e0..5cb3161 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -79,15 +79,12 @@ public class CommonService { private FileSystemService fileSystemService; public String getEleDataPath(int dataOwnCode) { - if (dataOwnCode == DataOwnEnum.USER_PRJ.code) { - return elePropertyConfig.getUserDataPath(); - } - return elePropertyConfig.getEleDataPath(); + return PATH_MAP.get(dataOwnCode); } @PostConstruct public void init() { - PATH_MAP.put(DataOwnEnum.COMMON.code, elePropertyConfig.getPrjDir()); + 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()); @@ -153,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 { @@ -236,7 +233,7 @@ 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); @@ -311,7 +308,7 @@ public class CommonService { String parentId = fileInfo.getParentId(); if (fileInfo.getDataOwn().equals(DataOwnEnum.SYS_PRJ.code)) { // 删除的是层级目录 long count = edFileInfoMapper.selectCount(Wrappers.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) { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index a271370..9da4bec 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -638,7 +638,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl batchExport(String dataIdArr, HttpServletResponse response, int dataOwnCode) throws IOException { String userDownloadDataDir = elePropertyConfig.getDownloadDataDir() + File.separator + UserThreadLocal.getUserId(); String[] ids = dataIdArr.split(","); - if (dataOwnCode == DataOwnEnum.COMMON.code) { + if (dataOwnCode == DataOwnEnum.SYS_FILE.code) { Map map = permissionService.filterExportIds(ids); Assert.isTrue(!map.containsValue(Boolean.FALSE), "有未授权的层级目录，禁止导出"); } @@ -654,7 +654,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl prjFolders = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) .likeRight(EdFileInfo::getFilePath, prjId + MYSQL_FILE_PATH_SPLIT) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code) - .eq(EdFileInfo::getDataOwn, dataOwnCode == DataOwnEnum.COMMON.code ? DataOwnEnum.SYS_PRJ.code : DataOwnEnum.USER_PRJ.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 prjFoldersMap = prjFolders.stream().collect(Collectors.toMap(EdFileInfo::getId, e -> e)); @@ -671,7 +671,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl