From 410eed616ce86a76ecfbd272be0a4463ac54a517 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 三月 2024 19:37:31 +0800
Subject: [PATCH] 刀具模块错误修改
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolModelServiceImpl.java | 88 +----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolChangeRecordServiceImpl.java | 166 ++--------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolManageServiceImpl.java | 342 ++++------------------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolCategoryServiceImpl.java | 168 ++---------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolParameterServiceImpl.java | 102 +-----
5 files changed, 175 insertions(+), 691 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolCategoryServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolCategoryServiceImpl.java
index 7176383..831e03d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolCategoryServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolCategoryServiceImpl.java
@@ -1,25 +1,28 @@
package com.qianwen.smartman.modules.tool.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.DncConstant;
-import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.coderule.constant.enums.ElementTypeEnum;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.tool.node.ForestNodeMerger;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.DncConstant;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.system.dto.BasCoderuleDTO;
+import com.qianwen.smartman.modules.system.entity.BasCodeRule;
import com.qianwen.smartman.modules.system.entity.BasCodeRuleEntry;
import com.qianwen.smartman.modules.system.entity.Dict;
import com.qianwen.smartman.modules.system.entity.MetaObjectType;
@@ -29,17 +32,15 @@
import com.qianwen.smartman.modules.system.vo.DictVO;
import com.qianwen.smartman.modules.tool.constant.ToolConstant;
import com.qianwen.smartman.modules.tool.convert.ToolCategoryConvert;
+import com.qianwen.smartman.modules.tool.entity.Tool;
import com.qianwen.smartman.modules.tool.entity.ToolCategory;
+import com.qianwen.smartman.modules.tool.entity.ToolModel;
import com.qianwen.smartman.modules.tool.mapper.ToolCategoryMapper;
import com.qianwen.smartman.modules.tool.service.IToolCategoryService;
import com.qianwen.smartman.modules.tool.service.IToolManageService;
import com.qianwen.smartman.modules.tool.service.IToolModelService;
import com.qianwen.smartman.modules.tool.vo.ToolCategoryTreeVO;
import com.qianwen.smartman.modules.tool.vo.ToolCategoryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/impl/ToolCategoryServiceImpl.class */
@@ -57,116 +58,6 @@
private IToolModelService toolModelService;
private final Integer MIN_SORT = 1;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1669172377:
- if (implMethodName.equals("getToolCategoryId")) {
- z = true;
- break;
- }
- break;
- case -1249363733:
- if (implMethodName.equals("getFId")) {
- z = true;
- break;
- }
- break;
- case -1041904421:
- if (implMethodName.equals("getParentId")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = true;
- break;
- }
- break;
- case -75145708:
- if (implMethodName.equals("getSort")) {
- z = false;
- break;
- }
- break;
- case 58947841:
- if (implMethodName.equals("getRuleFieldDictKey")) {
- 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/tool/entity/ToolCategory") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSort();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getRuleFieldDictKey();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/MetaObjectType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getFId();
- };
- }
- 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/tool/entity/ToolCategory") && 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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getToolCategoryId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/ToolModel") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getToolCategoryId();
- };
- }
- 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();
- };
- }
- 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/tool/entity/ToolCategory") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/ToolCategory") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
@Override // org.springblade.modules.tool.service.IToolCategoryService
public List<ToolCategoryTreeVO> tree() {
@@ -314,24 +205,27 @@
@Transactional(rollbackFor = {Exception.class})
public Boolean remove(List<Long> ids) {
List<Long> categoryIds = getChildrenIds(ids, ids);
+ long count = this.toolManageService.count(Wrappers.<Tool>lambdaQuery().in(Tool::getToolCategoryId, categoryIds));
+ /*
long count = this.toolManageService.count((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getToolCategoryId();
- }, categoryIds));
+ }, categoryIds));*/
if (count > 0) {
throw new ServiceException(MessageUtils.message("tool.have.tool.can.not.delete", new Object[0]));
}
- this.toolModelService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getToolCategoryId();
- }, categoryIds));
- List<String> idStrList = (List) categoryIds.stream().map((v0) -> {
+ this.toolModelService.remove(Wrappers.<ToolModel>lambdaQuery().in(ToolModel::getToolCategoryId, categoryIds));
+ List<String> idStrList = categoryIds.stream().map((v0) -> {
return String.valueOf(v0);
}).collect(Collectors.toList());
+
+ this.basCoderuleService.remove(Wrappers.<BasCodeRule>lambdaQuery().in(BasCodeRule::getRuleFieldDictKey, idStrList));
+ /*
this.basCoderuleService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getRuleFieldDictKey();
- }, idStrList));
- String idList = (String) categoryIds.stream().map((v0) -> {
+ }, idStrList));*/
+ String idList = categoryIds.stream().map((v0) -> {
return String.valueOf(v0);
- }).reduce(a, b -> {
+ }).reduce((a, b) -> {
return a + "," + b;
}).get();
this.dictService.removeDict(idList);
@@ -339,7 +233,7 @@
}
private int getNextDictSort(Long parentId) {
- List<DictVO> dictVOS = this.dictService.childList(new HashMap(), parentId);
+ List<DictVO> dictVOS = this.dictService.childList(new HashMap<>(), parentId);
return ((Integer) dictVOS.stream().map((v0) -> {
return v0.getSort();
}).max((v0, v1) -> {
@@ -348,11 +242,13 @@
}
private int getNextSort(Long parentId) {
+ List<ToolCategory> toolCategoryList = list(Wrappers.<ToolCategory>lambdaQuery().eq(ToolCategory::getParentId, parentId).orderByDesc(ToolCategory::getSort));
+ /*
List<ToolCategory> toolCategoryList = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getParentId();
}, parentId)).orderByDesc((v0) -> {
return v0.getSort();
- }));
+ }));*/
if (Func.isEmpty(toolCategoryList)) {
return this.MIN_SORT.intValue();
}
@@ -360,11 +256,13 @@
}
private void checkName(Long id, String name) {
+ long count = count(Wrappers.<ToolCategory>lambdaQuery().ne(Func.isNotEmpty(id), ToolCategory::getId, id).eq(ToolCategory::getName, name));
+ /*
long count = count((Wrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(id), (v0) -> {
return v0.getId();
}, id).eq((v0) -> {
return v0.getName();
- }, name));
+ }, name));*/
if (count > 0) {
throw new ServiceException(MessageUtils.message("tool.category.already.exists", new Object[0]));
}
@@ -372,7 +270,7 @@
@Override // org.springblade.modules.tool.service.IToolCategoryService
public List<Long> getChildrenIds(List<Long> queryIdList, List<Long> ids) {
- List<Long> categoryIdList = (List) list(Lambda.in((v0) -> {
+ List<Long> categoryIdList = list(Lambda.in((v0) -> {
return v0.getParentId();
}, queryIdList)).stream().map((v0) -> {
return v0.getId();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolChangeRecordServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolChangeRecordServiceImpl.java
index 969e013..b54f7b6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolChangeRecordServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolChangeRecordServiceImpl.java
@@ -1,21 +1,21 @@
package com.qianwen.smartman.modules.tool.service.impl;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-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.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.constant.ExcelConstant;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.mp.support.Condition;
@@ -23,6 +23,8 @@
import com.qianwen.core.oss.model.BladeFile;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.ExcelConstant;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.entity.Employee;
import com.qianwen.smartman.modules.cps.service.IEmployeeService;
import com.qianwen.smartman.modules.mdc.utils.ExcelStrategyUtil;
@@ -41,8 +43,6 @@
import com.qianwen.smartman.modules.tool.service.IToolParameterService;
import com.qianwen.smartman.modules.tool.vo.ToolChangeRecordQueryVO;
import com.qianwen.smartman.modules.tool.vo.ToolChangeRecordVO;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/impl/ToolChangeRecordServiceImpl.class */
@@ -54,115 +54,6 @@
private final IToolModelService toolModelService;
private final IToolCategoryService toolCategoryService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1669172377:
- if (implMethodName.equals("getToolCategoryId")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 119176648:
- if (implMethodName.equals("getToolParameterCode")) {
- z = true;
- break;
- }
- break;
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- z = false;
- break;
- }
- break;
- case 1093811483:
- if (implMethodName.equals("getToolCode")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/ToolParameter") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getToolParameterCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/ToolParameter") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getToolParameterCode();
- };
- }
- 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/tool/entity/ToolChangeRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getToolCategoryId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/ToolChangeRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getToolCategoryId();
- };
- }
- 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/tool/entity/ToolChangeRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getToolCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/ToolChangeRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getToolCode();
- };
- }
- 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;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public ToolChangeRecordServiceImpl(final IToolParameterService toolParameterService, final OssBuilder ossBuilder, final IEmployeeService employeeService, final IToolModelService toolModelService, final IToolCategoryService toolCategoryService) {
this.toolParameterService = toolParameterService;
@@ -174,6 +65,13 @@
@Override // org.springblade.modules.tool.service.IToolChangeRecordService
public IPage<ToolChangeRecordVO> pageToolChangeRecord(ToolChangeRecordQueryVO toolChangeRecordQueryVO, Query query) {
+ IPage<ToolChangeRecord> toolChangeRecordIPage = page(Condition.getPage(query),Wrappers.<ToolChangeRecord>lambdaQuery()
+ .eq((Func.isNotEmpty(toolChangeRecordQueryVO.getToolCategoryId()) && !Objects.equals(toolChangeRecordQueryVO.getToolCategoryId(), "1")), ToolChangeRecord::getToolCategoryId, toolChangeRecordQueryVO.getToolCategoryId())
+
+ .likeRight(Func.isNotEmpty(toolChangeRecordQueryVO.getCode()), ToolChangeRecord::getToolCode, toolChangeRecordQueryVO.getCode())
+ .between((Func.isNotEmpty(toolChangeRecordQueryVO.getStartTime()) && Func.isNotEmpty(toolChangeRecordQueryVO.getEndTime())), ToolChangeRecord::getCreateTime, toolChangeRecordQueryVO.getStartTime(), toolChangeRecordQueryVO.getEndTime())
+ .orderByDesc(Arrays.asList(ToolChangeRecord::getCreateTime, ToolChangeRecord::getId)));
+ /*
IPage<ToolChangeRecord> toolChangeRecordIPage = page(Condition.getPage(query), (Wrapper) Wrappers.lambdaQuery().eq(Func.isNotEmpty(toolChangeRecordQueryVO.getToolCategoryId()) && !Objects.equals(toolChangeRecordQueryVO.getToolCategoryId(), "1"), (v0) -> {
return v0.getToolCategoryId();
}, toolChangeRecordQueryVO.getToolCategoryId()).likeRight(Func.isNotEmpty(toolChangeRecordQueryVO.getCode()), (v0) -> {
@@ -184,7 +82,7 @@
return v0.getCreateTime();
}, new SFunction[]{(v0) -> {
return v0.getId();
- }}));
+ }}));*/
IPage<ToolChangeRecordVO> toolChangeRecordVOIPage = ToolChangeRecordConvert.INSTANCE.convert(toolChangeRecordIPage);
toolChangeRecordVOIPage.getRecords().forEach(toolChangeRecordVO -> {
toolChangeRecordVO.setOperationType(Func.isNotEmpty(toolChangeRecordVO.getOperationType()) ? ToolOperationTypeEnum.findByCode(Integer.valueOf(toolChangeRecordVO.getOperationType())).getDesc() : null);
@@ -212,13 +110,17 @@
head.add(annotation.value()[0]);
list.add(head);
}
+
+ List<ToolParameter> toolParameterList = this.toolParameterService.list(Wrappers.<ToolParameter>lambdaQuery().orderByAsc(ToolParameter::getToolParameterCode));
+ List<String> toolParameterNameList = toolParameterList.stream().map(ToolParameter::getToolParameterName).collect(Collectors.toList());
+ /*
List<ToolParameter> toolParameterList = this.toolParameterService.list((Wrapper) Wrappers.lambdaQuery().orderByAsc((v0) -> {
return v0.getToolParameterCode();
}));
List<String> toolParameterNameList = (List) toolParameterList.stream().map((v0) -> {
return v0.getToolParameterName();
- }).collect(Collectors.toList());
- Map<String, String> nameUnitMap = (Map) toolParameterList.stream().filter(item -> {
+ }).collect(Collectors.toList());*/
+ Map<String, String> nameUnitMap = toolParameterList.stream().filter(item -> {
return Func.isNotEmpty(item.getToolParameterUnit());
}).collect(Collectors.toMap((v0) -> {
return v0.getToolParameterName();
@@ -234,6 +136,12 @@
}
public List<List<Object>> getData(ToolChangeRecordQueryVO toolChangeRecordQueryVO) throws IllegalAccessException, NoSuchFieldException {
+ List<ToolChangeRecord> toolChangeRecords = list(Wrappers.<ToolChangeRecord>lambdaQuery()
+ .eq((Func.isNotEmpty(toolChangeRecordQueryVO.getToolCategoryId()) && !Objects.equals(toolChangeRecordQueryVO.getToolCategoryId(), "1")), ToolChangeRecord::getToolCategoryId, toolChangeRecordQueryVO.getToolCategoryId())
+ .likeRight(Func.isNotEmpty(toolChangeRecordQueryVO.getCode()), ToolChangeRecord::getToolCode, toolChangeRecordQueryVO.getCode())
+ .between((Func.isNotEmpty(toolChangeRecordQueryVO.getStartTime()) && Func.isNotEmpty(toolChangeRecordQueryVO.getEndTime())), ToolChangeRecord::getCreateTime, toolChangeRecordQueryVO.getStartTime(), toolChangeRecordQueryVO.getEndTime())
+ .orderByDesc(Arrays.asList(ToolChangeRecord::getCreateTime, ToolChangeRecord::getId) ));
+ /*
List<ToolChangeRecord> toolChangeRecords = list((Wrapper) Wrappers.lambdaQuery().eq(Func.isNotEmpty(toolChangeRecordQueryVO.getToolCategoryId()) && !Objects.equals(toolChangeRecordQueryVO.getToolCategoryId(), "1"), (v0) -> {
return v0.getToolCategoryId();
}, toolChangeRecordQueryVO.getToolCategoryId()).likeRight(Func.isNotEmpty(toolChangeRecordQueryVO.getCode()), (v0) -> {
@@ -244,12 +152,14 @@
return v0.getCreateTime();
}, new SFunction[]{(v0) -> {
return v0.getId();
- }}));
+ }}));*/
+ List<String> toolParameterCodeList = this.toolParameterService.list(Wrappers.<ToolParameter>lambdaQuery().orderByAsc(ToolParameter::getToolParameterCode)).stream().map(ToolParameter::getToolParameterCode).collect(Collectors.toList());
+ /*
List<String> toolParameterCodeList = (List) this.toolParameterService.list((Wrapper) Wrappers.lambdaQuery().orderByAsc((v0) -> {
return v0.getToolParameterCode();
})).stream().map((v0) -> {
return v0.getToolParameterCode();
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
List<List<Object>> list = new ArrayList<>();
for (ToolChangeRecord toolChangeRecord : toolChangeRecords) {
ToolChangeRecordExcel toolChangeRecordExcel = ToolChangeRecordConvert.INSTANCE.convertToExcel(toolChangeRecord);
@@ -276,12 +186,12 @@
public void dischargeToolChangeRecord(List<Tool> toolManageList, Long employeeId) {
List<ToolChangeRecord> toolChangeRecords = ToolChangeRecordConvert.INSTANCE.toolToConvert(toolManageList);
Employee employee = (Employee) this.employeeService.getById(employeeId);
- Map<Long, String> modelNameMap = (Map) this.toolModelService.list().stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, String> modelNameMap = this.toolModelService.list().stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, (v0) -> {
return v0.getModel();
}));
- Map<Long, String> categoryNameMap = (Map) this.toolCategoryService.list().stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, String> categoryNameMap = this.toolCategoryService.list().stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, (v0) -> {
return v0.getName();
@@ -302,12 +212,12 @@
@Override // org.springblade.modules.tool.service.IToolChangeRecordService
public void equipmentToolChangeRecord(Tool toolManage, Long employeeId) {
Employee employee = (Employee) this.employeeService.getById(employeeId);
- Map<Long, String> modelNameMap = (Map) this.toolModelService.list().stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, String> modelNameMap = this.toolModelService.list().stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, (v0) -> {
return v0.getModel();
}));
- Map<Long, String> categoryNameMap = (Map) this.toolCategoryService.list().stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, String> categoryNameMap = this.toolCategoryService.list().stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, (v0) -> {
return v0.getName();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolManageServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolManageServiceImpl.java
index 6ffe9d7..2ba9fe5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolManageServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolManageServiceImpl.java
@@ -1,17 +1,7 @@
package com.qianwen.smartman.modules.tool.service.impl;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.write.metadata.style.WriteCellStyle;
-import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-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.io.File;
import java.io.OutputStream;
-import java.lang.invoke.SerializedLambda;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -21,15 +11,25 @@
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
+
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.poi.ss.usermodel.FillPatternType;
import org.apache.poi.ss.usermodel.IndexedColors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.Lambda;
-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 org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.mp.support.Condition;
@@ -39,11 +39,14 @@
import com.qianwen.core.tool.node.ForestNodeMerger;
import com.qianwen.core.tool.utils.DateUtil;
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.modules.cps.entity.Employee;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.service.IEmployeeService;
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
+import com.qianwen.smartman.modules.system.entity.BasCodeRule;
import com.qianwen.smartman.modules.system.service.IBasCoderuleService;
import com.qianwen.smartman.modules.system.service.ICodeGeneratorService;
import com.qianwen.smartman.modules.tool.convert.ToolManageConvert;
@@ -70,10 +73,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolManageVO;
import com.qianwen.smartman.modules.tool.vo.ToolQueryVO;
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 org.springframework.web.multipart.commons.CommonsMultipartFile;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/impl/ToolManageServiceImpl.class */
@@ -90,251 +89,6 @@
private final IToolParameterService toolParameterService;
private static final String TOOL_EXCEL_NAME = "鍒�鍏风姸鎬佹姤琛�";
- 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;
- case -326855617:
- if (implMethodName.equals("getLifeState")) {
- z = true;
- break;
- }
- break;
- case 58947841:
- if (implMethodName.equals("getRuleFieldDictKey")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 119176648:
- if (implMethodName.equals("getToolParameterCode")) {
- z = true;
- break;
- }
- break;
- case 364831063:
- if (implMethodName.equals("getToolPosition")) {
- z = true;
- break;
- }
- break;
- case 859984188:
- if (implMethodName.equals("getUserId")) {
- z = true;
- break;
- }
- break;
- case 896567166:
- if (implMethodName.equals("getRemainLife")) {
- z = true;
- break;
- }
- break;
- case 1344540506:
- if (implMethodName.equals("getWorkstationCode")) {
- z = true;
- break;
- }
- break;
- case 1344855032:
- if (implMethodName.equals("getWorkstationName")) {
- z = true;
- break;
- }
- break;
- case 1783736512:
- if (implMethodName.equals("getUseState")) {
- z = true;
- break;
- }
- break;
- case 1798251983:
- if (implMethodName.equals("getUsedLife")) {
- 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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/Tool") && 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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWorkstationName();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWorkstationName();
- };
- }
- 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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getUsedLife();
- };
- }
- 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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getUseState();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getUseState();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getUseState();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getRuleFieldDictKey();
- };
- }
- 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/tool/entity/ToolParameter") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getToolParameterCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/ToolParameter") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getToolParameterCode();
- };
- }
- 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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getToolPosition();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getToolPosition();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getToolPosition();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getToolPosition();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- 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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getLifeState();
- };
- }
- 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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWorkstationCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWorkstationCode();
- };
- }
- 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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getRemainLife();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public ToolManageServiceImpl(final IToolCategoryService toolCategoryService, final IToolModelService toolModelService, final IWorkstationService workstationService, final IToolChangeRecordService toolChangeRecordService, final IEmployeeService employeeService, final ICodeGeneratorService codeGeneratorService, final IBasCoderuleService basCoderuleService, final OssBuilder ossBuilder, final IToolParameterService toolParameterService) {
this.toolCategoryService = toolCategoryService;
@@ -350,10 +104,10 @@
@Override // org.springblade.modules.tool.service.IToolManageService
public Boolean saveTool(ToolManageSaveVO toolManageSaveVO) {
- Set<String> toolManageCodeSet = (Set) list().stream().map((v0) -> {
+ Set<String> toolManageCodeSet = list().stream().map((v0) -> {
return v0.getCode();
}).collect(Collectors.toSet());
- ToolModel toolModel = (ToolModel) this.toolModelService.getOne(Lambda.eq((v0) -> {
+ ToolModel toolModel = this.toolModelService.getOne(Lambda.eq((v0) -> {
return v0.getId();
}, toolManageSaveVO.getToolModelId()));
Tool toolManage = ToolManageConvert.INSTANCE.saveVOToConvert(toolManageSaveVO);
@@ -402,11 +156,13 @@
@Override // org.springblade.modules.tool.service.IToolManageService
@Transactional(rollbackFor = {Exception.class})
public List<ToolManageVO> dischargeTool(ToolDischargeVO toolDischargeVO) {
+ List<Tool> toolList = list(Lambda.in(Tool::getId, toolDischargeVO.getIds()).eq(Tool::getUseState, ToolUseStateEnum.DISCHARGE.getCode()));
+ /*
List<Tool> toolList = list((Wrapper) Lambda.in((v0) -> {
return v0.getId();
}, toolDischargeVO.getIds()).eq((v0) -> {
return v0.getUseState();
- }, ToolUseStateEnum.DISCHARGE.getCode()));
+ }, ToolUseStateEnum.DISCHARGE.getCode()));*/
if (Func.isNotEmpty(toolList)) {
throw new ServiceException(MessageUtils.message("tool.tool.is.already.discharge", new Object[0]));
}
@@ -415,6 +171,13 @@
item.setUseState(ToolUseStateEnum.DISCHARGE.getCode());
});
this.toolChangeRecordService.dischargeToolChangeRecord(toolManageList, toolDischargeVO.getEmployeeId());
+ update(Wrappers.<Tool>lambdaUpdate().in(Tool::getId, toolDischargeVO.getIds())
+ .set(Tool::getWorkstationId, null)
+ .set(Tool::getWorkstationCode, null)
+ .set(Tool::getWorkstationName, null)
+ .set(Tool::getToolPosition, null)
+ .set(Tool::getUseState, ToolUseStateEnum.DISCHARGE.getCode()));
+ /*
update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().in((v0) -> {
return v0.getId();
}, toolDischargeVO.getIds())).set((v0) -> {
@@ -427,21 +190,28 @@
return v0.getToolPosition();
}, (Object) null)).set((v0) -> {
return v0.getUseState();
- }, ToolUseStateEnum.DISCHARGE.getCode()));
+ }, ToolUseStateEnum.DISCHARGE.getCode()));*/
return ToolManageConvert.INSTANCE.convert(toolManageList);
}
@Override // org.springblade.modules.tool.service.IToolManageService
@Transactional(rollbackFor = {Exception.class})
public ToolManageVO equipmentTool(ToolManageEquipmentVO toolManageEquipmentVO) {
- if (Func.isNotEmpty(getOne((Wrapper) Lambda.eq((v0) -> {
- return v0.getWorkstationId();
- }, toolManageEquipmentVO.getWorkstationId()).eq((v0) -> {
- return v0.getToolPosition();
- }, toolManageEquipmentVO.getToolPosition())))) {
+
+ Tool tool = getOne(Lambda.eq(Tool::getWorkstationId, toolManageEquipmentVO.getWorkstationId()).eq(Tool::getToolPosition, toolManageEquipmentVO.getToolPosition()));
+
+ if (Func.isNotEmpty(tool)) {
throw new ServiceException(MessageUtils.message("tool.tool.position.exist.tool", new Object[0]));
}
Workstation workstation = (Workstation) this.workstationService.getById(toolManageEquipmentVO.getWorkstationId());
+ update(Wrappers.<Tool>lambdaUpdate()
+ .eq(Tool::getId, toolManageEquipmentVO.getId())
+ .set(Tool::getWorkstationId, workstation.getId())
+ .set(Tool::getWorkstationName, workstation.getName())
+ .set(Tool::getWorkstationCode, workstation.getCode())
+ .set(Tool::getToolPosition, toolManageEquipmentVO.getToolPosition())
+ .set(Tool::getUseState, ToolUseStateEnum.EQUIP.getCode()));
+ /*
update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
return v0.getId();
}, toolManageEquipmentVO.getId())).set((v0) -> {
@@ -455,6 +225,7 @@
}, toolManageEquipmentVO.getToolPosition())).set((v0) -> {
return v0.getUseState();
}, ToolUseStateEnum.EQUIP.getCode()));
+ */
Tool toolManage = (Tool) getById(toolManageEquipmentVO.getId());
this.toolChangeRecordService.equipmentToolChangeRecord(toolManage, toolManageEquipmentVO.getEmployeeId());
return ToolManageConvert.INSTANCE.convert(toolManage);
@@ -466,6 +237,13 @@
Tool toolManage = (Tool) getById(id);
toolManage.setUsedLife(0);
toolManage.setRemainLife(toolManage.getInitialLife());
+ boolean flag = update(Wrappers.<Tool>lambdaUpdate()
+ .eq(Tool::getId, id)
+ .set(Tool::getUsedLife, 0)
+ .set(Tool::getRemainLife, toolManage.getInitialLife())
+ .set(Tool::getToolPosition, null)
+ .set(Tool::getLifeState, ToolLifeStateEnum.NORMAL.getCode()));
+ /*
boolean flag = update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
return v0.getId();
}, id)).set((v0) -> {
@@ -477,6 +255,7 @@
}, (Object) null)).set((v0) -> {
return v0.getLifeState();
}, ToolLifeStateEnum.NORMAL.getCode()));
+ */
if (Func.isEmpty(toolManage.getWorkstationId())) {
return Boolean.valueOf(flag);
}
@@ -511,9 +290,11 @@
@Override // org.springblade.modules.tool.service.IToolManageService
public Boolean isExistCodeRule(String ruleFieldDictKey) {
+ return Boolean.valueOf((this.basCoderuleService.count(Wrappers.<BasCodeRule>lambdaQuery().eq(BasCodeRule::getRuleFieldDictKey, ruleFieldDictKey)) > 0L));
+ /*
return Boolean.valueOf(this.basCoderuleService.count((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getRuleFieldDictKey();
- }, ruleFieldDictKey)) > 0);
+ }, ruleFieldDictKey)) > 0);*/
}
@Override // org.springblade.modules.tool.service.IToolManageService
@@ -580,13 +361,15 @@
list.add(head);
}
}
+ List<ToolParameter> toolParameterList = this.toolParameterService.list(Wrappers.<ToolParameter>lambdaQuery().orderByAsc(ToolParameter::getToolParameterCode));
+ /*
List<ToolParameter> toolParameterList = this.toolParameterService.list((Wrapper) Wrappers.lambdaQuery().orderByAsc((v0) -> {
return v0.getToolParameterCode();
- }));
- List<String> toolParameterNameList = (List) toolParameterList.stream().map((v0) -> {
+ }));*/
+ List<String> toolParameterNameList = toolParameterList.stream().map((v0) -> {
return v0.getToolParameterName();
}).collect(Collectors.toList());
- Map<String, String> nameUnitMap = (Map) toolParameterList.stream().filter(item -> {
+ Map<String, String> nameUnitMap = toolParameterList.stream().filter(item -> {
return Func.isNotEmpty(item.getToolParameterUnit());
}).collect(Collectors.toMap((v0) -> {
return v0.getToolParameterName();
@@ -603,14 +386,17 @@
return list;
}
- public List<List<Object>> getData(List<Tool> toolManageList) throws IllegalAccessException, NoSuchFieldException {
- Class<?> cls = Class.forName("org.springblade.modules.tool.excel.ToolManageExcel");
+ public List<List<Object>> getData(List<Tool> toolManageList) throws IllegalAccessException, NoSuchFieldException, ClassNotFoundException {
+ Class<?> cls = Class.forName("com.qianwen.smartman.modules.tool.excel.ToolManageExcel");
Field liftState = cls.getDeclaredField("lifeState");
+ List<String> toolParameterCodeList = this.toolParameterService.list(Wrappers.<ToolParameter>lambdaQuery().orderByAsc(ToolParameter::getToolParameterCode)).stream().map(ToolParameter::getToolParameterCode).collect(Collectors.toList());
+ /*
List<String> toolParameterCodeList = (List) this.toolParameterService.list((Wrapper) Wrappers.lambdaQuery().orderByAsc((v0) -> {
return v0.getToolParameterCode();
})).stream().map((v0) -> {
return v0.getToolParameterCode();
}).collect(Collectors.toList());
+ */
List<List<Object>> list = new ArrayList<>();
for (Tool tool : toolManageList) {
ToolManageExcel toolManageExcel = ToolManageConvert.INSTANCE.convertToExcel(tool);
@@ -620,7 +406,7 @@
toolManageExcel.setUsedLife(toolManageExcel.getUsedLife() == null ? "0" : toolManageExcel.getUsedLife() + "娆�");
toolManageExcel.setRemainLife(toolManageExcel.getRemainLife() + "娆�");
List<Object> objectList = new ArrayList<>();
- List<Field> fieldList = (List) Arrays.stream(toolManageExcel.getClass().getDeclaredFields()).filter(field -> {
+ List<Field> fieldList = Arrays.stream(toolManageExcel.getClass().getDeclaredFields()).filter(field -> {
return !field.equals(liftState);
}).collect(Collectors.toList());
for (Field field2 : fieldList) {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolModelServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolModelServiceImpl.java
index 80433f9..4ebce04 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolModelServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolModelServiceImpl.java
@@ -1,19 +1,22 @@
package com.qianwen.smartman.modules.tool.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
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.util.List;
-import com.qianwen.smartman.common.utils.MessageUtils;
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.tool.utils.Func;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.tool.convert.ToolModelConvert;
+import com.qianwen.smartman.modules.tool.entity.Tool;
import com.qianwen.smartman.modules.tool.entity.ToolCategory;
import com.qianwen.smartman.modules.tool.entity.ToolModel;
import com.qianwen.smartman.modules.tool.mapper.ToolModelMapper;
@@ -21,9 +24,6 @@
import com.qianwen.smartman.modules.tool.service.IToolManageService;
import com.qianwen.smartman.modules.tool.service.IToolModelService;
import com.qianwen.smartman.modules.tool.vo.ToolModelVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/impl/ToolModelServiceImpl.class */
@@ -35,67 +35,6 @@
@Lazy
private IToolManageService toolManageService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1669172377:
- if (implMethodName.equals("getToolCategoryId")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 106223670:
- if (implMethodName.equals("getToolModelId")) {
- z = true;
- break;
- }
- break;
- case 1959895411:
- if (implMethodName.equals("getModel")) {
- 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/tool/entity/ToolModel") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getModel();
- };
- }
- 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/tool/entity/Tool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getToolModelId();
- };
- }
- 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/tool/entity/ToolModel") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getToolCategoryId();
- };
- }
- 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;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
@Override // org.springblade.modules.tool.service.IToolModelService
public IPage<ToolModelVO> page(String keyWord, Long categoryId, Boolean isShowChild, Query query) {
@@ -122,13 +61,18 @@
}
private void checkName(ToolModelVO toolModelVO) {
+ long count = count(Wrappers.<ToolModel>lambdaQuery()
+ .ne(Func.isNotEmpty(toolModelVO.getId()), ToolModel::getId, toolModelVO.getId())
+ .eq(ToolModel::getToolCategoryId, toolModelVO.getToolCategoryId())
+ .eq(ToolModel::getModel, toolModelVO.getModel()));
+ /*
long count = count((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(toolModelVO.getId()), (v0) -> {
return v0.getId();
}, toolModelVO.getId()).eq((v0) -> {
return v0.getToolCategoryId();
}, toolModelVO.getToolCategoryId())).eq((v0) -> {
return v0.getModel();
- }, toolModelVO.getModel()));
+ }, toolModelVO.getModel()));*/
if (count > 0) {
throw new ServiceException(MessageUtils.message("tool.model.name.already.exists", new Object[0]));
}
@@ -136,9 +80,11 @@
@Override // org.springblade.modules.tool.service.IToolModelService
public boolean remove(List<Long> ids) {
+ long count = this.toolManageService.count(Wrappers.<Tool>lambdaQuery().in(Tool::getToolModelId, ids));
+ /*
long count = this.toolManageService.count((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getToolModelId();
- }, ids));
+ }, ids));*/
if (count > 0) {
throw new ServiceException(MessageUtils.message("tool.model.have.tool.can.not.delete", new Object[0]));
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolParameterServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolParameterServiceImpl.java
index ecc7a4b..9db6d1a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolParameterServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolParameterServiceImpl.java
@@ -1,16 +1,16 @@
package com.qianwen.smartman.modules.tool.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.stereotype.Service;
+
+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.utils.Func;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.system.service.IUserService;
import com.qianwen.smartman.modules.tool.constant.ToolConstant;
import com.qianwen.smartman.modules.tool.convert.ToolParameterConvert;
@@ -18,81 +18,11 @@
import com.qianwen.smartman.modules.tool.mapper.ToolParameterMapper;
import com.qianwen.smartman.modules.tool.service.IToolParameterService;
import com.qianwen.smartman.modules.tool.vo.ToolParameterVO;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/impl/ToolParameterServiceImpl.class */
public class ToolParameterServiceImpl extends BaseServiceImpl<ToolParameterMapper, ToolParameter> implements IToolParameterService {
private final IUserService userService;
-
- 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 119176648:
- if (implMethodName.equals("getToolParameterCode")) {
- z = false;
- break;
- }
- break;
- case 119491174:
- if (implMethodName.equals("getToolParameterName")) {
- 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/tool/entity/ToolParameter") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getToolParameterCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/ToolParameter") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getToolParameterCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/ToolParameter") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getToolParameterCode();
- };
- }
- 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/tool/entity/ToolParameter") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getToolParameterName();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/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/tool/entity/ToolParameter") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getToolParameterName();
- };
- }
- 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;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public ToolParameterServiceImpl(final IUserService userService) {
this.userService = userService;
@@ -100,19 +30,26 @@
@Override // org.springblade.modules.tool.service.IToolParameterService
public ToolParameterVO save(ToolParameterVO toolParameterVO) {
+ long count = count(Wrappers.<ToolParameter>lambdaQuery()
+ .ne(Func.isNotEmpty(toolParameterVO.getId()), ToolParameter::getId, toolParameterVO.getId())
+ .eq(ToolParameter::getToolParameterCode, toolParameterVO.getToolParameterCode()));
+ /*
long count = count((Wrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(toolParameterVO.getId()), (v0) -> {
return v0.getId();
}, toolParameterVO.getId()).eq((v0) -> {
return v0.getToolParameterCode();
- }, toolParameterVO.getToolParameterCode()));
+ }, toolParameterVO.getToolParameterCode()));*/
if (count > 0) {
throw new ServiceException(MessageUtils.message("tool.parameter.code.has.already.exists", new Object[0]));
}
+ long nameCount = count(Wrappers.<ToolParameter>lambdaQuery().ne(Func.isNotEmpty(toolParameterVO.getId()), ToolParameter::getId, toolParameterVO.getId())
+ .eq(ToolParameter::getToolParameterName, toolParameterVO.getToolParameterName()));
+ /*
long nameCount = count((Wrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(toolParameterVO.getId()), (v0) -> {
return v0.getId();
}, toolParameterVO.getId()).eq((v0) -> {
return v0.getToolParameterName();
- }, toolParameterVO.getToolParameterName()));
+ }, toolParameterVO.getToolParameterName()));*/
if (nameCount > 0) {
throw new ServiceException(MessageUtils.message("tool.parameter.name.has.already.exists", new Object[0]));
}
@@ -126,18 +63,25 @@
@Override // org.springblade.modules.tool.service.IToolParameterService
public List<ToolParameterVO> list(String keyWord) {
- Map<Long, String> userMap = (Map) this.userService.list().stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, String> userMap = this.userService.list().stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, (v0) -> {
return v0.getRealName();
}));
+
+ List<ToolParameter> list = list(Wrappers.<ToolParameter>lambdaQuery()
+ .likeRight(Func.isNotEmpty(keyWord), ToolParameter::getToolParameterCode, keyWord)
+ .or()
+ .likeRight(Func.isNotEmpty(keyWord), ToolParameter::getToolParameterName, keyWord)
+ .orderByAsc(ToolParameter::getToolParameterCode));
+ /*
List<ToolParameter> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().likeRight(Func.isNotEmpty(keyWord), (v0) -> {
return v0.getToolParameterCode();
}, keyWord).or()).likeRight(Func.isNotEmpty(keyWord), (v0) -> {
return v0.getToolParameterName();
}, keyWord).orderByAsc((v0) -> {
return v0.getToolParameterCode();
- }));
+ }));*/
List<ToolParameterVO> toolParameterVOList = ToolParameterConvert.INSTANCE.convert(list);
toolParameterVOList.forEach(toolParameter -> {
toolParameter.setCreateUserName((String) userMap.get(toolParameter.getCreateUser()));
--
Gitblit v1.9.3