From 014ac34ff2baf657c3236f41fdbf11c9d7d414b4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 09 五月 2024 18:02:27 +0800
Subject: [PATCH] 大批注释改造
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/TransferDirectoryServiceImpl.java | 448 ++++++++++++++-----------------------------------------
1 files changed, 118 insertions(+), 330 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/TransferDirectoryServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/TransferDirectoryServiceImpl.java
index 5a183fb..9b71fb4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/TransferDirectoryServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/TransferDirectoryServiceImpl.java
@@ -1,12 +1,6 @@
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.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -14,13 +8,20 @@
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.utils.Lambda;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.secure.utils.AuthUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.dto.WorkstationDTO;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.entity.WorkstationOfMachine;
@@ -47,13 +48,8 @@
import com.qianwen.smartman.modules.dnc.vo.FtpTransferDirectoryVO;
import com.qianwen.smartman.modules.dnc.vo.TransferDirectorAddVO;
import com.qianwen.smartman.modules.dnc.vo.UpdateDirectoryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-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/TransferDirectoryServiceImpl.class */
public class TransferDirectoryServiceImpl extends BaseServiceImpl<TransferDirectoryMapper, TransferDirectory> implements ITransferDirectoryService {
@Autowired
private TransferDirectoryMapper transferDirectoryMapper;
@@ -76,262 +72,17 @@
@Lazy
private IWorkstationOfMachineService workstationOfMachineService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1453405940:
- if (implMethodName.equals("getMachineId")) {
- z = true;
- break;
- }
- break;
- case -1041904421:
- if (implMethodName.equals("getParentId")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case -307107987:
- if (implMethodName.equals("getWorkstationGroupId")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = true;
- break;
- }
- break;
- case -75127775:
- if (implMethodName.equals("getTdId")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 388778789:
- if (implMethodName.equals("getSpaceLocation")) {
- z = true;
- break;
- }
- break;
- case 771206363:
- if (implMethodName.equals("getTenantId")) {
- z = true;
- break;
- }
- break;
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- z = true;
- break;
- }
- break;
- case 1956478023:
- if (implMethodName.equals("getTransferDirectoryId")) {
- z = true;
- break;
- }
- break;
- case 2141320712:
- if (implMethodName.equals("getTransferDirectorId")) {
- 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/TransferDirectory") && 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/TransferDirectory") && 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/TransferDirectory") && 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/TransferDirectory") && 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/TransferDirectory") && 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/DncWsRelationTd") && 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/DncWsRelationTd") && 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/TransferDirectory") && 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/DncWsRelationTd") && 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/DncWsRelationTd") && 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/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/cps/entity/WorkstationOfMachine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getMachineId();
- };
- }
- 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/cps/entity/WorkstationOfMachine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getMachineId();
- };
- }
- 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/TransferDirectory") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- 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/TransferDirectory") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- 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/TransferDirectory") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- 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/DncFixedSpace") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTdId();
- };
- }
- 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/DncFixedSpace") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTdId();
- };
- }
- 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/modules/dnc/entity/DncWsRelationTd") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTransferDirectorId();
- };
- }
- 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/DncWsRelationTd") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTransferDirectorId();
- };
- }
- 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/DncFixedSpace") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSpaceLocation();
- };
- }
- 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/Long;")) {
- return (v0) -> {
- return v0.getTransferDirectoryId();
- };
- }
- 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/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/modules/dnc/entity/TransferDirectoryGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationGroupId();
- };
- }
- 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/TransferDirectoryGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationGroupId();
- };
- }
- 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/TransferDirectoryGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- 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/TransferDirectoryGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Long saveWorkstationDirectory(WorkstationDirectoryDto workstationDirectoryDto) {
TransferDirectory transferDirectory = new TransferDirectory();
TransferDirectoryGroup group = getDirectoryGroup(workstationDirectoryDto.getWorkstationId(), workstationDirectoryDto.getWorkstationParentId());
transferDirectory.setGroupAllPath(group.getAllPath());
transferDirectory.setGroupId(group.getId());
- TransferDirectory directory = (TransferDirectory) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getWorkstationId();
- }, workstationDirectoryDto.getWorkstationId()));
+ TransferDirectory directory = getOne(Wrappers.<TransferDirectory>lambdaQuery()
+ .eq(TransferDirectory::getWorkstationId, workstationDirectoryDto.getWorkstationId()));
+
transferDirectory.setDeptId(workstationDirectoryDto.getDeptId());
transferDirectory.setTenantId("000000");
transferDirectory.setName(workstationDirectoryDto.getWorkstationName());
@@ -346,16 +97,20 @@
return transferDirectory.getId();
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
public Boolean updateWorkstationDirectory(WorkstationDirectoryDto workstationDirectoryDto) {
boolean result = false;
+ TransferDirectoryGroup transferDirectoryGroup = this.groupService.getOne(Wrappers.<TransferDirectoryGroup>lambdaQuery().eq(TransferDirectoryGroup::getWorkstationGroupId, workstationDirectoryDto.getWorkstationParentId()));
+ /*
TransferDirectoryGroup transferDirectoryGroup = (TransferDirectoryGroup) this.groupService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationGroupId();
- }, workstationDirectoryDto.getWorkstationParentId()));
+ }, workstationDirectoryDto.getWorkstationParentId()));*/
if (transferDirectoryGroup != null) {
+ TransferDirectory transferDirectory = getOne(Wrappers.<TransferDirectory>lambdaQuery().eq(TransferDirectory::getWorkstationId, workstationDirectoryDto.getWorkstationId()));
+ /*
TransferDirectory transferDirectory = (TransferDirectory) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationId();
- }, workstationDirectoryDto.getWorkstationId()));
+ }, workstationDirectoryDto.getWorkstationId()));*/
if (Func.isNotEmpty(transferDirectory)) {
transferDirectory.setGroupId(transferDirectoryGroup.getId());
transferDirectory.setGroupAllPath(transferDirectoryGroup.getAllPath());
@@ -365,21 +120,25 @@
return Boolean.valueOf(result);
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
public Boolean deleteWorkstationDirectory(Long workstationDirectoryId) {
boolean result = false;
+ TransferDirectory transferDirectory = getOne(Wrappers.<TransferDirectory>lambdaQuery().eq(TransferDirectory::getWorkstationId, workstationDirectoryId));
+ /*
TransferDirectory transferDirectory = (TransferDirectory) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationId();
- }, workstationDirectoryId));
+ }, workstationDirectoryId));*/
if (transferDirectory != null) {
+ List<TransferDirectoryFile> list = this.transferDirectoryFileService.list(Wrappers.<TransferDirectoryFile>lambdaQuery().eq(TransferDirectoryFile::getTransferDirectoryId, transferDirectory.getId()));
+ /*
List<TransferDirectoryFile> list = this.transferDirectoryFileService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getTransferDirectoryId();
- }, transferDirectory.getId()));
+ }, transferDirectory.getId()));*/
if (Func.isNotEmpty(list)) {
list.forEach(transferDirectoryFile -> {
this.transferDirectoryFileService.saveOperationLog(transferDirectoryFile, DncEnums.LogOperationType.DELETE.getCode());
});
- this.transferDirectoryFileService.removeByIds((Collection) list.stream().map((v0) -> {
+ this.transferDirectoryFileService.removeByIds(list.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList()));
}
@@ -388,78 +147,86 @@
return Boolean.valueOf(result);
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
public TransferDirectory findByWorkStationId(Long workstationId) {
+ return getOne(Wrappers.<TransferDirectory>lambdaQuery().eq(TransferDirectory::getWorkstationId, workstationId));
+ /*
return (TransferDirectory) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationId();
- }, workstationId));
+ }, workstationId));*/
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
public TransferDirectory findByNameAndWorkStationId(Long workstationId, String directoryName) {
+ return getOne(Wrappers.<TransferDirectory>lambdaQuery()
+ .eq(TransferDirectory::getName, directoryName)
+ .eq(TransferDirectory::getWorkstationId, workstationId));
+ /*
return (TransferDirectory) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getName();
}, directoryName)).eq((v0) -> {
return v0.getWorkstationId();
- }, workstationId));
+ }, workstationId));*/
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
public List<FtpTransferDirectoryVO> getFtpList() {
List<TransferDirectory> list = list();
if (Func.isNotEmpty(list)) {
- return (List) list.stream().map(s -> {
+ return list.stream().map(s -> {
FtpTransferDirectoryVO ftp = new FtpTransferDirectoryVO();
ftp.setId(s.getId());
ftp.setName(s.getName());
return ftp;
}).collect(Collectors.toList());
}
- return new ArrayList();
+ return new ArrayList<>();
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
public List<FtpDirectoryRelationWorkstationVO> getFtpListRelationWorkstation(FtpDirectorySearchVO ftpDirectorySearchVO) {
String name = ftpDirectorySearchVO.getName();
List<String> workstationIds = ftpDirectorySearchVO.getWorkstationIds();
- Map<Long, Workstation> workstationMap = (Map) this.workstationService.list().stream().collect(Collectors.toMap((v0) -> {
- return v0.getId();
- }, Function.identity()));
+ Map<Long, Workstation> workstationMap = this.workstationService.list().stream().collect(Collectors.toMap(Workstation::getId, Function.identity()));
+
Map<Long, List<DncWsRelationTd>> wsListMap = null;
List<Long> tranIds = null;
- List<DncWsRelationTd> list = this.wsRelationTdService.list(Wrappers.lambdaQuery().in(Func.isNotEmpty(workstationIds), (v0) -> {
- return v0.getWorkstationId();
- }, workstationIds));
+ List<DncWsRelationTd> list = this.wsRelationTdService.list(Wrappers.<DncWsRelationTd>lambdaQuery().in(Func.isNotEmpty(workstationIds), DncWsRelationTd::getWorkstationId, workstationIds));
if (Func.isNotEmpty(list)) {
- wsListMap = (Map) list.stream().collect(Collectors.groupingBy((v0) -> {
+ wsListMap = list.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getTransferDirectorId();
}));
if (Func.isNotEmpty(workstationIds)) {
- tranIds = (List) list.stream().map((v0) -> {
+ tranIds = list.stream().map((v0) -> {
return v0.getTransferDirectorId();
}).distinct().collect(Collectors.toList());
}
}
if (Func.isNotEmpty(workstationIds) && Func.isEmpty(list)) {
- return new ArrayList();
+ return new ArrayList<>();
}
+
+ List<TransferDirectory> directoryList = list(Wrappers.<TransferDirectory>lambdaQuery()
+ .in(Func.isNotEmpty(tranIds), TransferDirectory::getId, tranIds)
+ .likeRight(Func.isNotBlank(name), TransferDirectory::getName, name).orderByDesc(TransferDirectory::getCreateTime));
+ /*
List<TransferDirectory> directoryList = list((Wrapper) Wrappers.lambdaQuery().in(Func.isNotEmpty(tranIds), (v0) -> {
return v0.getId();
}, tranIds).likeRight(Func.isNotBlank(name), (v0) -> {
return v0.getName();
}, name).orderByDesc((v0) -> {
return v0.getCreateTime();
- }));
+ }));*/
if (Func.isNotEmpty(directoryList)) {
Map<Long, List<DncWsRelationTd>> finalWsListMap = wsListMap;
- return (List) directoryList.stream().map(s -> {
+ return directoryList.stream().map(s -> {
Long directoryId = s.getId();
FtpDirectoryRelationWorkstationVO ftpDir = new FtpDirectoryRelationWorkstationVO();
ftpDir.setId(directoryId);
ftpDir.setName(s.getName());
if (finalWsListMap != null) {
List<WorkstationDTO> workstations = new LinkedList<>();
- List<DncWsRelationTd> dncWsRelationTdList = (List) finalWsListMap.get(directoryId);
+ List<DncWsRelationTd> dncWsRelationTdList = finalWsListMap.get(directoryId);
if (Func.isNotEmpty(dncWsRelationTdList)) {
dncWsRelationTdList.forEach(a -> {
Long workstationId = a.getWorkstationId();
@@ -480,16 +247,19 @@
return ftpDir;
}).collect(Collectors.toList());
}
- return new ArrayList();
+ return new ArrayList<>();
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean saveTransferDirectory(TransferDirectorAddVO transferDirectorAddVO) {
String name = transferDirectorAddVO.getName();
+ /*
TransferDirectory existSameDirectory = (TransferDirectory) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getName();
- }, name));
+ }, name));*/
+ TransferDirectory existSameDirectory = getOne(Wrappers.<TransferDirectory>lambdaQuery().eq(TransferDirectory::getName, name));
+
if (existSameDirectory != null) {
throw new ServiceException(MessageUtils.message("dnc.workstation.directory.create.same.name.exists", new Object[0]));
}
@@ -511,23 +281,27 @@
return Boolean.valueOf(save);
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
public Boolean deleteDirectory(String directoryId) {
long id = Func.toLong(directoryId);
+ List<DncFixedSpace> list = this.dncFixedSpaceService.list(Wrappers.<DncFixedSpace>lambdaQuery().eq(DncFixedSpace::getTdId, Long.valueOf(id)));
+ /*
List<DncFixedSpace> list = this.dncFixedSpaceService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getTdId();
- }, Long.valueOf(id)));
+ }, Long.valueOf(id)));*/
if (Func.isNotEmpty(list)) {
- List<Long> ids = (List) list.stream().map((v0) -> {
+ List<Long> ids = list.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
this.dncFixedSpaceService.removeByIds(ids);
}
+ List<DncWsRelationTd> dncWsRelationTdList = this.wsRelationTdService.list(Wrappers.<DncWsRelationTd>lambdaQuery().eq(DncWsRelationTd::getTransferDirectorId, Long.valueOf(id)));
+ /*
List<DncWsRelationTd> dncWsRelationTdList = this.wsRelationTdService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getTransferDirectorId();
- }, Long.valueOf(id)));
+ }, Long.valueOf(id)));*/
if (Func.isNotEmpty(dncWsRelationTdList)) {
- List<Long> ids2 = (List) dncWsRelationTdList.stream().map((v0) -> {
+ List<Long> ids2 = dncWsRelationTdList.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
this.wsRelationTdService.removeByIds(ids2);
@@ -535,33 +309,38 @@
return Boolean.valueOf(removeById(Long.valueOf(id)));
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean updateDirectory(UpdateDirectoryVO updateDirectoryVO) {
- DncFixedSpace one;
+ //DncFixedSpace one;
String directorId = updateDirectoryVO.getDirectorId();
String directorName = updateDirectoryVO.getDirectorName();
List<String> oldWorkstationIds = updateDirectoryVO.getOldWorkstationIds();
List<String> newWorkstationIds = updateDirectoryVO.getNewWorkstationIds();
boolean result = false;
+ TransferDirectory transferDirectory = getOne(Wrappers.<TransferDirectory>lambdaQuery().eq(TransferDirectory::getId, directorId));
+ /*
TransferDirectory transferDirectory = (TransferDirectory) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getId();
- }, directorId));
+ }, directorId));*/
if (transferDirectory != null) {
if (!directorName.equals(transferDirectory.getName())) {
transferDirectory.setName(directorName);
updateById(transferDirectory);
}
if (Func.isNotEmpty(oldWorkstationIds)) {
- List<String> delWorkstationIds = (List) oldWorkstationIds.stream().filter(item -> {
+ List<String> delWorkstationIds = oldWorkstationIds.stream().filter(item -> {
return !newWorkstationIds.contains(item);
}).collect(Collectors.toList());
if (Func.isNotEmpty(delWorkstationIds)) {
+ List<DncWsRelationTd> list = this.wsRelationTdService.list(Wrappers.<DncWsRelationTd>lambdaQuery()
+ .eq(DncWsRelationTd::getTransferDirectorId, transferDirectory.getId()).in(DncWsRelationTd::getWorkstationId, delWorkstationIds));
+ /*
List<DncWsRelationTd> list = this.wsRelationTdService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getTransferDirectorId();
}, transferDirectory.getId())).in((v0) -> {
return v0.getWorkstationId();
- }, delWorkstationIds));
+ }, delWorkstationIds));*/
if (Func.isNotEmpty(list)) {
result = this.wsRelationTdService.removeBatchByIds(list);
}
@@ -569,7 +348,7 @@
}
if (Func.isNotEmpty(newWorkstationIds)) {
List<DncWsRelationTd> wsRelationTds = new LinkedList<>();
- List<String> addWorkstationIds = (List) newWorkstationIds.stream().filter(item2 -> {
+ List<String> addWorkstationIds = newWorkstationIds.stream().filter(item2 -> {
return !oldWorkstationIds.contains(item2);
}).collect(Collectors.toList());
if (Func.isNotEmpty(addWorkstationIds)) {
@@ -596,6 +375,14 @@
result = Boolean.TRUE.booleanValue();
}
}
+ if (Func.isNotBlank(directorName)) {
+ DncFixedSpace one = this.dncFixedSpaceService.getOne(Wrappers.<DncFixedSpace>lambdaQuery().eq(DncFixedSpace::getTdId, directorId).eq(DncFixedSpace::getSpaceLocation, 1));
+ if (one != null && !directorName.equals(one.getName())) {
+ one.setName(directorName);
+ result = this.dncFixedSpaceService.updateById(one);
+ }
+ }
+ /*
if (Func.isNotBlank(directorName) && (one = (DncFixedSpace) this.dncFixedSpaceService.getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getTdId();
}, directorId)).eq((v0) -> {
@@ -603,20 +390,22 @@
}, 1))) != null && !directorName.equals(one.getName())) {
one.setName(directorName);
result = this.dncFixedSpaceService.updateById(one);
- }
+ }*/
}
return Boolean.valueOf(result);
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
public TransferDirectoryGroup getDirectoryGroup(Long workstationId, Long workstationGroupId) {
WorkstationVO workstationVO = this.workstationService.getDetail(workstationId);
+ TransferDirectoryGroup group = this.groupService.getOne(Wrappers.<TransferDirectoryGroup>lambdaQuery().eq(TransferDirectoryGroup::getWorkstationGroupId, workstationGroupId));
+ /*
TransferDirectoryGroup group = (TransferDirectoryGroup) this.groupService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationGroupId();
- }, workstationGroupId));
+ }, workstationGroupId));*/
if (group == null) {
List<TransferDirectoryGroup> groupList = this.groupService.list();
- List<Long> workstationGroupIds = (List) groupList.stream().map((v0) -> {
+ List<Long> workstationGroupIds = groupList.stream().map((v0) -> {
return v0.getWorkstationGroupId();
}).collect(Collectors.toList());
if (!workstationGroupIds.contains(workstationVO.getGroupId())) {
@@ -630,37 +419,38 @@
}
private void checkWorkstation(TransferDirectoryDto transferDirectoryDto) {
- Wrapper queryWrapper = new QueryWrapper();
- queryWrapper.lambda().eq((v0) -> {
- return v0.getWorkstationId();
- }, transferDirectoryDto.getWorkstationId());
+ QueryWrapper<TransferDirectory> queryWrapper = new QueryWrapper<>();
+ queryWrapper.lambda().eq(TransferDirectory::getWorkstationId, transferDirectoryDto.getWorkstationId());
+
Optional.ofNullable(this.transferDirectoryMapper.selectOne(queryWrapper)).ifPresent(po -> {
if (!po.getWorkstationId().equals(transferDirectoryDto.getWorkstationId())) {
throw new ServiceException(MessageUtils.message("workstation.directory.name.already.exists", new Object[0]));
}
});
+ List<TransferDirectoryGroup> transferDirectoryGroups = this.groupService.list(Wrappers.<TransferDirectoryGroup>lambdaQuery()
+ .eq(Func.isNotEmpty(transferDirectoryDto.getGroupId()), TransferDirectoryGroup::getParentId, transferDirectoryDto.getGroupId())
+ .eq(TransferDirectoryGroup::getTenantId, AuthUtil.getTenantId()));
+ /*
List<TransferDirectoryGroup> transferDirectoryGroups = this.groupService.list((Wrapper) Wrappers.lambdaQuery().eq(Func.isNotEmpty(transferDirectoryDto.getGroupId()), (v0) -> {
return v0.getParentId();
}, transferDirectoryDto.getGroupId()).eq((v0) -> {
return v0.getTenantId();
- }, AuthUtil.getTenantId()));
+ }, AuthUtil.getTenantId()));*/
if (Func.isNotEmpty(transferDirectoryGroups)) {
throw new ServiceException(MessageUtils.message("workstation.directory.name.already.exists", new Object[0]));
}
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
public List<FtpTransferDirectoryVO> getMachineOfWorkstationForFtp(Long id) {
- List<WorkstationOfMachine> list = this.workstationOfMachineService.list(Lambda.eq((v0) -> {
- return v0.getMachineId();
- }, id));
+ List<WorkstationOfMachine> list = this.workstationOfMachineService.list(Lambda.eq(WorkstationOfMachine::getMachineId, id));
if (Func.isEmpty(list)) {
return getFtpList();
}
- List<Long> workStationIdList = (List) list.stream().map((v0) -> {
+ List<Long> workStationIdList = list.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
- List<Long> transferDirectorList = (List) this.wsRelationTdService.list(Lambda.in((v0) -> {
+ List<Long> transferDirectorList = this.wsRelationTdService.list(Lambda.in((v0) -> {
return v0.getWorkstationId();
}, workStationIdList)).stream().map((v0) -> {
return v0.getTransferDirectorId();
@@ -681,23 +471,21 @@
return ftpTransferDirectoryVOList;
}
- @Override // org.springblade.modules.dnc.service.ITransferDirectoryService
+ @Override
public Boolean judgeAndSaveWorkStationFtp(String machineId, Long workStationId, String directoryId) {
- List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list(Lambda.eq((v0) -> {
- return v0.getMachineId();
- }, machineId));
- List<Long> workstationIdList = (List) workstationOfMachineList.stream().map((v0) -> {
+ List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list(Lambda.eq(WorkstationOfMachine::getMachineId, machineId));
+ List<Long> workstationIdList = workstationOfMachineList.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
if (Func.isEmpty(workstationOfMachineList)) {
return true;
}
- List<Long> workstationIdFilterList = (List) workstationOfMachineList.stream().map((v0) -> {
+ List<Long> workstationIdFilterList = workstationOfMachineList.stream().map((v0) -> {
return v0.getWorkstationId();
}).filter(item -> {
return !Objects.equals(item, workStationId);
}).collect(Collectors.toList());
- List<Long> ftpWorkStationIdList = (List) this.wsRelationTdService.list(Lambda.in((v0) -> {
+ List<Long> ftpWorkStationIdList = this.wsRelationTdService.list(Lambda.in((v0) -> {
return v0.getWorkstationId();
}, workstationIdList)).stream().map((v0) -> {
return v0.getWorkstationId();
@@ -707,8 +495,8 @@
UpdateDirectoryVO updateDirectoryVO = new UpdateDirectoryVO();
updateDirectoryVO.setDirectorId(directoryId);
updateDirectoryVO.setDirectorName(transferDirectory.getName());
- updateDirectoryVO.setOldWorkstationIds(new ArrayList());
- updateDirectoryVO.setNewWorkstationIds((List) workstationIdFilterList.stream().map((v0) -> {
+ updateDirectoryVO.setOldWorkstationIds(new ArrayList<>());
+ updateDirectoryVO.setNewWorkstationIds(workstationIdFilterList.stream().map((v0) -> {
return String.valueOf(v0);
}).collect(Collectors.toList()));
return updateDirectory(updateDirectoryVO);
@@ -721,10 +509,10 @@
UpdateDirectoryVO updateDirectoryVO2 = new UpdateDirectoryVO();
updateDirectoryVO2.setDirectorId(directoryId);
updateDirectoryVO2.setDirectorName(transferDirectory2.getName());
- updateDirectoryVO2.setOldWorkstationIds((List) ftpWorkStationIdList.stream().map((v0) -> {
+ updateDirectoryVO2.setOldWorkstationIds(ftpWorkStationIdList.stream().map((v0) -> {
return String.valueOf(v0);
}).collect(Collectors.toList()));
- updateDirectoryVO2.setNewWorkstationIds((List) workstationIdFilterList.stream().map((v0) -> {
+ updateDirectoryVO2.setNewWorkstationIds(workstationIdFilterList.stream().map((v0) -> {
return String.valueOf(v0);
}).collect(Collectors.toList()));
return updateDirectory(updateDirectoryVO2);
--
Gitblit v1.9.3