From 567f6e53e80df539b72a43c7b6486beb01d1dbd1 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Thu, 27 Mar 2025 17:54:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/FileFormatController.java | 2 +- .../service/{serviceimpl => }/FileFormatService.java | 2 +- .../manage/service/serviceimpl/CommonService.java | 1 + .../service/serviceimpl/EdFileInfoServiceImpl.java | 11 ++++++++--- .../serviceimpl/EdFileRelationServiceImpl.java | 2 ++ .../manage/service/serviceimpl/EdPrjServiceImpl.java | 5 ++++- .../service/serviceimpl/FileFormatServiceImpl.java | 1 + .../service/serviceimpl/FileRecycleServiceImpl.java | 3 ++- 8 files changed, 20 insertions(+), 7 deletions(-) rename electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/{serviceimpl => }/FileFormatService.java (91%) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java index a9d28ab..76c1125 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java @@ -4,7 +4,7 @@ import com.electromagnetic.industry.software.common.annotations.UserOperation; 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.manage.service.serviceimpl.FileFormatService; +import com.electromagnetic.industry.software.manage.service.FileFormatService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileFormatService.java similarity index 91% rename from electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatService.java rename to electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileFormatService.java index 9dbb6e7..226fa15 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileFormatService.java @@ -1,4 +1,4 @@ -package com.electromagnetic.industry.software.manage.service.serviceimpl; +package com.electromagnetic.industry.software.manage.service; import com.baomidou.mybatisplus.extension.service.IService; import com.electromagnetic.industry.software.manage.pojo.models.FileFormat; 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 516c02e..8bdb92b 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 @@ -25,6 +25,7 @@ import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo; import com.electromagnetic.industry.software.manage.pojo.models.FileFormat; 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.FileFormatService; import com.electromagnetic.industry.software.manage.service.FileSystemService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; 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 0151481..ffd5721 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 @@ -864,7 +864,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl versionView(String fileId) { List edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) - .select(EdFileInfo::getParentId, EdFileInfo::getId, EdFileInfo::getFileId, EdFileInfo::getFileVersion, EdFileInfo::getPreVersion, EdFileInfo::getFileCode, EdFileInfo::getEffectFlag, EdFileInfo::getFileName) + .select(EdFileInfo.class, file -> !StrUtil.equals(file.getColumn(), "file_content")) .eq(EdFileInfo::getFileId, fileId)); List fileVersionViewVOS = BeanUtil.copyToList(edFileInfos, FileVersionViewVO.class); UserThreadLocal.setSuccessInfo(edFileInfos.get(0).getParentId(), fileId, "查询版本信息成功"); @@ -893,6 +893,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl !StrUtil.equals(file.getColumn(), "file_content")) .eq(EdFileInfo::getId, targetFolderId)); if (count == 0) { // 没有同名文件 @@ -932,6 +933,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl sameFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) + .select(EdFileInfo.class, file -> !StrUtil.equals(file.getColumn(), "file_content")) .eq(EdFileInfo::getParentId, targetFolderId) .eq(EdFileInfo::getFileName, srcFileInfo.getFileName()) .eq(EdFileInfo::getFileType, srcFileInfo.getFileType())); @@ -1001,6 +1003,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl !StrUtil.equals(file.getColumn(), "file_content")) .eq(EdFileInfo::getId, targetFolderId)); EdFileInfo destFileInfo; if (count == 0) { @@ -1038,7 +1041,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl uploadRecord(int pageNum, int pageSize, int dataOwnCode) { LambdaQueryWrapper lambdaQuery = Wrappers.lambdaQuery(EdFileInfo.class) - .select(EdFileInfo::getId, EdFileInfo::getFileName, EdFileInfo::getSaveStatus, EdFileInfo::getCreatedTime, EdFileInfo::getFileType) + .select(EdFileInfo.class, file -> !StrUtil.equals(file.getColumn(), "file_content")) .eq(EdFileInfo::getDataOwn, dataOwnCode) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FILE.code) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code); @@ -1104,6 +1107,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class) + .select(EdFileInfo.class, file -> !StrUtil.equals(file.getColumn(), "file_content")) .eq(EdFileInfo::getParentId, targetFolderId) .eq(EdFileInfo::getFileName, srcFileInfo.getFileName()) .eq(EdFileInfo::getFileType, srcFileInfo.getFileType()); @@ -1291,7 +1295,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl queryChildFolder(String parentId, int dataOwnCode) { - List edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).select(EdFileInfo::getId, EdFileInfo::getFileName) + List edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) + .select(EdFileInfo::getId, EdFileInfo::getFileName) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code) .eq(EdFileInfo::getDataOwn, dataOwnCode) .eq(EdFileInfo::getParentId, parentId) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java index c884314..833568a 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java @@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.StrFormatter; +import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -225,6 +226,7 @@ public class EdFileRelationServiceImpl extends ServiceImpl !StrUtil.equals(obj.getColumn(), "file_content")) .eq(EdFileInfo::getId, parentId) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)); String codePathByDbPath = commonService.getCodePathByDbPath(parentFileInfo.getFilePath()); 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 2dcd4bc..998da7f 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 @@ -421,7 +421,9 @@ public class EdPrjServiceImpl extends ServiceImpl sysFilePaths.add(targetSysFilePath); } } else { - List edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).in(EdFileInfo::getId, idMaps.values())); + List edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) + .select(EdFileInfo.class, file -> !StrUtil.equals(file.getColumn(), "file_content")) + .in(EdFileInfo::getId, idMaps.values())); Map map = edFileInfos.stream().collect(Collectors.toMap(EdFileInfo::getId, e -> e)); for (EdFileInfo edFileInfo : currentSourceLayerDirs) { String targetDirParentId = idMaps.get(edFileInfo.getParentId()); @@ -484,6 +486,7 @@ public class EdPrjServiceImpl extends ServiceImpl // 首先检查同层是否有同名目录 Assert.isTrue(commonService.notExistSameFolder(parentId, newFolderName, dataOwnCode), StrFormatter.format("{} 子集名已经存在", newFolderName)); EdFileInfo fileInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class) + .select(EdFileInfo.class, file -> !StrUtil.equals(file.getColumn(), "file_content")) .eq(EdFileInfo::getId, id)); String sysFilePath = commonService.getFileSysPath(fileInfo.getFilePath(), dataOwnCode); this.baseMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java index beff925..5c25aa5 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java @@ -11,6 +11,7 @@ import com.electromagnetic.industry.software.common.util.UserThreadLocal; import com.electromagnetic.industry.software.manage.mapper.FileFormatMapper; import com.electromagnetic.industry.software.manage.pojo.models.FileFormat; import com.electromagnetic.industry.software.manage.pojo.resp.FileFormatVO; +import com.electromagnetic.industry.software.manage.service.FileFormatService; import org.springframework.stereotype.Service; import java.util.List; 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 6890109..5da767f 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 @@ -96,7 +96,8 @@ public class FileRecycleServiceImpl implements FileRecycleService { } if (!UserThreadLocal.getAdminType().equals(AdminTypeEnum.SYSTEM.getValue())) { - LambdaQueryWrapper userPrjWrapper = Wrappers.lambdaQuery().select(EdFileInfo::getId, EdFileInfo::getFileCode) + LambdaQueryWrapper userPrjWrapper = Wrappers.lambdaQuery() + .select(EdFileInfo::getId, EdFileInfo::getFileCode) .eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_FILE.code) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code) .eq(EdFileInfo::getAllDeleted, true)