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/ToolParameterServiceImpl.java | 102 +++++++++++---------------------------------------
1 files changed, 23 insertions(+), 79 deletions(-)
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