From 98d8b621b3fdfe9759c9811be7e2831d6bdba0f8 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 15 Apr 2025 17:44:00 +0800 Subject: [PATCH] reformat code --- .../manage/pojo/models/FileBackupLog.java | 1 - .../manage/pojo/models/UserAccessLog.java | 2 +- .../service/serviceimpl/CommonService.java | 9 ++++-- .../serviceimpl/EdFileInfoServiceImpl.java | 30 +++++++------------ .../service/serviceimpl/EdPrjServiceImpl.java | 2 +- 5 files changed, 19 insertions(+), 25 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileBackupLog.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileBackupLog.java index 291c16c..1bba228 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileBackupLog.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileBackupLog.java @@ -1,7 +1,6 @@ package com.electromagnetic.industry.software.manage.pojo.models; import com.baomidou.mybatisplus.annotation.TableName; -import io.github.mymonstercat.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java index 8863b1b..480e266 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java @@ -11,7 +11,7 @@ import java.util.Date; @Data @Accessors(chain = true) @TableName("user_access_log") -public class UserAccessLog extends BaseModel{ +public class UserAccessLog extends BaseModel { private String id; 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 3822441..2f91d9f 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 @@ -528,9 +528,12 @@ public class CommonService { DataOwnEnum obj = DataOwnEnum.getEnumByCode(dataOwnCode); switch (Objects.requireNonNull(obj)) { - case USER_FILE, USER_PRJ -> prjInfo = queryUserPrjTree(PrjQuerySource.USER_DB.value, new FileProjectVO()).getOrDefault(PrjQuerySource.USER_DB.value, new ArrayList<>()); - case SYS_FILE, SYS_PRJ -> prjInfo = querySysPrjTree(PrjQuerySource.SYS_DB.value, accessibleIds, new FileProjectVO()).getOrDefault(PrjQuerySource.SYS_DB.value, new ArrayList<>()); - case REPO_PRJ, REPO_FILE -> prjInfo = queryRepoPrjTree(PrjQuerySource.REPO_DB.value, accessibleIds, new FileProjectVO()).getOrDefault(PrjQuerySource.REPO_DB.value, new ArrayList<>()); + case USER_FILE, USER_PRJ -> + prjInfo = queryUserPrjTree(PrjQuerySource.USER_DB.value, new FileProjectVO()).getOrDefault(PrjQuerySource.USER_DB.value, new ArrayList<>()); + case SYS_FILE, SYS_PRJ -> + prjInfo = querySysPrjTree(PrjQuerySource.SYS_DB.value, accessibleIds, new FileProjectVO()).getOrDefault(PrjQuerySource.SYS_DB.value, new ArrayList<>()); + case REPO_PRJ, REPO_FILE -> + prjInfo = queryRepoPrjTree(PrjQuerySource.REPO_DB.value, accessibleIds, new FileProjectVO()).getOrDefault(PrjQuerySource.REPO_DB.value, new ArrayList<>()); default -> ElectromagneticResultUtil.fail("-1", "参数错误"); } 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 7cf450c..b70e9a4 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 @@ -64,26 +64,20 @@ import static com.electromagnetic.industry.software.common.enums.FileRepeatEnum. @Service public class EdFileInfoServiceImpl extends ServiceImpl implements EdFileInfoService { + private static final Map> FILE_DB_ID_NAME = new ConcurrentHashMap<>(); private final EleLog log = new EleLog(EdFileInfoServiceImpl.class); - @Resource private CommonService commonService; - @Resource private FileSystemService fileSystemService; - @Resource private PermissionService permissionService; - @Resource private UserMapper userMapper; - @Resource private ElePropertyConfig elePropertyConfig; - @Resource private EdFileFavoriteService fileFavoriteService; - @Resource private FileTagRelationService fileTagRelationService; @Resource @@ -93,8 +87,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl> FILE_DB_ID_NAME = new ConcurrentHashMap<>(); - /** * 查询文件列表 * @@ -510,12 +502,12 @@ public class EdFileInfoServiceImpl extends ServiceImpl importInfoMap) { - List edFileFavorites = (List)importInfoMap.getOrDefault(ED_FILE_FAVORITE, new ArrayList<>()); + List edFileFavorites = (List) importInfoMap.getOrDefault(ED_FILE_FAVORITE, new ArrayList<>()); edFileFavoriteMapper.insertOrUpdate(edFileFavorites); } private void updatePrjInfo(Map importInfoMap, String prjDirPath, Integer dataOwnCode) { - List importAllFiles = (List)importInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>()); + List importAllFiles = (List) importInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>()); // 找出层级文件夹 List prjFolders = importAllFiles.stream().filter(e -> DataOwnEnum.isPrjCode(e.getDataOwn())) .toList(); @@ -697,7 +689,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl needMove2FileSystemFiles, String prjDirPath, int dataOwnCode) { Map maps = needMove2FileSystemFiles.stream().collect(Collectors.toMap(EdFileInfo::getId, e -> e)); List files = needMove2FileSystemFiles.stream().filter(e -> e.getDataType().equals(EleDataTypeEnum.FILE.code)).toList(); @@ -830,14 +822,14 @@ public class EdFileInfoServiceImpl extends ServiceImpl exportInfoMap) { - List fileInfos = (List)exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>()); + List fileInfos = (List) exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>()); List accessibleFileIds = fileInfos.stream().map(EdFileInfo::getId).toList(); List fileTagRelations = fileTagRelationMapper.selectList(Wrappers.lambdaQuery(FileTagRelation.class).in(FileTagRelation::getFileId, accessibleFileIds)); exportInfoMap.put(ED_TAG_RELATIONS, fileTagRelations); } private void exportFileRelationInfo(Map exportInfoMap) { - List fileInfos = (List)exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>()); + List fileInfos = (List) exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>()); List accessibleFileIds = fileInfos.stream().map(EdFileInfo::getId).toList(); List edFileRelations = edFileRelationMapper.selectList(Wrappers.lambdaQuery(EdFileRelation.class).in(EdFileRelation::getId1, accessibleFileIds) .or() @@ -846,10 +838,10 @@ public class EdFileInfoServiceImpl extends ServiceImpl exportInfoMap) { - List fileInfos = (List)exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>()); - List accessibleFileIds = fileInfos.stream().map(EdFileInfo::getId).toList(); - List edFileFavorites = edFileFavoriteMapper.selectList(Wrappers.lambdaQuery(EdFileFavorite.class).in(EdFileFavorite::getFileId, accessibleFileIds)); - exportInfoMap.put(ED_FILE_FAVORITE, edFileFavorites); + List fileInfos = (List) exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>()); + List accessibleFileIds = fileInfos.stream().map(EdFileInfo::getId).toList(); + List edFileFavorites = edFileFavoriteMapper.selectList(Wrappers.lambdaQuery(EdFileFavorite.class).in(EdFileFavorite::getFileId, accessibleFileIds)); + exportInfoMap.put(ED_FILE_FAVORITE, edFileFavorites); } private void exportPrjInfo(Map exportInfoMap, int dataOwnCode, String dataIdArr, String userDownloadDataDir) throws IOException { @@ -894,7 +886,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl batchExport1(String dataIdArr, HttpServletResponse response, int dataOwnCode) throws IOException { // String userDownloadDataDir = elePropertyConfig.getDownloadDataDir(dataOwnCode) + File.separator + UserThreadLocal.getUserId(); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java index 69d6a26..3d41f69 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java @@ -153,11 +153,11 @@ public class EdPrjServiceImpl extends ServiceImpl .eq(EdFileInfo::getId, prjId)); String oldPrjName = fileInfo.getFileName(); try { + Assert.isTrue(EleCommonUtil.isFileNameValid(newPrjName), StrFormatter.format("{} {}，{} 修改失败。", newPrjName, NAME_VALID_MSG, oldPrjName)); Long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class) .eq(EdFileInfo::getParentId, PRJ_PARENT_ID) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getFileName, newPrjName)); - Assert.isTrue(EleCommonUtil.isFileNameValid(newPrjName), StrFormatter.format("{} {}，{} 修改失败。", newPrjName, NAME_VALID_MSG, oldPrjName)); if (count > 0) { String info = StrFormatter.format("{} 项目已经存在，{} 修改失败。", newPrjName, oldPrjName); log.info(info);