From 80d01261e84d3c0f55cf2d17a56539b5c27a8485 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 27 三月 2024 22:45:27 +0800
Subject: [PATCH] 第三批编译错误修改
---
/dev/null | 274 ------------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupServiceImpl.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java | 260 ++---------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftRoutingServiceImpl.java | 214 +--------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java | 26 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceCheckServiceImpl.java | 36 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java | 490 ++++-----------------
7 files changed, 190 insertions(+), 1,112 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupServiceImpl.java
index 35ca7a1..d9522f9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupServiceImpl.java
@@ -855,7 +855,7 @@
List<CommonGroup> groupList = list(Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getGroupType, commonGroupTypeVO.getGroupType())
.eq(CommonGroup::getGroupCategory, commonGroupTypeVO.getGroupCategory())
.orderByAsc(CommonGroup::getSort));
- List<Long> groupIds = (List) groupList.stream().map((v0) -> {
+ List<Long> groupIds = groupList.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftRoutingServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftRoutingServiceImpl.java
index 3f62d28..49a12ed 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftRoutingServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftRoutingServiceImpl.java
@@ -77,171 +77,6 @@
private final IProductionCraftProcessFileService processFileService;
private final IBasCoderuleService basCodeRuleService;
- 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 -1291082392:
- if (implMethodName.equals("getVersionProcessId")) {
- z = true;
- break;
- }
- break;
- case -1061435468:
- if (implMethodName.equals("getProductId")) {
- 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 1330288580:
- if (implMethodName.equals("getGroupId")) {
- 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/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/CraftVersionLine") && 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/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();
- };
- }
- 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.getVersionProcessId();
- };
- }
- 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/ProductionCraftProcessRelatedTool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVersionProcessId();
- };
- }
- 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/ProductionCraftProcessFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVersionProcessId();
- };
- }
- 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/CraftRouting") && 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 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/CraftVersionLine") && 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/CraftRouting") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getProductId();
- };
- }
- 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/CraftRouting") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getProductId();
- };
- }
- 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/CraftRouting") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getProductId();
- };
- }
- 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/CraftRouting") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getProductId();
- };
- }
- 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/CraftRouting") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getProductId();
- };
- }
- 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/CraftRouting") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getProductId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public CraftRoutingServiceImpl(final IProductionCraftVersionService craftVersionService, final ICraftVersionLineService versionLineService, final IProductService productService, final IProductionCraftProcessService craftProcessService, final IProductionCraftProcessRelatedFixtureService relatedFixtureService, final IProductionCraftProcessRelatedToolService relatedToolService, final IProductionCraftProcessFileService processFileService, final IBasCoderuleService basCodeRuleService) {
this.craftVersionService = craftVersionService;
@@ -278,19 +113,23 @@
@Transactional(rollbackFor = {Exception.class})
public Boolean deleteCraft(Long id) {
boolean flag = removeById(id);
+
+ // .select(new SFunction[] { ProductionCraftVersion::getId })
+ List<Long> versionIds = this.craftVersionService.listObjs(Wrappers.<ProductionCraftVersion>lambdaQuery(ProductionCraftVersion.class)
+ .select(ProductionCraftVersion::getId)
+ .eq(ProductionCraftVersion::getCraftId, id), c -> Long.valueOf((c instanceof BigDecimal) ? ((BigDecimal)c).longValue() : ((Long)c).longValue()));
+ /*
List<Long> versionIds = this.craftVersionService.listObjs((Wrapper) Wrappers.lambdaQuery(ProductionCraftVersion.class).select(new SFunction[]{(v0) -> {
return v0.getId();
}}).eq((v0) -> {
return v0.getCraftId();
}, id), c -> {
return Long.valueOf(c instanceof BigDecimal ? ((BigDecimal) c).longValue() : ((Long) c).longValue());
- });
+ });*/
if (Func.isNotEmpty(versionIds)) {
flag = flag && this.craftVersionService.removeVersion(versionIds).booleanValue();
}
- return Boolean.valueOf(flag && this.versionLineService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCraftId();
- }, id)));
+ return Boolean.valueOf(flag && this.versionLineService.remove(Wrappers.<CraftVersionLine>lambdaQuery().eq(CraftVersionLine::getCraftId, id)));
}
@Override // org.springblade.modules.cps.service.ICraftRoutingService
@@ -347,20 +186,12 @@
@Override // org.springblade.modules.cps.service.ICraftRoutingService
public Boolean craftBindProduction(Long productionId, Long craftId) {
- return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate(CraftRouting.class).set((v0) -> {
- return v0.getProductId();
- }, productionId)).eq((v0) -> {
- return v0.getId();
- }, craftId)));
+ return update(Wrappers.lambdaUpdate(CraftRouting.class).set(CraftRouting::getProductId, productionId).eq(CraftRouting::getId, craftId));
}
@Override // org.springblade.modules.cps.service.ICraftRoutingService
public Boolean craftUnbindProduction(Long craftId) {
- return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate(CraftRouting.class).set((v0) -> {
- return v0.getProductId();
- }, (Object) null)).eq((v0) -> {
- return v0.getId();
- }, craftId)));
+ return update(Wrappers.lambdaUpdate(CraftRouting.class).set(CraftRouting::getProductId, null).eq(CraftRouting::getId, craftId));
}
@Override // org.springblade.modules.cps.service.ICraftRoutingService
@@ -380,7 +211,7 @@
newVersion.setDescription(version.getDescription());
newVersion.setGroupIds(getGroupIds(versionId));
ProductionCraftVersionVO craftVersion = this.craftVersionService.saveCraftVersion(craftId, newVersion);
- List<ProductionCraftProcess> processList = this.craftProcessService.list((Wrapper) Wrappers.lambdaQuery(ProductionCraftProcess.class).eq((v0) -> {
+ List<ProductionCraftProcess> processList = this.craftProcessService.list(Wrappers.lambdaQuery(ProductionCraftProcess.class).eq((v0) -> {
return v0.getVersionId();
}, version.getId()));
ProcessParallelSaveVO saveVO = copyProductNewCraftProcess(craftVersion.getId(), processList);
@@ -401,7 +232,7 @@
newVersion.setDescription(version.getDescription());
newVersion.setGroupIds(getGroupIds(versionId));
ProductionCraftVersionVO craftVersion = this.craftVersionService.saveCraftVersion(craftRouting.getId(), newVersion);
- List<ProductionCraftProcess> processList = this.craftProcessService.list((Wrapper) Wrappers.lambdaQuery(ProductionCraftProcess.class).eq((v0) -> {
+ List<ProductionCraftProcess> processList = this.craftProcessService.list(Wrappers.lambdaQuery(ProductionCraftProcess.class).eq((v0) -> {
return v0.getVersionId();
}, version.getId()));
ProcessParallelSaveVO saveVO = copyProductNewCraftProcess(craftVersion.getId(), processList);
@@ -412,20 +243,20 @@
private ProcessParallelSaveVO copyProductNewCraftProcess(Long versionId, List<ProductionCraftProcess> processList) {
ProcessParallelSaveVO vo = new ProcessParallelSaveVO();
if (Func.isNotEmpty(processList)) {
- List<Long> processIds = (List) processList.stream().map((v0) -> {
+ List<Long> processIds = processList.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
- Map<Long, List<ProductionCraftProcessRelatedFixture>> processFixtureMap = (Map) this.relatedFixtureService.list((Wrapper) Wrappers.lambdaQuery(ProductionCraftProcessRelatedFixture.class).in((v0) -> {
+ Map<Long, List<ProductionCraftProcessRelatedFixture>> processFixtureMap = this.relatedFixtureService.list( Wrappers.lambdaQuery(ProductionCraftProcessRelatedFixture.class).in((v0) -> {
return v0.getVersionProcessId();
}, processIds)).stream().collect(Collectors.groupingBy((v0) -> {
return v0.getVersionProcessId();
}));
- Map<Long, List<ProductionCraftProcessRelatedTool>> processToolMap = (Map) this.relatedToolService.list((Wrapper) Wrappers.lambdaQuery(ProductionCraftProcessRelatedTool.class).in((v0) -> {
+ Map<Long, List<ProductionCraftProcessRelatedTool>> processToolMap = (Map) this.relatedToolService.list(Wrappers.lambdaQuery(ProductionCraftProcessRelatedTool.class).in((v0) -> {
return v0.getVersionProcessId();
}, processIds)).stream().collect(Collectors.groupingBy((v0) -> {
return v0.getVersionProcessId();
}));
- Map<Long, List<ProductionCraftProcessFile>> processFileMap = (Map) this.processFileService.list((Wrapper) Wrappers.lambdaQuery(ProductionCraftProcessFile.class).in((v0) -> {
+ Map<Long, List<ProductionCraftProcessFile>> processFileMap = (Map) this.processFileService.list(Wrappers.lambdaQuery(ProductionCraftProcessFile.class).in((v0) -> {
return v0.getVersionProcessId();
}, processIds)).stream().collect(Collectors.groupingBy((v0) -> {
return v0.getVersionProcessId();
@@ -494,7 +325,10 @@
}
private List<Long> getGroupIds(Long versionId) {
- return this.versionLineService.listObjs((Wrapper) Wrappers.lambdaQuery(CraftVersionLine.class).select(new SFunction[]{(v0) -> {
+ return this.versionLineService.listObjs(Wrappers.lambdaQuery(CraftVersionLine.class).select(CraftVersionLine::getGroupId )
+ .eq(CraftVersionLine::getVersionId, versionId), c -> (c instanceof BigDecimal) ? Long.valueOf(((BigDecimal)c).longValue()) : (Long)c);
+ /*
+ return this.versionLineService.listObjs( Wrappers.lambdaQuery(CraftVersionLine.class).select(new SFunction[]{(v0) -> {
return v0.getGroupId();
}}).eq((v0) -> {
return v0.getVersionId();
@@ -503,7 +337,7 @@
return Long.valueOf(((BigDecimal) c).longValue());
}
return (Long) c;
- });
+ });*/
}
private void setProduce(CraftRoutingDetailVO vo, Long id) {
@@ -531,18 +365,18 @@
private QueryWrapper<CraftRouting> getWrapper(SearchVO vo) {
List<SearchVO.KV> param = vo.getParams();
- Map<String, String> params = (Map) param.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, String> params = param.stream().collect(Collectors.toMap((v0) -> {
return v0.getKey();
}, (v0) -> {
return v0.getValue();
}));
Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
- exclude.forEach(k, v -> {
+ exclude.forEach((k, v) -> {
String str = (String) params.remove(k);
});
QueryWrapper<CraftRouting> wrapper = new QueryWrapper<>();
if (Func.isNotEmpty(params)) {
- params.forEach(k2, v2 -> {
+ params.forEach((k2, v2) -> {
if (k2.endsWith(CraftConstant.LIKE)) {
wrapper.likeRight("bcr." + getColumn(k2, CraftConstant.LIKE), v2);
} else if (k2.endsWith(CraftConstant.ASC)) {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceCheckServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceCheckServiceImpl.java
index ae3959d..7902e76 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceCheckServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceCheckServiceImpl.java
@@ -22,28 +22,7 @@
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/DeviceCheckServiceImpl.class */
public class DeviceCheckServiceImpl extends BladeServiceImpl<DeviceTypeCheckProjectMapper, DeviceTypeCheckProject> implements IDeviceCheckService {
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case 731625057:
- if (implMethodName.equals("getDeviceTypeId")) {
- 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/DeviceTypeCheckProject") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getDeviceTypeId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
+
@Override // org.springblade.modules.cps.service.IDeviceCheckService
@Transactional(rollbackFor = {Exception.class})
@@ -54,21 +33,22 @@
}
Long deviceTypeId = vo.getDeviceTypeId();
Integer intervalTime = vo.getIntervalTime();
- List<DeviceTypeCheckProject> list = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getDeviceTypeId();
- }, deviceTypeId));
- Set<Long> checkProjectIdSet = (Set) list.stream().map((v0) -> {
+ List<DeviceTypeCheckProject> list = list(Wrappers.<DeviceTypeCheckProject>lambdaQuery().eq(DeviceTypeCheckProject::getDeviceTypeId, deviceTypeId));
+ Set<Long> checkProjectIdSet = list.stream().map((v0) -> {
return v0.getCheckProjectId();
}).collect(Collectors.toSet());
+
+ boolean anyMatch = checkProjectId.stream().anyMatch(checkProjectIdSet::contains);
+ /*
Stream<Long> stream = checkProjectId.stream();
checkProjectIdSet.getClass();
boolean anyMatch = stream.anyMatch((v1) -> {
return r1.contains(v1);
- });
+ });*/
if (anyMatch) {
throw new ServiceException(MessageUtils.message("cps.tpm.devicetype.checkproject.same", new Object[0]));
}
- List<DeviceTypeCheckProject> collect = (List) checkProjectId.stream().map(c -> {
+ List<DeviceTypeCheckProject> collect = checkProjectId.stream().map(c -> {
return DeviceTypeCheckProject.builder().deviceTypeId(deviceTypeId).checkProjectId(c).intervalTime(intervalTime).build();
}).collect(Collectors.toList());
saveBatch(collect);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java
index 8e29084..e64fa09 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java
@@ -11,6 +11,7 @@
import com.google.common.collect.Lists;
import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
@@ -52,187 +53,6 @@
private final OssBuilder ossBuilder;
private final IMachineService machineService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -274920090:
- if (implMethodName.equals("getMachineTypeId")) {
- z = true;
- 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 771206363:
- if (implMethodName.equals("getTenantId")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/DeviceType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/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();
- };
- }
- 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/Long;")) {
- return (v0) -> {
- return v0.getMachineTypeId();
- };
- }
- 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();
- };
- }
- 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();
- };
- }
- 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();
- };
- }
- 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();
- };
- }
- 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/DeviceType") && 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/DeviceType") && 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/DeviceType") && 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/DeviceType") && 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/DeviceType") && 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/DeviceType") && 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/DeviceType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
public DeviceTypeServiceImpl(final OssBuilder ossBuilder, final IMachineService machineService) {
this.ossBuilder = ossBuilder;
this.machineService = machineService;
@@ -240,13 +60,19 @@
@Override // org.springblade.modules.cps.service.IDeviceTypeService
public DeviceType createDeviceType(DeviceTypeAddVO deviceTypeAddVO) {
+ //DeviceType d;d.getTenantId()
+ Long count = Long.valueOf(count(Wrappers.<DeviceType>lambdaQuery()
+ .eq(DeviceType::getCode, deviceTypeAddVO.getCode())
+ .eq(DeviceType::getStatus, CommonConstant.ENABLE)
+ .eq(DeviceType::getTenantId, AuthUtil.getTenantId())));
+ /*
Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCode();
}, deviceTypeAddVO.getCode())).eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).eq((v0) -> {
return v0.getTenantId();
- }, AuthUtil.getTenantId())));
+ }, AuthUtil.getTenantId())));*/
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.workstation.device.type.code.already.exists", new Object[0]));
}
@@ -260,26 +86,29 @@
}
private boolean checkUnableType(String code) {
- DeviceType deviceType = (DeviceType) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCode();
- }, code)).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ DeviceType deviceType = getOne(Wrappers.<DeviceType>lambdaQuery().eq(DeviceType::getCode, code).eq(DeviceType::getStatus, CommonConstant.DEACTIVATE));
+
if (deviceType != null) {
- return Boolean.TRUE.booleanValue();
+ return true;
}
- return Boolean.FALSE.booleanValue();
+ return false;
}
@Override // org.springblade.modules.cps.service.IDeviceTypeService
public DeviceType updateDeviceType(DeviceTypeUpdateVO deviceTypeUpdateVO) {
- Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
+ Long count = Long.valueOf(count(Wrappers.<DeviceType>lambdaQuery()
+ .eq(DeviceType::getCode, checkExistDeviceType(deviceTypeUpdateVO.getId()).getCode())
+ .eq(DeviceType::getTenantId, AuthUtil.getTenantId())
+ .ne(DeviceType::getId, deviceTypeUpdateVO.getId())));
+
+ /*
+ Long count = Long.valueOf(count(Wrappers.<DeviceType>lambdaQuery().eq((v0) -> {
return v0.getCode();
}, checkExistDeviceType(Long.valueOf(deviceTypeUpdateVO.getId().longValue())).getCode())).eq((v0) -> {
return v0.getTenantId();
}, AuthUtil.getTenantId())).ne((v0) -> {
return v0.getId();
- }, deviceTypeUpdateVO.getId())));
+ }, deviceTypeUpdateVO.getId())));*/
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.workstation.device.type.code.already.exists", new Object[0]));
}
@@ -294,6 +123,16 @@
@Override // org.springblade.modules.cps.service.IDeviceTypeService
public IPage<DeviceTypeVO> pageDeviceType(String keyWord, Integer status, Query query) {
+ //DeviceType::getTenantId DeviceType::getName
+ IPage<DeviceType> page = page(Condition.getPage(query), Wrappers.<DeviceType>lambdaUpdate()
+ .eq(DeviceType::getTenantId, AuthUtil.getTenantId())
+ .eq(DeviceType::getStatus, (status == null) ? CommonConstant.ENABLE : status)
+ .and(Func.isNotEmpty(keyWord), wrapper -> wrapper.likeRight(DeviceType::getCode, keyWord).or().likeRight(DeviceType::getName, keyWord))
+
+ .orderByDesc(Arrays.asList(DeviceType::getCreateTime, DeviceType::getId) )
+ );
+
+ /*
IPage<DeviceType> page = page(Condition.getPage(query), (Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
return v0.getTenantId();
}, AuthUtil.getTenantId())).eq((v0) -> {
@@ -308,12 +147,12 @@
return v0.getCreateTime();
}, new SFunction[]{(v0) -> {
return v0.getId();
- }}));
- return (IPage) Optional.ofNullable(page).map(p -> {
- Page page2 = new Page(p.getCurrent(), p.getSize(), p.getTotal());
+ }}));*/
+ return Optional.ofNullable(page).map(p -> {
+ IPage<DeviceTypeVO> page2 = new Page<>(p.getCurrent(), p.getSize(), p.getTotal());
page2.setRecords(DeviceTypeConvert.INSTANCE.convert(p.getRecords()));
return page2;
- }).orElse(new Page());
+ }).orElse(new Page<>());
}
@Override // org.springblade.modules.cps.service.IDeviceTypeService
@@ -324,9 +163,8 @@
@Override // org.springblade.modules.cps.service.IDeviceTypeService
public Boolean deleteDeviceTypeByIds(List<Long> ids, Integer type) {
- List<Machine> machineList = this.machineService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getMachineTypeId();
- }, ids));
+ List<Machine> machineList = this.machineService.list(Wrappers.<Machine>lambdaQuery().in(Machine::getMachineTypeId, ids));
+
if (StatusType.REMOVE.getType().equals(type)) {
if (CollectionUtil.isNotEmpty(machineList)) {
throw new ServiceException(MessageUtils.message("cps.work.station.already.associated.with.the.device", new Object[0]));
@@ -345,7 +183,13 @@
@Override // org.springblade.modules.cps.service.IDeviceTypeService
public List<DeviceTypeExcel> listDeviceType(String keyword, Integer status) {
- List<DeviceType> deviceTypes = list((Wrapper) Wrappers.lambdaQuery().eq(status != null, (v0) -> {
+ List<DeviceType> deviceTypes = list(Wrappers.<DeviceType>lambdaQuery()
+ .eq((status != null), DeviceType::getStatus, status)
+ .and(Func.isNotEmpty(keyword), wrapper -> wrapper.likeRight(DeviceType::getCode, keyword).or().likeRight(DeviceType::getName, keyword))
+
+ .eq(Func.isNotEmpty(AuthUtil.getTenantId()), DeviceType::getTenantId, AuthUtil.getTenantId()).orderByAsc(DeviceType::getCode));
+ /*
+ List<DeviceType> deviceTypes2 = list((Wrapper) Wrappers.lambdaQuery().eq(status != null, (v0) -> {
return v0.getStatus();
}, status).and(Func.isNotEmpty(keyword), wrapper -> {
LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) wrapper.likeRight((v0) -> {
@@ -357,7 +201,7 @@
return v0.getTenantId();
}, AuthUtil.getTenantId()).orderByAsc((v0) -> {
return v0.getCode();
- }));
+ }));*/
List<DeviceTypeExcel> list = DeviceTypeConvert.INSTANCE.convert1(deviceTypes);
return list;
}
@@ -370,10 +214,9 @@
if (data.size() > 200) {
throw new ServiceException(MessageUtils.message("excel.import.size.failed", new Object[0]));
}
- List<DeviceType> deviceTypes = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE));
- Set<String> codeSet = (Set) deviceTypes.stream().map((v0) -> {
+ //DeviceType::getStatus
+ List<DeviceType> deviceTypes = list(Wrappers.<DeviceType>lambdaQuery().eq(DeviceType::getStatus, CommonConstant.ENABLE));
+ Set<String> codeSet = deviceTypes.stream().map((v0) -> {
return v0.getCode();
}).collect(Collectors.toSet());
Boolean flag = Boolean.TRUE;
@@ -407,7 +250,7 @@
}
}
if (!flag.booleanValue()) {
- MultipartFile multipartFile = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "鏈哄櫒绫诲瀷瀵煎叆澶辫触妯℃澘" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "鏈哄櫒绫诲瀷琛�", (List) data.stream().filter(x -> {
+ MultipartFile multipartFile = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "鏈哄櫒绫诲瀷瀵煎叆澶辫触妯℃澘" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "鏈哄櫒绫诲瀷琛�", data.stream().filter(x -> {
return Func.isNotEmpty(x.getFailReason());
}).collect(Collectors.toList()), (Object) null, (AbstractMergeStrategy) null);
BladeFile bladeFile = this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
@@ -450,11 +293,8 @@
}
boolean checkCodeIsExist(String code) {
- DeviceType one = (DeviceType) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCode();
- }, code)).eq((v0) -> {
- return v0.getTenantId();
- }, AuthUtil.getTenantId()));
+ DeviceType one = getOne(Wrappers.<DeviceType>lambdaQuery().eq(DeviceType::getCode, code)
+ .eq(DeviceType::getTenantId, AuthUtil.getTenantId()));
return Func.isNotEmpty(one);
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java
index 488d16e..9e18cb2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java
@@ -26,28 +26,6 @@
private final IWorkstationOfMachineService workstationOfMachineService;
private final IMachineService machineService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1453405940:
- if (implMethodName.equals("getMachineId")) {
- 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/DmpVariables") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getMachineId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public DmpVariablesServiceImpl(final IWorkstationOfMachineService workstationOfMachineService, final IMachineService machineService) {
this.workstationOfMachineService = workstationOfMachineService;
@@ -56,9 +34,7 @@
@Override // org.springblade.modules.cps.service.IDmpVariablesService
public List<DmpVariablesVO> listByMachineId(Long machineId) {
- List<DmpVariables> list = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineId();
- }, machineId));
+ List<DmpVariables> list = list(Wrappers.<DmpVariables>lambdaQuery().eq(DmpVariables::getMachineId, machineId));
return DmpVariablesConvert.INSTANCE.convert(list);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java
index d0b937c..812de99 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java
@@ -11,6 +11,7 @@
import com.google.common.collect.Lists;
import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -81,365 +82,6 @@
private final ICodeGeneratorService codeGeneratorService;
private final IPostService postService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1492577373:
- if (implMethodName.equals("getGroupType")) {
- z = true;
- break;
- }
- break;
- case -1460243263:
- if (implMethodName.equals("getPostName")) {
- z = true;
- break;
- }
- break;
- case -1249349403:
- if (implMethodName.equals("getTel")) {
- z = true;
- break;
- }
- break;
- case -129715105:
- if (implMethodName.equals("getEmployeeId")) {
- z = true;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 467811564:
- if (implMethodName.equals("getPinCode")) {
- z = true;
- break;
- }
- break;
- case 517353092:
- if (implMethodName.equals("getItemId")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- case 859984188:
- if (implMethodName.equals("getUserId")) {
- z = true;
- break;
- }
- break;
- case 977687216:
- if (implMethodName.equals("getJobNumber")) {
- z = true;
- break;
- }
- break;
- case 985326823:
- if (implMethodName.equals("getGroupCategory")) {
- z = true;
- break;
- }
- break;
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- z = false;
- break;
- }
- break;
- case 1330288580:
- if (implMethodName.equals("getGroupId")) {
- z = true;
- break;
- }
- break;
- case 1952444902:
- if (implMethodName.equals("getEmail")) {
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/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();
- };
- }
- 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;
- 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.getGroupType();
- };
- }
- 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/String;")) {
- return (v0) -> {
- return v0.getGroupType();
- };
- }
- 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();
- };
- }
- 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 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTel();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTel();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getPinCode();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getJobNumber();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getJobNumber();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getJobNumber();
- };
- }
- 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/Post") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getPostName();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getEmail();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getEmail();
- };
- }
- 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/EmployeePost") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getEmployeeId();
- };
- }
- 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/Employee") && 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/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getGroupCategory();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getGroupCategory();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public EmployeeServiceImpl(final ICommonGroupService commonGroupService, final ICommonGroupOfItemService commonGroupOfItemService, final IEmployeePostService employeePostService, final OssBuilder ossBuilder, final ICodeGeneratorService codeGeneratorService, final IPostService postService) {
this.commonGroupService = commonGroupService;
@@ -475,10 +117,10 @@
return v0.getEmail();
};
String conditionValue = isMobile.booleanValue() ? employeeSubmitVO.getTel() : employeeSubmitVO.getEmail();
- LambdaQueryWrapper<Employee> wrapper = ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq(column, conditionValue)).ne(isUpdate.booleanValue(), (v0) -> {
- return v0.getId();
- }, employeeSubmitVO.getId());
- Employee employee = (Employee) getOne(wrapper, Boolean.FALSE.booleanValue());
+
+ LambdaQueryWrapper<Employee> wrapper = Wrappers.<Employee>lambdaQuery().eq(column, conditionValue).ne(isUpdate.booleanValue(), Employee::getId, employeeSubmitVO.getId());
+
+ Employee employee = (Employee) getOne(wrapper, false);
if (!Objects.isNull(employee)) {
String message = MessageUtils.message("cps.employee.mobile.already.exists", new Object[0]);
Object[] objArr = new Object[2];
@@ -489,13 +131,18 @@
}
private void checkUnable(EmployeeSubmitVO employeeSubmitVO) {
+ Employee employee = (Employee)getOne(Lambda.<Employee>create()
+ .eq(Employee::getJobNumber, employeeSubmitVO.getJobNumber())
+ .ne(Func.isNotEmpty(employeeSubmitVO.getId()), Employee::getId, employeeSubmitVO.getId())
+ .eq(Employee::getStatus, CommonConstant.DEACTIVATE)
+ .limit());/*
Employee employee = (Employee) getOne(((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.create().eq((v0) -> {
return v0.getJobNumber();
}, employeeSubmitVO.getJobNumber())).ne(Func.isNotEmpty(employeeSubmitVO.getId()), (v0) -> {
return v0.getId();
}, employeeSubmitVO.getId()).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE)).limit());
+ }, CommonConstant.DEACTIVATE)).limit());*/
if (employee != null) {
throw new ServiceException(MessageUtils.message("cps.employee.name.exist.same.stop", new Object[0]));
}
@@ -503,6 +150,12 @@
private void checkEmployee(Boolean update, EmployeeSubmitVO employeeSubmitVO) {
if (Func.isNotEmpty(employeeSubmitVO.getJobNumber())) {
+ Employee employee = getOne(Lambda.<Employee>create()
+ .eq(Employee::getJobNumber, employeeSubmitVO.getJobNumber())
+ .ne(update.booleanValue(), Employee::getId, employeeSubmitVO.getId())
+ .eq(Employee::getStatus, CommonConstant.ENABLE)
+ .limit());
+ /*
Employee employee = (Employee) getOne(((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.create().eq((v0) -> {
return v0.getJobNumber();
}, employeeSubmitVO.getJobNumber())).ne(update.booleanValue(), (v0) -> {
@@ -510,6 +163,7 @@
}, employeeSubmitVO.getId()).eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).limit());
+ */
if (Func.isNotEmpty(employee)) {
throw new ServiceException(MessageUtils.message("cps.employee.job.number.already.exists", new Object[0]));
}
@@ -517,13 +171,19 @@
}
private void validCode(String code, Long id) {
+ Employee employee = getOne(Lambda.<Employee>create()
+ .eq(Employee::getCode, code)
+ .ne(Func.isNotEmpty(id), Employee::getId, id)
+ .eq(Employee::getStatus, CommonConstant.ENABLE)
+ .limit());
+ /*
Employee employee = (Employee) getOne(((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.create().eq((v0) -> {
return v0.getCode();
}, code)).ne(Func.isNotEmpty(id), (v0) -> {
return v0.getId();
}, id).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE)).limit());
+ }, CommonConstant.ENABLE)).limit());*/
if (Func.isNotEmpty(employee)) {
throw new ServiceException(MessageUtils.message("cps.employee.code.already.exists", new Object[0]));
}
@@ -548,9 +208,12 @@
HashMap<String, Long> commonGroupNameStatusMap = this.commonGroupService.getCommonGroupNameMap(organizationCode, CommonGroupTypeEnum.ORGANIZATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY, CommonConstant.ENABLE);
HashMap<String, Object> jobNumberMap = new HashMap<>(16);
HashMap<String, Object> telMap = new HashMap<>(16);
+
+ List<Employee> employeeList = list(Wrappers.<Employee>lambdaQuery().eq(Employee::getStatus, CommonConstant.ENABLE));
+ /*
List<Employee> employeeList = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE));
+ }, CommonConstant.ENABLE));*/
if (Func.isNotEmpty(employeeList)) {
employeeList.forEach(x -> {
jobNumberMap.put(x.getJobNumber(), null);
@@ -595,44 +258,60 @@
commonGroupOfItemList.add(commonGroupOfItem);
}
updateBatchById(employeeList);
+
+ this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>query().lambda()
+ .in(CommonGroupOfItem::getItemId, employeeIds));
+
+ /*
this.commonGroupOfItemService.remove((Wrapper) Wrappers.query().lambda().in((v0) -> {
return v0.getItemId();
- }, employeeIds));
+ }, employeeIds));*/
this.commonGroupOfItemService.saveBatch(commonGroupOfItemList);
return Boolean.TRUE;
}
@Override // org.springblade.modules.cps.service.IEmployeeService
public Boolean changeUserId(Long employeeId, Long oldEmployeeId, Long userId) {
+ update(Wrappers.<Employee>lambdaUpdate().set(Employee::getUserId, null).eq(Employee::getId, oldEmployeeId));
+ /*
update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getUserId();
}, (Object) null)).eq((v0) -> {
return v0.getId();
- }, oldEmployeeId));
+ }, oldEmployeeId));*/
if (Func.isNotEmpty(employeeId)) {
+ return Boolean.valueOf(update(Wrappers.<Employee>lambdaUpdate().set(Employee::getUserId, userId).eq(Employee::getId, employeeId)));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getUserId();
}, userId)).eq((v0) -> {
return v0.getId();
- }, employeeId)));
+ }, employeeId)));*/
}
return true;
}
@Override // org.springblade.modules.cps.service.IEmployeeService
public Boolean updateUserIdIsNull(List<String> userIdList) {
+
+ return Boolean.valueOf(update(Wrappers.<Employee>lambdaUpdate().set(Employee::getUserId, null).in(Employee::getUserId, userIdList)));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getUserId();
}, (Object) null)).in((v0) -> {
return v0.getUserId();
- }, userIdList)));
+ }, userIdList)));*/
}
@Override // org.springblade.modules.cps.service.IEmployeeService
public Boolean checkUserIsBindEmployee(String userIds) {
+ long count = count(Wrappers.<Employee>query().lambda()
+ .in(Employee::getUserId, Func.toLongList(userIds)));
+ /*
long count = count((Wrapper) Wrappers.query().lambda().in((v0) -> {
return v0.getUserId();
}, Func.toLongList(userIds)));
+ */
return Boolean.valueOf(count > 0);
}
@@ -645,20 +324,26 @@
@Override // org.springblade.modules.cps.service.IEmployeeService
public Employee getByUserId(Long userId) {
+ return (Employee)getOne(Wrappers.<Employee>query().lambda()
+ .eq(Employee::getUserId, userId));
+ /*
return (Employee) getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getUserId();
- }, userId));
+ }, userId));*/
}
private void checkImportEmployee(EmployeeImport employeeImport, HashMap<String, Long> commonGroupNameMap, HashMap<String, Object> jobNumberMap, HashMap<String, Object> telMap, HashMap<String, Long> commonGroupNameStatusMap) {
Map<String, Employee> stopEmployeeMap = null;
+
+ List<Employee> list = list(Wrappers.<Employee>lambdaQuery().eq(Employee::getStatus, CommonConstant.DEACTIVATE));
+ /*
List<Employee> list = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ }, CommonConstant.DEACTIVATE));*/
if (Func.isNotEmpty(list)) {
- stopEmployeeMap = (Map) list.stream().collect(Collectors.toMap((v0) -> {
+ stopEmployeeMap = list.stream().collect(Collectors.toMap((v0) -> {
return v0.getJobNumber();
- }, Function.identity(), k1, k2 -> {
+ }, Function.identity(), (k1, k2) -> {
return k1;
}));
}
@@ -700,11 +385,16 @@
}
employeeImport.setStatus(Integer.valueOf(Integer.parseInt(status)));
if (Func.isNotEmpty(employeeImport.getPostName())) {
+ Post post = this.postService.getOne(Lambda.<Post>create()
+ .eq(Post::getPostName, employeeImport.getPostName())
+ .eq(Post::getStatus, CommonConstant.DEACTIVATE)
+ .limit());
+ /*
Post post = (Post) this.postService.getOne(((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.create().eq((v0) -> {
return v0.getPostName();
}, employeeImport.getPostName())).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE)).limit());
+ }, CommonConstant.DEACTIVATE)).limit());*/
if (post != null) {
employeeImport.setFailReason(MessageUtils.message("cps.post.name.already.exist.stop.status", new Object[0]));
return;
@@ -767,9 +457,12 @@
private void submitEmployeeOrganization(Boolean update, Long employeeId, String organizationId) {
if (update.booleanValue()) {
+ this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery().eq(CommonGroupOfItem::getItemId, employeeId));
+ /*
this.commonGroupOfItemService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getItemId();
}, employeeId));
+ */
}
if (Func.isNotEmpty(organizationId)) {
List<Long> organizationIdList = Func.toLongList(organizationId);
@@ -784,9 +477,11 @@
private void submitEmployeePost(Boolean update, Long employeeId, String postId) {
if (update.booleanValue()) {
+ this.employeePostService.remove(Wrappers.<EmployeePost>lambdaQuery().eq(EmployeePost::getEmployeeId, employeeId));
+ /*
this.employeePostService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getEmployeeId();
- }, employeeId));
+ }, employeeId));*/
}
if (Func.isNotEmpty(postId)) {
List<Long> postIdList = Func.toLongList(postId);
@@ -803,6 +498,11 @@
@Override // org.springblade.modules.cps.service.IEmployeeService
public List<NotifyUserDTO> getNotifySubscriberList(List<String> userIds) {
+ return (List<NotifyUserDTO>)list(Wrappers.<Employee>lambdaQuery().in(Employee::getId, userIds)
+ .select(Employee::getId, Employee::getTel, Employee::getEmail )).stream()
+ .map(user -> new NotifyUserDTO(user.getId(), user.getEmail(), user.getTel(), null))
+ .collect(Collectors.toList());
+ /*
return (List) list(((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
}, userIds)).select(new SFunction[]{(v0) -> {
@@ -813,7 +513,7 @@
return v0.getEmail();
}})).stream().map(user -> {
return new NotifyUserDTO(user.getId(), user.getEmail(), user.getTel(), null);
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
}
@Override // org.springblade.modules.cps.service.IEmployeeService
@@ -833,14 +533,17 @@
@Override // org.springblade.modules.cps.service.IEmployeeService
public List<Employee> listByOrgIds(List<Long> orgIds) {
if (Func.isNotEmpty(orgIds)) {
+ List<CommonGroupOfItem> list = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getGroupId, orgIds).eq(CommonGroupOfItem::getGroupType, CommonGroupTypeEnum.ORGANIZATION.getName())
+ .eq(CommonGroupOfItem::getGroupCategory, CommonGroupConstant.DEFAULT_CATEGORY));
+ /*
List<CommonGroupOfItem> list = this.commonGroupOfItemService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getGroupId();
}, orgIds)).eq((v0) -> {
return v0.getGroupType();
}, CommonGroupTypeEnum.ORGANIZATION.getName())).eq((v0) -> {
return v0.getGroupCategory();
- }, CommonGroupConstant.DEFAULT_CATEGORY));
- List<Long> empIds = (List) list.stream().map((v0) -> {
+ }, CommonGroupConstant.DEFAULT_CATEGORY));*/
+ List<Long> empIds = list.stream().map((v0) -> {
return v0.getItemId();
}).collect(Collectors.toList());
return listByIds(empIds);
@@ -852,13 +555,16 @@
public List<GroupTreeVO> tree() {
List<GroupTreeVO> treeList = Lists.newArrayList();
CommonGroupTypeVO commonGroupType = new CommonGroupTypeVO().setGroupType(CommonGroupTypeEnum.ORGANIZATION.getName()).setGroupCategory(CommonGroupConstant.DEFAULT_CATEGORY);
+ List<Employee> list = list(Wrappers.<Employee>lambdaQuery().eq(Employee::getStatus, CommonConstant.ENABLE)
+ .orderByDesc(Arrays.asList(Employee::getCreateTime, Employee::getId) ));
+ /*
List<Employee> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).orderByDesc((v0) -> {
return v0.getCreateTime();
}, new SFunction[]{(v0) -> {
return v0.getId();
- }}));
+ }}));*/
list.forEach(x -> {
GroupTreeVO groupTree = EmployeeConvert.INSTANCE.convertToTree(x);
groupTree.setParentId(Long.valueOf(Func.toLong(x.getOrganizationId())));
@@ -876,22 +582,28 @@
if (!employeeUpdatePartVO.getPinCode().equals(employee.getPinCode())) {
throw new ServiceException(MessageUtils.message("cps.employee.ori.pin.error", new Object[0]));
}
+ return Boolean.valueOf(update(Wrappers.<Employee>lambdaUpdate().set(Employee::getPinCode, employeeUpdatePartVO.getNewPinCode()).eq(Employee::getId, employeeUpdatePartVO.getId())));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getPinCode();
}, employeeUpdatePartVO.getNewPinCode())).eq((v0) -> {
return v0.getId();
- }, employeeUpdatePartVO.getId())));
+ }, employeeUpdatePartVO.getId())));*/
} else if (Func.isNotEmpty(employeeUpdatePartVO.getJobNumber())) {
EmployeeSubmitVO employeeSubmitVO = new EmployeeSubmitVO();
employeeSubmitVO.setId(employeeUpdatePartVO.getId());
employeeSubmitVO.setJobNumber(employeeUpdatePartVO.getJobNumber());
checkEmployee(true, employeeSubmitVO);
checkUnable(employeeSubmitVO);
+
+ return Boolean.valueOf(update(Wrappers.<Employee>lambdaUpdate().set(Employee::getJobNumber, employeeUpdatePartVO.getJobNumber()).eq(Employee::getId, employeeUpdatePartVO.getId())));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getJobNumber();
}, employeeUpdatePartVO.getJobNumber())).eq((v0) -> {
return v0.getId();
}, employeeUpdatePartVO.getId())));
+ */
} else {
return false;
}
@@ -901,9 +613,12 @@
public EmployeeNameDTO getEmployeeNameMap() {
HashMap<String, Long> employeeNameMap = new HashMap<>(16);
HashMap<String, Long> repeatEmployeeNameMap = new HashMap<>(16);
+
+ List<Employee> list = list(Wrappers.<Employee>lambdaQuery().eq(Employee::getStatus, CommonConstant.ENABLE));
+ /*
List<Employee> list = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE));
+ }, CommonConstant.ENABLE));*/
list.forEach(x -> {
if (employeeNameMap.containsKey(x.getName())) {
repeatEmployeeNameMap.put(x.getName(), null);
@@ -916,9 +631,11 @@
@Override // org.springblade.modules.cps.service.IEmployeeService
public EmployeeVO currentEmployee(Long userId) {
+ Employee one = (Employee)getOne(Wrappers.<Employee>lambdaQuery().like(Employee::getUserId, userId));
+ /*
Employee one = (Employee) getOne((Wrapper) Wrappers.lambdaQuery().like((v0) -> {
return v0.getUserId();
- }, userId));
+ }, userId));*/
return EmployeeConvert.INSTANCE.convert(one);
}
@@ -935,13 +652,18 @@
CommonGroup currentNode = (CommonGroup) this.commonGroupService.getById(organizationId);
List<String> codeList = getCodeHierarchyList(currentNode.getCode());
if (Func.isNotEmpty(codeList)) {
+ List<CommonGroup> list = this.commonGroupService.list(Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getGroupType, CommonGroupTypeEnum.ORGANIZATION.getName())
+ .eq(CommonGroup::getGroupCategory, CommonGroupConstant.DEFAULT_CATEGORY)
+ .in(CommonGroup::getCode, codeList)
+ .last("order by length(code)"));
+ /*
List<CommonGroup> list = this.commonGroupService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getGroupType();
}, CommonGroupTypeEnum.ORGANIZATION.getName())).eq((v0) -> {
return v0.getGroupCategory();
}, CommonGroupConstant.DEFAULT_CATEGORY)).in((v0) -> {
return v0.getCode();
- }, codeList)).last("order by length(code)"));
+ }, codeList)).last("order by length(code)"));*/
list.forEach(x -> {
idList.add(x.getId());
sb.append(x.getName() + "/");
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/BasCoderuleController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/BasCoderuleController.java
deleted file mode 100644
index 001d1b3..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/BasCoderuleController.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package com.qianwen.smartman.modules.system.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.CodeRuleCache;
-import com.qianwen.smartman.common.constant.ExtCacheConstant;
-import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.core.boot.ctrl.BladeController;
-import com.qianwen.core.cache.utils.CacheUtil;
-import com.qianwen.core.log.exception.ServiceException;
-import com.qianwen.core.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.scanner.modular.annotation.GetResource;
-import com.qianwen.core.scanner.modular.annotation.PostResource;
-import com.qianwen.core.scanner.modular.stereotype.ApiResource;
-import com.qianwen.core.secure.annotation.PreAuth;
-import com.qianwen.core.tool.api.R;
-import com.qianwen.core.tool.api.ResultCode;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.smartman.modules.system.convert.BasCoderuleConvert;
-import com.qianwen.smartman.modules.system.dto.BasCoderuleDTO;
-import com.qianwen.smartman.modules.system.dto.BaseCodeRuleQueryDTO;
-import com.qianwen.smartman.modules.system.entity.BasCodeRule;
-import com.qianwen.smartman.modules.system.entity.MetaObjectType;
-import com.qianwen.smartman.modules.system.service.IBasCoderuleService;
-import com.qianwen.smartman.modules.system.service.ICodeGeneratorService;
-import com.qianwen.smartman.modules.system.service.IMetaObjectTypeService;
-import com.qianwen.smartman.modules.system.vo.UserVO;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@ApiResource({"blade-system/bascoderule"})
-@Api(value = "缂栫爜瑙勫垯", tags = {"缂栫爜瑙勫垯鎺ュ彛"})
-@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/controller/BasCoderuleController.class */
-public class BasCoderuleController extends BladeController {
- private IBasCoderuleService basCoderuleService;
- private IMetaObjectTypeService metaObjectTypeService;
- private ICodeGeneratorService codeGeneratorService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -464233508:
- if (implMethodName.equals("getBillFormId")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = true;
- break;
- }
- break;
- case 16953342:
- if (implMethodName.equals("getSubsysId")) {
- z = true;
- break;
- }
- break;
- case 58947841:
- if (implMethodName.equals("getRuleFieldDictKey")) {
- z = false;
- break;
- }
- break;
- case 761390710:
- if (implMethodName.equals("getRemark")) {
- 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/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getRuleFieldDictKey();
- };
- }
- 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/BasCodeRule") && 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/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getRemark();
- };
- }
- 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/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getBillFormId();
- };
- }
- 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/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getBillFormId();
- };
- }
- 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/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getBillFormId();
- };
- }
- 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/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getBillFormId();
- };
- }
- 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/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getBillFormId();
- };
- }
- 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/MetaObjectType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getSubsysId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
- public BasCoderuleController(final IBasCoderuleService basCoderuleService, final IMetaObjectTypeService metaObjectTypeService, final ICodeGeneratorService codeGeneratorService) {
- this.basCoderuleService = basCoderuleService;
- this.metaObjectTypeService = metaObjectTypeService;
- this.codeGeneratorService = codeGeneratorService;
- }
-
- @ApiOperationSupport(order = 1)
- @GetResource({"/detail"})
- @ApiOperation(value = "璇︽儏", notes = "鏍规嵁缂栫爜id鑾峰彇璇︽儏")
- public R<BasCoderuleDTO> detail(Long id) {
- BasCoderuleDTO detail = this.basCoderuleService.getCoderuleDetails(id);
- return R.data(detail);
- }
-
- @ApiOperationSupport(order = 2)
- @GetResource({"/list"})
- @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆basCoderule")
- @PreAuth
- public R<IPage<BasCodeRule>> list(BaseCodeRuleQueryDTO baseCodeRuleQueryDTO, Query query) {
- List<String> list = new ArrayList<>();
- if (Func.isNotEmpty(baseCodeRuleQueryDTO.getSubsysId())) {
- List<MetaObjectType> metaObjectTypes = this.metaObjectTypeService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getSubsysId();
- }, baseCodeRuleQueryDTO.getSubsysId()));
- if (metaObjectTypes.isEmpty()) {
- return R.data(new Page());
- }
- list = (List) metaObjectTypes.stream().map((v0) -> {
- return v0.getFId();
- }).collect(Collectors.toList());
- }
- IPage<BasCodeRule> pages = this.basCoderuleService.page(Condition.getPage(query), Wrappers.lambdaQuery().eq(Func.isNotEmpty(baseCodeRuleQueryDTO.getDictKey()), (v0) -> {
- return v0.getRuleFieldDictKey();
- }, baseCodeRuleQueryDTO.getDictKey()).eq(Func.isNotEmpty(baseCodeRuleQueryDTO.getObjectId()), (v0) -> {
- return v0.getBillFormId();
- }, baseCodeRuleQueryDTO.getObjectId()).in(Func.isNotEmpty(list), (v0) -> {
- return v0.getBillFormId();
- }, list).and(Func.isNotEmpty(baseCodeRuleQueryDTO.getCondition()), wrapper -> {
- LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) wrapper.like((v0) -> {
- return v0.getName();
- }, baseCodeRuleQueryDTO.getCondition())).or()).like((v0) -> {
- return v0.getRemark();
- }, baseCodeRuleQueryDTO.getCondition());
- }));
- return R.data(pages);
- }
-
- @PreAuth
- @GetResource({"/count"})
- @ApiOperation(value = "count", notes = "缂栫爜瑙勫垯鏌ヨ鏁伴噺")
- public R<Long> count(@RequestParam("type") @ApiParam("涓氬姟瀵硅薄鍚嶇О") String type) {
- return R.data(Long.valueOf(this.basCoderuleService.count(Lambda.eq((v0) -> {
- return v0.getBillFormId();
- }, type))));
- }
-
- @GetResource({"/count-all"})
- @ApiOperation(value = "count-all", notes = "鏌ヨ鎵�鏈変笟鍔″璞＄紪鐮佽鍒欐暟閲�")
- public R countAll() {
- Wrapper w = (Wrapper) new QueryWrapper().select(new String[]{"count(1) as \"count\"", Lambda.getName((v0) -> {
- return v0.getBillFormId();
- })}).lambda().groupBy((v0) -> {
- return v0.getBillFormId();
- });
- return R.data(BasCoderuleConvert.INSTANCE.convert(this.basCoderuleService.listMaps(w)));
- }
-
- @ApiOperationSupport(order = 6)
- @PostResource({"/submit"})
- @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆basCoderule")
- @PreAuth
- public R<BasCodeRule> submit(@Valid @RequestBody BasCoderuleDTO basCoderuleDTO) {
- return R.data(this.basCoderuleService.submitCoderule(basCoderuleDTO));
- }
-
- @ApiOperationSupport(order = 7)
- @PostResource({"/remove"})
- @ApiOperation(value = "閫昏緫鍒犻櫎", notes = "浼犲叆ids")
- @PreAuth
- public R remove(@RequestParam @ApiParam(value = "涓婚敭闆嗗悎", required = true) String ids) {
- CacheUtil.clear(ExtCacheConstant.CODE_RULE_CACHE, Boolean.FALSE);
- return R.status(this.basCoderuleService.deleteCoderule(Func.toLongList(ids)).booleanValue());
- }
-
- @ApiOperationSupport(order = 8)
- @GetResource({"/is-exist-code-rule"})
- @ApiOperation(value = "鏍规嵁涓氬姟瀵硅薄鏌ヨ鏄惁瀛樺湪缂栫爜瑙勫垯", notes = "浼犲叆涓氬姟瀵硅薄")
- public R<Boolean> getIsExistCodeRuleByBillFormId(@RequestParam @ApiParam(value = "涓氬姟瀵硅薄", required = true) String billFormId) {
- boolean existCodeRule = CodeRuleCache.existCodeRule(billFormId);
- return R.data(Boolean.valueOf(existCodeRule));
- }
-
- @PreAuth
- @GetResource({"change-default/{id}"})
- @ApiOperation(value = "鍚敤鍋滅敤", notes = "鍚敤鍋滅敤缂栫爜瑙勫垯")
- public R<Boolean> changeDefault(@PathVariable String id) {
- CacheUtil.clear(ExtCacheConstant.CODE_RULE_CACHE, Boolean.FALSE);
- return R.status(this.basCoderuleService.changeDefault(id));
- }
-
- @PostMapping({"/patch-code"})
- @PreAuth
- @ApiOperation(value = "鑾峰彇鎵嬪姩琛ュ彿鏁版嵁", notes = "浼犲叆涓氬姟瀵硅薄鐨勭紪鐮佸瓧娈靛拰涓氬姟瀵硅薄,鏌ヨ鎵嬪姩琛ュ彿鏁版嵁")
- public R<List<String>> patchCodeList(@RequestParam @ApiParam("涓氬姟瀵硅薄") String billFormId, @RequestBody Map<String, Object> objectData) {
- try {
- return R.data(this.basCoderuleService.patchCodeList(billFormId, objectData));
- } catch (IllegalArgumentException e) {
- R re = (R) JSONObject.parseObject(e.getMessage(), R.class);
- re.setCode(ResultCode.FAILURE.getCode());
- return re;
- } catch (ServiceException e2) {
- return R.fail(e2.getMessage());
- }
- }
-
- @PostMapping({"/generate"})
- public R<String> generateTest(@ApiParam("鏂板缓鐢ㄦ埛瀵硅薄") UserVO user) {
- String code = this.codeGeneratorService.getGeneratorCode(user, "User");
- return R.data(code);
- }
-}
--
Gitblit v1.9.3