From 13ada1093cb8de6e31a718d2222429ded70133c8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 28 三月 2024 12:47:11 +0800
Subject: [PATCH] 修改编译错误
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/GlobalWcsServiceImpl.java | 107 -----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java | 407 +++--------------------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java | 144 +++-----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EnterpriseInformationServiceImpl.java | 109 -----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/utils/TelemetryDataUtils.java | 32 +
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/FixtureServiceImpl.java | 164 +--------
6 files changed, 198 insertions(+), 765 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EnterpriseInformationServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EnterpriseInformationServiceImpl.java
index b7be2ae..7044012 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EnterpriseInformationServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EnterpriseInformationServiceImpl.java
@@ -20,109 +20,18 @@
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/EnterpriseInformationServiceImpl.class */
public class EnterpriseInformationServiceImpl extends BaseServiceImpl<EnterpriseInformationMapper, EnterpriseInformation> implements IEnterpriseInformationService {
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1658513143:
- if (implMethodName.equals("getContentLength")) {
- z = true;
- break;
- }
- break;
- case -1499219990:
- if (implMethodName.equals("getObjectKey")) {
- z = true;
- break;
- }
- break;
- case -75360144:
- if (implMethodName.equals("getLink")) {
- z = false;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 804592199:
- if (implMethodName.equals("getSuffix")) {
- z = true;
- break;
- }
- break;
- case 1342178205:
- if (implMethodName.equals("getFileName")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/EnterpriseInformation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getLink();
- };
- }
- 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/EnterpriseInformation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getSuffix();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/EnterpriseInformation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getObjectKey();
- };
- }
- 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();
- };
- }
- 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/EnterpriseInformation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getContentLength();
- };
- }
- 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/cps/entity/EnterpriseInformation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getFileName();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
+
@Override // org.springblade.modules.cps.service.IEnterpriseInformationService
public Boolean editEnterprise(EnterpriseInVO enterpriseInformation) {
- return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
- return v0.getId();
- }, enterpriseInformation.getId())).set((v0) -> {
- return v0.getObjectKey();
- }, enterpriseInformation.getObjectKey())).set((v0) -> {
- return v0.getContentLength();
- }, enterpriseInformation.getContentLength())).set((v0) -> {
- return v0.getLink();
- }, enterpriseInformation.getLink())).set((v0) -> {
- return v0.getSuffix();
- }, enterpriseInformation.getSuffix())).set((v0) -> {
- return v0.getFileName();
- }, enterpriseInformation.getFileName())));
+ return Boolean.valueOf(update(Wrappers.<EnterpriseInformation>lambdaUpdate()
+ .eq(EnterpriseInformation::getId, enterpriseInformation.getId())
+ .set(EnterpriseInformation::getObjectKey, enterpriseInformation.getObjectKey())
+ .set(EnterpriseInformation::getContentLength, enterpriseInformation.getContentLength())
+ .set(EnterpriseInformation::getLink, enterpriseInformation.getLink())
+ .set(EnterpriseInformation::getSuffix, enterpriseInformation.getSuffix())
+ .set(EnterpriseInformation::getFileName, enterpriseInformation.getFileName())));
+
}
@Override // org.springblade.modules.cps.service.IEnterpriseInformationService
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/FixtureServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/FixtureServiceImpl.java
index d3a03a7..427c2da 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/FixtureServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/FixtureServiceImpl.java
@@ -40,6 +40,7 @@
import com.qianwen.smartman.modules.cps.entity.CommonGroup;
import com.qianwen.smartman.modules.cps.entity.CommonGroupOfItem;
import com.qianwen.smartman.modules.cps.entity.Fixture;
+import com.qianwen.smartman.modules.cps.entity.ProductionCraftProcessRelatedFixture;
import com.qianwen.smartman.modules.cps.entity.ToolAppendix;
import com.qianwen.smartman.modules.cps.entity.TrayFixture;
import com.qianwen.smartman.modules.cps.enums.CommonGroupEnum;
@@ -66,8 +67,10 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+/**
+ * 澶瑰叿鏈嶅姟
+ */
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/FixtureServiceImpl.class */
public class FixtureServiceImpl extends BaseServiceImpl<FixtureMapper, Fixture> implements IFixtureService {
private static final Logger log = LoggerFactory.getLogger(FixtureServiceImpl.class);
private final ICommonGroupOfItemService commonGroupOfItemService;
@@ -77,127 +80,6 @@
private final OssBuilder ossBuilder;
private final ICodeGeneratorService codeGeneratorService;
private final IProductionCraftProcessRelatedFixtureService relatedFixtureService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -75622813:
- if (implMethodName.equals("getCode")) {
- 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 517353092:
- if (implMethodName.equals("getItemId")) {
- z = false;
- break;
- }
- break;
- case 1183913550:
- if (implMethodName.equals("getFixtureId")) {
- z = true;
- break;
- }
- break;
- case 1330288580:
- if (implMethodName.equals("getGroupId")) {
- z = true;
- break;
- }
- break;
- case 1953270362:
- if (implMethodName.equals("getFixId")) {
- 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/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- 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/Fixture") && 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/TrayFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getFixId();
- };
- }
- 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/TrayFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getFixId();
- };
- }
- 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/TrayFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getFixId();
- };
- }
- 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/modules/cps/entity/CommonGroup") && 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/Fixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/Fixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getGroupId();
- };
- }
- 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/ProductionCraftProcessRelatedFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getFixtureId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FixtureServiceImpl(final ICommonGroupOfItemService commonGroupOfItemService, final IToolAppendixService toolAppendixService, final ICommonGroupService commonGroupService, final ITrayFixtureService trayFixtureService, final OssBuilder ossBuilder, final ICodeGeneratorService codeGeneratorService, final IProductionCraftProcessRelatedFixtureService relatedFixtureService) {
this.commonGroupOfItemService = commonGroupOfItemService;
@@ -214,13 +96,14 @@
if (ids.isEmpty()) {
return false;
}
+ long countRelatedFixture = this.relatedFixtureService.count(Wrappers.<ProductionCraftProcessRelatedFixture>lambdaQuery()
+ .in(ProductionCraftProcessRelatedFixture::getFixtureId, ids));
+ /*
long countRelatedFixture = this.relatedFixtureService.count((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getFixtureId();
- }, ids));
+ }, ids));*/
ThrowFun.isTrue(countRelatedFixture > 0).throwMessage(MessageUtils.message("cps.system.banding.not.remove", new Object[0]));
- this.trayFixtureService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getFixId();
- }, ids));
+ this.trayFixtureService.remove(Wrappers.<TrayFixture>lambdaQuery().in(TrayFixture::getFixId, ids));
return Boolean.valueOf(removeByIds(ids));
}
@@ -260,11 +143,14 @@
@Override // org.springblade.modules.cps.service.IFixtureService
public void checkFixture(Fixture fixture) {
+ long count = count(Wrappers.<Fixture>lambdaQuery().eq(Fixture::getCode, fixture.getCode())
+ .ne(Func.isNotEmpty(fixture.getId()), Fixture::getId, fixture.getId()));
+ /*
long count = count(((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCode();
}, fixture.getCode())).ne(Func.isNotEmpty(fixture.getId()), (v0) -> {
return v0.getId();
- }, fixture.getId()));
+ }, fixture.getId()));*/
if (count > 0) {
throw new ServiceException(MessageUtils.message("cps.fixture.code.already.exists", new Object[0]));
}
@@ -274,9 +160,8 @@
@Transactional(rollbackFor = {Exception.class})
public boolean remove(List<Long> ids) {
removeByIds(ids);
- this.trayFixtureService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getFixId();
- }, ids));
+ this.trayFixtureService.remove(Wrappers.<TrayFixture>lambdaQuery().in(TrayFixture::getFixId, ids));
+
return true;
}
@@ -297,13 +182,12 @@
if (Func.isEmpty(fixtureGroupFixtureVOList)) {
return Lists.newArrayList();
}
- List<Long> groupIdList = (List) fixtureGroupFixtureVOList.stream().map((v0) -> {
+ List<Long> groupIdList = fixtureGroupFixtureVOList.stream().map((v0) -> {
return v0.getParentId();
}).collect(Collectors.toList());
- List<CommonGroup> commonGroupList = this.commonGroupService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getId();
- }, groupIdList));
- List<FixtureGroupFixtureVO> groupList = (List) commonGroupList.stream().map(c -> {
+
+ List<CommonGroup> commonGroupList = this.commonGroupService.list(Wrappers.<CommonGroup>lambdaQuery().in(CommonGroup::getId, groupIdList));
+ List<FixtureGroupFixtureVO> groupList = commonGroupList.stream().map(c -> {
FixtureGroupFixtureVO fixtureGroupFixtureVO = new FixtureGroupFixtureVO();
fixtureGroupFixtureVO.setId(c.getId());
fixtureGroupFixtureVO.setName(c.getName());
@@ -362,6 +246,10 @@
String fixtureCode = fix.getFixtureCode();
if (fixtureCodeSet.contains(fixtureCode)) {
String name = fix.getName();
+ update(Wrappers.<Fixture>lambdaUpdate().eq(Fixture::getCode, fixtureCode).set(Fixture::getName, Func.isBlank(name) ? fixtureCode : name));
+ this.commonGroupOfItemService.update(Wrappers.<CommonGroupOfItem>update().lambda().eq(CommonGroupOfItem::getItemId, ((Fixture)fixtureMap.get(fixtureCode)).getId()).set(CommonGroupOfItem::getGroupId, commonGroupNameMap.get(fix.getFixtureGroupName())));
+
+ /*
update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
return v0.getCode();
}, fixtureCode)).set((v0) -> {
@@ -371,7 +259,7 @@
return v0.getItemId();
}, ((Fixture) fixtureMap.get(fixtureCode)).getId())).set((v0) -> {
return v0.getGroupId();
- }, commonGroupNameMap.get(fix.getFixtureGroupName())));
+ }, commonGroupNameMap.get(fix.getFixtureGroupName())));*/
return;
}
FixtureVO fixtureVO = new FixtureVO();
@@ -399,9 +287,11 @@
Fixture fixture = FixtureConvert.INSTANCE.convert(vo);
checkFixture(fixture);
updateById(fixture);
+ this.trayFixtureService.remove(Wrappers.<TrayFixture>lambdaQuery().eq(TrayFixture::getFixId, vo.getId()));
+ /*
this.trayFixtureService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getFixId();
- }, vo.getId()));
+ }, vo.getId()));*/
TrayFixture trayFixture = new TrayFixture().setFixId(vo.getId()).setTrayId(vo.getTrayId()).setFaceId(vo.getSurfaceId());
this.trayFixtureService.save(trayFixture);
return FixtureConvert.INSTANCE.convert(fixture);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/GlobalWcsServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/GlobalWcsServiceImpl.java
index 08d4ae6..04af98c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/GlobalWcsServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/GlobalWcsServiceImpl.java
@@ -24,105 +24,19 @@
import org.springframework.transaction.annotation.Transactional;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/GlobalWcsServiceImpl.class */
+
public class GlobalWcsServiceImpl extends ServiceImpl<GlobalWcsMapper, GlobalWcs> implements IGlobalWcsService {
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1249350359:
- if (implMethodName.equals("getSeq")) {
- z = false;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = true;
- break;
- }
- break;
- case -75106384:
- if (implMethodName.equals("getType")) {
- z = true;
- break;
- }
- break;
- case 1950668205:
- if (implMethodName.equals("getColor")) {
- 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/GlobalWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSeq();
- };
- }
- 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/GlobalWcs") && 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/GlobalWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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/GlobalWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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/GlobalWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getColor();
- };
- }
- 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/GlobalWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/GlobalWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/GlobalWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
+
@Override // org.springblade.modules.cps.service.IGlobalWcsService
public List<GlobalWcs> getGlobalWcsList(GlobalWcsTypeEnum globalWcsTypeEnum) {
+ return list(Wrappers.<GlobalWcs>lambdaQuery().eq(GlobalWcs::getType, globalWcsTypeEnum.getType()).orderByAsc(GlobalWcs::getSeq));
+ /*
return list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getType();
}, globalWcsTypeEnum.getType())).orderByAsc((v0) -> {
return v0.getSeq();
- }));
+ }));*/
}
@Override // org.springblade.modules.cps.service.IGlobalWcsService
@@ -132,23 +46,30 @@
@Override // org.springblade.modules.cps.service.IGlobalWcsService
public GlobalWcs getByCode(String code, GlobalWcsTypeEnum globalWcsTypeEnum) {
+ return getOne(Lambda.eq(GlobalWcs::getCode, code).eq(GlobalWcs::getType, globalWcsTypeEnum.getType()));
+ /*
return (GlobalWcs) getOne((Wrapper) Lambda.eq((v0) -> {
return v0.getCode();
}, code).eq((v0) -> {
return v0.getType();
- }, globalWcsTypeEnum.getType()));
+ }, globalWcsTypeEnum.getType()));*/
}
@Override // org.springblade.modules.cps.service.IGlobalWcsService
@Transactional
public void updateWcsAndAchievements(WcsAchievementsUpdateVO wcsAchievements) {
+ boolean update = lambdaUpdate()
+ .set(Func.isNotBlank(wcsAchievements.getName()), GlobalWcs::getName, wcsAchievements.getName())
+ .set(Func.isNotBlank(wcsAchievements.getColor()), GlobalWcs::getColor, wcsAchievements.getColor())
+ .eq(GlobalWcs::getCode, wcsAchievements.getCode()).update();
+ /*
((LambdaUpdateChainWrapper) ((LambdaUpdateChainWrapper) ((LambdaUpdateChainWrapper) lambdaUpdate().set(Func.isNotBlank(wcsAchievements.getName()), (v0) -> {
return v0.getName();
}, wcsAchievements.getName())).set(Func.isNotBlank(wcsAchievements.getColor()), (v0) -> {
return v0.getColor();
}, wcsAchievements.getColor())).eq((v0) -> {
return v0.getCode();
- }, wcsAchievements.getCode())).update();
+ }, wcsAchievements.getCode())).update();*/
GlobalWcsOfRps globalWcsOfRps = new GlobalWcsOfRps();
globalWcsOfRps.setCode(wcsAchievements.getCode());
globalWcsOfRps.setRps(wcsAchievements.getRps());
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
index 2413ad1..e536d8b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
@@ -30,6 +30,7 @@
import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.redis.cache.BladeRedis;
+import com.qianwen.core.tool.api.ResultCode;
import com.qianwen.core.tool.utils.DigestUtil;
import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.enums.AppEnum;
@@ -42,6 +43,7 @@
import com.qianwen.smartman.modules.cps.vo.ConfigVO;
import com.qianwen.smartman.modules.cps.vo.InitSettingVO;
import com.qianwen.smartman.modules.system.dto.LicenseDetailDTO;
+import com.qianwen.smartman.modules.system.entity.Application;
import com.qianwen.smartman.modules.system.service.IApplicationService;
import com.qianwen.smartman.modules.visual.entity.VisualConfig;
import com.qianwen.smartman.modules.visual.service.IVisualConfigService;
@@ -67,46 +69,6 @@
private final ThreadPoolTaskExecutor taskExecutor;
private final Environment environment;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case 643007317:
- if (implMethodName.equals("getDomainUrl")) {
- 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/system/entity/Application") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getDomainUrl();
- };
- }
- 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/system/entity/Application") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/system/entity/Application") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public InitServiceImpl(final InitMapper initMapper, final ConfigVO configVO, final TdengineMapper tdengineMapper, final DataSource dataSource, final IInitBusinessService initBusinessService, final BladeRedis bladeRedis, final IVisualConfigService visualConfigService, final IApplicationService applicationService, final ThreadPoolTaskExecutor taskExecutor, final Environment environment) {
this.initMapper = initMapper;
@@ -151,48 +113,53 @@
@Override // org.springblade.modules.cps.service.IInitService
@Transactional(rollbackFor = {Exception.class})
public Boolean initSystem(InitSettingVO initSettingVO) {
- if (!initSettingVO.getPassword().equals(initSettingVO.getConfirmPassword())) {
- throw new ServiceException(MessageUtils.message("init.system.inconsistent.password", new Object[0]));
- }
- initSettingVO.setPassword(DigestUtil.encrypt(initSettingVO.getPassword()));
- Connection conn = this.dataSource.getConnection();
- ScriptRunner runner = new ScriptRunner(conn);
- runner.setStopOnError(true);
- File file = new File(System.getProperty("java.io.tmpdir") + File.separator + "common.sql");
- FileUtils.copyToFile(new ClassPathResource("sql" + File.separator + this.configVO.getType() + File.separator + "common.sql").getInputStream(), file);
- runner.runScript(new FileReader(file));
- FileUtils.copyToFile(new ClassPathResource("sql" + File.separator + this.configVO.getType() + File.separator + "xxl_job.sql").getInputStream(), file);
- runner.runScript(new FileReader(file));
- List<Integer> appIds = (List) initSettingVO.getAppList().stream().sorted().collect(Collectors.toList());
- for (Integer appId : appIds) {
- Future<?> asyncResult = this.taskExecutor.submit(() -> {
- try {
- this.initBusinessService.initApp(appId, this.configVO);
- } catch (Exception e) {
- throw new ServiceException(e.getMessage());
- }
- });
- while (!asyncResult.isDone()) {
- TimeUnit.NANOSECONDS.sleep(2L);
- }
- }
- initAdapter(initSettingVO, this.configVO.getUrl(), this.configVO.getType());
- replaceJumuUrl();
- this.initMapper.replaceUrlJiMu(initSettingVO);
- if (CommonConstant.ORACLE.equals(this.configVO.getType()) && Func.isNotEmpty(initSettingVO.getAppList()) && initSettingVO.getAppList().contains(AppEnum.VISUAL.getCode())) {
- try {
- VisualConfig visualConfig = new VisualConfig();
- visualConfig.setId(1510135236368261122L);
- visualConfig.setVisualId(1510135236343095298L);
- visualConfig.setDetail(FileUtil.getFileString(new ClassPathResource("constant" + File.separator + "VisualDetail.txt")));
- visualConfig.setComponent(FileUtil.getFileString(new ClassPathResource("constant" + File.separator + "VisualComponent.txt")));
- this.visualConfigService.save(visualConfig);
- } catch (Exception e) {
- throw new ServiceException(e.getMessage());
- }
- }
- IoUtil.close(conn);
- return true;
+ try {
+ if (!initSettingVO.getPassword().equals(initSettingVO.getConfirmPassword())) {
+ throw new ServiceException(MessageUtils.message("init.system.inconsistent.password", new Object[0]));
+ }
+ initSettingVO.setPassword(DigestUtil.encrypt(initSettingVO.getPassword()));
+ Connection conn = this.dataSource.getConnection();
+ ScriptRunner runner = new ScriptRunner(conn);
+ runner.setStopOnError(true);
+ File file = new File(System.getProperty("java.io.tmpdir") + File.separator + "common.sql");
+ FileUtils.copyToFile(new ClassPathResource("sql" + File.separator + this.configVO.getType() + File.separator + "common.sql").getInputStream(), file);
+ runner.runScript(new FileReader(file));
+ FileUtils.copyToFile(new ClassPathResource("sql" + File.separator + this.configVO.getType() + File.separator + "xxl_job.sql").getInputStream(), file);
+ runner.runScript(new FileReader(file));
+ List<Integer> appIds = initSettingVO.getAppList().stream().sorted().collect(Collectors.toList());
+ for (Integer appId : appIds) {
+ Future<?> asyncResult = this.taskExecutor.submit(() -> {
+ try {
+ this.initBusinessService.initApp(appId, this.configVO);
+ } catch (Exception e) {
+ throw new ServiceException(e.getMessage());
+ }
+ });
+ while (!asyncResult.isDone()) {
+ TimeUnit.NANOSECONDS.sleep(2L);
+ }
+ }
+ initAdapter(initSettingVO, this.configVO.getUrl(), this.configVO.getType());
+ replaceJumuUrl();
+ this.initMapper.replaceUrlJiMu(initSettingVO);
+ if (CommonConstant.ORACLE.equals(this.configVO.getType()) && Func.isNotEmpty(initSettingVO.getAppList()) && initSettingVO.getAppList().contains(AppEnum.VISUAL.getCode())) {
+ try {
+ VisualConfig visualConfig = new VisualConfig();
+ visualConfig.setId(1510135236368261122L);
+ visualConfig.setVisualId(1510135236343095298L);
+ visualConfig.setDetail(FileUtil.getFileString(new ClassPathResource("constant" + File.separator + "VisualDetail.txt")));
+ visualConfig.setComponent(FileUtil.getFileString(new ClassPathResource("constant" + File.separator + "VisualComponent.txt")));
+ this.visualConfigService.save(visualConfig);
+ } catch (Exception e) {
+ throw new ServiceException(e.getMessage());
+ }
+ }
+ IoUtil.close(conn);
+ return true;
+ }catch(Exception ex) {
+ log.error("鍒濆鍖栫郴缁熷け璐�",ex);
+ throw new ServiceException(ResultCode.FAILURE,ex);
+ }
}
@Override // org.springblade.modules.cps.service.IInitService
@@ -224,15 +191,16 @@
List<String> list = new ArrayList<>();
list.addAll(applicationCodes);
list.add("HMI");
+
+ this.applicationService.remove(Wrappers.<Application>lambdaQuery().notIn(Application::getCode, list));
+ /*
this.applicationService.remove((Wrapper) Wrappers.lambdaQuery().notIn((v0) -> {
return v0.getCode();
}, list));
- initSettingVO.getApplicationList().forEach(k, v -> {
- this.applicationService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
- return v0.getDomainUrl();
- }, v)).eq((v0) -> {
- return v0.getCode();
- }, k));
+ Application::getDomainUrl
+ */
+ initSettingVO.getApplicationList().forEach((k, v) -> {
+ this.applicationService.update(Wrappers.<Application>lambdaUpdate().set(Application::getDomainUrl, v).eq(Application::getCode, k));
});
}
System.setProperty("blade.system.need_init", FmsConstant.MANUAL);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
index e023e2a..0e52c7d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
@@ -134,277 +134,6 @@
@Autowired
private IEmployeeService employeeService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -2038138413:
- if (implMethodName.equals("getShortCode")) {
- z = true;
- break;
- }
- break;
- case -1453405940:
- if (implMethodName.equals("getMachineId")) {
- z = true;
- break;
- }
- break;
- case -1107875961:
- if (implMethodName.equals("getDeviceId")) {
- z = true;
- break;
- }
- break;
- case -858902114:
- if (implMethodName.equals("getMachineCode")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- 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 112409713:
- if (implMethodName.equals("getPlanStatus")) {
- z = true;
- break;
- }
- break;
- case 257009483:
- if (implMethodName.equals("getExtendId")) {
- z = true;
- break;
- }
- break;
- case 517353092:
- if (implMethodName.equals("getItemId")) {
- z = true;
- break;
- }
- break;
- case 771206363:
- if (implMethodName.equals("getTenantId")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- case 1330288580:
- if (implMethodName.equals("getGroupId")) {
- 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/WorkstationOfMachine") && 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/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getPlanStatus();
- };
- }
- 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/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getPlanStatus();
- };
- }
- 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/DeviceType") && 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();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- break;
- case 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/tenant/mp/TenantEntity") && 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/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getGroupId();
- };
- }
- 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/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- 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/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- 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/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- 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/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- 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/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getDeviceId();
- };
- }
- 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();
- };
- }
- 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();
- };
- }
- 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/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- 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/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- 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/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getShortCode();
- };
- }
- 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/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getExtendId();
- };
- }
- 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/DeviceType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
@Override // org.springblade.modules.cps.service.IMachineService
@Transactional(rollbackFor = {Exception.class})
@@ -433,10 +162,9 @@
@Override // org.springblade.modules.cps.service.IMachineService
public List<WorkstationWcsDTO> getWorkstationWcsByMachineId(Long machineId, String paramName) {
- List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineId();
- }, machineId));
- List<Long> workstationIdList = (List) workstationOfMachineList.stream().map((v0) -> {
+ List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list(Wrappers.<WorkstationOfMachine>lambdaQuery().eq(WorkstationOfMachine::getMachineId, machineId));
+
+ List<Long> workstationIdList =workstationOfMachineList.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
List<WorkstationWcs> workstationWcsList = this.workstationWcsMapper.getWorkstationWcsByName(workstationIdList, paramName);
@@ -462,24 +190,22 @@
machineDetailVO.setMachineLifeStatusName(DictCache.getValue(DictEnum.MACHINE_LIFE_STATUS.getName(), machineDetailVO.getMachineLifeStatus()));
machineDetailVO.setManagementClassName(DictCache.getValue(DictEnum.MACHINE_MANAGEMENT_CLASS, machineDetailVO.getManagementClass()));
machineDetailVO.setMachineUseStatusName(DictCache.getValue(DictEnum.MACHINE_USE_STATUS.getName(), machineDetailVO.getMachineUseStatus()));
- List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineId();
- }, machineDetailVO.getId()));
+ List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list(Wrappers.<WorkstationOfMachine>lambdaQuery().eq(WorkstationOfMachine::getMachineId, machineDetailVO.getId()));
if (Func.isNotEmpty(workstationOfMachineList)) {
- List<Workstation> workstationList = this.workstationService.listByIds((Collection) workstationOfMachineList.stream().map((v0) -> {
+ List<Workstation> workstationList = this.workstationService.listByIds(workstationOfMachineList.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList()));
Optional.ofNullable(workstationList).ifPresent(workstations -> {
- List<String> workstationCodeList = (List) workstations.stream().map((v0) -> {
+ List<String> workstationCodeList = workstations.stream().map((v0) -> {
return v0.getCode();
}).collect(Collectors.toList());
- List<String> workstationNameList = (List) workstations.stream().map((v0) -> {
+ List<String> workstationNameList = workstations.stream().map((v0) -> {
return v0.getName();
}).collect(Collectors.toList());
- String code = workstationCodeList.stream().reduce(a, b -> {
+ String code = workstationCodeList.stream().reduce((a, b) -> {
return a.concat(";").concat(b);
}).orElse("");
- String name = workstationNameList.stream().reduce(a2, b2 -> {
+ String name = workstationNameList.stream().reduce((a2, b2) -> {
return a2.concat(";").concat(b2);
}).orElse("");
machineDetailVO.setWorkstationCode(code);
@@ -549,11 +275,8 @@
if (len < 4 || len > 8) {
throw new ServiceException(String.format(MessageUtils.message("cps.tpm.machine.short.code.length", new Object[0]), 4, 8));
}
- Long count = Long.valueOf(count(((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getShortCode();
- }, shortCode)).ne(Func.isNotEmpty(id), (v0) -> {
- return v0.getId();
- }, id)));
+
+ Long count = Long.valueOf(count(Wrappers.<Machine>lambdaQuery().eq(Machine::getShortCode, shortCode).ne(Func.isNotEmpty(id), Machine::getId, id)));
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.tpm.machine.short.code.exists", new Object[0]));
}
@@ -568,7 +291,7 @@
Integer status = machineSelectVO.getStatus();
IPage<MachineListVO> page = ((MachineMapper) this.baseMapper).pageMachine(Condition.getPage(query), machineName, machineCode, machineTypeId, groupId, CommonGroupConstant.ALL_MACHINE_ID, status == null ? CommonConstant.ENABLE : status);
List<MachineListVO> records = page.getRecords();
- List<MachineListVO> collect = (List) records.stream().peek(c -> {
+ List<MachineListVO> collect = records.stream().peek(c -> {
c.setMachineUseStatusName(DictCache.getValue(DictEnum.MACHINE_USE_STATUS.getName(), c.getMachineUseStatus()));
}).collect(Collectors.toList());
page.setRecords(collect);
@@ -597,13 +320,18 @@
boolean updateById = updateById(machine);
Long groupId = machine.getGroupId();
if (!Func.isNull(groupId)) {
+ this.itemService.update(Wrappers.<CommonGroupOfItem>lambdaUpdate()
+ .set(CommonGroupOfItem::getGroupId, groupId)
+ .set(CommonGroupOfItem::getExtendId, machine.getExtendId())
+ .eq(CommonGroupOfItem::getItemId, machine.getId()));
+ /*
this.itemService.update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getGroupId();
}, groupId)).set((v0) -> {
return v0.getExtendId();
}, machine.getExtendId())).eq((v0) -> {
return v0.getItemId();
- }, machine.getId()));
+ }, machine.getId()));*/
}
if (updateById) {
CacheUtil.clear(ExtCacheConstant.POSTING_MACHINE, Boolean.FALSE);
@@ -614,9 +342,8 @@
@Override // org.springblade.modules.cps.service.IMachineService
public void renewMachineRepairStatus(Long machineId, Integer maintenanceStatus) {
- Machine machine = (Machine) getOne((Wrapper) new QueryWrapper().lambda().eq((v0) -> {
- return v0.getId();
- }, machineId));
+ Machine machine = (Machine)getOne(new QueryWrapper<Machine>().lambda().eq(Machine::getId, machineId));
+
if (machine != null) {
machine.setRepairStatus(maintenanceStatus);
updateById(machine);
@@ -765,10 +492,8 @@
buildMap(rawData, machineCodeMap, machineCodes, pinMap, pinCodes, shortMap, shortCodes);
List<MachineImport> failExcel = Lists.newArrayList();
List<DeviceType> deviceTypeList = Lists.newArrayList();
- List<Workstation> workstationList = this.workstationService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE));
- Map<String, Workstation> workstationMap = (Map) workstationList.stream().collect(Collectors.toMap((v0) -> {
+ List<Workstation> workstationList = this.workstationService.list(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getStatus, CommonConstant.ENABLE));
+ Map<String, Workstation> workstationMap = workstationList.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, v -> {
return v;
@@ -787,11 +512,11 @@
if (Func.isNotEmpty(failExcel)) {
return exportFailFile(failExcel);
}
- Map<String, Long> typeMap = (Map) deviceTypeList.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Long> typeMap = deviceTypeList.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, (v0) -> {
return v0.getId();
- }, v1, v2 -> {
+ },(v1, v2) -> {
return v1;
}));
saveExportMachine(rawData, typeMap, commonGroupNameMap, organizationNameMap, employeeNameMap);
@@ -799,7 +524,7 @@
}
public void saveExportMachine(List<MachineImport> rawData, Map<String, Long> typeMap, HashMap<String, Long> commonGroupNameMap, HashMap<String, Long> organizationNameMap, EmployeeNameDTO employeeNameMap) {
- List<Machine> collect = (List) rawData.stream().map(c -> {
+ List<Machine> collect = rawData.stream().map(c -> {
Machine machine = MachineConvert.INSTANCE.convert(c);
String machineTypeName = c.getMachineTypeName();
String machineTypeCode = c.getMachineTypeCode();
@@ -857,9 +582,9 @@
}
private void buildMap(List<MachineImport> rawData, Map<String, Integer> machineCodeMap, Set<String> machineCodes, Map<String, Integer> pinMap, Set<String> pinCodes, Map<String, Integer> shortMap, Set<String> shortCodes) {
- QueryWrapper<Machine> machineCodeQuery = Wrappers.query().select(new String[]{"machine_code"});
- QueryWrapper<Machine> pinCodeQuery = Wrappers.query().select(new String[]{"pin_code"});
- QueryWrapper<Machine> shortCodeQuery = Wrappers.query().select(new String[]{"short_code"});
+ QueryWrapper<Machine> machineCodeQuery = Wrappers.<Machine>query().select(new String[]{"machine_code"});
+ QueryWrapper<Machine> pinCodeQuery = Wrappers.<Machine>query().select(new String[]{"pin_code"});
+ QueryWrapper<Machine> shortCodeQuery = Wrappers.<Machine>query().select(new String[]{"short_code"});
boolean flag1 = false;
boolean flag2 = false;
boolean flag3 = false;
@@ -876,7 +601,8 @@
}
flag1 = true;
machineCodeQuery.nested(i -> {
- QueryWrapper queryWrapper = (QueryWrapper) i.eq("machine_code", machineCode);
+ i.eq("machine_code", machineCode);
+ //QueryWrapper queryWrapper = (QueryWrapper) i.eq("machine_code", machineCode);
});
machineCodeQuery.apply("status =1", new Object[0]);
}
@@ -892,7 +618,7 @@
}
flag2 = true;
pinCodeQuery.nested(i2 -> {
- QueryWrapper queryWrapper = (QueryWrapper) i2.eq("pin_code", pinCode);
+ i2.eq("pin_code", pinCode);
});
pinCodeQuery.apply("status =1", new Object[0]);
}
@@ -908,7 +634,7 @@
}
flag3 = true;
shortCodeQuery.nested(i3 -> {
- QueryWrapper queryWrapper = (QueryWrapper) i3.eq("short_code", shortCode);
+ i3.eq("short_code", shortCode);
});
shortCodeQuery.apply("status =1", new Object[0]);
}
@@ -963,12 +689,8 @@
throw new ServiceException(MessageUtils.message("machine.andon.not.remove", new Object[0]));
}
removeByIds(Func.toLongList(vo.getIds()));
- this.workstationOfMachineService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getMachineId();
- }, vo.getIds()));
- this.itemService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getItemId();
- }, vo.getIds()));
+ this.workstationOfMachineService.remove(Wrappers.<WorkstationOfMachine>lambdaQuery().in(WorkstationOfMachine::getMachineId, vo.getIds()));
+ this.itemService.remove( Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getItemId, vo.getIds()));
CacheUtil.clear(ExtCacheConstant.POSTING_MACHINE, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.WORKSTATION_MACHINE, Boolean.FALSE);
}
@@ -982,11 +704,10 @@
if (machine == null) {
throw new ServiceException("鏈哄櫒涓嶅瓨鍦�");
}
- List<WorkstationOfMachine> list = this.workstationOfMachineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineId();
- }, machineId));
+ List<WorkstationOfMachine> list = this.workstationOfMachineService.list(Wrappers.<WorkstationOfMachine>lambdaQuery().eq(WorkstationOfMachine::getMachineId, machineId));
+
if (Func.isNotEmpty(list)) {
- List<Long> workstationIds = (List) list.stream().map((v0) -> {
+ List<Long> workstationIds = list.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
if (Func.isNotEmpty(workstationIds)) {
@@ -1057,11 +778,8 @@
return true;
}
if (Func.isNotBlank(typeName) && Func.isNotBlank(typeCode)) {
- DeviceType type = (DeviceType) this.typeService.getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getName();
- }, typeName)).eq((v0) -> {
- return v0.getCode();
- }, typeCode));
+ DeviceType type = this.typeService.getOne(Wrappers.<DeviceType>lambdaQuery().eq(DeviceType::getName, typeName)
+ .eq(DeviceType::getCode, typeCode));
if (Func.isEmpty(type)) {
data.setFailReason(MessageUtils.message("cps.tpm.machine.type.not.exists", new Object[0]));
failExcel.add(data);
@@ -1208,13 +926,10 @@
machineDetailVO.setMachineLifeStatusName(DictCache.getValue(DictEnum.MACHINE_LIFE_STATUS.getName(), machineDetailVO.getMachineLifeStatus()));
machineDetailVO.setManagementClassName(DictCache.getValue(DictEnum.MACHINE_MANAGEMENT_CLASS, machineDetailVO.getManagementClass()));
machineDetailVO.setMachineUseStatusName(DictCache.getValue(DictEnum.MACHINE_USE_STATUS.getName(), machineDetailVO.getMachineUseStatus()));
- List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineId();
- }, machineDetailVO.getId()));
+ List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list(Wrappers.<WorkstationOfMachine>lambdaQuery()
+ .eq(WorkstationOfMachine::getMachineId, machineDetailVO.getId()));
if (Func.isNotEmpty(workstationOfMachineList)) {
- List<Workstation> workstationList = this.workstationService.listByIds((Collection) workstationOfMachineList.stream().map((v0) -> {
- return v0.getWorkstationId();
- }).collect(Collectors.toList()));
+ List<Workstation> workstationList = this.workstationService.listByIds(workstationOfMachineList.stream().map(WorkstationOfMachine::getWorkstationId).collect(Collectors.toList()));
Optional.ofNullable(workstationList).ifPresent(workstations -> {
String code = ((Workstation) ListUtils.getFirst(workstations)).getCode();
String name = ((Workstation) ListUtils.getFirst(workstations)).getName();
@@ -1310,9 +1025,12 @@
private boolean validWorkstationBind(MachineImport data, Map<String, Workstation> workstationMap, List<MachineImport> failExcel) {
Workstation workstation = workstationMap.get(data.getMachineCode());
if (Func.isNotEmpty(workstation)) {
+ long count = this.workstationOfMachineService.count(Wrappers.<WorkstationOfMachine>lambdaQuery()
+ .eq(WorkstationOfMachine::getWorkstationId, workstation.getId()));
+ /*
long count = this.workstationOfMachineService.count((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationId();
- }, workstation.getId()));
+ }, workstation.getId()));*/
if (count > 0) {
data.setFailReason(MessageUtils.message("excel.import.machine.workstation.already.bound", new Object[0]));
failExcel.add(data);
@@ -1392,11 +1110,8 @@
}
private boolean checkStopImportMachine(String machineCode) {
- Machine machine = (Machine) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineCode();
- }, machineCode)).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ Machine machine = getOne(Wrappers.<Machine>lambdaQuery().eq(Machine::getMachineCode, machineCode).eq(Machine::getStatus, CommonConstant.DEACTIVATE));
+
if (machine != null) {
return Boolean.TRUE.booleanValue();
}
@@ -1404,35 +1119,37 @@
}
private void checkStopMachine(String machineCode) {
+ Machine machine = getOne(Wrappers.<Machine>lambdaQuery().eq(Machine::getMachineCode, machineCode).eq(Machine::getStatus, CommonConstant.DEACTIVATE));
+ /*
Machine machine = (Machine) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getMachineCode();
}, machineCode)).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ }, CommonConstant.DEACTIVATE));*/
if (machine != null) {
throw new ServiceException(MessageUtils.message("machine.code.already.exist.stop.status", new Object[0]));
}
}
private void checkStopMachineByCode(String workstationCode) {
- Machine machine = (Machine) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineCode();
- }, workstationCode)).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ Machine machine = getOne(Wrappers.<Machine>lambdaQuery().eq(Machine::getMachineCode, workstationCode).eq(Machine::getStatus, CommonConstant.DEACTIVATE));
if (machine != null) {
throw new ServiceException(MessageUtils.message("machine.machine.workstation.already.exist.stop.status", new Object[0]));
}
}
private void checkMachine(Long id, String machineCode) {
+ Long count = Long.valueOf(count(Wrappers.<Machine>lambdaQuery().ne(Func.isNotEmpty(id), Machine::getId, id)
+ .eq(Machine::getMachineCode, machineCode)
+ .eq(Machine::getStatus, CommonConstant.ENABLE)));
+ /*
Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(id), (v0) -> {
return v0.getId();
}, id).eq((v0) -> {
return v0.getMachineCode();
}, machineCode)).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE)));
+ }, CommonConstant.ENABLE)));*/
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("machine.code.already.exists", new Object[0]));
}
@@ -1455,6 +1172,14 @@
}
private List<MaintainPlan> checkExistPlanStatus(Long deviceId, Long id) {
+ List<MaintainPlan> maintainPlanList = this.maintainPlanService.list(Wrappers.<MaintainPlan>query().lambda()
+ .eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId())
+ .eq(MaintainPlan::getDeviceId, deviceId)
+ .notIn(
+ Func.isNotEmpty(id), MaintainPlan::getId, new Object[] { id })
+ .notIn(MaintainPlan::getPlanStatus, new Object[] { Integer.valueOf(MaintainPlanStatusEnum.T5.getType()) })
+ .orderByDesc(MaintainPlan::getPlanStatus));
+ /*
List<MaintainPlan> maintainPlanList = this.maintainPlanService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
return v0.getTenantId();
}, AuthUtil.getTenantId()).eq((v0) -> {
@@ -1465,7 +1190,7 @@
return v0.getPlanStatus();
}, new Object[]{Integer.valueOf(MaintainPlanStatusEnum.T5.getType())})).orderByDesc((v0) -> {
return v0.getPlanStatus();
- }));
+ }));*/
return maintainPlanList;
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/utils/TelemetryDataUtils.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/utils/TelemetryDataUtils.java
index 17f066c..f9ba4d6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/utils/TelemetryDataUtils.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/utils/TelemetryDataUtils.java
@@ -26,6 +26,9 @@
import com.qianwen.smartman.modules.cps.message.event.TelemetryDataMessage;
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/utils/TelemetryDataUtils.class */
+/**
+ * 閬ユ祴鏁版嵁util
+ */
public class TelemetryDataUtils {
private static final Logger log = LoggerFactory.getLogger(TelemetryDataUtils.class);
@@ -94,17 +97,20 @@
if (!checkResult.booleanValue()) {
return null;
}
- switch (AnonymousClass1.$SwitchMap$org$springblade$common$enums$WorkstationParamTypeEnum[WorkstationParamTypeEnum.of(workstationParam.getType(), WorkstationParamTypeEnum.OTHER).ordinal()]) {
- case 1:
+ switch (WorkstationParamTypeEnum.of(workstationParam.getType(), WorkstationParamTypeEnum.OTHER)) {
+ case STATE:
handlerStatusUpdateValue(telemetryDataMessage, workstationParam);
break;
- case 3:
- case 4:
+ case ALARM:
+ case ALARM_NO:
packWorkStationAlarmMessageInfo(telemetryDataMessage, workstationParam.getWorkstationId());
break;
- case RegionCache.VILLAGE_LEVEL /* 5 */:
+ case ALARM_MSG:
telemetryDataMessage = null;
break;
+ default:
+ break;
+
}
return telemetryDataMessage;
}
@@ -167,7 +173,20 @@
}
private static List<AlarmInfoDTO> handlerRepeatAlarmInfo(List<AlarmInfoDTO> alarmInfoDTOS) {
- ArrayList arrayList = new ArrayList(CommonConstant.ALARM_MAX_COUNT.intValue());
+ ArrayList<AlarmInfoDTO> arrayList = new ArrayList<>(CommonConstant.ALARM_MAX_COUNT.intValue());
+ List<AlarmInfoDTO> alarmList = alarmInfoDTOS.stream().collect(
+ Collectors.collectingAndThen(
+ Collectors.toCollection(() -> new TreeSet<AlarmInfoDTO>(Comparator.comparing(
+ alarm -> {
+ return alarm.getCode() + ";" + alarm.getMsg();
+ })//end of comparing
+ )//end new treeset
+ )//end toCollection
+ , ArrayList::new)//collectingAndThen
+ );
+
+ alarmList = alarmList.stream().sorted(Comparator.comparing(AlarmInfoDTO::getTimestamp).reversed()).collect(Collectors.toList());
+ /*
List<AlarmInfoDTO> alarmList = (List) ((List) alarmInfoDTOS.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> {
return new TreeSet(Comparator.comparing(alarm -> {
return alarm.getCode() + ";" + alarm.getMsg();
@@ -177,6 +196,7 @@
}))).stream().sorted(Comparator.comparing((v0) -> {
return v0.getTimestamp();
}).reversed()).collect(Collectors.toList());
+ */
for (int i = 0; i < alarmList.size() && arrayList.size() < CommonConstant.ALARM_MAX_COUNT.intValue(); i++) {
arrayList.add(alarmList.get(i));
}
--
Gitblit v1.9.3