From 14f1953b1944b3e53d8312e151902c4695faa2e1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 01 四月 2024 22:51:45 +0800
Subject: [PATCH] trace模块修复

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/trace/service/impl/NgReasonInfoServiceImpl.java |  101 +++++++++++---------------------------------------
 1 files changed, 23 insertions(+), 78 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/trace/service/impl/NgReasonInfoServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/trace/service/impl/NgReasonInfoServiceImpl.java
index f82cf46..1f67af6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/trace/service/impl/NgReasonInfoServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/trace/service/impl/NgReasonInfoServiceImpl.java
@@ -1,18 +1,20 @@
 package com.qianwen.smartman.modules.trace.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.List;
+
+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 java.lang.invoke.SerializedLambda;
-import java.util.List;
-import com.qianwen.smartman.common.constant.CommonGroupConstant;
-import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
-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.constant.CommonGroupConstant;
+import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
+import com.qianwen.smartman.common.utils.MessageUtils;
 import com.qianwen.smartman.modules.cps.entity.CommonGroupOfItem;
 import com.qianwen.smartman.modules.cps.service.ICommonGroupOfItemService;
 import com.qianwen.smartman.modules.trace.convert.NgReasonInfoConvert;
@@ -22,78 +24,12 @@
 import com.qianwen.smartman.modules.trace.vo.NgReasonInfoSubmitVO;
 import com.qianwen.smartman.modules.trace.vo.NgReasonInfoUpdateVO;
 import com.qianwen.smartman.modules.trace.vo.NgReasonInfoVO;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/trace/service/impl/NgReasonInfoServiceImpl.class */
 public class NgReasonInfoServiceImpl extends BaseServiceImpl<NgReasonInfoMapper, NgReasonInfo> implements INgReasonInfoService {
     private final ICommonGroupOfItemService commonGroupOfItemService;
     private final NgReasonInfoMapper ngReasonInfoMapper;
-
-    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 424389191:
-                if (implMethodName.equals("getReasonCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 517353092:
-                if (implMethodName.equals("getItemId")) {
-                    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/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getItemId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getItemId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/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/trace/entity/NgReasonInfo") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getReasonCode();
-                    };
-                }
-                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/trace/entity/NgReasonInfo") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getReasonCode();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
     public NgReasonInfoServiceImpl(final ICommonGroupOfItemService commonGroupOfItemService, final NgReasonInfoMapper ngReasonInfoMapper) {
         this.commonGroupOfItemService = commonGroupOfItemService;
@@ -105,9 +41,10 @@
         NgReasonInfo ngReasonInfo = NgReasonInfoConvert.INSTANCE.convertVO(ngReasonInfoSubmitVO);
         checkNgInfo(ngReasonInfo);
         save(ngReasonInfo);
-        if (Func.isNotEmpty(ngReasonInfoSubmitVO.getGroupId()) && Func.isEmpty(this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
-            return v0.getItemId();
-        }, ngReasonInfo.getId())))) {
+        
+        List<CommonGroupOfItem> items = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery().eq(CommonGroupOfItem::getItemId, ngReasonInfo.getId()));
+        		
+        if (Func.isNotEmpty(ngReasonInfoSubmitVO.getGroupId()) && Func.isEmpty(items)) {
             CommonGroupOfItem commonGroupOfItem = new CommonGroupOfItem(ngReasonInfoSubmitVO.getGroupId(), ngReasonInfo.getId(), CommonGroupTypeEnum.NG_REASON.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
             this.commonGroupOfItemService.save(commonGroupOfItem);
         }
@@ -125,9 +62,11 @@
 
     @Override // org.springblade.modules.trace.service.INgReasonInfoService
     public Boolean delete(List<Long> ids) {
+    	this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getItemId, ids));
+    	/*
         this.commonGroupOfItemService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
             return v0.getItemId();
-        }, ids));
+        }, ids));*/
         return Boolean.valueOf(removeByIds(ids));
     }
 
@@ -146,11 +85,14 @@
 
     @Override // org.springblade.modules.trace.service.INgReasonInfoService
     public Boolean isReasonCodeRepeat(Long id, String code) {
+    	long count = count(Wrappers.<NgReasonInfo>lambdaQuery().ne(Func.isNotEmpty(id), NgReasonInfo::getId, id).eq(NgReasonInfo::getReasonCode, code));
+    	
+    	/*
         long count = count((Wrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(id), (v0) -> {
             return v0.getId();
         }, id).eq((v0) -> {
             return v0.getReasonCode();
-        }, code));
+        }, code));*/
         return Boolean.valueOf(count > 0);
     }
 
@@ -163,11 +105,14 @@
         if (Func.isNotEmpty(ngReasonInfo.getReasonCode()) && ngReasonInfo.getReasonCode().length() > 24) {
             throw new ServiceException(MessageUtils.message("cps.ng.reasoncode.length.too.long", new Object[0]));
         }
+        Long count = Long.valueOf(count(Wrappers.<NgReasonInfo>lambdaQuery().ne(Func.isNotEmpty(ngReasonInfo.getId()), NgReasonInfo::getId, ngReasonInfo.getId())
+        		.eq(NgReasonInfo::getReasonCode, ngReasonInfo.getReasonCode())));
+        /*
         Long count = Long.valueOf(count((Wrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(ngReasonInfo.getId()), (v0) -> {
             return v0.getId();
         }, ngReasonInfo.getId()).eq((v0) -> {
             return v0.getReasonCode();
-        }, ngReasonInfo.getReasonCode())));
+        }, ngReasonInfo.getReasonCode())));*/
         if (count.longValue() > 0) {
             throw new ServiceException(MessageUtils.message("cps.ng.reasoncode.already.exists", new Object[0]));
         }

--
Gitblit v1.9.3