From e19227de97d21c10fd22536f85c8153e63072d0c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 06 五月 2024 11:30:54 +0800
Subject: [PATCH] 代码整理1
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java | 523 +++++++++++++--------------------------------------------
1 files changed, 122 insertions(+), 401 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
index e023e2a..4caccc8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
@@ -1,19 +1,8 @@
package com.qianwen.smartman.modules.cps.service.impl;
-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.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
@@ -25,10 +14,31 @@
import java.util.UUID;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+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.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.DateUtil;
+import com.qianwen.core.tool.utils.Func;
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.cache.cps.WorkstationOfMachineCache;
import com.qianwen.smartman.common.constant.CommonConstant;
@@ -42,16 +52,6 @@
import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
import com.qianwen.smartman.common.utils.ListUtils;
import com.qianwen.smartman.common.utils.MessageUtils;
-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.DateUtil;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.convert.MachineConvert;
import com.qianwen.smartman.modules.cps.convert.WorkstationWcsConvert;
import com.qianwen.smartman.modules.cps.dto.DeviceMaintainInDTO;
@@ -98,14 +98,10 @@
import com.qianwen.smartman.modules.tpm.enums.MetaTypeEnum;
import com.qianwen.smartman.modules.tpm.enums.RepairRecordEnum;
import com.qianwen.smartman.modules.tpm.service.IMaintainPlanService;
-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.util.StrUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/MachineServiceImpl.class */
public class MachineServiceImpl extends BaseServiceImpl<MachineMapper, Machine> implements IMachineService {
private static final Logger log = LoggerFactory.getLogger(MachineServiceImpl.class);
private static final Pattern NUMBER = Pattern.compile("[1-9]\\d*.\\d*|0\\.\\d*[1-9]\\d*");
@@ -134,279 +130,8 @@
@Autowired
private IEmployeeService employeeService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -2038138413:
- if (implMethodName.equals("getShortCode")) {
- z = true;
- break;
- }
- break;
- case -1453405940:
- if (implMethodName.equals("getMachineId")) {
- z = true;
- break;
- }
- break;
- case -1107875961:
- if (implMethodName.equals("getDeviceId")) {
- z = true;
- break;
- }
- break;
- case -858902114:
- if (implMethodName.equals("getMachineCode")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 112409713:
- if (implMethodName.equals("getPlanStatus")) {
- z = true;
- break;
- }
- break;
- case 257009483:
- if (implMethodName.equals("getExtendId")) {
- z = true;
- break;
- }
- break;
- case 517353092:
- if (implMethodName.equals("getItemId")) {
- z = true;
- break;
- }
- break;
- case 771206363:
- if (implMethodName.equals("getTenantId")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- case 1330288580:
- if (implMethodName.equals("getGroupId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationOfMachine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getPlanStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getPlanStatus();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/DeviceType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- break;
- case RegionCache.VILLAGE_LEVEL /* 5 */:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getGroupId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getDeviceId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationOfMachine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getMachineId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationOfMachine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getMachineId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationOfMachine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getMachineId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationOfMachine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getMachineId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationOfMachine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getMachineId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getShortCode();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getExtendId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/DeviceType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public MachineVO insert(MachineVO machineVO) {
checkMachine(machineVO.id, machineVO.getMachineCode());
@@ -419,7 +144,7 @@
return MachineConvert.INSTANCE.convert(machine);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public Boolean changeCollectSwitch(Long workstationId, Integer collectSwitch) {
((MachineMapper) this.baseMapper).changeCollectSwitch(workstationId, collectSwitch, AuthUtil.getTenantId());
if (0 == collectSwitch.intValue()) {
@@ -431,19 +156,18 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<WorkstationWcsDTO> getWorkstationWcsByMachineId(Long machineId, String paramName) {
- List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineId();
- }, machineId));
- List<Long> workstationIdList = (List) workstationOfMachineList.stream().map((v0) -> {
+ List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list(Wrappers.<WorkstationOfMachine>lambdaQuery().eq(WorkstationOfMachine::getMachineId, machineId));
+
+ List<Long> workstationIdList =workstationOfMachineList.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
List<WorkstationWcs> workstationWcsList = this.workstationWcsMapper.getWorkstationWcsByName(workstationIdList, paramName);
return WorkstationWcsConvert.INSTANCE.convertToDTOList(workstationWcsList);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public Boolean updateBrand(Long id, String brand) {
Machine machine = (Machine) getById(id);
machine.setBrand(brand);
@@ -455,31 +179,29 @@
return Boolean.valueOf(updateById);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public MachineDetailVO detailMachine(Long id) {
MachineDetailVO machineDetailVO = ((MachineMapper) this.baseMapper).selectMachineDetail(id);
if (Func.isNotEmpty(machineDetailVO)) {
machineDetailVO.setMachineLifeStatusName(DictCache.getValue(DictEnum.MACHINE_LIFE_STATUS.getName(), machineDetailVO.getMachineLifeStatus()));
machineDetailVO.setManagementClassName(DictCache.getValue(DictEnum.MACHINE_MANAGEMENT_CLASS, machineDetailVO.getManagementClass()));
machineDetailVO.setMachineUseStatusName(DictCache.getValue(DictEnum.MACHINE_USE_STATUS.getName(), machineDetailVO.getMachineUseStatus()));
- List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineId();
- }, machineDetailVO.getId()));
+ List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list(Wrappers.<WorkstationOfMachine>lambdaQuery().eq(WorkstationOfMachine::getMachineId, machineDetailVO.getId()));
if (Func.isNotEmpty(workstationOfMachineList)) {
- List<Workstation> workstationList = this.workstationService.listByIds((Collection) workstationOfMachineList.stream().map((v0) -> {
+ List<Workstation> workstationList = this.workstationService.listByIds(workstationOfMachineList.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList()));
Optional.ofNullable(workstationList).ifPresent(workstations -> {
- List<String> workstationCodeList = (List) workstations.stream().map((v0) -> {
+ List<String> workstationCodeList = workstations.stream().map((v0) -> {
return v0.getCode();
}).collect(Collectors.toList());
- List<String> workstationNameList = (List) workstations.stream().map((v0) -> {
+ List<String> workstationNameList = workstations.stream().map((v0) -> {
return v0.getName();
}).collect(Collectors.toList());
- String code = workstationCodeList.stream().reduce(a, b -> {
+ String code = workstationCodeList.stream().reduce((a, b) -> {
return a.concat(";").concat(b);
}).orElse("");
- String name = workstationNameList.stream().reduce(a2, b2 -> {
+ String name = workstationNameList.stream().reduce((a2, b2) -> {
return a2.concat(";").concat(b2);
}).orElse("");
machineDetailVO.setWorkstationCode(code);
@@ -490,7 +212,7 @@
return machineDetailVO;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Machine createMachine(MachineSubmitVO machineSubmitVO) {
String pinCode = machineSubmitVO.getPinCode();
@@ -549,33 +271,30 @@
if (len < 4 || len > 8) {
throw new ServiceException(String.format(MessageUtils.message("cps.tpm.machine.short.code.length", new Object[0]), 4, 8));
}
- Long count = Long.valueOf(count(((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getShortCode();
- }, shortCode)).ne(Func.isNotEmpty(id), (v0) -> {
- return v0.getId();
- }, id)));
+
+ Long count = Long.valueOf(count(Wrappers.<Machine>lambdaQuery().eq(Machine::getShortCode, shortCode).ne(Func.isNotEmpty(id), Machine::getId, id)));
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.tpm.machine.short.code.exists", new Object[0]));
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public IPage<MachineListVO> pageMachine(MachineSelectVO machineSelectVO, Query query) {
String machineName = machineSelectVO.getMachineName();
String machineCode = machineSelectVO.getMachineCode();
Long machineTypeId = machineSelectVO.getMachineTypeId();
Long groupId = machineSelectVO.getGroupId();
Integer status = machineSelectVO.getStatus();
- IPage<MachineListVO> page = ((MachineMapper) this.baseMapper).pageMachine(Condition.getPage(query), machineName, machineCode, machineTypeId, groupId, CommonGroupConstant.ALL_MACHINE_ID, status == null ? CommonConstant.ENABLE : status);
+ IPage<MachineListVO> page = this.baseMapper.pageMachine(Condition.getPage(query), machineName, machineCode, machineTypeId, groupId, CommonGroupConstant.ALL_MACHINE_ID, status == null ? CommonConstant.ENABLE : status);
List<MachineListVO> records = page.getRecords();
- List<MachineListVO> collect = (List) records.stream().peek(c -> {
+ List<MachineListVO> collect = records.stream().peek(c -> {
c.setMachineUseStatusName(DictCache.getValue(DictEnum.MACHINE_USE_STATUS.getName(), c.getMachineUseStatus()));
}).collect(Collectors.toList());
page.setRecords(collect);
return page;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean updateMachine(MachineUpdateVO vo) {
Long id = vo.getId();
@@ -597,13 +316,18 @@
boolean updateById = updateById(machine);
Long groupId = machine.getGroupId();
if (!Func.isNull(groupId)) {
+ this.itemService.update(Wrappers.<CommonGroupOfItem>lambdaUpdate()
+ .set(CommonGroupOfItem::getGroupId, groupId)
+ .set(CommonGroupOfItem::getExtendId, machine.getExtendId())
+ .eq(CommonGroupOfItem::getItemId, machine.getId()));
+ /*
this.itemService.update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getGroupId();
}, groupId)).set((v0) -> {
return v0.getExtendId();
}, machine.getExtendId())).eq((v0) -> {
return v0.getItemId();
- }, machine.getId()));
+ }, machine.getId()));*/
}
if (updateById) {
CacheUtil.clear(ExtCacheConstant.POSTING_MACHINE, Boolean.FALSE);
@@ -612,18 +336,17 @@
return Boolean.valueOf(updateById);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void renewMachineRepairStatus(Long machineId, Integer maintenanceStatus) {
- Machine machine = (Machine) getOne((Wrapper) new QueryWrapper().lambda().eq((v0) -> {
- return v0.getId();
- }, machineId));
+ Machine machine = (Machine)getOne(new QueryWrapper<Machine>().lambda().eq(Machine::getId, machineId));
+
if (machine != null) {
machine.setRepairStatus(maintenanceStatus);
updateById(machine);
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void updateMachineRepairPriority(Long deviceId, List<RepairRecord> toBeConfirmedRecordList, List<RepairApply> inMaintenanceApplyList, List<RepairApply> toBeRepairedApplyList) {
if (Func.isNotEmpty(toBeConfirmedRecordList)) {
renewMachineRepairStatus(deviceId, Integer.valueOf(DeviceRepairStatusEnum.TO_BE_CONFIRM.getType()));
@@ -636,7 +359,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void renewMachineRepairTime(Long deviceId) {
Machine machine = (Machine) getById(deviceId);
if (machine != null) {
@@ -645,7 +368,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void createRepairApplyUpdateMachine(Long deviceId, Integer maintenanceStatus) {
Machine machine = (Machine) getById(deviceId);
if (machine != null) {
@@ -658,7 +381,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void implementRepairApply(Long deviceId, Integer maintenanceStatus) {
Machine machine = (Machine) getById(deviceId);
if (Func.isNull(machine.getRepairStatus())) {
@@ -669,10 +392,10 @@
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void updateDeviceMaintainStatus(Long deviceId, Integer status, Long planId, LocalDateTime nextMaintainTime) {
List<MaintainPlan> checkList = checkExistPlanStatus(deviceId, null);
- List<MaintainPlan> checkTimeList = (List) checkList.stream().sorted(Comparator.comparing((v0) -> {
+ List<MaintainPlan> checkTimeList = checkList.stream().sorted(Comparator.comparing((v0) -> {
return v0.getMaintainDate();
})).collect(Collectors.toList());
DeviceMaintainInDTO deviceMaintainInDTO = new DeviceMaintainInDTO();
@@ -690,7 +413,7 @@
updateDeviceMaintain(deviceMaintainInDTO);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void updateDeviceMaintain(DeviceMaintainInDTO deviceMaintainInDTO) {
Machine one = (Machine) getById(deviceMaintainInDTO.getDeviceId());
if (one == null) {
@@ -702,10 +425,10 @@
updateById(one);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void updateDeviceMaintainStatus(Long deviceId, Long planId, LocalDateTime lastMaintainTime) {
List<MaintainPlan> checkList = checkExistPlanStatus(deviceId, null);
- List<MaintainPlan> checkTimeList = (List) checkList.stream().sorted(Comparator.comparing((v0) -> {
+ List<MaintainPlan> checkTimeList = checkList.stream().sorted(Comparator.comparing((v0) -> {
return v0.getMaintainDate();
})).collect(Collectors.toList());
DeviceMaintainInDTO deviceMaintainInDTO = new DeviceMaintainInDTO();
@@ -726,20 +449,20 @@
updateDeviceMaintain(deviceMaintainInDTO);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<DeviceSimpleDTO> deviceListByDeviceTypeId(Long deviceTypeId) {
return ((MachineMapper) this.baseMapper).deviceListByDeviceTypeId(deviceTypeId);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<DeviceSimpleDTO> deviceListByDeviceIdList(List<Long> deviceIdList) {
return ((MachineMapper) this.baseMapper).deviceListByDeviceIdList(deviceIdList);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public BladeFile exportMachine(MachineSelectVO vo) {
List<MachineDetailVO> vos = ((MachineMapper) this.baseMapper).listMachineDetail(vo.getMachineName(), vo.getMachineCode(), vo.getMachineTypeId(), vo.getGroupId(), CommonGroupConstant.ALL_MACHINE_ID, vo.getStatus());
- List<MachineDetailVO> list = (List) vos.stream().peek(c -> {
+ List<MachineDetailVO> list = vos.stream().peek(c -> {
c.setMachineLifeStatusName(DictCache.getValue(DictEnum.MACHINE_LIFE_STATUS.getName(), c.getMachineLifeStatus()));
c.setManagementClassName(DictCache.getValue(DictEnum.MACHINE_MANAGEMENT_CLASS, c.getManagementClass()));
c.setMachineUseStatusName(DictCache.getValue(DictEnum.MACHINE_USE_STATUS.getName(), c.getMachineUseStatus()));
@@ -750,7 +473,7 @@
return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public BladeFile importMachine(MultipartFile file) {
List<MachineImport> rawData = ExcelUtil.read(file, 0, 2, MachineImport.class);
@@ -765,10 +488,8 @@
buildMap(rawData, machineCodeMap, machineCodes, pinMap, pinCodes, shortMap, shortCodes);
List<MachineImport> failExcel = Lists.newArrayList();
List<DeviceType> deviceTypeList = Lists.newArrayList();
- List<Workstation> workstationList = this.workstationService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE));
- Map<String, Workstation> workstationMap = (Map) workstationList.stream().collect(Collectors.toMap((v0) -> {
+ List<Workstation> workstationList = this.workstationService.list(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getStatus, CommonConstant.ENABLE));
+ Map<String, Workstation> workstationMap = workstationList.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, v -> {
return v;
@@ -787,11 +508,11 @@
if (Func.isNotEmpty(failExcel)) {
return exportFailFile(failExcel);
}
- Map<String, Long> typeMap = (Map) deviceTypeList.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Long> typeMap = deviceTypeList.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, (v0) -> {
return v0.getId();
- }, v1, v2 -> {
+ },(v1, v2) -> {
return v1;
}));
saveExportMachine(rawData, typeMap, commonGroupNameMap, organizationNameMap, employeeNameMap);
@@ -799,7 +520,7 @@
}
public void saveExportMachine(List<MachineImport> rawData, Map<String, Long> typeMap, HashMap<String, Long> commonGroupNameMap, HashMap<String, Long> organizationNameMap, EmployeeNameDTO employeeNameMap) {
- List<Machine> collect = (List) rawData.stream().map(c -> {
+ List<Machine> collect = rawData.stream().map(c -> {
Machine machine = MachineConvert.INSTANCE.convert(c);
String machineTypeName = c.getMachineTypeName();
String machineTypeCode = c.getMachineTypeCode();
@@ -857,9 +578,9 @@
}
private void buildMap(List<MachineImport> rawData, Map<String, Integer> machineCodeMap, Set<String> machineCodes, Map<String, Integer> pinMap, Set<String> pinCodes, Map<String, Integer> shortMap, Set<String> shortCodes) {
- QueryWrapper<Machine> machineCodeQuery = Wrappers.query().select(new String[]{"machine_code"});
- QueryWrapper<Machine> pinCodeQuery = Wrappers.query().select(new String[]{"pin_code"});
- QueryWrapper<Machine> shortCodeQuery = Wrappers.query().select(new String[]{"short_code"});
+ QueryWrapper<Machine> machineCodeQuery = Wrappers.<Machine>query().select(new String[]{"machine_code"});
+ QueryWrapper<Machine> pinCodeQuery = Wrappers.<Machine>query().select(new String[]{"pin_code"});
+ QueryWrapper<Machine> shortCodeQuery = Wrappers.<Machine>query().select(new String[]{"short_code"});
boolean flag1 = false;
boolean flag2 = false;
boolean flag3 = false;
@@ -876,7 +597,8 @@
}
flag1 = true;
machineCodeQuery.nested(i -> {
- QueryWrapper queryWrapper = (QueryWrapper) i.eq("machine_code", machineCode);
+ i.eq("machine_code", machineCode);
+ //QueryWrapper queryWrapper = (QueryWrapper) i.eq("machine_code", machineCode);
});
machineCodeQuery.apply("status =1", new Object[0]);
}
@@ -892,7 +614,7 @@
}
flag2 = true;
pinCodeQuery.nested(i2 -> {
- QueryWrapper queryWrapper = (QueryWrapper) i2.eq("pin_code", pinCode);
+ i2.eq("pin_code", pinCode);
});
pinCodeQuery.apply("status =1", new Object[0]);
}
@@ -908,7 +630,7 @@
}
flag3 = true;
shortCodeQuery.nested(i3 -> {
- QueryWrapper queryWrapper = (QueryWrapper) i3.eq("short_code", shortCode);
+ i3.eq("short_code", shortCode);
});
shortCodeQuery.apply("status =1", new Object[0]);
}
@@ -953,7 +675,7 @@
});
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean delete(IdsVO vo, Integer type) {
if (StatusType.REMOVE.getType().equals(type)) {
@@ -963,30 +685,25 @@
throw new ServiceException(MessageUtils.message("machine.andon.not.remove", new Object[0]));
}
removeByIds(Func.toLongList(vo.getIds()));
- this.workstationOfMachineService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getMachineId();
- }, vo.getIds()));
- this.itemService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getItemId();
- }, vo.getIds()));
+ this.workstationOfMachineService.remove(Wrappers.<WorkstationOfMachine>lambdaQuery().in(WorkstationOfMachine::getMachineId, vo.getIds()));
+ this.itemService.remove( Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getItemId, vo.getIds()));
CacheUtil.clear(ExtCacheConstant.POSTING_MACHINE, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.WORKSTATION_MACHINE, Boolean.FALSE);
}
return Boolean.valueOf(changeStatus(Func.toLongList(vo.getIds()), CommonConstant.DEACTIVATE));
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<HmiDeviceVO> getHmiWorkstation(String machineId) {
List<HmiDeviceVO> hmiDeviceVOList = new ArrayList<>();
Machine machine = (Machine) getById(machineId);
if (machine == null) {
throw new ServiceException("鏈哄櫒涓嶅瓨鍦�");
}
- List<WorkstationOfMachine> list = this.workstationOfMachineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineId();
- }, machineId));
+ List<WorkstationOfMachine> list = this.workstationOfMachineService.list(Wrappers.<WorkstationOfMachine>lambdaQuery().eq(WorkstationOfMachine::getMachineId, machineId));
+
if (Func.isNotEmpty(list)) {
- List<Long> workstationIds = (List) list.stream().map((v0) -> {
+ List<Long> workstationIds = list.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
if (Func.isNotEmpty(workstationIds)) {
@@ -1008,12 +725,12 @@
return hmiDeviceVOList;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<MachineExtDTO> getMachineByWorkStation(List<Long> workstationIds) {
return ((MachineMapper) this.baseMapper).getMachineByWorkStation(workstationIds);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public String queryDateTypeState(Long workstationId) {
return ((MachineMapper) this.baseMapper).queryDateTypeState(WcsDataTypeEnums.WcsDataType.STATE.getCode(), workstationId);
}
@@ -1057,11 +774,8 @@
return true;
}
if (Func.isNotBlank(typeName) && Func.isNotBlank(typeCode)) {
- DeviceType type = (DeviceType) this.typeService.getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getName();
- }, typeName)).eq((v0) -> {
- return v0.getCode();
- }, typeCode));
+ DeviceType type = this.typeService.getOne(Wrappers.<DeviceType>lambdaQuery().eq(DeviceType::getName, typeName)
+ .eq(DeviceType::getCode, typeCode));
if (Func.isEmpty(type)) {
data.setFailReason(MessageUtils.message("cps.tpm.machine.type.not.exists", new Object[0]));
failExcel.add(data);
@@ -1201,20 +915,17 @@
return false;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public MachineDetailVO detailByCode(String machineCode) {
MachineDetailVO machineDetailVO = ((MachineMapper) this.baseMapper).selectMachineDetailByCode(machineCode);
if (Func.isNotEmpty(machineDetailVO)) {
machineDetailVO.setMachineLifeStatusName(DictCache.getValue(DictEnum.MACHINE_LIFE_STATUS.getName(), machineDetailVO.getMachineLifeStatus()));
machineDetailVO.setManagementClassName(DictCache.getValue(DictEnum.MACHINE_MANAGEMENT_CLASS, machineDetailVO.getManagementClass()));
machineDetailVO.setMachineUseStatusName(DictCache.getValue(DictEnum.MACHINE_USE_STATUS.getName(), machineDetailVO.getMachineUseStatus()));
- List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineId();
- }, machineDetailVO.getId()));
+ List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list(Wrappers.<WorkstationOfMachine>lambdaQuery()
+ .eq(WorkstationOfMachine::getMachineId, machineDetailVO.getId()));
if (Func.isNotEmpty(workstationOfMachineList)) {
- List<Workstation> workstationList = this.workstationService.listByIds((Collection) workstationOfMachineList.stream().map((v0) -> {
- return v0.getWorkstationId();
- }).collect(Collectors.toList()));
+ List<Workstation> workstationList = this.workstationService.listByIds(workstationOfMachineList.stream().map(WorkstationOfMachine::getWorkstationId).collect(Collectors.toList()));
Optional.ofNullable(workstationList).ifPresent(workstations -> {
String code = ((Workstation) ListUtils.getFirst(workstations)).getCode();
String name = ((Workstation) ListUtils.getFirst(workstations)).getName();
@@ -1228,7 +939,7 @@
return machineDetailVO;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public IPage<MachineListVO> pageMachineByParam(MachineSelectVO machineSelectVO, Query query) {
IPage<MachineListVO> page = ((MachineMapper) this.baseMapper).pageMachineByParam(Condition.getPage(query), machineSelectVO);
List<MachineListVO> records = page.getRecords();
@@ -1239,12 +950,12 @@
return page;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<MachineVO> listNoBand() {
return ((MachineMapper) this.baseMapper).listNoBand();
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<MachineVO> listHaveBand() {
return ((MachineMapper) this.baseMapper).listHaveBand();
}
@@ -1310,9 +1021,12 @@
private boolean validWorkstationBind(MachineImport data, Map<String, Workstation> workstationMap, List<MachineImport> failExcel) {
Workstation workstation = workstationMap.get(data.getMachineCode());
if (Func.isNotEmpty(workstation)) {
+ long count = this.workstationOfMachineService.count(Wrappers.<WorkstationOfMachine>lambdaQuery()
+ .eq(WorkstationOfMachine::getWorkstationId, workstation.getId()));
+ /*
long count = this.workstationOfMachineService.count((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationId();
- }, workstation.getId()));
+ }, workstation.getId()));*/
if (count > 0) {
data.setFailReason(MessageUtils.message("excel.import.machine.workstation.already.bound", new Object[0]));
failExcel.add(data);
@@ -1392,11 +1106,8 @@
}
private boolean checkStopImportMachine(String machineCode) {
- Machine machine = (Machine) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineCode();
- }, machineCode)).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ Machine machine = getOne(Wrappers.<Machine>lambdaQuery().eq(Machine::getMachineCode, machineCode).eq(Machine::getStatus, CommonConstant.DEACTIVATE));
+
if (machine != null) {
return Boolean.TRUE.booleanValue();
}
@@ -1404,35 +1115,37 @@
}
private void checkStopMachine(String machineCode) {
+ Machine machine = getOne(Wrappers.<Machine>lambdaQuery().eq(Machine::getMachineCode, machineCode).eq(Machine::getStatus, CommonConstant.DEACTIVATE));
+ /*
Machine machine = (Machine) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getMachineCode();
}, machineCode)).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ }, CommonConstant.DEACTIVATE));*/
if (machine != null) {
throw new ServiceException(MessageUtils.message("machine.code.already.exist.stop.status", new Object[0]));
}
}
private void checkStopMachineByCode(String workstationCode) {
- Machine machine = (Machine) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getMachineCode();
- }, workstationCode)).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ Machine machine = getOne(Wrappers.<Machine>lambdaQuery().eq(Machine::getMachineCode, workstationCode).eq(Machine::getStatus, CommonConstant.DEACTIVATE));
if (machine != null) {
throw new ServiceException(MessageUtils.message("machine.machine.workstation.already.exist.stop.status", new Object[0]));
}
}
private void checkMachine(Long id, String machineCode) {
+ Long count = Long.valueOf(count(Wrappers.<Machine>lambdaQuery().ne(Func.isNotEmpty(id), Machine::getId, id)
+ .eq(Machine::getMachineCode, machineCode)
+ .eq(Machine::getStatus, CommonConstant.ENABLE)));
+ /*
Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(id), (v0) -> {
return v0.getId();
}, id).eq((v0) -> {
return v0.getMachineCode();
}, machineCode)).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE)));
+ }, CommonConstant.ENABLE)));*/
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("machine.code.already.exists", new Object[0]));
}
@@ -1455,6 +1168,14 @@
}
private List<MaintainPlan> checkExistPlanStatus(Long deviceId, Long id) {
+ List<MaintainPlan> maintainPlanList = this.maintainPlanService.list(Wrappers.<MaintainPlan>query().lambda()
+ .eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId())
+ .eq(MaintainPlan::getDeviceId, deviceId)
+ .notIn(
+ Func.isNotEmpty(id), MaintainPlan::getId, new Object[] { id })
+ .notIn(MaintainPlan::getPlanStatus, new Object[] { Integer.valueOf(MaintainPlanStatusEnum.T5.getType()) })
+ .orderByDesc(MaintainPlan::getPlanStatus));
+ /*
List<MaintainPlan> maintainPlanList = this.maintainPlanService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
return v0.getTenantId();
}, AuthUtil.getTenantId()).eq((v0) -> {
@@ -1465,7 +1186,7 @@
return v0.getPlanStatus();
}, new Object[]{Integer.valueOf(MaintainPlanStatusEnum.T5.getType())})).orderByDesc((v0) -> {
return v0.getPlanStatus();
- }));
+ }));*/
return maintainPlanList;
}
}
--
Gitblit v1.9.3