From d0c4758b378e46b35429e2a2ca7d6d3ecf284143 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 28 三月 2024 20:36:36 +0800
Subject: [PATCH] 编译错误修改
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/ProductionCraftVersionServiceImpl.java | 206 ++++++++++++---------------------------------------
1 files changed, 50 insertions(+), 156 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/ProductionCraftVersionServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/ProductionCraftVersionServiceImpl.java
index 9852744..b8c104d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/ProductionCraftVersionServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/ProductionCraftVersionServiceImpl.java
@@ -47,7 +47,6 @@
import org.springframework.transaction.annotation.Transactional;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/ProductionCraftVersionServiceImpl.class */
public class ProductionCraftVersionServiceImpl extends BladeServiceImpl<ProductionCraftVersionMapper, ProductionCraftVersion> implements IProductionCraftVersionService {
private static final Logger log = LoggerFactory.getLogger(ProductionCraftVersionServiceImpl.class);
private final ICodeGeneratorService codeGeneratorService;
@@ -56,146 +55,6 @@
private final ICraftVersionLineService versionLineService;
private final ICommonGroupService groupService;
private final IProductionCraftProcessRelatedFixtureService relatedFixtureService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1416707747:
- if (implMethodName.equals("getVersionId")) {
- z = true;
- break;
- }
- break;
- case -983652454:
- if (implMethodName.equals("getEditionStatus")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 2061868837:
- if (implMethodName.equals("getCraftId")) {
- z = false;
- 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/CraftVersionLine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getCraftId();
- };
- }
- 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/ProductionCraftVersion") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getCraftId();
- };
- }
- 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/ProductionCraftVersion") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getCraftId();
- };
- }
- 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/ProductionCraftProcess") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVersionId();
- };
- }
- 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/CraftVersionLine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVersionId();
- };
- }
- 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/CraftVersionLine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVersionId();
- };
- }
- 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/ProductionCraftVersion") && 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/cps/entity/ProductionCraftVersion") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getEditionStatus();
- };
- }
- 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/ProductionCraftVersion") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getEditionStatus();
- };
- }
- 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/ProductionCraftVersion") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getEditionStatus();
- };
- }
- 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/ProductionCraftVersion") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getEditionStatus();
- };
- }
- 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/ProductionCraftVersion") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getEditionStatus();
- };
- }
- 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();
- };
- }
- 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;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public ProductionCraftVersionServiceImpl(final ICodeGeneratorService codeGeneratorService, final IProductionCraftProcessService craftProcessService, final IBasCoderuleService basCodeRuleService, final ICraftVersionLineService versionLineService, final ICommonGroupService groupService, final IProductionCraftProcessRelatedFixtureService relatedFixtureService) {
this.codeGeneratorService = codeGeneratorService;
@@ -237,13 +96,18 @@
public Boolean removeVersion(List<Long> ids) {
validEditionStatus(ids);
boolean flag = removeBatchByIds(ids);
+
+ List<Long> processIds = this.craftProcessService.listObjs(Wrappers.lambdaQuery(ProductionCraftProcess.class)
+ .select(ProductionCraftProcess::getId)
+ .in(ProductionCraftProcess::getVersionId, ids), c -> Long.valueOf((c instanceof BigDecimal) ? ((BigDecimal)c).longValue() : ((Long)c).longValue()));
+ /*
List<Long> processIds = this.craftProcessService.listObjs((Wrapper) Wrappers.lambdaQuery(ProductionCraftProcess.class).select(new SFunction[]{(v0) -> {
return v0.getId();
}}).in((v0) -> {
return v0.getVersionId();
}, ids), c -> {
return Long.valueOf(c instanceof BigDecimal ? ((BigDecimal) c).longValue() : ((Long) c).longValue());
- });
+ });*/
if (Func.isNotEmpty(processIds)) {
flag = flag && this.craftProcessService.removeVersionProcess(processIds).booleanValue();
}
@@ -265,12 +129,18 @@
validNameExist(craftId, versionId, vo.getName());
version.setName(vo.getName());
version.setDescription(vo.getDescription());
+
+ this.versionLineService.remove(Wrappers.lambdaQuery(CraftVersionLine.class)
+ .eq(CraftVersionLine::getVersionId, versionId)
+ .eq(CraftVersionLine::getCraftId, craftId));
+
+ /*
this.versionLineService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery(CraftVersionLine.class).eq((v0) -> {
return v0.getVersionId();
}, versionId)).eq((v0) -> {
return v0.getCraftId();
- }, craftId));
- List<CraftVersionLine> versionLines = (List) vo.getGroupIds().stream().map(c -> {
+ }, craftId));*/
+ List<CraftVersionLine> versionLines = vo.getGroupIds().stream().map(c -> {
return new CraftVersionLine().setVersionId(versionId).setCraftId(craftId).setGroupId(c);
}).collect(Collectors.toList());
boolean batch = this.versionLineService.saveBatch(versionLines);
@@ -282,10 +152,10 @@
public Boolean fixVersion(Long id) {
List<ProductionCraftProcess> processList = this.craftProcessService.listProcessByVersion(id);
ThrowFun.isTrue(Func.isEmpty(processList)).throwMessage(MessageUtils.message("cps.production.craft.version.has.no.process.and.can.not.fix.version", new Object[0]));
- List<CraftVersionLine> lineList = this.versionLineService.list((Wrapper) Wrappers.lambdaQuery(CraftVersionLine.class).eq((v0) -> {
+ List<CraftVersionLine> lineList = this.versionLineService.list(Wrappers.lambdaQuery(CraftVersionLine.class).eq((v0) -> {
return v0.getVersionId();
}, id));
- List<Long> groupIds = (List) lineList.stream().map((v0) -> {
+ List<Long> groupIds = lineList.stream().map((v0) -> {
return v0.getGroupId();
}).collect(Collectors.toList());
List<CommonGroup> commonGroups = this.groupService.listByIds(groupIds);
@@ -297,20 +167,24 @@
validProcessMeets(processList);
validProcessBindTray(processList);
}
- return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate(ProductionCraftVersion.class).set((v0) -> {
+ return Boolean.valueOf(update(Wrappers.lambdaUpdate(ProductionCraftVersion.class)
+ .set(ProductionCraftVersion::getEditionStatus, ProductionCraftStatusEnum.FINALIZED.getStatus())
+ .eq(ProductionCraftVersion::getId, id)));
+ /*
+ return Boolean.valueOf(update(Wrappers.lambdaUpdate(ProductionCraftVersion.class).set((v0) -> {
return v0.getEditionStatus();
}, ProductionCraftStatusEnum.FINALIZED.getStatus())).eq((v0) -> {
return v0.getId();
- }, id)));
+ }, id)));*/
}
- List<ProductionCraftProcess> parallelProcessList = (List) processList.stream().filter(pl -> {
+ List<ProductionCraftProcess> parallelProcessList = processList.stream().filter(pl -> {
return pl.getMainSequenceId() == null;
}).collect(Collectors.toList());
boolean sortNull = parallelProcessList.stream().anyMatch(c2 -> {
return Func.isNull(c2.getSort());
});
ThrowFun.isTrue(sortNull).throwMessage(MessageUtils.message("cps.production.craft.version.has.no.process.and.can.not.fix.version", new Object[0]));
- Map<Integer, List<ProductionCraftProcess>> map = (Map) parallelProcessList.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Integer, List<ProductionCraftProcess>> map = parallelProcessList.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getSort();
}));
if (map.size() != parallelProcessList.size()) {
@@ -324,11 +198,18 @@
validProcessMeets(processList);
validProcessBindTray(processList);
}
+
+ return Boolean.valueOf(update(Wrappers.lambdaUpdate(ProductionCraftVersion.class)
+ .set(ProductionCraftVersion::getEditionStatus, ProductionCraftStatusEnum.FINALIZED.getStatus())
+ .eq(ProductionCraftVersion::getId, id)));
+
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate(ProductionCraftVersion.class).set((v0) -> {
return v0.getEditionStatus();
}, ProductionCraftStatusEnum.FINALIZED.getStatus())).eq((v0) -> {
return v0.getId();
}, id)));
+ */
}
private void validProcessMeets(List<ProductionCraftProcess> processList) {
@@ -361,7 +242,7 @@
}
private void validProcessBindTray(List<ProductionCraftProcess> processList) {
- List<Long> processIds = (List) processList.stream().filter(pl -> {
+ List<Long> processIds = processList.stream().filter(pl -> {
return pl.getProcessId() != null;
}).map((v0) -> {
return v0.getId();
@@ -390,24 +271,37 @@
@Override // org.springblade.modules.cps.service.IProductionCraftVersionService
public Boolean cancelFixVersion(Long id) {
+ return Boolean.valueOf(update(Wrappers.lambdaUpdate(ProductionCraftVersion.class)
+ .set(ProductionCraftVersion::getEditionStatus, ProductionCraftStatusEnum.DEFAULT.getStatus())
+ .eq(ProductionCraftVersion::getId, id)));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate(ProductionCraftVersion.class).set((v0) -> {
return v0.getEditionStatus();
}, ProductionCraftStatusEnum.DEFAULT.getStatus())).eq((v0) -> {
return v0.getId();
- }, id)));
+ }, id)));*/
}
@Override // org.springblade.modules.cps.service.IProductionCraftVersionService
public List<ProductionCraftVersionVO> listFixed(Long craftId) {
+ List<ProductionCraftVersion> list = list(Wrappers.lambdaQuery(ProductionCraftVersion.class)
+ .eq(ProductionCraftVersion::getCraftId, craftId)
+ .eq(ProductionCraftVersion::getEditionStatus, ProductionCraftStatusEnum.FINALIZED.getStatus()));
+ /*
List<ProductionCraftVersion> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery(ProductionCraftVersion.class).eq((v0) -> {
return v0.getCraftId();
}, craftId)).eq((v0) -> {
return v0.getEditionStatus();
- }, ProductionCraftStatusEnum.FINALIZED.getStatus()));
+ }, ProductionCraftStatusEnum.FINALIZED.getStatus()));*/
return ProductionCraftVersionConvert.INSTANCE.convert(list);
}
private void validEditionStatus(List<Long> ids) {
+ List<Integer> editionStatus = listObjs(Wrappers.lambdaQuery(ProductionCraftVersion.class)
+ .select(ProductionCraftVersion::getEditionStatus).in(ProductionCraftVersion::getId, ids), c -> Integer.valueOf((c instanceof BigDecimal) ? ((BigDecimal)c).intValue() : ((Integer)c).intValue()));
+ boolean edition = editionStatus.stream().anyMatch(c -> ProductionCraftStatusEnum.FINALIZED.getStatus().equals(c));
+
+ /*
List<Integer> editionStatus = listObjs((Wrapper) Wrappers.lambdaQuery(ProductionCraftVersion.class).select(new SFunction[]{(v0) -> {
return v0.getEditionStatus();
}}).in((v0) -> {
@@ -417,7 +311,7 @@
});
boolean edition = editionStatus.stream().anyMatch(c2 -> {
return ProductionCraftStatusEnum.FINALIZED.getStatus().equals(c2);
- });
+ });*/
ThrowFun.isTrue(edition).throwMessage(MessageUtils.message("cps.production.craft.version.has.been.finalized.can.not.delete", new Object[0]));
}
@@ -435,14 +329,14 @@
}
private void saveCraftVersionLine(Long craftId, Long version, List<Long> groupIds) {
- List<CraftVersionLine> lineList = (List) groupIds.stream().map(groupId -> {
+ List<CraftVersionLine> lineList = groupIds.stream().map(groupId -> {
return new CraftVersionLine().setCraftId(craftId).setVersionId(version).setGroupId(groupId);
}).collect(Collectors.toList());
this.versionLineService.saveBatch(lineList);
}
private void validNameExist(Long craft, Long id, String name) {
- long count = count((Wrapper) Wrappers.lambdaQuery(ProductionCraftVersion.class).eq(Func.isNotEmpty(craft), (v0) -> {
+ long count = count(Wrappers.lambdaQuery(ProductionCraftVersion.class).eq(Func.isNotEmpty(craft), (v0) -> {
return v0.getCraftId();
}, craft).ne(Func.isNotEmpty(id), (v0) -> {
return v0.getId();
--
Gitblit v1.9.3