From d247fda266d3b88d7a1bdf998e822a926b05161a Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 8 Apr 2025 15:21:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=A4=87=E4=BB=BD=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../software/manage/service/serviceimpl/ChatService.java | 3 +-- .../manage/service/serviceimpl/EdFileInfoServiceImpl.java | 6 +++--- .../manage/service/serviceimpl/EdPrjServiceImpl.java | 2 +- .../manage/service/serviceimpl/EdTagLibraryServiceImpl.java | 2 +- .../manage/service/serviceimpl/FileBackLogServiceImpl.java | 2 +- .../manage/service/serviceimpl/FileRecycleServiceImpl.java | 4 ++-- .../service/serviceimpl/FileTagRelationServiceImpl.java | 2 +- .../manage/service/serviceimpl/PermissionServiceImpl.java | 2 +- .../service/serviceimpl/RolePermissionServiceImpl.java | 4 ++-- .../manage/service/serviceimpl/RoleServiceImpl.java | 4 ++-- .../service/serviceimpl/UserAccessLogServiceImpl.java | 2 +- .../industry/software/manage/tasks/BackupTask.java | 6 +++--- 12 files changed, 19 insertions(+), 20 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java index dcae7a1..283fbe5 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java @@ -46,7 +46,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; -import java.util.stream.Collectors; @Slf4j @Service @@ -73,7 +72,7 @@ public class ChatService { .in(AiFileUploadRecord::getId, ids)) .stream() .map(AiFileUploadRecord::getVectorId) - .collect(Collectors.toList()); + .toList(); Optional delete = vectorStore.delete(vectorIds); if (delete.isPresent() && ObjectUtil.equals(delete.get(), true)) { aiFileUploadRecordMapper.update(Wrappers.lambdaUpdate(AiFileUploadRecord.class) 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 6a074eb..6c41146 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 @@ -215,7 +215,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl> map; if (querySource == PrjQuerySource.SYS_DB.value) { @@ -414,7 +414,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl e.replace(UPLOAD_FILE_CHUNK_SUFFIX, "")) .map(Integer::parseInt) - .collect(Collectors.toList()); + .toList(); } /** @@ -1482,7 +1482,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.select(EdFileFavorite::getFileId).eq(EdFileFavorite::getUserId, userId); 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 fc8180e..2597bbb 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 @@ -221,7 +221,7 @@ public class EdPrjServiceImpl extends ServiceImpl .select(EdFileInfo::getId) .likeRight(EdFileInfo::getFilePath, prjId + MYSQL_FILE_PATH_SPLIT); List edFileInfos = this.baseMapper.selectList(queryWrapper); - List ids = edFileInfos.stream().map(EdFileInfo::getId).collect(Collectors.toList()); + List ids = edFileInfos.stream().map(EdFileInfo::getId).toList(); ids.add(prjId); this.baseMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class).set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code).in(EdFileInfo::getId, ids)); // 对原文件进行处理 diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java index 0ac2d79..59af45b 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java @@ -343,7 +343,7 @@ public class EdTagLibraryServiceImpl extends ServiceImpl(0L, records)); } - List fileIds = records.stream().map(FileBackupLog::getFileId).collect(Collectors.toList()); + List fileIds = records.stream().map(FileBackupLog::getFileId).toList(); List edFileInfos = edFileInfoMapper.selectList(Wrappers.lambdaQuery() .select(EdFileInfo.class, file -> !StrUtil.equals(file.getColumn(), "file_content")) .in(EdFileInfo::getId, fileIds)); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java index 6c64b0d..57e1e87 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java @@ -114,9 +114,9 @@ public class FileRecycleServiceImpl implements FileRecycleService { long total = edFileInfoPage.getTotal(); List records = BeanUtil.copyToList(edFileInfoPage.getRecords(), FileRecycleQueryVO.class); - List filePaths = records.stream().map(FileRecycleQueryVO::getFilePath).collect(Collectors.toList()); + List filePaths = records.stream().map(FileRecycleQueryVO::getFilePath).toList(); Map filesPath = commonService.getFilesPath(filePaths); - Map userIdNameMap = getUserIdNameMap(records.stream().map(FileRecycleQueryVO::getUpdatedBy).collect(Collectors.toList())); + Map userIdNameMap = getUserIdNameMap(records.stream().map(FileRecycleQueryVO::getUpdatedBy).toList()); records.forEach(e -> { e.setDataOwner(DataOwnEnum.getTypeByCode(e.getDataOwn())); e.setFilePrjPath(filesPath.get(e.getFilePath())); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java index 6d349e5..7ca1e0e 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java @@ -118,6 +118,6 @@ public class FileTagRelationServiceImpl extends ServiceImpl roleIds = Optional.ofNullable(userRoleMapper.selectList(queryWrapper)) .orElse(Collections.emptyList()) - .stream().map(UserRole::getRoleId).collect(Collectors.toList()); + .stream().map(UserRole::getRoleId).toList(); if (roleIds.isEmpty()) { return false; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java index 7303156..d063150 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java @@ -49,7 +49,7 @@ public class RolePermissionServiceImpl extends ServiceImpl permissionsToDelete = oldPermissions.stream() .filter(p -> !newPermissionSet.contains(p.getRoleId() + "_" + p.getPermissionCode())) - .collect(Collectors.toList()); + .toList(); log.info("删除旧权限: {}", permissionsToDelete); @@ -57,7 +57,7 @@ public class RolePermissionServiceImpl extends ServiceImpl idsToDelete = permissionsToDelete.stream() .map(RolePermission::getId) - .collect(Collectors.toList()); + .toList(); this.removeBatchByIds(idsToDelete); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java index ff15304..d397d30 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java @@ -344,7 +344,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro // 找到所有的根节点 List rootNodes = nodes.stream() .filter(node -> node.getParentId().equals(PRJ_PARENT_ID)) - .collect(Collectors.toList()); + .toList(); // 递归设置子节点 for (RolePermissionDTO rootNode : rootNodes) { @@ -359,7 +359,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro return nodes.stream() .filter(node -> parent.getId().equals(node.getParentId())) // 匹配父子关系 .peek(node -> node.setChildren(findChildren(node, nodes))) // 递归设置子节点 - .collect(Collectors.toList()); + .toList(); } /** diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java index 37d4f64..9285020 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java @@ -89,7 +89,7 @@ public class UserAccessLogServiceImpl extends ServiceImpl res) { - List userIds = res.stream().map(AccessLogQueryVO::getUserId).collect(Collectors.toList()); + List userIds = res.stream().map(AccessLogQueryVO::getUserId).toList(); if (CollUtil.isEmpty(userIds)) { return; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java index 9f39284..7cc630f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java @@ -137,7 +137,7 @@ public class BackupTask { List fileBackupLogs = fileBackupLogMapper.selectList(Wrappers.lambdaQuery() .select(FileBackupLog::getFileId) .eq(FileBackupLog::isBackupSuccess, false)); - return fileBackupLogs.stream().map(FileBackupLog::getFileId).collect(Collectors.toList()); + return fileBackupLogs.stream().map(FileBackupLog::getFileId).toList(); } @Scheduled(cron = "0 0 3 * * ?") @@ -190,7 +190,7 @@ public class BackupTask { List fileBackupLogs = fileBackupLogMapper.selectList(Wrappers.lambdaQuery() .eq(FileBackupLog::getFileName, fileName) .eq(FileBackupLog::getSource, FileBackupSource.SQL.code)); - List successBacks = fileBackupLogs.stream().filter(FileBackupLog::isBackupSuccess).collect(Collectors.toList()); + List successBacks = fileBackupLogs.stream().filter(FileBackupLog::isBackupSuccess).toList(); if (CollUtil.isNotEmpty(successBacks)) { log.info("最新的SQL文件已经备份过。"); return; @@ -199,7 +199,7 @@ public class BackupTask { long startTime = System.currentTimeMillis(); BackupFileResLog resLog = backupHandler.backupSql(maxModifyTimeFile.getAbsolutePath()); long endTime = System.currentTimeMillis(); - List failBacks = fileBackupLogs.stream().filter(FileBackupLog::isBackupSuccess).collect(Collectors.toList()); + List failBacks = fileBackupLogs.stream().filter(FileBackupLog::isBackupSuccess).toList(); if (CollUtil.isEmpty(failBacks)) { FileBackupLog backupLog = new FileBackupLog() .setId(IdWorker.getSnowFlakeIdString())