From 4684d271ea0107097209f7de0951bf451e48df21 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 三月 2024 19:16:36 +0800
Subject: [PATCH] tpm模块修复
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.java | 112 ++++++++++++--------------------------------------------
1 files changed, 24 insertions(+), 88 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.java
index fd18bc2..64254e4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.java
@@ -1,31 +1,33 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.io.Serializable;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
+
import javax.validation.constraints.NotNull;
+
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.constant.DictConstant;
import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.entity.WorkstationWcsUsage;
import com.qianwen.smartman.modules.cps.mapper.WorkstationWcsUsageMapper;
import com.qianwen.smartman.modules.cps.service.IWorkstationWcsUsageService;
import com.qianwen.smartman.modules.cps.vo.WorkstationWcsUsageVO;
import com.qianwen.smartman.modules.system.service.IDictService;
import com.qianwen.smartman.modules.tdengine.service.IWorkstationDynamicCollectService;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.json.JSONUtil;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.class */
@@ -34,82 +36,7 @@
private final IDictService dictService;
private final IWorkstationDynamicCollectService workstationDynamicCollectService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 764041336:
- if (implMethodName.equals("getUsageCode")) {
- z = false;
- break;
- }
- break;
- case 764355862:
- if (implMethodName.equals("getUsageName")) {
- z = true;
- break;
- }
- break;
- case 1213007438:
- if (implMethodName.equals("getCollectType")) {
- 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/WorkstationWcsUsage") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUsageCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/WorkstationWcsUsage") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUsageCode();
- };
- }
- 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/WorkstationWcsUsage") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getCollectType();
- };
- }
- 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/WorkstationWcsUsage") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUsageName();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/WorkstationWcsUsage") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUsageName();
- };
- }
- 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/WorkstationWcsUsage") && 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/WorkstationWcsUsage") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
+
public WorkstationWcsUsageServiceImpl(final IDictService dictService, final IWorkstationDynamicCollectService workstationDynamicCollectService) {
this.dictService = dictService;
@@ -125,12 +52,12 @@
@Override // org.springblade.modules.cps.service.IWorkstationWcsUsageService
@Cacheable(cacheNames = {WORKSTATION_WCS_USAGE_EXP}, key = "'usage:list'")
public List<WorkstationWcsUsageVO> listVO() {
- Map<Integer, String> wcsMap = (Map) this.dictService.getList(DictConstant.WORKSTATION_PARAM_TYPE).stream().collect(Collectors.toMap(dict -> {
+ Map<Integer, String> wcsMap = this.dictService.getList(DictConstant.WORKSTATION_PARAM_TYPE).stream().collect(Collectors.toMap(dict -> {
return Integer.valueOf(Func.toInt(dict.getDictKey()));
}, (v0) -> {
return v0.getDictValue();
}));
- return (List) list(Lambda.asc((v0) -> {
+ return list(Lambda.asc((v0) -> {
return v0.getCollectType();
})).stream().map(it -> {
WorkstationWcsUsageVO vo = new WorkstationWcsUsageVO();
@@ -169,6 +96,14 @@
@CacheEvict(cacheNames = {WORKSTATION_WCS_USAGE_EXP}, allEntries = true)
public Boolean update(final WorkstationWcsUsageVO workstationWcsVO) {
Assert.notNull(workstationWcsVO.getId());
+
+ Assert.isTrue(
+ (list(Lambda.eq(WorkstationWcsUsage::getUsageName, workstationWcsVO.getUsageName()).ne(WorkstationWcsUsage::getId, workstationWcsVO.getId())).size() == 0),
+ MessageUtils.message("workstation.wcs.usage.usageName.exists", new Object[0]), new Object[0]);
+ Assert.isTrue(
+ (list(Lambda.eq(WorkstationWcsUsage::getUsageCode, workstationWcsVO.getUsageCode()).ne(WorkstationWcsUsage::getId, workstationWcsVO.getId())).size() == 0),
+ MessageUtils.message("workstation.wcs.usage.usageCode.exists", new Object[0]), new Object[0]);
+ /*
Assert.isTrue(list((Wrapper) Lambda.eq((v0) -> {
return v0.getUsageName();
}, workstationWcsVO.getUsageName()).ne((v0) -> {
@@ -179,6 +114,7 @@
}, workstationWcsVO.getUsageCode()).ne((v0) -> {
return v0.getId();
}, workstationWcsVO.getId())).size() == 0, MessageUtils.message("workstation.wcs.usage.usageCode.exists", new Object[0]), new Object[0]);
+ */
Assert.isTrue(Func.isEmpty(workstationWcsVO.getParameter()) || JSONUtil.isJsonObj(workstationWcsVO.getParameter()), MessageUtils.message("workstation.wcs.usage.parameter.nojson", new Object[0]), new Object[0]);
wcsUsageUsedValid(workstationWcsVO.getId(), oldUsage -> {
return Boolean.valueOf((oldUsage.getUsageCode().equals(workstationWcsVO.getUsageCode()) && oldUsage.getCollectType().equals(workstationWcsVO.getCollectType()) && oldUsage.getUsageName().equals(workstationWcsVO.getUsageName())) ? false : true);
--
Gitblit v1.9.3