From 7d18c733d4c4109f2bc8e5b176cfde74c490a207 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 三月 2024 10:30:48 +0800
Subject: [PATCH] cps ok
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java | 201 ++++++++++++-------------------------------------
1 files changed, 50 insertions(+), 151 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java
index 412fa2d..eeb72a9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java
@@ -26,6 +26,8 @@
import com.qianwen.smartman.modules.dnc.entity.TransferDirectory;
import com.qianwen.smartman.modules.dnc.service.IDncWsRelationTdService;
import com.qianwen.smartman.modules.dnc.service.ITransferDirectoryService;
+import com.qianwen.smartman.modules.trace.entity.TraceFlowSettings;
+import com.qianwen.smartman.modules.trace.entity.TraceRelatedWorkstation;
import com.qianwen.smartman.modules.trace.service.ITraceFlowSettingsService;
import com.qianwen.smartman.modules.trace.service.ITraceRelatedWorkstationService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +35,6 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.class */
public class WorkstationWorkbenchServiceImpl extends BaseServiceImpl<WorkstationWorkbenchMapper, WorkstationWorkbench> implements IWorkstationWorkbenchService {
@Autowired
@Lazy
@@ -49,156 +50,18 @@
private final Integer SORT = 1;
private final Integer DEFAULT = 1;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -871043410:
- if (implMethodName.equals("getTraceFlowSettingId")) {
- 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 -75145708:
- if (implMethodName.equals("getSort")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- 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/cps/entity/WorkstationWorkbench") && 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/cps/entity/WorkstationWorkbench") && 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/cps/entity/WorkstationWorkbench") && 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/cps/entity/WorkstationWorkbench") && 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/cps/entity/WorkstationWorkbench") && 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/cps/entity/WorkstationWorkbench") && 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/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSort();
- };
- }
- 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/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSort();
- };
- }
- 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/WorkstationWorkbench") && 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/cps/entity/WorkstationWorkbench") && 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/cps/entity/WorkstationWorkbench") && 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/cps/entity/WorkstationWorkbench") && 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/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/trace/entity/TraceRelatedWorkstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTraceFlowSettingId();
- };
- }
- 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/trace/entity/TraceFlowSettings") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationGroupId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
@Override // org.springblade.modules.cps.service.IWorkstationWorkbenchService
public Boolean saveWorkstationWorkbench(WorkstationWorkbenchVO vo) {
+ WorkstationWorkbench workbench = (WorkstationWorkbench)getOne(Wrappers.<WorkstationWorkbench>query().lambda()
+ .eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId())
+ .eq(WorkstationWorkbench::getName, vo.getName()));
+ /*
WorkstationWorkbench workbench = (WorkstationWorkbench) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getWorkstationId();
}, vo.getWorkstationId())).eq((v0) -> {
return v0.getName();
- }, vo.getName()));
+ }, vo.getName()));*/
if (Func.isNull(workbench)) {
WorkstationWorkbench workstationWorkbench = WorkstationWorkbenchConvert.INSTANCE.convert(vo);
workstationWorkbench.setId(vo.getId());
@@ -212,11 +75,16 @@
public MachineInformationVO listWorkstationWorkbench(Long workstationId) {
TransferDirectory transferDirectory;
MachineInformationVO machineInformationVO = new MachineInformationVO();
+
+ List<WorkstationWorkbench> workbenchList = list(Wrappers.<WorkstationWorkbench>query().lambda()
+ .eq(WorkstationWorkbench::getWorkstationId, workstationId)
+ .orderByAsc(WorkstationWorkbench::getSort));
+ /*
List<WorkstationWorkbench> workbenchList = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getWorkstationId();
}, workstationId)).orderByAsc((v0) -> {
return v0.getSort();
- }));
+ }));*/
WorkstationVO workstationVO = this.workstationService.getDetail(workstationId);
if (Func.isEmpty(workstationVO)) {
return machineInformationVO;
@@ -243,23 +111,36 @@
if (vo.getWorkbenchDefault().equals(this.DEFAULT)) {
throw new ServiceException(MessageUtils.message("work.station.default.work.bench.not.delete", new Object[0]));
}
+ List<WorkstationWorkbench> list = list(Wrappers.<WorkstationWorkbench>query().lambda()
+ .eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId()));
+ /*
List<WorkstationWorkbench> list = list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getWorkstationId();
- }, vo.getWorkstationId()));
+ }, vo.getWorkstationId()));*/
if (list.size() <= 1) {
throw new ServiceException(MessageUtils.message("work.station.work.bench.is.only.so.not.delete", new Object[0]));
}
+
+ boolean remove = remove(Wrappers.<WorkstationWorkbench>update().lambda()
+ .eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId())
+ .eq(WorkstationWorkbench::getName, vo.getName()));
+ /*
boolean remove = remove((Wrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().eq((v0) -> {
return v0.getWorkstationId();
}, vo.getWorkstationId())).eq((v0) -> {
return v0.getName();
- }, vo.getName()));
+ }, vo.getName()));*/
+
if (remove) {
+ List<WorkstationWorkbench> workbenchList = list(Wrappers.<WorkstationWorkbench>query().lambda()
+ .eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId())
+ .ge(WorkstationWorkbench::getSort, vo.getSort()));
+ /*
List<WorkstationWorkbench> workbenchList = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getWorkstationId();
}, vo.getWorkstationId())).ge((v0) -> {
return v0.getSort();
- }, vo.getSort()));
+ }, vo.getSort()));*/
if (Func.isNotEmpty(workbenchList)) {
workbenchList.forEach(workbench -> {
workbench.setSort(Integer.valueOf(workbench.getSort().intValue() - this.SORT.intValue()));
@@ -272,17 +153,26 @@
@Override // org.springblade.modules.cps.service.IWorkstationWorkbenchService
public Boolean updateWorkstationWorkbench(WorkstationWorkbenchVO vo) {
+ WorkstationWorkbench workbench = getOne(Wrappers.<WorkstationWorkbench>query().lambda()
+ .eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId())
+ .eq(WorkstationWorkbench::getName, vo.getName()));
+ /*
WorkstationWorkbench workbench = (WorkstationWorkbench) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getWorkstationId();
}, vo.getWorkstationId())).eq((v0) -> {
return v0.getName();
}, vo.getName()));
+ */
if (Func.isNull(workbench) || vo.getId().equals(workbench.getId())) {
+ return Boolean.valueOf(update(Wrappers.<WorkstationWorkbench>update().lambda()
+ .eq(WorkstationWorkbench::getId, vo.getId())
+ .set(WorkstationWorkbench::getName, vo.getName())));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().eq((v0) -> {
return v0.getId();
}, vo.getId())).set((v0) -> {
return v0.getName();
- }, vo.getName())));
+ }, vo.getName())));*/
}
throw new ServiceException(MessageUtils.message("work.station.work.bench.name.already.exist", new Object[0]));
}
@@ -293,21 +183,30 @@
if (Func.isEmpty(groupId)) {
return ((WorkstationWorkbenchMapper) this.baseMapper).listByGroupId(groupIds, keyWord);
}
+ List<Long> settingsIdList = this.traceFlowSettingsService.list(Wrappers.<TraceFlowSettings>lambdaQuery()
+ .eq(TraceFlowSettings::getWorkstationGroupId, groupId)
+ .ne(Func.isNotEmpty(settingsId), TraceFlowSettings::getId, settingsId))
+ .stream().map(TraceFlowSettings::getId).collect(Collectors.toList());
+ /*
List<Long> settingsIdList = (List) this.traceFlowSettingsService.list(((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationGroupId();
}, groupId)).ne(Func.isNotEmpty(settingsId), (v0) -> {
return v0.getId();
}, settingsId)).stream().map((v0) -> {
return v0.getId();
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
if (Func.isEmpty(settingsIdList)) {
return ((WorkstationWorkbenchMapper) this.baseMapper).listByGroupId(groupIds, keyWord);
}
+ List<Long> workstationIdList = this.traceRelatedWorkstationService.list(Wrappers.<TraceRelatedWorkstation>lambdaQuery()
+ .in(TraceRelatedWorkstation::getTraceFlowSettingId, settingsIdList))
+ .stream().map(TraceRelatedWorkstation::getWorkstationId).collect(Collectors.toList());
+ /*
List<Long> workstationIdList = (List) this.traceRelatedWorkstationService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getTraceFlowSettingId();
}, settingsIdList)).stream().map((v0) -> {
return v0.getWorkstationId();
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
return ((WorkstationWorkbenchMapper) this.baseMapper).listByGroupIdAndWorkstationNotIn(groupIds, keyWord, workstationIdList);
}
}
--
Gitblit v1.9.3