From 153cc3fd4ef015a8b1390b2eef3d102c5859a5e7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 三月 2024 16:07:48 +0800
Subject: [PATCH] dnc Module error fix
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArchiveDirectoryFileServiceImpl.java | 252 ++++++++++----------------------------------------
1 files changed, 50 insertions(+), 202 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArchiveDirectoryFileServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArchiveDirectoryFileServiceImpl.java
index 42adaa3..9eaca9f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArchiveDirectoryFileServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArchiveDirectoryFileServiceImpl.java
@@ -1,32 +1,33 @@
package com.qianwen.smartman.modules.dnc.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
import com.qianwen.smartman.modules.dnc.convert.DncArchiveDirectoryFileConvert;
import com.qianwen.smartman.modules.dnc.entity.DncArchiveDirectory;
import com.qianwen.smartman.modules.dnc.entity.DncArchiveDirectoryFile;
+import com.qianwen.smartman.modules.dnc.entity.DncFactoryFile;
+import com.qianwen.smartman.modules.dnc.entity.TransferDirectoryFile;
import com.qianwen.smartman.modules.dnc.enums.DncEnums;
import com.qianwen.smartman.modules.dnc.mapper.DncArchiveDirectoryFileMapper;
import com.qianwen.smartman.modules.dnc.service.IDncArchiveDirectoryFileService;
@@ -43,11 +44,8 @@
import com.qianwen.smartman.modules.dnc.vo.VerifyArchiveFileVO;
import com.qianwen.smartman.modules.system.entity.User;
import com.qianwen.smartman.modules.system.service.IUserService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/service/impl/DncArchiveDirectoryFileServiceImpl.class */
public class DncArchiveDirectoryFileServiceImpl extends BaseServiceImpl<DncArchiveDirectoryFileMapper, DncArchiveDirectoryFile> implements IDncArchiveDirectoryFileService {
private final IFileService fileService;
private final IUserService userService;
@@ -56,178 +54,6 @@
private final ITransferDirectoryFileService transferDirectoryFileService;
private final IDncFactoryFileService factoryFileService;
private final IObsFileService obsFileService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -2007000029:
- if (implMethodName.equals("getWhetherArchive")) {
- z = true;
- break;
- }
- break;
- case -691880900:
- if (implMethodName.equals("getArchiveDirectoryId")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 537556537:
- if (implMethodName.equals("getIsCurrent")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- case 804592199:
- if (implMethodName.equals("getSuffix")) {
- z = true;
- break;
- }
- break;
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- z = true;
- break;
- }
- break;
- case 1343131517:
- if (implMethodName.equals("getFilename")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArchiveDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArchiveDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArchiveDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getSuffix();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArchiveDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getSuffix();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArchiveDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getSuffix();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArchiveDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getIsCurrent();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArchiveDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getIsCurrent();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArchiveDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getFilename();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArchiveDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getFilename();
- };
- }
- break;
- case RegionCache.VILLAGE_LEVEL /* 5 */:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/TransferDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getWhetherArchive();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncFactoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getWhetherArchive();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArchiveDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getArchiveDirectoryId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArchiveDirectoryFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getArchiveDirectoryId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public DncArchiveDirectoryFileServiceImpl(final IFileService fileService, final IUserService userService, final IWorkstationService workstationService, final IDncArchiveDirectoryService directoryService, final ITransferDirectoryFileService transferDirectoryFileService, final IDncFactoryFileService factoryFileService, final IObsFileService obsFileService) {
this.fileService = fileService;
@@ -247,13 +73,13 @@
String noSuffix = "";
if (fileType != null && fileType.equals(DncEnums.FileType.PROCESSING_PROGRAM.getCode())) {
result = true;
- List<String> collect = (List) suffixs.stream().filter((v1) -> {
- return r1.equals(v1);
- }).collect(Collectors.toList());
+
+ List<String> collect = suffixs.stream().filter(CommonConstant.NOT_SUFFIX::equals).collect(Collectors.toList());
+
if (collect.size() > 0) {
noSuffix = CommonConstant.NOT_SUFFIX;
}
- suffixs = (List) suffixs.stream().filter(s -> {
+ suffixs = suffixs.stream().filter(s -> {
return !CommonConstant.NOT_SUFFIX.equals(s);
}).collect(Collectors.toList());
}
@@ -261,16 +87,25 @@
if (Func.isNotEmpty(searchVO.getEndTime())) {
endTime = DateUtil.formatDate(searchVO.getEndTime()) + " 23:59:59";
}
- Map<Long, User> userMap = (Map) this.userService.list().stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, User> userMap = this.userService.list().stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, Function.identity()));
- Map<Long, Workstation> workstationMap = (Map) this.workstationService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE)).stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, Workstation> workstationMap = this.workstationService.list(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getStatus, CommonConstant.ENABLE)).stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, Function.identity()));
List<String> finalSuffixs = suffixs;
String finalNoSuffix = noSuffix;
+
+ IPage<DncArchiveDirectoryFile> page = page(Condition.getPage(query), Wrappers.<DncArchiveDirectoryFile>lambdaQuery()
+ .eq(DncArchiveDirectoryFile::getArchiveDirectoryId, searchVO.getArId())
+ .eq(DncArchiveDirectoryFile::getIsCurrent, DncEnums.CurrentVersion.YES.getCode())
+ .and(result, i -> i.in(DncArchiveDirectoryFile::getSuffix, finalSuffixs).or().eq(Func.isNotBlank(finalNoSuffix), DncArchiveDirectoryFile::getSuffix, ""))
+ .eq(Func.isNotEmpty(searchVO.getWorkstationId()), DncArchiveDirectoryFile::getWorkstationId, searchVO.getWorkstationId())
+ .ge(Func.isNotEmpty(searchVO.getStartTime()), DncArchiveDirectoryFile::getCreateTime, searchVO.getStartTime())
+ .le(Func.isNotBlank(endTime), DncArchiveDirectoryFile::getCreateTime, endTime)
+ .and(Func.isNotEmpty(searchVO.getKeywords()), i -> i.likeRight(DncArchiveDirectoryFile::getFilename, searchVO.getKeywords()).or().likeRight(DncArchiveDirectoryFile::getSuffix, searchVO.getKeywords())));
+
+ /*
IPage<DncArchiveDirectoryFile> page = page(Condition.getPage(query), ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getArchiveDirectoryId();
}, searchVO.getArId())).eq((v0) -> {
@@ -294,6 +129,7 @@
return v0.getSuffix();
}, searchVO.getKeywords());
}));
+ */
IPage<DncArchiveDirectoryFileVO> convert = DncArchiveDirectoryFileConvert.INSTANCE.convert(page);
convert.getRecords().forEach(s2 -> {
User userCr = (User) userMap.get(s2.getCreateUser());
@@ -304,7 +140,7 @@
s2.setWorkstationName(workstation != null ? workstation.getName() : "");
s2.setVersionDesc((Func.isNotBlank(s2.getVersion()) ? s2.getVersion() : CommonConstant.VERSION_NUM) + CommonConstant.FILE_SUFFIX);
});
- return (IPage) Optional.of(convert).orElse(new Page());
+ return Optional.of(convert).orElse(new Page<>());
}
@Override // org.springblade.modules.dnc.service.IDncArchiveDirectoryFileService
@@ -321,36 +157,42 @@
}
}
if (Func.isNotEmpty(fileAddVOList)) {
- List<DncArchiveDirectoryFileAddVO> workstationList = (List) fileAddVOList.stream().filter(s -> {
+ List<DncArchiveDirectoryFileAddVO> workstationList = fileAddVOList.stream().filter(s -> {
return DncEnums.FileOwnership.WORKSTATION.getCode().equals(s.getFileOwnership());
}).collect(Collectors.toList());
if (Func.isNotEmpty(workstationList)) {
- List<Long> workstationFileIds = (List) workstationList.stream().map((v0) -> {
+ List<Long> workstationFileIds = workstationList.stream().map((v0) -> {
return v0.getWorkstationFileId();
}).distinct().collect(Collectors.toList());
fileList.addAll(addFile(Long.valueOf(Long.parseLong(archiveDirectoryId)), workstationList));
if (Func.isNotEmpty(workstationFileIds)) {
+ this.transferDirectoryFileService.update(Wrappers.<TransferDirectoryFile>lambdaUpdate()
+ .set(TransferDirectoryFile::getWhetherArchive, DncEnums.WhetherArchive.not_Archive.getCode())
+ .in(TransferDirectoryFile::getId, workstationFileIds));
+ /*
this.transferDirectoryFileService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getWhetherArchive();
}, DncEnums.WhetherArchive.not_Archive.getCode())).in((v0) -> {
return v0.getId();
- }, workstationFileIds));
+ }, workstationFileIds));*/
}
}
- List<DncArchiveDirectoryFileAddVO> factoryList = (List) fileAddVOList.stream().filter(s2 -> {
+ List<DncArchiveDirectoryFileAddVO> factoryList = fileAddVOList.stream().filter(s2 -> {
return DncEnums.FileOwnership.FACTORY.getCode().equals(s2.getFileOwnership());
}).collect(Collectors.toList());
if (Func.isNotEmpty(factoryList)) {
- List<Long> factoryIds = (List) factoryList.stream().map((v0) -> {
+ List<Long> factoryIds = factoryList.stream().map((v0) -> {
return v0.getWorkstationFileId();
}).distinct().collect(Collectors.toList());
fileList.addAll(addFile(Long.valueOf(Long.parseLong(archiveDirectoryId)), factoryList));
if (Func.isNotEmpty(factoryIds)) {
+ this.factoryFileService.update(Wrappers.<DncFactoryFile>lambdaUpdate().set(DncFactoryFile::getWhetherArchive, DncEnums.WhetherArchive.not_Archive.getCode()).in(DncFactoryFile::getId, factoryIds));
+ /*
this.factoryFileService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getWhetherArchive();
}, DncEnums.WhetherArchive.not_Archive.getCode())).in((v0) -> {
return v0.getId();
- }, factoryIds));
+ }, factoryIds));*/
}
}
}
@@ -362,7 +204,7 @@
}
private List<DncArchiveDirectoryFile> addFile(Long archiveDirectoryId, List<DncArchiveDirectoryFileAddVO> list) {
- return (List) list.stream().map(addVO -> {
+ return list.stream().map(addVO -> {
DncArchiveDirectoryFile addFile = new DncArchiveDirectoryFile();
Long workstationId = addVO.getWorkstationId();
String filename = addVO.getFilename();
@@ -387,6 +229,12 @@
@Override // org.springblade.modules.dnc.service.IDncArchiveDirectoryFileService
public DncArchiveDirectoryFile verifyFileName(String fileName, Long workstationId, Long archiveDirectoryId) {
+ return (DncArchiveDirectoryFile)getOne(Wrappers.<DncArchiveDirectoryFile>lambdaQuery()
+ .eq(DncArchiveDirectoryFile::getIsCurrent, DncEnums.CurrentVersion.YES.getCode())
+ .eq(DncArchiveDirectoryFile::getFilename, fileName)
+ .eq(DncArchiveDirectoryFile::getWorkstationId, workstationId)
+ .eq(DncArchiveDirectoryFile::getArchiveDirectoryId, archiveDirectoryId));
+ /*
return (DncArchiveDirectoryFile) getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getIsCurrent();
}, DncEnums.CurrentVersion.YES.getCode())).eq((v0) -> {
@@ -395,7 +243,7 @@
return v0.getWorkstationId();
}, workstationId)).eq((v0) -> {
return v0.getArchiveDirectoryId();
- }, archiveDirectoryId));
+ }, archiveDirectoryId));*/
}
@Override // org.springblade.modules.dnc.service.IDncArchiveDirectoryFileService
--
Gitblit v1.9.3