From 2969df3e404db3cd116f27db1495e523ce05bf86 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 31 三月 2024 10:35:33 +0800
Subject: [PATCH] pref修改

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolManageServiceImpl.java |  342 ++++++++++----------------------------------------------
 1 files changed, 64 insertions(+), 278 deletions(-)

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) {

--
Gitblit v1.9.3