From 25475f31cd0d52ff328bbea9e80f15647dedd80b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 28 三月 2024 23:12:14 +0800
Subject: [PATCH] fix cmpile error
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseGridServiceImpl.java | 58 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseAreaServiceImpl.java | 133 +---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseStationServiceImpl.java | 234 +-----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java | 570 +++--------------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayServiceImpl.java | 320 ++--------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayStorageServiceImpl.java | 216 ++----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TraySurfaceServiceImpl.java | 104 --
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayFixtureServiceImpl.java | 159 +---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationOfMachineServiceImpl.java | 33
9 files changed, 422 insertions(+), 1,405 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayFixtureServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayFixtureServiceImpl.java
index 2cd5045..e4b2d0a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayFixtureServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayFixtureServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.lang.Snowflake;
import com.alibaba.excel.write.merge.AbstractMergeStrategy;
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.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -55,7 +56,7 @@
import org.springframework.web.multipart.MultipartFile;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/TrayFixtureServiceImpl.class */
+
public class TrayFixtureServiceImpl extends BladeServiceImpl<TrayFixtureMapper, TrayFixture> implements ITrayFixtureService {
private static final Logger log = LoggerFactory.getLogger(TrayFixtureServiceImpl.class);
@Autowired
@@ -72,88 +73,6 @@
@Autowired
private ICommonGroupOfItemService itemService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -494860379:
- if (implMethodName.equals("getFixtureStatus")) {
- 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 1956157548:
- if (implMethodName.equals("getInUse")) {
- 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/Fixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getInUse();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Fixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getInUse();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Fixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getFixtureStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Fixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getFixtureStatus();
- };
- }
- 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/Tray") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Fixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
@Override // org.springblade.modules.cps.service.ITrayFixtureService
public List<TrayFaceFixtureVO> listFixture(String faceId) {
return this.baseMapper.listFixture(faceId);
@@ -163,7 +82,7 @@
@Transactional(rollbackFor = {Exception.class})
public List<TrayFixtureVO> addFaceFixture(TrayFaceFixtureAddVO vo) {
List<Long> fixIds = vo.getFixIds();
- List<TrayFixture> fixtures = (List) fixIds.stream().map(c -> {
+ List<TrayFixture> fixtures = fixIds.stream().map(c -> {
TrayFixture trayFixture = new TrayFixture();
trayFixture.setTrayId(vo.getTrayId());
trayFixture.setFaceId(vo.getFaceId());
@@ -171,14 +90,19 @@
return trayFixture;
}).collect(Collectors.toList());
saveBatch(fixtures);
- Tray tray = (Tray) this.trayService.getById(vo.getTrayId());
+ Tray tray = this.trayService.getById(vo.getTrayId());
+ this.fixtureService.update(Wrappers.<Fixture>lambdaUpdate()
+ .set(Fixture::getInUse, ToolingConstant.TOOLING_IN_USE)
+ .set(Fixture::getFixtureStatus, tray.getAvailability())
+ .in(Fixture::getId, fixIds));
+ /*
this.fixtureService.update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getInUse();
}, ToolingConstant.TOOLING_IN_USE)).set((v0) -> {
return v0.getFixtureStatus();
}, tray.getAvailability())).in((v0) -> {
return v0.getId();
- }, fixIds));
+ }, fixIds));*/
return TrayFixtureConvert.INSTANCE.convert(fixtures);
}
@@ -195,6 +119,12 @@
fixIds.add(s.getOthersId());
});
boolean remove = removeByIds(idList);
+
+ boolean update = this.fixtureService.update(Wrappers.<Fixture>lambdaUpdate()
+ .set(Fixture::getInUse, ToolingConstant.TOOLING_NOT_USE)
+ .set(Fixture::getFixtureStatus, null)
+ .in(Fixture::getId, fixIds));
+ /*
boolean update = this.fixtureService.update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getInUse();
}, ToolingConstant.TOOLING_NOT_USE)).set((v0) -> {
@@ -202,6 +132,7 @@
}, (Object) null)).in((v0) -> {
return v0.getId();
}, fixIds));
+ */
return Boolean.valueOf(remove && update);
}
@@ -234,37 +165,37 @@
return exportFailFile(failExcel);
}
if (Func.isNotEmpty(needSaveTray)) {
- Map<String, Tray> needSaveTrayMap = (Map) needSaveTray.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Tray> needSaveTrayMap = needSaveTray.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
- }, Function.identity(), v1, v2 -> {
+ }, Function.identity(), (v1, v2) -> {
return v1;
}));
Collection<Tray> trays = needSaveTrayMap.values();
this.trayService.saveBatch(trays);
- List<CommonGroupOfItem> items = (List) trays.stream().map(tray -> {
+ List<CommonGroupOfItem> items = trays.stream().map(tray -> {
return CommonGroupOfItem.builder().groupId(105L).itemId(tray.getId()).groupType(CommonGroupTypeEnum.TRAY.getName()).groupCategory(CommonGroupConstant.DEFAULT_CATEGORY).build();
}).collect(Collectors.toList());
this.itemService.saveBatch(items);
trayMap.putAll(needSaveTrayMap);
}
if (Func.isNotEmpty(needSaveFace)) {
- Map<String, TraySurface> needSaveFaceMap = (Map) needSaveFace.stream().collect(Collectors.toMap(k -> {
+ Map<String, TraySurface> needSaveFaceMap = needSaveFace.stream().collect(Collectors.toMap(k -> {
return StringUtils.getKey(k.getTrayId(), k.getCode());
- }, Function.identity(), v12, v22 -> {
+ }, Function.identity(), (v12, v22) -> {
return v12;
}));
this.traySurfaceService.saveBatch(needSaveFaceMap.values());
trayFaceMap.putAll(needSaveFaceMap);
}
if (Func.isNotEmpty(needSaveFixture)) {
- Map<String, Fixture> needSaveFixtureMap = (Map) needSaveFixture.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Fixture> needSaveFixtureMap = needSaveFixture.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
- }, Function.identity(), v13, v23 -> {
+ }, Function.identity(), (v13, v23) -> {
return v13;
}));
Collection<Fixture> fixtures = needSaveFixtureMap.values();
this.fixtureService.saveBatch(fixtures);
- List<CommonGroupOfItem> items2 = (List) fixtures.stream().map(fixture -> {
+ List<CommonGroupOfItem> items2 = fixtures.stream().map(fixture -> {
return CommonGroupOfItem.builder().groupId(104L).itemId(fixture.getId()).groupCategory(CommonGroupConstant.DEFAULT_CATEGORY).groupType(CommonGroupTypeEnum.FIXTURE.getName()).build();
}).collect(Collectors.toList());
this.itemService.saveBatch(items2);
@@ -290,12 +221,12 @@
}
});
List<TrayFixture> trayFixtures = list();
- Map<String, TrayFixture> trayFixtureMap = (Map) trayFixtures.stream().collect(Collectors.toMap(k -> {
+ Map<String, TrayFixture> trayFixtureMap = trayFixtures.stream().collect(Collectors.toMap(k -> {
return StringUtils.getKey(k.getTrayId(), k.getFaceId(), k.getFixId());
}, v -> {
return v;
}));
- List<TrayFixture> list = (List) trayFixtureList.stream().distinct().filter(c -> {
+ List<TrayFixture> list = trayFixtureList.stream().distinct().filter(c -> {
return !trayFixtureMap.containsKey(StringUtils.getKey(c.getTrayId(), c.getFaceId(), c.getFixId()));
}).collect(Collectors.toList());
if (Func.isNotEmpty(list)) {
@@ -416,28 +347,34 @@
}
private void getTrayFixtureMap(List<TrayFixtureImport> rawData, Map<String, Tray> trayMap, Map<String, Fixture> fixtureMap, Map<String, TraySurface> surfaceMap) {
- Wrapper lambdaQuery = Wrappers.lambdaQuery();
- Wrapper lambdaQuery2 = Wrappers.lambdaQuery();
- Wrapper<TrayFixtureImport> query = Wrappers.query();
+ LambdaQueryWrapper<Tray> trayQuery = Wrappers.lambdaQuery();
+ //Wrapper lambdaQuery = Wrappers.lambdaQuery();
+
+
+
+ LambdaQueryWrapper<Fixture> fixtureQuery = Wrappers.lambdaQuery();
+ // Wrapper lambdaQuery2 = Wrappers.lambdaQuery();
+
+ QueryWrapper<TrayFixtureImport> query = Wrappers.query();
boolean flag1 = false;
boolean flag2 = false;
boolean flag3 = false;
for (TrayFixtureImport data : rawData) {
if (trayCodeNameRequired(data)) {
if (flag1) {
- lambdaQuery.or();
+ trayQuery.or();
}
flag1 = true;
- lambdaQuery.eq((v0) -> {
+ trayQuery.eq((v0) -> {
return v0.getCode();
}, data.getTrayCode());
}
if (fixtureCodeNameRequired(data)) {
if (flag2) {
- lambdaQuery2.or();
+ fixtureQuery.or();
}
flag2 = true;
- lambdaQuery2.eq((v0) -> {
+ fixtureQuery.eq((v0) -> {
return v0.getCode();
}, data.getFixtureCode());
}
@@ -447,26 +384,26 @@
}
flag3 = true;
query.nested(i -> {
- QueryWrapper queryWrapper = (QueryWrapper) ((QueryWrapper) i.eq("bt.code", data.getTrayCode())).eq("bts.code", data.getTrayFaceCode());
+ i.eq("bt.code", data.getTrayCode()).eq("bts.code", data.getTrayFaceCode());
});
}
}
- String sqlSegment1 = lambdaQuery.getSqlSegment();
+ String sqlSegment1 = trayQuery.getSqlSegment();
if (Func.isNotEmpty(sqlSegment1)) {
- List<Tray> trays = this.trayService.list(lambdaQuery);
+ List<Tray> trays = this.trayService.list(trayQuery);
if (Func.isNotEmpty(trays)) {
- trayMap.putAll((Map) trays.stream().collect(Collectors.toMap((v0) -> {
+ trayMap.putAll(trays.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, v -> {
return v;
})));
}
}
- String sqlSegment2 = lambdaQuery2.getSqlSegment();
+ String sqlSegment2 = fixtureQuery.getSqlSegment();
if (Func.isNotEmpty(sqlSegment2)) {
- List<Fixture> fixtures = this.fixtureService.list(lambdaQuery2);
+ List<Fixture> fixtures = this.fixtureService.list(fixtureQuery);
if (Func.isNotEmpty(fixtures)) {
- fixtureMap.putAll((Map) fixtures.stream().collect(Collectors.toMap((v0) -> {
+ fixtureMap.putAll(fixtures.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, v2 -> {
return v2;
@@ -477,7 +414,7 @@
if (Func.isNotEmpty(sqlSegment3)) {
List<TraySurface> traySurfaces = this.traySurfaceService.listByTrayCodeName(query);
if (Func.isNotEmpty(traySurfaces)) {
- surfaceMap.putAll((Map) traySurfaces.stream().collect(Collectors.toMap(k -> {
+ surfaceMap.putAll(traySurfaces.stream().collect(Collectors.toMap(k -> {
return StringUtils.getKey(k.getTrayId(), k.getCode());
}, v3 -> {
return v3;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayServiceImpl.java
index 7e777d1..a7deda6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayServiceImpl.java
@@ -11,6 +11,7 @@
import com.google.common.collect.Sets;
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;
@@ -43,6 +44,8 @@
import com.qianwen.smartman.modules.cps.entity.CommonGroupOfItem;
import com.qianwen.smartman.modules.cps.entity.ToolAppendix;
import com.qianwen.smartman.modules.cps.entity.Tray;
+import com.qianwen.smartman.modules.cps.entity.TrayFixture;
+import com.qianwen.smartman.modules.cps.entity.TrayStorage;
import com.qianwen.smartman.modules.cps.entity.TraySurface;
import com.qianwen.smartman.modules.cps.enums.CommonGroupEnum;
import com.qianwen.smartman.modules.cps.enums.TrayEnum;
@@ -74,7 +77,6 @@
import org.springframework.web.multipart.MultipartFile;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/TrayServiceImpl.class */
public class TrayServiceImpl extends BladeServiceImpl<TrayMapper, Tray> implements ITrayService {
private static final Logger log = LoggerFactory.getLogger(TrayServiceImpl.class);
private final ITraySurfaceService surfaceService;
@@ -85,221 +87,6 @@
private final ICommonGroupOfItemService commonGroupOfItemService;
private final OssBuilder ossBuilder;
private final ICodeGeneratorService codeGeneratorService;
-
- 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 -1041904421:
- if (implMethodName.equals("getParentId")) {
- 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 517353092:
- if (implMethodName.equals("getItemId")) {
- z = false;
- break;
- }
- break;
- case 830319079:
- if (implMethodName.equals("getTrayId")) {
- z = true;
- break;
- }
- break;
- case 985326823:
- if (implMethodName.equals("getGroupCategory")) {
- z = true;
- break;
- }
- break;
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- z = true;
- break;
- }
- break;
- case 1330288580:
- if (implMethodName.equals("getGroupId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/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();
- };
- }
- 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/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/CommonGroup") && 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/Tray") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/TraySurface") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTrayId();
- };
- }
- 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/TrayStorage") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTrayId();
- };
- }
- 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/TraySurface") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTrayId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/TrayFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTrayId();
- };
- }
- 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/TrayStorage") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTrayId();
- };
- }
- 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/CommonGroup") && 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 RegionCache.VILLAGE_LEVEL /* 5 */:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroup") && 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/Tray") && 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/Tray") && 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/Tray") && 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/Long;")) {
- return (v0) -> {
- return v0.getGroupId();
- };
- }
- 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();
- };
- }
- 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();
- };
- }
- 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/ToolAppendix") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public TrayServiceImpl(final ITraySurfaceService surfaceService, final ICommonGroupService commonGroupService, final IToolAppendixService toolAppendixService, final ITrayFixtureService fixtureService, final ITrayStorageService storageService, final ICommonGroupOfItemService commonGroupOfItemService, final OssBuilder ossBuilder, final ICodeGeneratorService codeGeneratorService) {
this.surfaceService = surfaceService;
@@ -330,7 +117,7 @@
List<TrayFaceDTO> faceList = vo.getFaceList();
if (Func.isNotEmpty(faceList)) {
Set<String> codeSet = Sets.newHashSet();
- List<TraySurface> surfaces = (List) faceList.stream().map(f -> {
+ List<TraySurface> surfaces = faceList.stream().map(f -> {
String faceCode = f.getFaceCode();
String faceName = f.getFaceName();
codeSet.add(faceCode);
@@ -348,9 +135,7 @@
@Override // org.springblade.modules.cps.service.ITrayService
public TrayVO getDetail(Long id) {
Tray tray = (Tray) getById(id);
- CommonGroupOfItem item = (CommonGroupOfItem) this.commonGroupOfItemService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getItemId();
- }, id));
+ CommonGroupOfItem item = (CommonGroupOfItem) this.commonGroupOfItemService.getOne(Wrappers.<CommonGroupOfItem>lambdaQuery().eq(CommonGroupOfItem::getItemId, id));
Long groupId = item.getGroupId();
CommonGroup group = (CommonGroup) this.commonGroupService.getById(groupId);
long count = this.surfaceService.count(Lambda.eq((v0) -> {
@@ -372,11 +157,16 @@
public Boolean updateTray(TrayUpdateVO vo) {
Tray tray = TrayConvert.INSTANCE.convert(vo);
boolean update = updateById(tray);
+
+ this.commonGroupOfItemService.update(Wrappers.<CommonGroupOfItem>lambdaUpdate()
+ .set(CommonGroupOfItem::getGroupId, vo.getGroupId())
+ .eq(CommonGroupOfItem::getItemId, vo.getId()));
+ /*
this.commonGroupOfItemService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getGroupId();
}, vo.getGroupId())).eq((v0) -> {
return v0.getItemId();
- }, vo.getId()));
+ }, vo.getId()));*/
Integer availability = vo.getAvailability();
boolean flag = Func.isNotEmpty(availability);
if (flag) {
@@ -391,21 +181,13 @@
List<Long> ids = Func.toLongList(vo.getIds());
int count = removeFaceFixture(ids);
ThrowFun.isTrue(count > 0).throwMessage(MessageUtils.message("cps.tray.face.banding.fixture", new Object[0]));
- long countTrayStorage = this.storageService.count((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getTrayId();
- }, ids));
+ long countTrayStorage = this.storageService.count(Wrappers.<TrayStorage>lambdaQuery().in(TrayStorage::getTrayId, ids));
ThrowFun.isTrue(countTrayStorage > 0).throwMessage(MessageUtils.message("cps.tray.ware.station.fixture", new Object[0]));
boolean remove = removeByIds(ids);
- boolean removeFace = this.surfaceService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getTrayId();
- }, ids));
- boolean removeFixture = this.fixtureService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getTrayId();
- }, ids));
+ boolean removeFace = this.surfaceService.remove(Wrappers.<TraySurface>lambdaQuery().in(TraySurface::getTrayId, ids));
+ boolean removeFixture = this.fixtureService.remove(Wrappers.<TrayFixture>lambdaQuery().in(TrayFixture::getTrayId, ids));
this.fixtureService.updateFixtureStatusByTray(ids);
- this.storageService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getTrayId();
- }, ids));
+ this.storageService.remove(Wrappers.<TrayStorage>lambdaQuery().in(TrayStorage::getTrayId, ids));
return Boolean.valueOf(remove && removeFace && removeFixture);
}
@@ -425,22 +207,27 @@
@Transactional(rollbackFor = {Exception.class})
public Boolean removeTree(Long id) {
CommonGroup group = (CommonGroup) this.commonGroupService.getById(id);
- CommonGroup rootGroup = (CommonGroup) this.commonGroupService.getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getGroupCategory();
- }, group.getGroupCategory())).eq((v0) -> {
- return v0.getGroupType();
- }, group.getGroupType())).eq((v0) -> {
- return v0.getName();
- }, CommonGroupConstant.DEFAULT_GROUP_NAME));
+
+ CommonGroup rootGroup = this.commonGroupService.getOne(Wrappers.<CommonGroup>lambdaQuery()
+ .eq(CommonGroup::getGroupCategory, group.getGroupCategory())
+ .eq(CommonGroup::getGroupType, group.getGroupType())
+ .eq(CommonGroup::getName, CommonGroupConstant.DEFAULT_GROUP_NAME));
+
List<CommonGroup> allSubGroup = this.commonGroupService.getAllSubGroup(Long.valueOf(Func.toLong(id)), group.getGroupType(), group.getGroupCategory());
- List<Long> groupId = (List) allSubGroup.stream().map((v0) -> {
+ List<Long> groupId = allSubGroup.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
+
+ boolean update = this.commonGroupOfItemService.update(Wrappers.<CommonGroupOfItem>lambdaUpdate()
+ .set(CommonGroupOfItem::getGroupId, rootGroup.getId())
+ .in(CommonGroupOfItem::getGroupId, groupId));
+
+ /*
boolean update = this.commonGroupOfItemService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getGroupId();
}, rootGroup.getId())).in((v0) -> {
return v0.getGroupId();
- }, groupId));
+ }, groupId));*/
boolean remove = this.commonGroupService.removeById(id);
return Boolean.valueOf(update && remove);
}
@@ -453,9 +240,12 @@
@Override // org.springblade.modules.cps.service.ITrayService
public List<ToolAppendixVO> listToolAppendix(String id) {
+ List<ToolAppendix> appendixList = this.toolAppendixService.list(Wrappers.<ToolAppendix>lambdaQuery()
+ .eq(ToolAppendix::getParentId, id));
+ /*
List<ToolAppendix> appendixList = this.toolAppendixService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getParentId();
- }, id));
+ }, id));*/
return ToolAppendixConvert.INSTANCE.convert(appendixList);
}
@@ -467,11 +257,14 @@
@Override // org.springblade.modules.cps.service.ITrayService
public List<TrayEasyVO> listTray() {
+ List<Tray> list = list(Wrappers.<Tray>lambdaQuery()
+ .orderByDesc(Arrays.asList(Tray::getCreateTime, Tray::getId) ));
+ /*
List<Tray> list = list((Wrapper) Wrappers.lambdaQuery().orderByDesc((v0) -> {
return v0.getCreateTime();
}, new SFunction[]{(v0) -> {
return v0.getId();
- }}));
+ }}));*/
return TrayConvert.INSTANCE.convertVO(list);
}
@@ -488,21 +281,21 @@
if (trayData.size() > 200) {
throw new ServiceException(MessageUtils.message("excel.import.size.failed", new Object[0]));
}
- Set<String> trayCodeSet = (Set) list().stream().map((v0) -> {
+ Set<String> trayCodeSet = list().stream().map((v0) -> {
return v0.getCode();
}).collect(Collectors.toSet());
- Map<String, List<TrayImport>> map = (Map) trayData.stream().filter(c -> {
+ Map<String, List<TrayImport>> map = trayData.stream().filter(c -> {
return Func.isNotEmpty(c.getTrayCode());
}).collect(Collectors.groupingBy((v0) -> {
return v0.getTrayCode();
}));
HashMap<String, Long> commonGroupNameMap = this.commonGroupService.getCommonGroupNameMap(CommonGroupTypeEnum.TRAY.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
checkTrayImport(trayData, commonGroupNameMap, map, trayCodeSet);
- List<TrayImport> fails = (List) trayData.stream().filter(w -> {
+ List<TrayImport> fails = trayData.stream().filter(w -> {
return StrUtil.isNotEmpty(w.getFailReason());
}).collect(Collectors.toList());
if (fails.size() > 0) {
- MultipartFile template = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "trayImportErrorTemplate" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "鎵樼洏淇℃伅琛�", (List) trayData.stream().filter(x -> {
+ MultipartFile template = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "trayImportErrorTemplate" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "鎵樼洏淇℃伅琛�", trayData.stream().filter(x -> {
return Func.isNotEmpty(x.getFailReason());
}).collect(Collectors.toList()), (Object) null, (AbstractMergeStrategy) null);
return this.ossBuilder.tempTemplate().putFile(template.getOriginalFilename(), template);
@@ -512,19 +305,24 @@
trayImport.setTrayGroupName(CommonGroupEnum.UNASSORTED.getCode());
}
if (trayCodeSet.contains(trayImport.getTrayCode())) {
+ update(Wrappers.<Tray>update().lambda().eq(Tray::getCode, trayImport.getTrayCode()).set(Tray::getName, trayImport.getName()));
+ /*
update((Wrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().eq((v0) -> {
return v0.getCode();
}, trayImport.getTrayCode())).set((v0) -> {
return v0.getName();
- }, trayImport.getName()));
- Tray tray = (Tray) getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
- return v0.getCode();
- }, trayImport.getTrayCode()));
+ }, trayImport.getName()));*/
+ Tray tray = getOne(Wrappers.<Tray>query().lambda().eq(Tray::getCode, trayImport.getTrayCode()));
+ this.commonGroupOfItemService.update(Wrappers.<CommonGroupOfItem>update().lambda()
+ .eq(CommonGroupOfItem::getItemId, tray.getId())
+ .set(CommonGroupOfItem::getGroupId, commonGroupNameMap.get(trayImport.getTrayGroupName())));
+ /*
this.commonGroupOfItemService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().eq((v0) -> {
return v0.getItemId();
}, tray.getId())).set((v0) -> {
return v0.getGroupId();
}, commonGroupNameMap.get(trayImport.getTrayGroupName())));
+ */
return;
}
TraySaveVO traySaveVO = new TraySaveVO();
@@ -532,7 +330,7 @@
traySaveVO.setName(Func.isEmpty(trayImport.getName()) ? trayImport.getTrayCode() : trayImport.getName());
traySaveVO.setAvailability(TrayEnum.StatusEnum.ACTIVATING.getStatus());
traySaveVO.setGroupId((Long) commonGroupNameMap.get(trayImport.getTrayGroupName()));
- traySaveVO.setFaceList(new ArrayList());
+ traySaveVO.setFaceList(new ArrayList<>());
saveTray(traySaveVO);
});
return null;
@@ -572,24 +370,32 @@
if (Func.isEmpty(vo)) {
return Lists.newArrayList();
}
- List<Long> groupIds = (List) vo.stream().map((v0) -> {
+ List<Long> groupIds = vo.stream().map((v0) -> {
return v0.getParentId();
}).collect(Collectors.toList());
+
+ List<CommonGroup> commonGroups = this.commonGroupService.list(Wrappers.<CommonGroup>lambdaQuery().in(CommonGroup::getId, groupIds));
+ /*
List<CommonGroup> commonGroups = this.commonGroupService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
}, groupIds));
- List<TrayTreeVO> groups = (List) commonGroups.stream().map(this::convert).collect(Collectors.toList());
+ */
+ List<TrayTreeVO> groups = commonGroups.stream().map(this::convert).collect(Collectors.toList());
vo.addAll(groups);
return ForestNodeMerger.merge(vo);
}
private List<TrayTreeVO> getTrayTree(List<TrayTreeVO> vo, CommonGroupTypeVO groupTypeVO) {
+ List<CommonGroup> commonGroups = this.commonGroupService.list(Wrappers.<CommonGroup>lambdaQuery()
+ .eq(CommonGroup::getGroupType, groupTypeVO.getGroupType())
+ .eq(CommonGroup::getGroupCategory, groupTypeVO.getGroupCategory()));
+ /*
List<CommonGroup> commonGroups = this.commonGroupService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getGroupType();
}, groupTypeVO.getGroupType())).eq((v0) -> {
return v0.getGroupCategory();
- }, groupTypeVO.getGroupCategory()));
- List<TrayTreeVO> groups = (List) commonGroups.stream().map(this::convert).collect(Collectors.toList());
+ }, groupTypeVO.getGroupCategory()));*/
+ List<TrayTreeVO> groups = commonGroups.stream().map(this::convert).collect(Collectors.toList());
vo.addAll(groups);
return ForestNodeMerger.merge(vo);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayStorageServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayStorageServiceImpl.java
index b2a3e7d..0a955ab 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayStorageServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayStorageServiceImpl.java
@@ -1,33 +1,37 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import cn.hutool.core.lang.Snowflake;
-import com.alibaba.excel.write.merge.AbstractMergeStrategy;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.constant.CommonGroupConstant;
-import com.qianwen.smartman.common.constant.ExcelConstant;
-import com.qianwen.smartman.common.constant.ToolingConstant;
-import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
-import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.smartman.common.websocket.entity.FmsArea;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.mp.service.impl.BladeServiceImpl;
import com.qianwen.core.oss.model.BladeFile;
import com.qianwen.core.secure.utils.AuthUtil;
import com.qianwen.core.tool.support.Kv;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonGroupConstant;
+import com.qianwen.smartman.common.constant.ExcelConstant;
+import com.qianwen.smartman.common.constant.ToolingConstant;
+import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
+import com.qianwen.smartman.common.utils.MessageUtils;
+import com.qianwen.smartman.common.websocket.entity.FmsArea;
import com.qianwen.smartman.modules.cps.convert.TrayStorageConvert;
import com.qianwen.smartman.modules.cps.dto.RemoveIdsDTO;
import com.qianwen.smartman.modules.cps.entity.CommonGroupOfItem;
@@ -53,11 +57,8 @@
import com.qianwen.smartman.modules.fms.enums.PositionTypeEnum;
import com.qianwen.smartman.modules.fms.service.IFmsRealTimeTrayService;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.lang.Snowflake;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/TrayStorageServiceImpl.class */
@@ -78,97 +79,7 @@
private IFmsRealTimeTrayService fmsRealTimeTrayService;
@Autowired
private ICommonGroupOfItemService itemService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -927447111:
- if (implMethodName.equals("getTrayCode")) {
- z = false;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 1929248666:
- if (implMethodName.equals("getWarehouseCode")) {
- z = true;
- break;
- }
- break;
- case 1956157548:
- if (implMethodName.equals("getInUse")) {
- 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/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTrayCode();
- };
- }
- 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/Tray") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getInUse();
- };
- }
- 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/Tray") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getInUse();
- };
- }
- 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/WarehouseStation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWarehouseCode();
- };
- }
- 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/WarehouseArea") && 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/Tray") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
+
@Override // org.springblade.modules.cps.service.ITrayStorageService
public List<WareTrayStorageVO> listTray(Long id) {
return this.baseMapper.listTray(id);
@@ -179,15 +90,22 @@
public List<TrayStorageVO> addTrayStorage(TrayStorageAddVO vo) {
List<Long> trayIds = vo.getTrayIds();
Long warehouseStationId = vo.getWarehouseStationId();
- List<TrayStorage> storages = (List) trayIds.stream().map(c -> {
+
+
+ List<TrayStorage> storages = trayIds.stream().map(c -> {
return new TrayStorage().setTrayId(c).setWarehouseStationId(warehouseStationId);
}).collect(Collectors.toList());
+
saveBatch(storages);
+ this.trayService.update(Wrappers.<Tray>lambdaUpdate()
+ .set(Tray::getInUse, ToolingConstant.TOOLING_IN_USE)
+ .in(Tray::getId, trayIds));
+ /*
this.trayService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getInUse();
}, ToolingConstant.TOOLING_IN_USE)).in((v0) -> {
return v0.getId();
- }, trayIds));
+ }, trayIds));*/
saveFmsRealTimeTray(storages);
return TrayStorageConvert.INSTANCE.convert(storages);
}
@@ -200,12 +118,12 @@
trayIds.add(trayStorage.getTrayId());
warehouseStationIds.add(trayStorage.getWarehouseStationId());
});
- Map<Long, String> trayMap = (Map) this.trayService.listByIds(trayIds).stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, String> trayMap = this.trayService.listByIds(trayIds).stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, (v0) -> {
return v0.getCode();
}));
- Map<Long, String> warehouseStationMap = (Map) this.warehouseStationService.getWarehouseStationList(warehouseStationIds).stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, String> warehouseStationMap = this.warehouseStationService.getWarehouseStationList(warehouseStationIds).stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, (v0) -> {
return v0.getWarehouseAreaCode();
@@ -233,23 +151,30 @@
int count = this.trayService.removeFaceFixture(trayIds);
ThrowFun.isTrue(count > 0).throwMessage(MessageUtils.message("cps.tray.face.banding.fixture", new Object[0]));
boolean remove = removeByIds(idList);
+ boolean update = this.trayService.update(Wrappers.<Tray>lambdaUpdate()
+ .set(Tray::getInUse, ToolingConstant.TOOLING_NOT_USE)
+ .in(Tray::getId, trayIds));
+ /*
boolean update = this.trayService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getInUse();
}, ToolingConstant.TOOLING_NOT_USE)).in((v0) -> {
return v0.getId();
- }, trayIds));
+ }, trayIds));*/
Boolean fmsRealTimeTrayFlag = removeFmsRealTimeTray(trayIds);
return Boolean.valueOf(remove && update && fmsRealTimeTrayFlag.booleanValue());
}
private Boolean removeFmsRealTimeTray(List<Long> trayIds) {
List<Tray> trays = this.trayService.listByIds(trayIds);
- List<String> trayCodes = (List) trays.stream().map((v0) -> {
+ List<String> trayCodes = trays.stream().map((v0) -> {
return v0.getCode();
}).collect(Collectors.toList());
+ return Boolean.valueOf(this.fmsRealTimeTrayService.remove(Wrappers.<FmsRealTimeTray>lambdaQuery()
+ .in(FmsRealTimeTray::getTrayCode, trayCodes)));
+ /*
return Boolean.valueOf(this.fmsRealTimeTrayService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getTrayCode();
- }, trayCodes)));
+ }, trayCodes)));*/
}
@Override // org.springblade.modules.cps.service.ITrayStorageService
@@ -285,14 +210,14 @@
if (Func.isNotEmpty(failExcel)) {
return exportFailFile(failExcel);
}
- Map<String, WarehouseArea> needSaveAreaMap = (Map) needSaveArea.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, WarehouseArea> needSaveAreaMap = needSaveArea.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
- }, Function.identity(), v1, v2 -> {
+ }, Function.identity(), (v1, v2) -> {
return v1;
}));
- Map<String, WarehouseStation> needSaveStationMap = (Map) needSaveStation.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, WarehouseStation> needSaveStationMap = needSaveStation.stream().collect(Collectors.toMap((v0) -> {
return v0.getWarehouseCode();
- }, Function.identity(), v12, v22 -> {
+ }, Function.identity(), (v12, v22) -> {
return v12;
}));
if (Func.isNotEmpty(needSaveArea)) {
@@ -305,11 +230,11 @@
}
if (Func.isNotEmpty(needSaveTray)) {
this.trayService.saveBatch(needSaveTray);
- List<CommonGroupOfItem> items = (List) needSaveTray.stream().map(tray -> {
+ List<CommonGroupOfItem> items = needSaveTray.stream().map(tray -> {
return CommonGroupOfItem.builder().groupId(105L).itemId(tray.getId()).groupType(CommonGroupTypeEnum.TRAY.getName()).groupCategory(CommonGroupConstant.DEFAULT_CATEGORY).build();
}).collect(Collectors.toList());
this.itemService.saveBatch(items);
- trayMap.putAll((Map) needSaveTray.stream().collect(Collectors.toMap((v0) -> {
+ trayMap.putAll(needSaveTray.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, v -> {
return v;
@@ -331,12 +256,12 @@
trayStorageList.add(trayStorage);
});
List<TrayStorage> trayStorages = list();
- Map<String, TrayStorage> trayFixtureMap = (Map) trayStorages.stream().collect(Collectors.toMap(k -> {
+ Map<String, TrayStorage> trayFixtureMap = trayStorages.stream().collect(Collectors.toMap(k -> {
return StringUtils.getKey(k.getTrayId(), k.getWarehouseStationId());
}, v -> {
return v;
}));
- List<TrayStorage> collect = (List) trayStorageList.stream().distinct().filter(c -> {
+ List<TrayStorage> collect = trayStorageList.stream().distinct().filter(c -> {
return !trayFixtureMap.containsKey(StringUtils.getKey(c.getTrayId(), c.getWarehouseStationId()));
}).collect(Collectors.toList());
if (Func.isNotEmpty(collect)) {
@@ -464,46 +389,51 @@
}
private void getTrayStorage(List<TrayStorageImport> rawData, Map<String, WarehouseArea> areaMap, Map<String, WarehouseStation> warehouseStationMap, Map<String, Tray> trayMap) {
- Wrapper lambdaQuery = Wrappers.lambdaQuery();
- Wrapper lambdaQuery2 = Wrappers.lambdaQuery();
- Wrapper lambdaQuery3 = Wrappers.lambdaQuery();
+ //Wrapper lambdaQuery = Wrappers.lambdaQuery();
+ //Wrapper lambdaQuery2 = Wrappers.lambdaQuery();
+ //Wrapper lambdaQuery3 = Wrappers.lambdaQuery();
+
+ LambdaQueryWrapper<WarehouseArea> areaQuery = Wrappers.lambdaQuery();
+ LambdaQueryWrapper<WarehouseStation> staQuery = Wrappers.lambdaQuery();
+ LambdaQueryWrapper<Tray> trayQuery = Wrappers.lambdaQuery();
+
boolean flag1 = false;
boolean flag2 = false;
boolean flag3 = false;
for (TrayStorageImport data : rawData) {
if (requiredArea(data)) {
if (flag1) {
- lambdaQuery.or();
+ areaQuery.or();
}
flag1 = true;
- lambdaQuery.eq((v0) -> {
+ areaQuery.eq((v0) -> {
return v0.getCode();
}, data.getAreaCode());
}
if (requiredLocation(data)) {
if (flag2) {
- lambdaQuery2.or();
+ staQuery.or();
}
flag2 = true;
- lambdaQuery2.eq((v0) -> {
+ staQuery.eq((v0) -> {
return v0.getWarehouseCode();
}, data.getLocationCode());
}
if (requiredTray(data)) {
if (flag3) {
- lambdaQuery3.or();
+ trayQuery.or();
}
flag3 = true;
- lambdaQuery3.eq((v0) -> {
+ trayQuery.eq((v0) -> {
return v0.getCode();
}, data.getTrayCode());
}
}
- String sqlSegment1 = lambdaQuery.getSqlSegment();
+ String sqlSegment1 = areaQuery.getSqlSegment();
if (Func.isNotEmpty(sqlSegment1)) {
- List<WarehouseArea> areaList = this.warehouseAreaService.list(lambdaQuery);
+ List<WarehouseArea> areaList = this.warehouseAreaService.list(areaQuery);
if (Func.isNotEmpty(areaList)) {
- Map<String, WarehouseArea> map = (Map) areaList.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, WarehouseArea> map = areaList.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, v -> {
return v;
@@ -511,11 +441,11 @@
areaMap.putAll(map);
}
}
- String sqlSegment2 = lambdaQuery2.getSqlSegment();
+ String sqlSegment2 = staQuery.getSqlSegment();
if (Func.isNotEmpty(sqlSegment2)) {
- List<WarehouseStation> warehouseStations = this.warehouseStationService.list(lambdaQuery2);
+ List<WarehouseStation> warehouseStations = this.warehouseStationService.list(staQuery);
if (Func.isNotEmpty(warehouseStations)) {
- Map<String, WarehouseStation> map1 = (Map) warehouseStations.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, WarehouseStation> map1 =warehouseStations.stream().collect(Collectors.toMap((v0) -> {
return v0.getWarehouseCode();
}, v2 -> {
return v2;
@@ -523,11 +453,11 @@
warehouseStationMap.putAll(map1);
}
}
- String sqlSegment3 = lambdaQuery3.getSqlSegment();
+ String sqlSegment3 = trayQuery.getSqlSegment();
if (Func.isNotEmpty(sqlSegment3)) {
- List<Tray> trays = this.trayService.list(lambdaQuery3);
+ List<Tray> trays = this.trayService.list(trayQuery);
if (Func.isNotEmpty(trays)) {
- Map<String, Tray> map2 = (Map) trays.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Tray> map2 = trays.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, v3 -> {
return v3;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TraySurfaceServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TraySurfaceServiceImpl.java
index 7770327..4cc5d53 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TraySurfaceServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TraySurfaceServiceImpl.java
@@ -1,15 +1,16 @@
package com.qianwen.smartman.modules.cps.service.impl;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
-import java.util.List;
-import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.core.mp.service.impl.BladeServiceImpl;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.TraySurfaceConvert;
+import com.qianwen.smartman.modules.cps.entity.TrayFixture;
import com.qianwen.smartman.modules.cps.entity.TraySurface;
import com.qianwen.smartman.modules.cps.excel.TrayFixtureImport;
import com.qianwen.smartman.modules.cps.mapper.TraySurfaceMapper;
@@ -19,92 +20,13 @@
import com.qianwen.smartman.modules.cps.vo.TrayFaceAddVO;
import com.qianwen.smartman.modules.cps.vo.TrayFaceUpdateVO;
import com.qianwen.smartman.modules.cps.vo.TraySurfaceVO;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/TraySurfaceServiceImpl.class */
public class TraySurfaceServiceImpl extends BladeServiceImpl<TraySurfaceMapper, TraySurface> implements ITraySurfaceService {
private final ITrayFixtureService fixtureService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = false;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 413851470:
- if (implMethodName.equals("getFaceId")) {
- z = true;
- break;
- }
- break;
- case 830319079:
- if (implMethodName.equals("getTrayId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/TraySurface") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/TrayFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getFaceId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/TrayFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTrayId();
- };
- }
- 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/TraySurface") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getTrayId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/TraySurface") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
+
public TraySurfaceServiceImpl(final ITrayFixtureService fixtureService) {
this.fixtureService = fixtureService;
@@ -114,11 +36,13 @@
public Boolean removeFace(Long trayId, Long faceId) {
int count = this.baseMapper.removeFixture(trayId, faceId);
ThrowFun.isTrue(count > 0).throwMessage(MessageUtils.message("cps.face.fixture.station.fixture", new Object[0]));
+ boolean removeFixture = this.fixtureService.remove(Wrappers.<TrayFixture>lambdaQuery().eq(TrayFixture::getTrayId, trayId).eq(TrayFixture::getFaceId, faceId));
+ /*
boolean removeFixture = this.fixtureService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getTrayId();
}, trayId)).eq((v0) -> {
return v0.getFaceId();
- }, faceId));
+ }, faceId));*/
this.fixtureService.updateFixtureStatusByTray(Lists.newArrayList(new Long[]{trayId}));
return Boolean.valueOf(removeById(faceId) && removeFixture);
}
@@ -139,11 +63,13 @@
@Override // org.springblade.modules.cps.service.ITraySurfaceService
public Boolean updateTraySurface(TrayFaceUpdateVO vo) {
+ return Boolean.valueOf(update(Wrappers.<TraySurface>lambdaUpdate().set(TraySurface::getName, vo.getName()).eq(TraySurface::getId, vo.getId())));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getName();
}, vo.getName())).eq((v0) -> {
return v0.getId();
- }, vo.getId())));
+ }, vo.getId())));*/
}
@Override // org.springblade.modules.cps.service.ITraySurfaceService
@@ -152,11 +78,13 @@
}
public void validFaceCode(String code, Long trayId) {
+ long count = count(Wrappers.<TraySurface>lambdaQuery().eq(TraySurface::getTrayId, trayId).eq(TraySurface::getCode, code));
+ /*
long count = count((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getTrayId();
}, trayId)).eq((v0) -> {
return v0.getCode();
- }, code));
+ }, code));*/
ThrowFun.isTrue(count > 0).throwMessage(MessageUtils.message("cps.tray.face.name.exist", new Object[0]));
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseAreaServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseAreaServiceImpl.java
index 9346bf8..7bcc0d8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseAreaServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseAreaServiceImpl.java
@@ -1,21 +1,22 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.smartman.common.websocket.entity.FmsArea;
-import com.qianwen.smartman.common.websocket.entity.FmsAreaLocation;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.tool.node.ForestNodeMerger;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.common.utils.MessageUtils;
+import com.qianwen.smartman.common.websocket.entity.FmsArea;
+import com.qianwen.smartman.common.websocket.entity.FmsAreaLocation;
import com.qianwen.smartman.modules.cps.convert.WarehouseAreaConvert;
import com.qianwen.smartman.modules.cps.entity.WarehouseArea;
import com.qianwen.smartman.modules.cps.entity.WarehouseStation;
@@ -28,96 +29,12 @@
import com.qianwen.smartman.modules.cps.vo.WarehouseAreaUpdateVO;
import com.qianwen.smartman.modules.cps.vo.WarehouseAreaVO;
import com.qianwen.smartman.modules.fms.entity.FmsRealTimeTray;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/WarehouseAreaServiceImpl.class */
public class WarehouseAreaServiceImpl extends BaseServiceImpl<WarehouseAreaMapper, WarehouseArea> implements IWarehouseAreaService {
private final IWarehouseStationService iWarehouseStationService;
private final ITrayStorageService trayStorageService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = false;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 286461310:
- if (implMethodName.equals("getAreaId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WarehouseArea") && 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();
- };
- }
- 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/WarehouseArea") && 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/WarehouseStation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getAreaId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public WarehouseAreaServiceImpl(final IWarehouseStationService iWarehouseStationService, final ITrayStorageService trayStorageService) {
this.iWarehouseStationService = iWarehouseStationService;
@@ -137,22 +54,31 @@
if (Func.isNotEmpty(warehouseAreaSubmitVO.getCode()) && warehouseAreaSubmitVO.getCode().length() > 24) {
throw new ServiceException(MessageUtils.message("cps.warehouse.area.code.length.too.long", new Object[0]));
}
+ Long count = Long.valueOf(count(Wrappers.<WarehouseArea>lambdaQuery()
+ .ne(Func.isNotEmpty(warehouseAreaSubmitVO.getId()), WarehouseArea::getId, warehouseAreaSubmitVO.getId())
+ .eq(WarehouseArea::getCode, warehouseAreaSubmitVO.getCode())));
+ /*
Long count = Long.valueOf(count((Wrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(warehouseAreaSubmitVO.getId()), (v0) -> {
return v0.getId();
}, warehouseAreaSubmitVO.getId()).eq((v0) -> {
return v0.getCode();
- }, warehouseAreaSubmitVO.getCode())));
+ }, warehouseAreaSubmitVO.getCode())));*/
+
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.warehouse.area.code.already.exists", new Object[0]));
}
if (Func.isNotEmpty(warehouseAreaSubmitVO.getName()) && warehouseAreaSubmitVO.getName().length() > 32) {
throw new ServiceException(MessageUtils.message("cps.warehouse.area.name.length.too.long", new Object[0]));
}
+ Long countName = Long.valueOf(count(Wrappers.<WarehouseArea>lambdaQuery()
+ .ne(Func.isNotEmpty(warehouseAreaSubmitVO.getId()), WarehouseArea::getId, warehouseAreaSubmitVO.getId())
+ .eq(WarehouseArea::getName, warehouseAreaSubmitVO.getName())));
+ /*
Long countName = Long.valueOf(count((Wrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(warehouseAreaSubmitVO.getId()), (v0) -> {
return v0.getId();
}, warehouseAreaSubmitVO.getId()).eq((v0) -> {
return v0.getName();
- }, warehouseAreaSubmitVO.getName())));
+ }, warehouseAreaSubmitVO.getName())));*/
if (countName.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.warehouse.area.name.already.exists", new Object[0]));
}
@@ -171,11 +97,14 @@
@Override // org.springblade.modules.cps.service.IWarehouseAreaService
@Transactional(rollbackFor = {Exception.class})
public Boolean removeWithRelation(List<Long> ids) {
+ List<WarehouseStation> stationList = this.iWarehouseStationService.list(Wrappers.<WarehouseStation>lambdaQuery().select(WarehouseStation::getId)
+ .in(WarehouseStation::getAreaId, ids));
+ /*
List<WarehouseStation> stationList = this.iWarehouseStationService.list((Wrapper) Wrappers.lambdaQuery().select(new SFunction[]{(v0) -> {
return v0.getId();
}}).in((v0) -> {
return v0.getAreaId();
- }, ids));
+ }, ids));*/
if (Func.isNotEmpty(stationList)) {
throw new ServiceException(MessageUtils.message("cps.warehouse.area.cannot.delete", new Object[0]));
}
@@ -186,7 +115,7 @@
public List<WarehouseAreaStationVO> areaStationTree() {
List<WarehouseAreaStationVO> stationList = ((WarehouseAreaMapper) this.baseMapper).stationList();
List<WarehouseArea> areaList = list();
- List<WarehouseAreaStationVO> areas = (List) areaList.stream().map(c -> {
+ List<WarehouseAreaStationVO> areas = areaList.stream().map(c -> {
WarehouseAreaStationVO vo = new WarehouseAreaStationVO();
vo.setId(c.getId());
vo.setCode(c.getCode());
@@ -210,12 +139,12 @@
List<WarehouseArea> areaList = list(Lambda.in(Func.isNotEmpty(filterAreaId), (v0) -> {
return v0.getId();
}, filterAreaId));
- List<FmsArea> fmsAreaList = (List) areaList.stream().map(area -> {
+ List<FmsArea> fmsAreaList = areaList.stream().map(area -> {
FmsArea fmsArea = new FmsArea();
fmsArea.setId(area.getId() + "");
fmsArea.setName(area.getName());
fmsArea.setCode(area.getCode());
- fmsArea.setLocationList((List) stationList.stream().filter(station -> {
+ fmsArea.setLocationList(stationList.stream().filter(station -> {
return area.getId().equals(station.getParentId());
}).map(station2 -> {
FmsAreaLocation fmsAreaStation = new FmsAreaLocation();
@@ -236,10 +165,12 @@
@Override // org.springblade.modules.cps.service.IWarehouseAreaService
public List<FmsArea> assembleAreaData(List<String> filterAreaIds, Map<String, FmsRealTimeTray> realTimeTrayMap) {
List<WarehouseAreaStationVO> stationList = ((WarehouseAreaMapper) this.baseMapper).stationList();
+ List<WarehouseArea> list = list(Wrappers.<WarehouseArea>lambdaQuery().in(WarehouseArea::getId, filterAreaIds));
+ /*
List<WarehouseArea> list = list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
- }, filterAreaIds));
- return (List) list.stream().map(area -> {
+ }, filterAreaIds));*/
+ return list.stream().map(area -> {
FmsArea fmsArea = new FmsArea();
fmsArea.setId(String.valueOf(area.getId()));
fmsArea.setName(area.getName());
@@ -247,7 +178,7 @@
List<FmsAreaLocation> locationList = new ArrayList<>();
stationList.forEach(station -> {
if (area.getId().equals(station.getParentId())) {
- List<String> trayCodes = (List) this.trayStorageService.listTray(station.getId()).stream().map((v0) -> {
+ List<String> trayCodes = this.trayStorageService.listTray(station.getId()).stream().map((v0) -> {
return v0.getTrayCode();
}).collect(Collectors.toList());
for (String trayCode : trayCodes) {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseGridServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseGridServiceImpl.java
index 855326e..2df6e26 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseGridServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseGridServiceImpl.java
@@ -23,55 +23,6 @@
public class WarehouseGridServiceImpl extends BaseServiceImpl<WarehouseGridMapper, WarehouseGrid> implements IWarehouseGridService {
private IWarehouseStationService warehouseStationService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -2090991943:
- if (implMethodName.equals("getStationId")) {
- z = false;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WarehouseGrid") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getStationId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WarehouseGrid") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
public WarehouseGridServiceImpl(final IWarehouseStationService warehouseStationService) {
this.warehouseStationService = warehouseStationService;
}
@@ -99,18 +50,23 @@
@Override // org.springblade.modules.cps.service.IWarehouseGridService
public List<WarehouseGridVO> listByStationId(Long stationId) {
+ List<WarehouseGrid> list = list(Wrappers.<WarehouseGrid>lambdaQuery().eq(WarehouseGrid::getStationId, stationId));
+ /*
List<WarehouseGrid> list = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStationId();
- }, stationId));
+ }, stationId));*/
return WarehouseGridConvert.INSTANCE.convert(list);
}
private void checkWarehouseGrid(WarehouseGrid warehouseGrid) {
+ long count = count(Wrappers.<WarehouseGrid>lambdaQuery()
+ .ne(Func.isNotEmpty(warehouseGrid.getId()), WarehouseGrid::getId, warehouseGrid.getId()).eq(WarehouseGrid::getCode, warehouseGrid.getCode()));
+ /*
long count = count((Wrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(warehouseGrid.getId()), (v0) -> {
return v0.getId();
}, warehouseGrid.getId()).eq((v0) -> {
return v0.getCode();
- }, warehouseGrid.getCode()));
+ }, warehouseGrid.getCode()));*/
if (count > 0) {
throw new ServiceException(MessageUtils.message("cps.warehouse.grid.code.already.exists", new Object[0]));
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseStationServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseStationServiceImpl.java
index b39f3dd..ac9c02e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseStationServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WarehouseStationServiceImpl.java
@@ -1,15 +1,5 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.write.merge.AbstractMergeStrategy;
-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.core.toolkit.support.SFunction;
-import java.lang.invoke.SerializedLambda;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -17,14 +7,20 @@
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
+
import javax.servlet.http.HttpServletResponse;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.constant.CommonGroupConstant;
-import com.qianwen.smartman.common.constant.ExcelConstant;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+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.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
@@ -34,10 +30,15 @@
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
import com.qianwen.core.tool.utils.StringUtil;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.constant.CommonGroupConstant;
+import com.qianwen.smartman.common.constant.ExcelConstant;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.WarehouseStationConvert;
import com.qianwen.smartman.modules.cps.entity.MaterialStorage;
import com.qianwen.smartman.modules.cps.entity.TrayStorage;
import com.qianwen.smartman.modules.cps.entity.WarehouseArea;
+import com.qianwen.smartman.modules.cps.entity.WarehouseGrid;
import com.qianwen.smartman.modules.cps.entity.WarehouseStation;
import com.qianwen.smartman.modules.cps.excel.WarehouseStationExcel;
import com.qianwen.smartman.modules.cps.excel.WarehouseStationImport;
@@ -52,9 +53,9 @@
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
import com.qianwen.smartman.modules.system.service.ICodeGeneratorService;
import com.qianwen.smartman.modules.tpm.enums.MetaTypeEnum;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/WarehouseStationServiceImpl.class */
@@ -71,141 +72,6 @@
public static final Integer TYPE_CODE = 1;
public static final Integer TYPE_NAME = 2;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -2090991943:
- if (implMethodName.equals("getStationId")) {
- z = true;
- break;
- }
- break;
- case -633192478:
- if (implMethodName.equals("getWarehouseStationId")) {
- z = false;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 286461310:
- if (implMethodName.equals("getAreaId")) {
- z = true;
- break;
- }
- break;
- case 1929248666:
- if (implMethodName.equals("getWarehouseCode")) {
- z = true;
- break;
- }
- break;
- case 1929563192:
- if (implMethodName.equals("getWarehouseName")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/MaterialStorage") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWarehouseStationId();
- };
- }
- 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/TrayStorage") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWarehouseStationId();
- };
- }
- 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/WarehouseGrid") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getStationId();
- };
- }
- 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/WarehouseStation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWarehouseCode();
- };
- }
- 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/WarehouseStation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWarehouseCode();
- };
- }
- 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();
- };
- }
- 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/WarehouseStation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWarehouseName();
- };
- }
- 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/WarehouseStation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWarehouseName();
- };
- }
- 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/WarehouseArea") && 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/WarehouseArea") && 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/WarehouseStation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getAreaId();
- };
- }
- 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/WarehouseStation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getAreaId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public WarehouseStationServiceImpl(final WarehouseGridMapper warehouseGridMapper, final WarehouseAreaMapper warehouseAreaMapper, final OssBuilder ossBuilder, final WarehouseStationMapper warehouseStationMapper, final MaterialStorageMapper storageMapper, final ITrayStorageService trayStorageService, final ICodeGeneratorService codeGeneratorService) {
this.warehouseGridMapper = warehouseGridMapper;
@@ -220,6 +86,13 @@
@Override // org.springblade.modules.cps.service.IWarehouseStationService
@Transactional(rollbackFor = {Exception.class})
public Boolean deleteByIds(List<Long> ids) {
+
+
+ Long gridCont = this.warehouseGridMapper.selectCount(new QueryWrapper<WarehouseGrid>().lambda().in(WarehouseGrid::getStationId, ids));
+ Long materialCount = this.storageMapper.selectCount(Wrappers.lambdaQuery(MaterialStorage.class).in(MaterialStorage::getWarehouseStationId, ids));
+ long trayStorageCount = this.trayStorageService.count(Wrappers.lambdaQuery(TrayStorage.class).in(TrayStorage::getWarehouseStationId, ids));
+
+ /*
Long gridCont = this.warehouseGridMapper.selectCount((Wrapper) new QueryWrapper().lambda().in((v0) -> {
return v0.getStationId();
}, ids));
@@ -229,6 +102,7 @@
long trayStorageCount = this.trayStorageService.count((Wrapper) Wrappers.lambdaQuery(TrayStorage.class).in((v0) -> {
return v0.getWarehouseStationId();
}, ids));
+ */
if (gridCont.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.warehouse.station.not.delete", new Object[0]));
}
@@ -255,7 +129,7 @@
throw new ServiceException(MessageUtils.message("excel.import.size.failed", new Object[0]));
}
checkImportData(warehouseStationImports);
- List<WarehouseStationImport> fails = (List) warehouseStationImports.stream().filter(w -> {
+ List<WarehouseStationImport> fails = warehouseStationImports.stream().filter(w -> {
return StrUtil.isNotEmpty(w.getFailReason());
}).collect(Collectors.toList());
if (fails.size() > CommonConstant.ZERO.intValue()) {
@@ -279,7 +153,7 @@
}
private void saveWarehouseStation(List<WarehouseStationImport> success) {
- List<WarehouseStation> stationList = (List) success.parallelStream().map(station -> {
+ List<WarehouseStation> stationList = success.parallelStream().map(station -> {
WarehouseArea area = AREAS_CACHE.get(station.getWarehouseAreaCode());
WarehouseStation warehouseStation = WarehouseStationConvert.INSTANCE.convert(station);
warehouseStation.setAreaId(area.getId());
@@ -290,44 +164,42 @@
}
private void checkImportData(List<WarehouseStationImport> imports) {
- List<String> includeAreaCodes = (List) imports.parallelStream().map((v0) -> {
+ List<String> includeAreaCodes = imports.parallelStream().map((v0) -> {
return v0.getWarehouseAreaCode();
}).collect(Collectors.toList());
- List<WarehouseArea> warehouseAreas = this.warehouseAreaMapper.selectList(((LambdaQueryWrapper) Wrappers.lambdaQuery(WarehouseArea.class).in((v0) -> {
- return v0.getCode();
- }, includeAreaCodes)).select(new SFunction[]{(v0) -> {
- return v0.getId();
- }, (v0) -> {
- return v0.getCode();
- }}));
- Map<String, WarehouseArea> areaMap = (Map) warehouseAreas.parallelStream().collect(Collectors.toMap((v0) -> {
+ List<WarehouseArea> warehouseAreas = this.warehouseAreaMapper.selectList(Wrappers.lambdaQuery(WarehouseArea.class)
+ .in(WarehouseArea::getCode, includeAreaCodes)
+ .select(WarehouseArea::getId, WarehouseArea::getCode ));
+
+
+ Map<String, WarehouseArea> areaMap = warehouseAreas.parallelStream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, warehouseArea -> {
return warehouseArea;
- }, oldVal, currVal -> {
+ }, (oldVal, currVal) -> {
return currVal;
}));
- Map<Long, WarehouseArea> areaIdMap = (Map) warehouseAreas.parallelStream().collect(Collectors.toMap((v0) -> {
+ Map<Long, WarehouseArea> areaIdMap = warehouseAreas.parallelStream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, warehouseArea2 -> {
return warehouseArea2;
- }, oldVal2, currVal2 -> {
+ }, (oldVal2, currVal2) -> {
return currVal2;
}));
AREAS_CACHE.putAll(areaMap);
- List<String> importCodes = (List) imports.parallelStream().map((v0) -> {
+ List<String> importCodes = imports.parallelStream().map((v0) -> {
return v0.getWarehouseCode();
}).collect(Collectors.toList());
- List<String> importNames = (List) imports.parallelStream().map((v0) -> {
+ List<String> importNames = imports.parallelStream().map((v0) -> {
return v0.getWarehouseName();
}).collect(Collectors.toList());
- List<WarehouseStation> warehouseStations = (List) list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery(WarehouseStation.class).in((v0) -> {
- return v0.getWarehouseCode();
- }, importCodes)).or()).in((v0) -> {
- return v0.getWarehouseName();
- }, importNames)).parallelStream().peek(w -> {
- w.setWarehouseAreaCode(((WarehouseArea) areaIdMap.get(w.getAreaId())).getCode());
- }).collect(Collectors.toList());
+ List<WarehouseStation> warehouseStations = list(Wrappers.lambdaQuery(WarehouseStation.class)
+ .in(WarehouseStation::getWarehouseCode, importCodes)
+ .or().in(WarehouseStation::getWarehouseName, importNames))
+ .parallelStream().peek(w -> {
+ w.setWarehouseAreaCode(((WarehouseArea) areaIdMap.get(w.getAreaId())).getCode());
+ }).collect(Collectors.toList());
+
Map<String, Object> stationCodeMap = getVerifyList(Boolean.TRUE, warehouseStations);
Map<String, Object> stationNameMap = getVerifyList(Boolean.FALSE, warehouseStations);
imports.parallelStream().forEachOrdered(stationImport -> {
@@ -354,11 +226,14 @@
Function<WarehouseStation, String> function = x -> {
return isCode.booleanValue() ? x.getWarehouseAreaCode() + "-" + x.getWarehouseCode() : x.getWarehouseAreaCode() + "-" + x.getWarehouseName();
};
+
+ return warehouseStations.parallelStream().collect(HashMap::new, (map, item) -> map.put(function.apply(item), null), HashMap::putAll);
+ /*
return (HashMap) warehouseStations.parallelStream().collect(HashMap::new, map, item -> {
map.put(function.apply(item), null);
}, (v0, v1) -> {
v0.putAll(v1);
- });
+ });*/
}
private Boolean exitsArea(String areaCode, List<WarehouseArea> warehouseAreas) {
@@ -414,6 +289,9 @@
}
public void verifyCodeAndName(WarehouseStationVO warehouseStation) {
+ LambdaQueryWrapper<WarehouseStation> codeWrapper = Wrappers.lambdaQuery(WarehouseStation.class).eq(WarehouseStation::getAreaId, warehouseStation.getAreaId()).ne(Func.isNotEmpty(warehouseStation.getId()), WarehouseStation::getId, warehouseStation.getId()).eq(WarehouseStation::getWarehouseCode, warehouseStation.getWarehouseCode());
+ LambdaQueryWrapper<WarehouseStation> nameWrapper = Wrappers.lambdaQuery(WarehouseStation.class).eq(WarehouseStation::getAreaId, warehouseStation.getAreaId()).ne(Func.isNotEmpty(warehouseStation.getId()), WarehouseStation::getId, warehouseStation.getId()).eq(WarehouseStation::getWarehouseName, warehouseStation.getWarehouseName());
+ /*
LambdaQueryWrapper<WarehouseStation> codeWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery(WarehouseStation.class).eq((v0) -> {
return v0.getAreaId();
}, warehouseStation.getAreaId())).ne(Func.isNotEmpty(warehouseStation.getId()), (v0) -> {
@@ -427,7 +305,7 @@
return v0.getId();
}, warehouseStation.getId()).eq((v0) -> {
return v0.getWarehouseName();
- }, warehouseStation.getWarehouseName());
+ }, warehouseStation.getWarehouseName());*/
long codeCount = count(codeWrapper);
if (codeCount > 0) {
throw new ServiceException(MessageUtils.message("cps.warehouse.station.code.is.not.only", new Object[0]));
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationOfMachineServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationOfMachineServiceImpl.java
index 54a2c82..d68edcd 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationOfMachineServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationOfMachineServiceImpl.java
@@ -1,44 +1,23 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.lang.invoke.SerializedLambda;
import com.qianwen.smartman.modules.cps.entity.WorkstationOfMachine;
import com.qianwen.smartman.modules.cps.mapper.WorkstationOfMachineMapper;
import com.qianwen.smartman.modules.cps.service.IWorkstationOfMachineService;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/WorkstationOfMachineServiceImpl.class */
public class WorkstationOfMachineServiceImpl extends ServiceImpl<WorkstationOfMachineMapper, WorkstationOfMachine> implements IWorkstationOfMachineService {
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- 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/WorkstationOfMachine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
+
@Override // org.springblade.modules.cps.service.IWorkstationOfMachineService
public WorkstationOfMachine getWorkstationOfMachineByWorkstationId(Long workstationId) {
+ return getOne(Wrappers.<WorkstationOfMachine>lambdaQuery().eq(WorkstationOfMachine::getWorkstationId, workstationId));
+ /*
return (WorkstationOfMachine) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationId();
- }, workstationId));
+ }, workstationId));*/
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java
index 11051b0..cd742b9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java
@@ -1,20 +1,10 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.alibaba.excel.write.merge.AbstractMergeStrategy;
-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.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAccessor;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
@@ -28,11 +18,34 @@
import java.util.function.Function;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+
import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.collections.MapUtils;
import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+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.google.common.collect.Lists;
+import com.qianwen.core.cache.utils.CacheUtil;
+import com.qianwen.core.excel.util.ExcelUtil;
+import com.qianwen.core.log.exception.ServiceException;
+import com.qianwen.core.mp.base.BaseServiceImpl;
+import com.qianwen.core.mp.support.Condition;
+import com.qianwen.core.mp.support.Query;
+import com.qianwen.core.oss.model.BladeFile;
+import com.qianwen.core.secure.utils.AuthUtil;
+import com.qianwen.core.tool.utils.CollectionUtil;
+import com.qianwen.core.tool.utils.DateUtil;
+import com.qianwen.core.tool.utils.Func;
+import com.qianwen.core.tool.utils.StringUtil;
import com.qianwen.smartman.common.cache.DictCache;
-import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.common.cache.cps.WorkstationCache;
import com.qianwen.smartman.common.constant.CalendarConstant;
import com.qianwen.smartman.common.constant.CommonConstant;
@@ -51,18 +64,6 @@
import com.qianwen.smartman.common.utils.ValidatorUtils;
import com.qianwen.smartman.common.websocket.entity.FmsWorkBench;
import com.qianwen.smartman.common.websocket.entity.FmsWorkstation;
-import com.qianwen.core.cache.utils.CacheUtil;
-import com.qianwen.core.excel.util.ExcelUtil;
-import com.qianwen.core.log.exception.ServiceException;
-import com.qianwen.core.mp.base.BaseServiceImpl;
-import com.qianwen.core.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.oss.model.BladeFile;
-import com.qianwen.core.secure.utils.AuthUtil;
-import com.qianwen.core.tool.utils.CollectionUtil;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.core.tool.utils.StringUtil;
import com.qianwen.smartman.modules.cps.convert.CommonGroupConvert;
import com.qianwen.smartman.modules.cps.convert.WorkstationConvert;
import com.qianwen.smartman.modules.cps.convert.WorkstationWorkbenchConvert;
@@ -123,10 +124,6 @@
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
import com.qianwen.smartman.modules.tdengine.service.IWorkstationDynamicCollectService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/WorkstationServiceImpl.class */
public class WorkstationServiceImpl extends BaseServiceImpl<WorkstationMapper, Workstation> implements IWorkstationService {
@@ -155,326 +152,6 @@
private final Integer FTP_CORRELATION_DIRECTORY = 1;
private final Integer FTP_SAME_DIRECTORY = 2;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -2038138413:
- if (implMethodName.equals("getShortCode")) {
- z = true;
- break;
- }
- break;
- case -1710716399:
- if (implMethodName.equals("getGroupTag")) {
- z = true;
- break;
- }
- break;
- case -1492577373:
- if (implMethodName.equals("getGroupType")) {
- z = true;
- break;
- }
- break;
- case -1041904421:
- if (implMethodName.equals("getParentId")) {
- z = true;
- break;
- }
- break;
- case -858902114:
- if (implMethodName.equals("getMachineCode")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = true;
- break;
- }
- break;
- case -75106384:
- if (implMethodName.equals("getType")) {
- z = true;
- break;
- }
- break;
- case -74977101:
- if (implMethodName.equals("getYear")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 483442342:
- if (implMethodName.equals("getDeviceType")) {
- 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 985326823:
- if (implMethodName.equals("getGroupCategory")) {
- z = true;
- break;
- }
- break;
- case 1330288580:
- if (implMethodName.equals("getGroupId")) {
- z = true;
- break;
- }
- break;
- case 1984111180:
- if (implMethodName.equals("getCalendarCodeWaiting")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationOfMachine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/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();
- };
- }
- 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();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCalendarCodeWaiting();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- 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();
- };
- }
- 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/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getYear();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getDeviceType();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getShortCode();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupTag();
- };
- }
- 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/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/CommonGroup") && 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/Workstation") && 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/ProductionCalendar") && 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/Workstation") && 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/Workstation") && 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/Workstation") && 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/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public WorkstationServiceImpl(final IMachineService machineService, final IWorkstationOfMachineService workstationOfMachineService, final IWorkstationWcsService workstationWcsService, final ICommonGroupOfItemService commonGroupOfItemService, final ICommonGroupService commonGroupService, final ICalendarService calendarService, final WorkstationMapper workstationMapper, final OssBuilder ossBuilder, final IDmpVariablesService dmpVariablesService, final ITransferDirectoryService transferDirectoryService, final ITransferDirectoryGroupService transferDirectoryGroupService, final IWorkstationWorkbenchService workbenchService, final IDncWsRelationTdService wsRelationTdService, final IDncFixedSpaceService dncFixedSpaceService, final InsertWorkstationProducer workstationProducer, final IWorkstationDynamicCollectService dynamicCollectService) {
this.machineService = machineService;
@@ -506,7 +183,7 @@
@Override // org.springblade.modules.cps.service.IWorkstationService
public List<WorkstationWcsDmpDTO> queryWcsList(String workstationId) {
- return (List) ((WorkstationMapper) this.baseMapper).queryWcsList(workstationId).stream().filter(c -> {
+ return this.baseMapper.queryWcsList(workstationId).stream().filter(c -> {
return (WcsDataTypeEnums.WcsDataType.ALARM.getCode().equals(c.getWcsDataType()) || WcsDataTypeEnums.WcsDataType.ALARM_NUM.getCode().equals(c.getWcsDataType()) || WcsDataTypeEnums.WcsDataType.ALARM_INFO.getCode().equals(c.getWcsDataType())) ? false : true;
}).collect(Collectors.toList());
}
@@ -538,9 +215,8 @@
}
saveOrUpdate(workstation);
if (Func.isNotEmpty(workstationSubmitVO.getGroupId())) {
- if (Func.isEmpty(this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getItemId();
- }, workstation.getId())))) {
+ List<CommonGroupOfItem> itemList = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery().eq(CommonGroupOfItem::getItemId, workstation.getId()));
+ if (Func.isEmpty(itemList)) {
CommonGroupOfItem commonGroupOfItem = new CommonGroupOfItem(workstationSubmitVO.getGroupId(), workstation.getId(), CommonGroupTypeEnum.WORKSTATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
this.commonGroupOfItemService.save(commonGroupOfItem);
} else {
@@ -555,7 +231,7 @@
CacheUtil.clear(ExtCacheConstant.POSTING_WORKSTATION, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.POSTING_MACHINE, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.WORKSTATION_MACHINE, Boolean.FALSE);
- String redisKey = ExtCacheConstant.CPS_CACHE.concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(WorkstationCache.CRC);
+ String redisKey = ExtCacheConstant.CPS_CACHE.concat(":").concat(":").concat(WorkstationCache.CRC);
CacheUtil.clear(redisKey, Boolean.FALSE);
WorkstationVO workstationVO = WorkstationConvert.INSTANCE.convertSaveVO(workstationSubmitVO);
workstationVO.setId(workstation.getId());
@@ -599,9 +275,12 @@
return;
}
if (Func.isEmpty(workstationSubmitVO.getMachineId())) {
+ Machine machine1 = this.machineService.getOne(Wrappers.<Machine>lambdaQuery().eq(Machine::getMachineCode, workstationSubmitVO.getMachineCode()));
+ workstationSubmitVO.setMachineId(machine1.getId());
+ /*
workstationSubmitVO.setMachineId(((Machine) this.machineService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getMachineCode();
- }, workstationSubmitVO.getMachineCode()))).getId());
+ }, workstationSubmitVO.getMachineCode()))).getId());*/
}
WorkstationOfMachine workstationOfMachine2 = new WorkstationOfMachine(workstation.getId(), workstationSubmitVO.getMachineId());
this.workstationOfMachineService.save(workstationOfMachine2);
@@ -630,7 +309,7 @@
}
List<WorkstationWorkbenchVO> workbenchVOList = workstationSubmitVO.getWorkbenchVOList();
List<WorkstationWorkbench> workstationWorkbenchList = new ArrayList<>();
- Map<String, List<WorkstationWorkbenchVO>> map = (Map) workbenchVOList.stream().collect(Collectors.groupingBy(c -> {
+ Map<String, List<WorkstationWorkbenchVO>> map = workbenchVOList.stream().collect(Collectors.groupingBy(c -> {
return c.getName();
}));
map.values().forEach(workbenchList -> {
@@ -676,7 +355,7 @@
@Override // org.springblade.modules.cps.service.IWorkstationService
@Transactional(rollbackFor = {Exception.class})
public Boolean delete(List<Long> workstationIds, Integer type) {
- String redisKey = ExtCacheConstant.CPS_CACHE.concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(WorkstationCache.CRC);
+ String redisKey = ExtCacheConstant.CPS_CACHE.concat(":").concat(":").concat(WorkstationCache.CRC);
if (StatusType.REMOVE.getType().equals(type)) {
workstationIds.forEach(id -> {
this.transferDirectoryService.deleteWorkstationDirectory(id);
@@ -685,12 +364,15 @@
removeByIds(workstationIds);
this.dynamicCollectService.removeTableByDelWorkstations(workstationIds);
this.workstationWcsService.deleteByWorkstationIdList(workstationIds);
+ this.workstationOfMachineService.remove(Wrappers.<WorkstationOfMachine>lambdaQuery().in(WorkstationOfMachine::getWorkstationId, workstationIds));
+ this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getItemId, workstationIds));
+ /*
this.workstationOfMachineService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getWorkstationId();
}, workstationIds));
this.commonGroupOfItemService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getItemId();
- }, workstationIds));
+ }, workstationIds));*/
WorkstationCache.clearWorkstationCache();
CacheUtil.clear(ExtCacheConstant.POSTING_WORKSTATION, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.POSTING_MACHINE, Boolean.FALSE);
@@ -711,7 +393,7 @@
List<String> workStationGroupIdList = new ArrayList<>();
if (!Objects.equals(groupId, CommonGroupConstant.ALL_WORKSTATION_ID) && Func.isNotEmpty(groupId)) {
workStationGroupIdList.add(String.valueOf(groupId));
- workStationGroupIdList.addAll((Collection) getCommonGroupIds(workStationGroupIdList, new ArrayList()).stream().map(item -> {
+ workStationGroupIdList.addAll(getCommonGroupIds(workStationGroupIdList, new ArrayList<>()).stream().map(item -> {
return String.valueOf(item.getId());
}).collect(Collectors.toList()));
}
@@ -746,7 +428,7 @@
@NotNull
private List<FmsWorkBench> wrapperBench(WorkstationOfWorkbenchVO station) {
- return (List) station.getWorkstationWorkbenchVOList().stream().map(bench -> {
+ return station.getWorkstationWorkbenchVOList().stream().map(bench -> {
FmsWorkBench workBench = new FmsWorkBench();
workBench.setId(Func.toStr(bench.getId()));
workBench.setName(bench.getName());
@@ -757,12 +439,12 @@
@Override // org.springblade.modules.cps.service.IWorkstationService
public List<FmsWorkstation> getFmsWorkstation(final List<Long> workstationIds) {
- List<Long> commonGroupIds = (List) this.commonGroupService.list(Lambda.eq((v0) -> {
+ List<Long> commonGroupIds = this.commonGroupService.list(Lambda.eq((v0) -> {
return v0.getGroupTag();
}, FmsOrderEnum.FMS_BELTLINE.getCode())).stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
- List<FmsWorkstation> fmsWorkstations = (List) commonGroupIds.stream().flatMap(id -> {
+ List<FmsWorkstation> fmsWorkstations = commonGroupIds.stream().flatMap(id -> {
return this.commonGroupService.getAllSubGroup(id, CommonGroupTypeEnum.WORKSTATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY).stream();
}).map((v0) -> {
return v0.getId();
@@ -778,11 +460,11 @@
fmsWorkstation.setWorkBenchList(wrapperBench(station2));
return fmsWorkstation;
}).collect(Collectors.collectingAndThen(Collectors.toCollection(() -> {
- return new TreeSet(Comparator.comparing((v0) -> {
+ return new TreeSet<>(Comparator.comparing((v0) -> {
return v0.getId();
}));
}), (v1) -> {
- return new ArrayList(v1);
+ return new ArrayList<>(v1);
}));
return fmsWorkstations;
}
@@ -796,9 +478,7 @@
@Override // org.springblade.modules.cps.service.IWorkstationService
public void updateWorkstationCalendar() {
- List<Workstation> list = list((Wrapper) new QueryWrapper().lambda().isNotNull((v0) -> {
- return v0.getCalendarCodeWaiting();
- }));
+ List<Workstation> list = list(new QueryWrapper<Workstation>().lambda().isNotNull(Workstation::getCalendarCodeWaiting));
List<Workstation> workstationList = new ArrayList<>();
if (Func.isNotEmpty(list)) {
list.stream().filter(workstation -> {
@@ -817,9 +497,7 @@
@Transactional(rollbackFor = {Exception.class})
public Boolean changeWorkstationGroup(Long groupId, List<Long> workstationIdList) {
CommonGroup commonGroup = (CommonGroup) this.commonGroupService.getById(groupId);
- List<CommonGroupOfItem> list = this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getItemId();
- }, workstationIdList));
+ List<CommonGroupOfItem> list = this.commonGroupOfItemService.list( Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getItemId, workstationIdList));
list.forEach(commonGroupOfItem -> {
commonGroupOfItem.setGroupId(groupId);
commonGroupOfItem.setGroupType(commonGroup.getGroupType());
@@ -855,10 +533,8 @@
throw new ServiceException(MessageUtils.message("excel.import.size.failed", new Object[0]));
}
HashMap<String, Long> commonGroupNameMap = this.commonGroupService.getCommonGroupNameMap(CommonGroupTypeEnum.WORKSTATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
- List<Machine> machineList = this.machineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE));
- List<String> calendarCodeList = (List) this.calendarService.getCalendarList(AuthUtil.getTenantId()).stream().map((v0) -> {
+ List<Machine> machineList = this.machineService.list(Wrappers.<Machine>lambdaQuery().eq(Machine::getStatus, CommonConstant.ENABLE));
+ List<String> calendarCodeList = this.calendarService.getCalendarList(AuthUtil.getTenantId()).stream().map((v0) -> {
return v0.getCode();
}).collect(Collectors.toList());
Boolean flag = Boolean.TRUE;
@@ -869,7 +545,7 @@
List<String> workstationCodeList = new ArrayList<>();
List<String> machineCodeList = new ArrayList<>();
List<MachineVO> machineVOList = this.machineService.listHaveBand();
- Set<String> machineCodeSet = (Set) machineVOList.stream().map((v0) -> {
+ Set<String> machineCodeSet = machineVOList.stream().map((v0) -> {
return v0.getMachineCode();
}).collect(Collectors.toSet());
CodeMapDTO codeMapDTO = new CodeMapDTO(pinCodeMap, shortCodeMap, workstationCodeList, machineCodeList, importPinCodeMap, importShortCodeMap);
@@ -880,7 +556,7 @@
}
}
if (!flag.booleanValue()) {
- MultipartFile multipartFile = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "workstationFailTemplate" + 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 + "workstationFailTemplate" + 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);
@@ -913,12 +589,12 @@
public IPage<WorkstationRealTimeStatusVO> getRealTimeStatus(WorkstationRealTimeStatusDTO dto, Query query) {
List<String> workStationGroupIdList = dto.getWorkStationGroupIdList();
if (workStationGroupIdList.size() == 1) {
- List<String> workStationGroupIdByParentList = (List) getCommonGroupIds(workStationGroupIdList, new ArrayList()).stream().map(item -> {
+ List<String> workStationGroupIdByParentList = getCommonGroupIds(workStationGroupIdList, new ArrayList<>()).stream().map(item -> {
return String.valueOf(item.getId());
}).collect(Collectors.toList());
dto.getWorkStationGroupIdList().addAll(workStationGroupIdByParentList);
}
- List<WorkstationRealTimeStatusVO> result = ((WorkstationMapper) this.baseMapper).getWorkstationListByWorkStationGroupIdList(new Page().setSize(-1L), dto);
+ List<WorkstationRealTimeStatusVO> result = this.baseMapper.getWorkstationListByWorkStationGroupIdList(new Page<WorkstationRealTimeStatusVO>().setSize(-1L), dto);
return manualBuildIPage(query, buildProperties(result, dto.getDeviceStatus()));
}
@@ -951,11 +627,11 @@
Map<Long, List<RealTimeStatusVO>> properties = new HashMap<>();
List<DmpVariablesVO> list = this.dmpVariablesService.getDmpVariablesByWorkstationIds(workstationIdList);
if (Func.isNotEmpty(list)) {
- Map<Long, List<DmpVariablesVO>> dmpVariablesMap = (Map) list.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, List<DmpVariablesVO>> dmpVariablesMap =list.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
- dmpVariablesMap.forEach(k, v -> {
- ArrayList arrayList = new ArrayList();
+ dmpVariablesMap.forEach((k, v) -> {
+ ArrayList<RealTimeStatusVO> arrayList = new ArrayList<>();
Map<String, Object> map = WorkstationCache.getWorkstationRealTime(String.valueOf(k));
v.forEach(dmpVariablesVO -> {
RealTimeStatusVO vo = new RealTimeStatusVO();
@@ -1000,7 +676,7 @@
@Override // org.springblade.modules.cps.service.IWorkstationService
public List<Workstation> listWorkStationByGroup(List<Long> ids) {
- return ((WorkstationMapper) this.baseMapper).listWorkStationByGroupId((List) ids.stream().map((v0) -> {
+ return ((WorkstationMapper) this.baseMapper).listWorkStationByGroupId(ids.stream().map((v0) -> {
return String.valueOf(v0);
}).collect(Collectors.toList()));
}
@@ -1017,17 +693,13 @@
@Override // org.springblade.modules.cps.service.IWorkstationService
public List<Workstation> workStationList(List<Long> ids) {
- return list((Wrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().in((v0) -> {
- return v0.getId();
- }, ids)).orderByAsc((v0) -> {
- return v0.getName();
- }));
+ return list(new QueryWrapper<Workstation>().lambda().in(Workstation::getId, ids).orderByAsc(Workstation::getName));
}
@Override // org.springblade.modules.cps.service.IWorkstationService
public Map<Long, GroupWorkDTO> queryGroupWorkStation(List<Long> ids) {
- List<GroupWorkDTO> groupWorkDTOS = ((WorkstationMapper) this.baseMapper).queryGroupWorkStation(ids);
- return (Map) groupWorkDTOS.stream().collect(Collectors.toMap((v0) -> {
+ List<GroupWorkDTO> groupWorkDTOS = this.baseMapper.queryGroupWorkStation(ids);
+ return groupWorkDTOS.stream().collect(Collectors.toMap((v0) -> {
return v0.getItemId();
}, v -> {
return v;
@@ -1045,15 +717,12 @@
CommonGroup commonGroup = (CommonGroup) this.commonGroupService.getById(groupId);
if (commonGroup != null) {
String code = commonGroup.getCode();
- List<CommonGroup> commonGroupList = this.commonGroupService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getGroupCategory();
- }, CommonGroupConstant.DEFAULT_CATEGORY)).eq((v0) -> {
- return v0.getGroupType();
- }, CommonGroupTypeEnum.WORKSTATION.getName())).likeRight((v0) -> {
- return v0.getCode();
- }, code));
+ List<CommonGroup> commonGroupList = this.commonGroupService.list(Wrappers.<CommonGroup>lambdaQuery()
+ .eq(CommonGroup::getGroupCategory, CommonGroupConstant.DEFAULT_CATEGORY)
+ .eq(CommonGroup::getGroupType, CommonGroupTypeEnum.WORKSTATION.getName())
+ .likeRight(CommonGroup::getCode, code));
if (Func.isNotEmpty(commonGroupList)) {
- List<Long> collect = (List) commonGroupList.stream().map((v0) -> {
+ List<Long> collect = commonGroupList.stream().map((v0) -> {
return v0.getId();
}).distinct().collect(Collectors.toList());
ids.addAll(collect);
@@ -1075,18 +744,16 @@
Map<String, String> importPinCodeMap = codeMapDTO.getImportPinCodeMap();
Map<String, String> importShortCodeMap = codeMapDTO.getImportShortCodeMap();
Map<String, Machine> machineDeaMap = null;
- List<Machine> deactivateList = this.machineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ List<Machine> deactivateList = this.machineService.list( Wrappers.<Machine>lambdaQuery().eq(Machine::getStatus, CommonConstant.DEACTIVATE));
if (Func.isNotEmpty(deactivateList)) {
- machineDeaMap = (Map) deactivateList.stream().collect(Collectors.toMap((v0) -> {
+ machineDeaMap = deactivateList.stream().collect(Collectors.toMap((v0) -> {
return v0.getMachineCode();
}, Function.identity()));
}
- List<String> machineShortCodeList = (List) machineList.stream().map((v0) -> {
+ List<String> machineShortCodeList = machineList.stream().map((v0) -> {
return v0.getShortCode();
}).distinct().collect(Collectors.toList());
- Map<String, Machine> machineCodeToValue = (Map) machineList.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Machine> machineCodeToValue = machineList.stream().collect(Collectors.toMap((v0) -> {
return v0.getMachineCode();
}, v -> {
return v;
@@ -1101,9 +768,7 @@
workstationImport.setFailReason(MessageUtils.message("cps.workstation.code.already.exists.stop.status", new Object[0]));
} else if (ValidatorUtils.stringFilter(workstationImport.getCode())) {
workstationImport.setFailReason(MessageUtils.message("cps.workstation.code.exist.special.symbols.error", new Object[0]));
- } else if (count((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCode();
- }, workstationImport.getCode())) > 0) {
+ } else if (count(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getCode, workstationImport.getCode())) > 0) {
workstationImport.setFailReason(MessageUtils.message("cps.workstation.code.already.exists", new Object[0]));
} else if (!codeList.contains(workstationImport.getCode())) {
codeList.add(workstationImport.getCode());
@@ -1248,11 +913,8 @@
workstationImport.setFailReason(StringUtil.format(MessageUtils.message("cps.tpm.machine.short.code.length", new Object[0]), new Object[]{4, 8}));
return true;
}
- Long count = Long.valueOf(this.machineService.count(((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getShortCode();
- }, shortCode)).ne(Func.isNotEmpty(code), (v0) -> {
- return v0.getMachineCode();
- }, code)));
+ Long count = Long.valueOf(this.machineService.count(Wrappers.<Machine>lambdaQuery().eq(Machine::getShortCode, shortCode)
+ .ne(Func.isNotEmpty(code), Machine::getMachineCode, code)));
if (count.longValue() > 0) {
workstationImport.setFailReason(MessageUtils.message("cps.tpm.machine.short.code.exists", new Object[0]));
return true;
@@ -1285,19 +947,23 @@
Workstation workstation = (Workstation) getById(workstationId);
if (workstation != null) {
WorkstationVO workstationVO = WorkstationConvert.INSTANCE.convert(workstation);
+
+ ProductionCalendar calendar = this.calendarService.getOne(Wrappers.<ProductionCalendar>lambdaQuery()
+ .eq(ProductionCalendar::getCode, workstation.getCalendarCode())
+ .eq(ProductionCalendar::getYear, Integer.valueOf(LocalDate.now().getYear())));
+ /*
ProductionCalendar calendar = (ProductionCalendar) this.calendarService.getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCode();
}, workstation.getCalendarCode())).eq((v0) -> {
return v0.getYear();
- }, Integer.valueOf(LocalDate.now().getYear())));
+ }, Integer.valueOf(LocalDate.now().getYear())));*/
+
if (Func.notNull(calendar)) {
workstationVO.setCalendarName(calendar.getName());
} else {
workstationVO.setCalendarName("绯荤粺鏃ュ巻");
}
- CommonGroupOfItem commonGroupOfItem = (CommonGroupOfItem) this.commonGroupOfItemService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getItemId();
- }, workstationId));
+ CommonGroupOfItem commonGroupOfItem = this.commonGroupOfItemService.getOne(Wrappers.<CommonGroupOfItem>lambdaQuery().eq(CommonGroupOfItem::getItemId, workstationId));
if (commonGroupOfItem != null) {
CommonGroup commonGroup = (CommonGroup) this.commonGroupService.getById(commonGroupOfItem.getGroupId());
if (Func.isNotEmpty(commonGroup)) {
@@ -1338,7 +1004,7 @@
throw new ServiceException(MessageUtils.message("workstation.not.turn.on.acquisition.function", new Object[0]));
}
List<DmpVariablesVO> dmpVariablesVOS = this.dmpVariablesService.getDmpVariablesByWorkstationId(Long.valueOf(workstationId));
- return (List) dmpVariablesVOS.stream().filter((v0) -> {
+ return dmpVariablesVOS.stream().filter((v0) -> {
return v0.getRealTimeData();
}).collect(Collectors.toList());
}
@@ -1347,24 +1013,33 @@
if (Func.isNotEmpty(workstationSubmitVO.getCode()) && workstationSubmitVO.getCode().length() > 24) {
throw new ServiceException(MessageUtils.message("cps.workstation.code.length.too.long", new Object[0]));
}
+ Long count = Long.valueOf(count(Wrappers.<Workstation>lambdaQuery()
+ .ne(Func.isNotEmpty(workstationSubmitVO.getId()), Workstation::getId, workstationSubmitVO.getId())
+ .eq(Workstation::getCode, workstationSubmitVO.getCode())
+ .eq(Workstation::getStatus, CommonConstant.ENABLE)));
+ /*
Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(workstationSubmitVO.getId()), (v0) -> {
return v0.getId();
}, workstationSubmitVO.getId()).eq((v0) -> {
return v0.getCode();
}, workstationSubmitVO.getCode())).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE)));
+ }, CommonConstant.ENABLE)));*/
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.workstation.code.already.exists", new Object[0]));
}
}
private boolean checkUnableImportWorkstation(String code) {
+ Workstation workstation = getOne(Wrappers.<Workstation>lambdaQuery()
+ .eq(Workstation::getCode, code)
+ .eq(Workstation::getStatus, CommonConstant.DEACTIVATE));
+ /*
Workstation workstation = (Workstation) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCode();
}, code)).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ }, CommonConstant.DEACTIVATE));*/
if (workstation != null) {
return Boolean.TRUE.booleanValue();
}
@@ -1372,13 +1047,17 @@
}
private void checkUnableWorkstation(WorkstationSubmitVO workstationSubmitVO) {
+ Workstation workstation = getOne(Wrappers.<Workstation>lambdaQuery().ne(Func.isNotEmpty(workstationSubmitVO.getId()), Workstation::getId, workstationSubmitVO.getId())
+ .eq(Workstation::getCode, workstationSubmitVO.getCode())
+ .eq(Workstation::getStatus, CommonConstant.DEACTIVATE));
+ /*
Workstation workstation = (Workstation) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(workstationSubmitVO.getId()), (v0) -> {
return v0.getId();
}, workstationSubmitVO.getId()).eq((v0) -> {
return v0.getCode();
}, workstationSubmitVO.getCode())).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ }, CommonConstant.DEACTIVATE));*/
if (workstation != null) {
throw new ServiceException(MessageUtils.message("cps.workstation.code.already.exists.stop.status", new Object[0]));
}
@@ -1391,7 +1070,7 @@
if (Func.isEmpty(commonGroupList)) {
return list;
}
- List<String> ids = (List) commonGroupList.stream().map(item -> {
+ List<String> ids = commonGroupList.stream().map(item -> {
return String.valueOf(item.getId());
}).collect(Collectors.toList());
list.addAll(commonGroupList);
@@ -1406,13 +1085,13 @@
MachineInformationVO machineInformationVO = this.workbenchService.listWorkstationWorkbench(Long.valueOf(Func.toLong(id)));
informationList.add(machineInformationVO);
});
- List<MachineInformationVO> informationVOS = (List) informationList.stream().filter(s -> {
+ List<MachineInformationVO> informationVOS = informationList.stream().filter(s -> {
return Func.isNotEmpty(s.getDeviceType());
}).collect(Collectors.toList());
- Map<Integer, List<MachineInformationVO>> workstationMap = (Map) informationVOS.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Integer, List<MachineInformationVO>> workstationMap = informationVOS.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getDeviceType();
}));
- workstationMap.forEach(key, value -> {
+ workstationMap.forEach((key, value) -> {
dealWorkstation(fmsWorkstationList, value, key, realTimeTrayList, positionList);
});
return fmsWorkstationList;
@@ -1428,38 +1107,31 @@
WorkTypeEnum workTypeEnum;
List<CommonGroup> allSubGroup = this.commonGroupService.getAllSubGroup(CommonGroupConstant.WARE_ROOT, CommonGroupTypeEnum.WORKSTATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
if (Func.isEmpty(allSubGroup)) {
- return new ArrayList();
+ return new ArrayList<>();
}
- List<Long> groupIds = (List) allSubGroup.stream().map((v0) -> {
+ List<Long> groupIds = allSubGroup.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<FmsWorkstationGroupVO> fmsWorkstationGroupVOS = CommonGroupConvert.INSTANCE.convertFmsList(allSubGroup);
- List<CommonGroupOfItem> list = this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getGroupId();
- }, groupIds));
- Map<Long, CommonGroupOfItem> groupOfItemMap = (Map) list.stream().collect(Collectors.toMap((v0) -> {
+ List<CommonGroupOfItem> list = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getGroupId, groupIds));
+ Map<Long, CommonGroupOfItem> groupOfItemMap = list.stream().collect(Collectors.toMap((v0) -> {
return v0.getItemId();
}, item -> {
return item;
}));
- List<Long> workstationIds = (List) list.stream().map((v0) -> {
+ List<Long> workstationIds = list.stream().map((v0) -> {
return v0.getItemId();
}).collect(Collectors.toList());
- List<FmsWorkstationGroupVO> roots = (List) fmsWorkstationGroupVOS.stream().filter(item2 -> {
+ List<FmsWorkstationGroupVO> roots = fmsWorkstationGroupVOS.stream().filter(item2 -> {
return Func.equals(item2.getParentId(), Long.valueOf(CommonGroupConstant.ROOT.longValue()));
}).collect(Collectors.toList());
if (Func.isEmpty(workstationIds)) {
return roots;
}
- List<Workstation> workstations = list(((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getId();
- }, workstationIds)).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE)).in(Func.isNotEmpty(queryVO.getTypeList()), (v0) -> {
- return v0.getType();
- }, queryVO.getTypeList()).in(Func.isNotEmpty(queryVO.getDeviceTypeList()), (v0) -> {
- return v0.getDeviceType();
- }, queryVO.getDeviceTypeList()));
+ List<Workstation> workstations = list(Wrappers.<Workstation>lambdaQuery().in(Workstation::getId, workstationIds).eq(Workstation::getStatus, CommonConstant.ENABLE)
+ .in(Func.isNotEmpty(queryVO.getTypeList()),Workstation::getType, queryVO.getTypeList())
+ .in(Func.isNotEmpty(queryVO.getDeviceTypeList()), Workstation::getDeviceType, queryVO.getDeviceTypeList()));
+
List<FmsWorkstationGroupVO> vos = WorkstationConvert.INSTANCE.convertListFms(workstations);
for (FmsWorkstationGroupVO fmsWorkstationVO : vos) {
CommonGroupOfItem commonGroupOfItem = groupOfItemMap.get(fmsWorkstationVO.getId());
@@ -1491,14 +1163,14 @@
@Override // org.springblade.modules.cps.service.IWorkstationService
public IPage<WorkstationRealTimeStatusVO> pageH5(Query query, WorkstationPageQueryVO workstationPageQueryVO) {
- IPage<WorkstationVO> workstationVOIPage = listPage(new Page().setSize(-1L), workstationPageQueryVO.getKeyWord(), null, workstationPageQueryVO.getStatus(), workstationPageQueryVO.getType());
+ IPage<WorkstationVO> workstationVOIPage = listPage(new Page<WorkstationVO>().setSize(-1L), workstationPageQueryVO.getKeyWord(), null, workstationPageQueryVO.getStatus(), workstationPageQueryVO.getType());
IPage<WorkstationRealTimeStatusVO> convert = WorkstationConvert.INSTANCE.convertPage(workstationVOIPage);
List<WorkstationRealTimeStatusVO> result = buildProperties(convert.getRecords(), workstationPageQueryVO.getDeviceStatus());
return manualBuildIPage(query, result);
}
private IPage<WorkstationRealTimeStatusVO> manualBuildIPage(Query query, List<WorkstationRealTimeStatusVO> result) {
- Page page = new Page(query.getCurrent().intValue(), query.getSize().intValue(), result.size());
+ Page<WorkstationRealTimeStatusVO> page = new Page<>(query.getCurrent().intValue(), query.getSize().intValue(), result.size());
if (result.size() == 0) {
return page;
}
@@ -1517,15 +1189,15 @@
if (Func.isEmpty(list)) {
return dataList;
}
- Map<Long, List<RealTimeStatusVO>> realTimePropertiesMap = getRealTimeProperties((List) list.stream().map((v0) -> {
+ Map<Long, List<RealTimeStatusVO>> realTimePropertiesMap = getRealTimeProperties( list.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList()));
- return (List) list.stream().filter(i -> {
+ return list.stream().filter(i -> {
boolean filter = Boolean.TRUE.booleanValue();
if (Func.isEmpty(i.getMachineId())) {
filter = false;
}
- List<RealTimeStatusVO> properties = (List) realTimePropertiesMap.get(i.getId());
+ List<RealTimeStatusVO> properties = realTimePropertiesMap.get(i.getId());
if (Func.isNotEmpty(deviceStatus)) {
if (Func.isEmpty(properties)) {
filter = false;
@@ -1555,7 +1227,7 @@
}
List<FmsWorkstationGroupVO> itemGroups = new ArrayList<>();
for (FmsWorkstationGroupVO vo : roots) {
- List<FmsWorkstationGroupVO> vos = (List) fmsWorkstationGroupVOS.stream().filter(item -> {
+ List<FmsWorkstationGroupVO> vos = fmsWorkstationGroupVOS.stream().filter(item -> {
return Func.equals(item.getParentId(), vo.getId());
}).collect(Collectors.toList());
vo.setChildren(vos);
@@ -1602,8 +1274,8 @@
List<WorkstationWorkbench> workbenchList = workstation.getWorkstationList();
if (Func.isNotEmpty(workbenchList)) {
if (!WorkTypeEnum.HANDLE.getCode().equals(key)) {
- fmsWorkstation.setWorkBenchList((List) workbenchList.stream().map(s -> {
- List<FmsRealTimeTray> collect = (List) realTimeTrayList.stream().filter(r -> {
+ fmsWorkstation.setWorkBenchList(workbenchList.stream().map(s -> {
+ List<FmsRealTimeTray> collect = realTimeTrayList.stream().filter(r -> {
return workstation.getWorkstationCode().equals(r.getCurrentPosition()) && String.valueOf(s.getSort()).equals(r.getCurrentStation());
}).collect(Collectors.toList());
FmsWorkBench fmsWorkBench = new FmsWorkBench();
@@ -1620,8 +1292,8 @@
return fmsWorkBench;
}).collect(Collectors.toList()));
} else {
- fmsWorkstation.setWorkBenchList((List) workbenchList.stream().map(s2 -> {
- List<FmsRealTimeTray> collect = (List) realTimeTrayList.stream().filter(r -> {
+ fmsWorkstation.setWorkBenchList(workbenchList.stream().map(s2 -> {
+ List<FmsRealTimeTray> collect = realTimeTrayList.stream().filter(r -> {
return workstation.getWorkstationCode().equals(r.getCurrentPosition());
}).collect(Collectors.toList());
FmsWorkBench fmsWorkBench = new FmsWorkBench();
@@ -1640,7 +1312,7 @@
}
}
if ((WorkTypeEnum.LOAD_AND_UNLOAD.getCode().equals(key) || WorkTypeEnum.PROCESS.getCode().equals(key)) && positionList.contains(workstation.getWorkstationCode())) {
- List<FmsRealTimeTray> collect = (List) realTimeTrayList.stream().filter(r -> {
+ List<FmsRealTimeTray> collect = realTimeTrayList.stream().filter(r -> {
return workstation.getWorkstationCode().equals(r.getCurrentPosition());
}).collect(Collectors.toList());
FmsRealTimeTray trayRealTimeData = collect.get(0);
--
Gitblit v1.9.3