From ed4a5236bab800094be4a8378f5098eebe3de6ac Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 04 四月 2024 23:30:30 +0800
Subject: [PATCH] 清楚不不要的mapstruct文件
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsServiceImpl.java | 354 +++++++++++++++-------------------------------------------
1 files changed, 95 insertions(+), 259 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsServiceImpl.java
index 42b4bb0..1b5480d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsServiceImpl.java
@@ -30,6 +30,7 @@
import com.qianwen.smartman.modules.cps.entity.DmpVariables;
import com.qianwen.smartman.modules.cps.entity.WorkstationOfMachine;
import com.qianwen.smartman.modules.cps.entity.WorkstationWcs;
+import com.qianwen.smartman.modules.cps.entity.WorkstationWcsUsage;
import com.qianwen.smartman.modules.cps.mapper.WorkstationWcsMapper;
import com.qianwen.smartman.modules.cps.service.IDmpVariablesService;
import com.qianwen.smartman.modules.cps.service.IWorkstationOfMachineService;
@@ -48,7 +49,6 @@
import org.springframework.transaction.annotation.Transactional;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/WorkstationWcsServiceImpl.class */
public class WorkstationWcsServiceImpl extends BaseServiceImpl<WorkstationWcsMapper, WorkstationWcs> implements IWorkstationWcsService {
@Autowired
private IWorkstationOfMachineService workstationOfMachineService;
@@ -65,223 +65,19 @@
private IWorkstationWcsUsageService workstationWcsUsageService;
private static final String SUFFIX = "_____0";
- 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 -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case -428329133:
- if (implMethodName.equals("getDataItem")) {
- z = true;
- break;
- }
- break;
- case -427996294:
- if (implMethodName.equals("getDataType")) {
- z = true;
- break;
- }
- break;
- case 64117345:
- if (implMethodName.equals("getDmpVariablesId")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 1431273455:
- if (implMethodName.equals("getCollectSettingItem")) {
- 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/WorkstationWcs") && 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/WorkstationWcs") && 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/WorkstationWcs") && 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/WorkstationWcs") && 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/WorkstationWcs") && 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/WorkstationWcs") && 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/WorkstationOfMachine") && 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/WorkstationWcs") && 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/WorkstationWcs") && 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/WorkstationWcs") && 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/WorkstationWcs") && 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/WorkstationWcs") && 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/WorkstationWcs") && 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/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCollectSettingItem();
- };
- }
- 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/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCollectSettingItem();
- };
- }
- 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/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCollectSettingItem();
- };
- }
- 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/DmpVariables") && 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/cps/entity/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getDmpVariablesId();
- };
- }
- 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/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getDmpVariablesId();
- };
- }
- 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/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getDataType();
- };
- }
- 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/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getDataType();
- };
- }
- 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/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getDataType();
- };
- }
- 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/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getDataType();
- };
- }
- 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();
- };
- }
- 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/cps/entity/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getDataItem();
- };
- }
- 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/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getDataItem();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
@Transactional(rollbackFor = {Exception.class})
public List<WorkstationWcsVO> updateBatch(List<WorkstationWcsSaveVO> workstationWcsSaveVOList) {
List<WorkstationWcs> workstationWcsList = WorkstationWcsConvert.INSTANCE.convertVOToEntity(workstationWcsSaveVOList);
List<Long> workstationWcsIdList = new ArrayList<>();
List<WorkstationWcs> wcsList = new ArrayList<>();
for (WorkstationWcs workstationWcs : workstationWcsList) {
+ List<Long> ids = list(Wrappers.<WorkstationWcs>lambdaQuery()
+ .eq(Func.isNotEmpty(workstationWcs.getWorkstationId()), WorkstationWcs::getWorkstationId, workstationWcs.getWorkstationId())
+ .eq(WorkstationWcs::getCollectSettingItem, workstationWcs.getCollectSettingItem())
+ .eq(WorkstationWcs::getDataType, workstationWcs.getDataType())
+ .eq(WorkstationWcs::getDataItem, workstationWcs.getDataItem()))
+ .stream().map(WorkstationWcs::getId).collect(Collectors.toList());
+ /*
List<Long> ids = (List) list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq(Func.isNotEmpty(workstationWcs.getWorkstationId()), (v0) -> {
return v0.getWorkstationId();
}, workstationWcs.getWorkstationId()).eq((v0) -> {
@@ -292,7 +88,7 @@
return v0.getDataItem();
}, workstationWcs.getDataItem())).stream().map((v0) -> {
return v0.getId();
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
if (Func.isNotEmpty(ids)) {
workstationWcsIdList.addAll(ids);
} else {
@@ -302,11 +98,11 @@
MachineDmpVariablesVO machineDmpVariablesVO = this.dmpVariablesService.listByWorkstationId(workstationWcs.getWorkstationId());
List<DmpVariablesVO> dmpVariablesVOList = machineDmpVariablesVO.getDmpVariablesVOList();
if (Func.isNotEmpty(dmpVariablesVOList)) {
- List<String> nameList = (List) dmpVariablesVOList.stream().map((v0) -> {
+ List<String> nameList = dmpVariablesVOList.stream().map((v0) -> {
return v0.getName();
}).collect(Collectors.toList());
if (nameList.contains(workstationWcs.getCollectSettingItem())) {
- Map<String, Long> dmpNameToId = (Map) dmpVariablesVOList.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Long> dmpNameToId = dmpVariablesVOList.stream().collect(Collectors.toMap((v0) -> {
return v0.getName();
}, (v0) -> {
return v0.getId();
@@ -318,7 +114,7 @@
}
removeByIds(workstationWcsIdList);
saveBatch(wcsList);
- List<Long> workstationIds = (List) wcsList.stream().map((v0) -> {
+ List<Long> workstationIds = wcsList.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
if (Func.isNotEmpty(workstationIds)) {
@@ -334,30 +130,36 @@
@Transactional(rollbackFor = {Exception.class})
public List<WorkstationWcsVO> insert(List<WorkstationWcsSaveVO> workstationWcsSaveVOList) {
Long workstationId = workstationWcsSaveVOList.get(0).getWorkstationId();
- List<WorkstationWcsSaveVO> checkedVoList = (List) workstationWcsSaveVOList.stream().filter((v0) -> {
+ List<WorkstationWcsSaveVO> checkedVoList = workstationWcsSaveVOList.stream().filter((v0) -> {
return v0.checkedItem();
}).collect(Collectors.toList());
validWorkstationExistsWcs(checkedVoList);
List<DmpVariables> dmpVariablesList = validDmpName(workstationId, checkedVoList);
List<WorkstationWcs> saveWorkstationWcsList = WorkstationWcsConvert.INSTANCE.convertVOToEntity(checkedVoList);
this.dynamicCollectService.removeTableUpdateWcs(saveWorkstationWcsList);
+
+ this.dynamicCollectService.removeTableDeleteWcs(list(Lambda.eq(WorkstationWcs::getWorkstationId, workstationId)
+ .notIn(Func.isNotEmpty(saveWorkstationWcsList), WorkstationWcs::getCollectSettingItem, saveWorkstationWcsList
+ .stream().map(WorkstationWcs::getCollectSettingItem)
+ .collect(Collectors.toList()))));
+ /*
this.dynamicCollectService.removeTableDeleteWcs(list(Lambda.eq((v0) -> {
return v0.getWorkstationId();
}, workstationId).notIn(Func.isNotEmpty(saveWorkstationWcsList), (v0) -> {
return v0.getCollectSettingItem();
}, (Collection) saveWorkstationWcsList.stream().map((v0) -> {
return v0.getCollectSettingItem();
- }).collect(Collectors.toList()))));
+ }).collect(Collectors.toList()))));*/
deleteByWorkstationIdList(Collections.singletonList(workstationId));
for (WorkstationWcs workstationWcs : saveWorkstationWcsList) {
checkWorkstationWcs(workstationWcs);
setCrc(workstationWcs);
}
- List<WorkstationWcs> collect = (List) saveWorkstationWcsList.stream().filter(w -> {
+ List<WorkstationWcs> collect = saveWorkstationWcsList.stream().filter(w -> {
return Func.isNotEmpty(w.getDataItem());
}).collect(Collectors.toList());
saveOrUpdateBatch(collect);
- Map<Long, Integer> idToIdx = (Map) workstationWcsSaveVOList.stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, Integer> idToIdx = workstationWcsSaveVOList.stream().collect(Collectors.toMap((v0) -> {
return v0.getDmpVariablesId();
}, (v0) -> {
return v0.getSort();
@@ -366,7 +168,7 @@
dmpVariables.setIdx((Integer) idToIdx.get(dmpVariables.getId()));
});
this.dmpVariablesService.updateBatchById(dmpVariablesList);
- List<Long> workstationIds = (List) workstationWcsSaveVOList.stream().map((v0) -> {
+ List<Long> workstationIds = workstationWcsSaveVOList.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
WorkstationCache.clearDmpStatus(workstationIds);
@@ -378,7 +180,7 @@
}
private void validWorkstationExistsWcs(final List<WorkstationWcsSaveVO> workstationWcsSaveVOList) {
- boolean exist = ((Map) workstationWcsSaveVOList.stream().filter(it -> {
+ boolean exist = (workstationWcsSaveVOList.stream().filter(it -> {
return !it.getDataType().equals(WcsDataTypeEnums.WcsDataType.OTHER.getCode());
}).filter(it2 -> {
return it2.getUsageId() != null;
@@ -392,18 +194,18 @@
private List<DmpVariables> validDmpName(Long workstationId, List<WorkstationWcsSaveVO> workstationWcsSaveVOList) {
WorkstationOfMachine one = this.workstationOfMachineService.getWorkstationOfMachineByWorkstationId(workstationId);
- List<DmpVariables> dmpVariablesList = this.dmpVariablesService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineId();
- }, one.getMachineId()));
- Map<Long, String> dmpIdToName = (Map) dmpVariablesList.stream().collect(Collectors.toMap((v0) -> {
+
+ List<DmpVariables> dmpVariablesList = this.dmpVariablesService.list(Wrappers.<DmpVariables>lambdaQuery().eq(DmpVariables::getMachineId, one.getMachineId()));
+
+ Map<Long, String> dmpIdToName = dmpVariablesList.stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, (v0) -> {
return v0.getName();
}));
- List<String> collectItemList = (List) workstationWcsSaveVOList.stream().map(w -> {
+ List<String> collectItemList = workstationWcsSaveVOList.stream().map(w -> {
return (String) dmpIdToName.get(w.getDmpVariablesId());
}).collect(Collectors.toList());
- List<String> collectItemDistinctList = (List) collectItemList.stream().distinct().collect(Collectors.toList());
+ List<String> collectItemDistinctList = collectItemList.stream().distinct().collect(Collectors.toList());
Assert.isTrue(collectItemList.size() == collectItemDistinctList.size(), MessageUtils.message("workstationWcs.collectItem.already.exists", new Object[0]), new Object[0]);
return dmpVariablesList;
}
@@ -428,9 +230,7 @@
@Override // org.springblade.modules.cps.service.IWorkstationWcsService
public List<WorkstationWcsVO> listWcsSetting() {
- List<WorkstationWcs> list = list((Wrapper) Wrappers.lambdaQuery().isNull((v0) -> {
- return v0.getWorkstationId();
- }));
+ List<WorkstationWcs> list = list( Wrappers.<WorkstationWcs>lambdaQuery().isNull(WorkstationWcs::getWorkstationId));
List<WorkstationWcsVO> convert = WorkstationWcsConvert.INSTANCE.convert(list);
wrapperVO(convert);
return convert;
@@ -448,7 +248,14 @@
}
public void checkSetting(WorkstationWcs workstationWcs) {
- Long count = Long.valueOf(count((Wrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(workstationWcs.getId()), (v0) -> {
+ Long count = Long.valueOf(count(Wrappers.<WorkstationWcs>lambdaQuery()
+ .ne(Func.isNotEmpty(workstationWcs.getId()), WorkstationWcs::getId, workstationWcs.getId())
+ .eq(Func.isNotEmpty(workstationWcs.getWorkstationId()), WorkstationWcs::getWorkstationId, workstationWcs.getWorkstationId())
+ .isNull(Func.isEmpty(workstationWcs.getWorkstationId()), WorkstationWcs::getWorkstationId)
+ .eq(WorkstationWcs::getCollectSettingItem, workstationWcs.getCollectSettingItem())));
+
+ /*
+ Long count = Long.valueOf(count( Wrappers.lambdaQuery().ne(Func.isNotEmpty(workstationWcs.getId()), (v0) -> {
return v0.getId();
}, workstationWcs.getId()).eq(Func.isNotEmpty(workstationWcs.getWorkstationId()), (v0) -> {
return v0.getWorkstationId();
@@ -456,7 +263,7 @@
return v0.getWorkstationId();
}).eq((v0) -> {
return v0.getCollectSettingItem();
- }, workstationWcs.getCollectSettingItem())));
+ }, workstationWcs.getCollectSettingItem())));*/
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("workstationWcs.collectItem.already.exists", new Object[0]));
}
@@ -464,9 +271,11 @@
@Override // org.springblade.modules.cps.service.IWorkstationWcsService
public Boolean deleteByWorkstationIdList(List<Long> workstationIdList) {
+ remove(Wrappers.<WorkstationWcs>lambdaQuery().in(WorkstationWcs::getWorkstationId, workstationIdList));
+ /*
remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getWorkstationId();
- }, workstationIdList));
+ }, workstationIdList));*/
clearWorkstationParamTypeCacheByWorkstationId(workstationIdList);
return true;
}
@@ -479,6 +288,21 @@
}
private void wrapperVO(final List<WorkstationWcsVO> workstationWcsVOList) {
+ workstationWcsVOList
+ .forEach(it -> {
+ it.setDataTypeDesc(WcsDataTypeEnums.WcsDataType.getNameByCode(it.getDataType()));
+
+ //WorkstationWcsUsage usage = workstationWcsUsageService.getById(it.getUsageId());
+ //it.setUsageName(usage.getUsageName());
+ Optional.<Long>ofNullable(it.getUsageId()).map(usageId -> {
+ WorkstationWcsUsage usage = workstationWcsUsageService.getById(usageId);
+ return usage;
+ }).ifPresent(usage2 -> {
+ it.setUsageName(usage2.getUsageName());
+ });
+ //Optional.<Long>ofNullable(it.getUsageId()).map(this.workstationWcsUsageService::getById).ifPresent(());
+ });
+ /*
workstationWcsVOList.forEach(it -> {
it.setDataTypeDesc(WcsDataTypeEnums.WcsDataType.getNameByCode(it.getDataType()));
Optional ofNullable = Optional.ofNullable(it.getUsageId());
@@ -489,14 +313,14 @@
}).ifPresent(usage -> {
it.setUsageName(usage.getUsageName());
});
- });
+ });*/
}
@Override // org.springblade.modules.cps.service.IWorkstationWcsService
public Boolean delete(List<Long> workstationWcsIdList) {
List<WorkstationWcs> workstationWcs = listByIds(workstationWcsIdList);
removeByIds(workstationWcsIdList);
- List<Long> workstationIds = (List) workstationWcs.stream().map((v0) -> {
+ List<Long> workstationIds = workstationWcs.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
workstationIds.forEach(id -> {
@@ -508,10 +332,13 @@
@Override // org.springblade.modules.cps.service.IWorkstationWcsService
public void clearWorkstationParamTypeCacheByWorkstationId(List<Long> workstationIdList) {
+ List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list(Wrappers.<WorkstationOfMachine>lambdaQuery()
+ .in(WorkstationOfMachine::getWorkstationId, workstationIdList));
+ /*
List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getWorkstationId();
- }, workstationIdList));
- List<Long> machineIdList = (List) workstationOfMachineList.stream().map((v0) -> {
+ }, workstationIdList));*/
+ List<Long> machineIdList = workstationOfMachineList.stream().map((v0) -> {
return v0.getMachineId();
}).collect(Collectors.toList());
for (Long id : machineIdList) {
@@ -525,7 +352,7 @@
List<WorkstationWcsSaveVO> workstationWcsSaveVOList = new ArrayList<>();
workstationIdList.forEach(workstationId -> {
List<WorkstationWcsVO> workstationWcsVOList = listWorkstationWcsByWorkstationId(workstationId);
- Map<String, Long> wcsCollectItemToId = (Map) workstationWcsVOList.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Long> wcsCollectItemToId = workstationWcsVOList.stream().collect(Collectors.toMap((v0) -> {
return v0.getCollectItemDesc();
}, (v0) -> {
return v0.getId();
@@ -539,6 +366,18 @@
});
List<WorkstationWcs> workstationWcsList = WorkstationWcsConvert.INSTANCE.convertVOToEntity(workstationWcsSaveVOList);
workstationWcsList.forEach(this::setCrc);
+
+ Stream<WorkstationWcsSaveVO> stream = workstationWcsSaveVOList.stream();
+ Stream<WorkstationWcsSaveVO> stream2 = list(Lambda.in(WorkstationWcs::getWorkstationId, workstationIdList)
+ .notIn(WorkstationWcs::getId,workstationWcsList
+ .stream().map(WorkstationWcs::getId).collect(Collectors.toList()))
+ .ne(WorkstationWcs::getDataType, WcsDataTypeEnums.WcsDataType.OTHER.getCode()))
+ .stream().map(WorkstationWcsConvert.INSTANCE::convert);
+
+ //Stream.concat(stream, stream2);
+ validWorkstationExistsWcs(Stream.concat(stream, stream2).collect(Collectors.toList()));
+
+ /*
Stream<WorkstationWcsSaveVO> stream = workstationWcsSaveVOList.stream();
Stream stream2 = list((Wrapper) ((ExtraLambdaQueryWrapper) Lambda.in((v0) -> {
return v0.getWorkstationId();
@@ -552,6 +391,7 @@
WorkstationWcsConvert workstationWcsConvert = WorkstationWcsConvert.INSTANCE;
workstationWcsConvert.getClass();
validWorkstationExistsWcs((List) Stream.concat(stream, stream2.map(this::convert)).collect(Collectors.toList()));
+ */
this.dynamicCollectService.removeTableUpdateWcs(workstationWcsList);
updateBatchById(workstationWcsList);
WorkstationCache.clearDmpStatus(workstationIdList);
@@ -566,7 +406,7 @@
@Override // org.springblade.modules.cps.service.IWorkstationWcsService
public String isExists(List<WorkstationWcsSaveNewVO> workstationWcsSaveNewVOList, List<Long> workstationIdList) {
- Map<Long, String> workstationIdToName = (Map) this.workstationService.listByIds(workstationIdList).stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, String> workstationIdToName = this.workstationService.listByIds(workstationIdList).stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, (v0) -> {
return v0.getName();
@@ -575,6 +415,10 @@
Set<Long> idSet = new HashSet<>();
for (Long workstationId : workstationIdList) {
for (WorkstationWcsSaveNewVO w : workstationWcsSaveNewVOList) {
+ Long count = Long.valueOf(count(Wrappers.<WorkstationWcs>lambdaQuery()
+ .eq(WorkstationWcs::getWorkstationId, workstationId).eq(WorkstationWcs::getDmpVariablesId, w.getDmpVariablesId())
+ .eq(WorkstationWcs::getDataType, w.getDataType()).eq(WorkstationWcs::getDataItem, w.getDataItem())));
+ /*
Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationId();
}, workstationId)).eq((v0) -> {
@@ -583,7 +427,7 @@
return v0.getDataType();
}, w.getDataType())).eq((v0) -> {
return v0.getDataItem();
- }, w.getDataItem())));
+ }, w.getDataItem())));*/
if (count.longValue() > 0) {
idSet.add(workstationId);
}
@@ -597,28 +441,20 @@
private void checkWorkstationWcs(WorkstationWcs workstationWcs) {
if (WcsDataTypeEnums.ONLY_ONE_LIST.contains(workstationWcs.getDataType())) {
- Long count = Long.valueOf(count((Wrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(workstationWcs.getId()), (v0) -> {
- return v0.getId();
- }, workstationWcs.getId()).eq(Func.isNotEmpty(workstationWcs.getWorkstationId()), (v0) -> {
- return v0.getWorkstationId();
- }, workstationWcs.getWorkstationId()).isNotNull(Func.isNotEmpty(workstationWcs.getWorkstationId()), (v0) -> {
- return v0.getWorkstationId();
- }).eq((v0) -> {
- return v0.getDataType();
- }, workstationWcs.getDataType())));
+ Long count = Long.valueOf(count(Wrappers.<WorkstationWcs>lambdaQuery()
+ .ne(Func.isNotEmpty(workstationWcs.getId()), WorkstationWcs::getId, workstationWcs.getId())
+ .eq(Func.isNotEmpty(workstationWcs.getWorkstationId()), WorkstationWcs::getWorkstationId, workstationWcs.getWorkstationId())
+ .isNotNull(Func.isNotEmpty(workstationWcs.getWorkstationId()), WorkstationWcs::getWorkstationId)
+ .eq(WorkstationWcs::getDataType, workstationWcs.getDataType())));
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("workstationWcs.dataType.already.exists", new Object[0]));
}
}
- Long count2 = Long.valueOf(count((Wrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(workstationWcs.getId()), (v0) -> {
- return v0.getId();
- }, workstationWcs.getId()).eq(Func.isNotEmpty(workstationWcs.getWorkstationId()), (v0) -> {
- return v0.getWorkstationId();
- }, workstationWcs.getWorkstationId()).isNotNull(Func.isNotEmpty(workstationWcs.getWorkstationId()), (v0) -> {
- return v0.getWorkstationId();
- }).eq((v0) -> {
- return v0.getDmpVariablesId();
- }, workstationWcs.getDmpVariablesId())));
+ Long count2 = Long.valueOf(count(Wrappers.<WorkstationWcs>lambdaQuery()
+ .ne(Func.isNotEmpty(workstationWcs.getId()), WorkstationWcs::getId, workstationWcs.getId())
+ .eq(Func.isNotEmpty(workstationWcs.getWorkstationId()), WorkstationWcs::getWorkstationId, workstationWcs.getWorkstationId())
+ .isNotNull(Func.isNotEmpty(workstationWcs.getWorkstationId()), WorkstationWcs::getWorkstationId)
+ .eq(WorkstationWcs::getDmpVariablesId, workstationWcs.getDmpVariablesId())));
if (count2.longValue() > 0) {
throw new ServiceException(MessageUtils.message("workstationWcs.collectItem.already.exists", new Object[0]));
}
--
Gitblit v1.9.3