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/dnc/service/impl/DncArtBagLogServiceImpl.java |  129 ++++++-------------------------------------
 1 files changed, 18 insertions(+), 111 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArtBagLogServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArtBagLogServiceImpl.java
index 7b3a8b0..a2a3c59 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArtBagLogServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArtBagLogServiceImpl.java
@@ -1,13 +1,13 @@
 package com.qianwen.smartman.modules.dnc.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
 import java.util.List;
 import java.util.stream.Collectors;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.CommonConstant;
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qianwen.core.excel.util.ExcelUtil;
 import com.qianwen.core.mp.base.BaseServiceImpl;
 import com.qianwen.core.mp.support.Condition;
@@ -15,6 +15,7 @@
 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.CommonConstant;
 import com.qianwen.smartman.modules.dnc.convert.DncArtBagLogConvert;
 import com.qianwen.smartman.modules.dnc.dto.DncArtBagLogDTO;
 import com.qianwen.smartman.modules.dnc.entity.DncArtBagLog;
@@ -24,114 +25,11 @@
 import com.qianwen.smartman.modules.dnc.vo.DncArtBagLogPageVO;
 import com.qianwen.smartman.modules.dnc.vo.DncArtBagLogVO;
 import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 @Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/service/impl/DncArtBagLogServiceImpl.class */
 public class DncArtBagLogServiceImpl extends BaseServiceImpl<DncArtBagLogMapper, DncArtBagLog> implements IDncArtBagLogService {
     private final OssBuilder ossBuilder;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -1025815266:
-                if (implMethodName.equals("getOperationTime")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -847413691:
-                if (implMethodName.equals("getStorage")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 804592199:
-                if (implMethodName.equals("getSuffix")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 812940310:
-                if (implMethodName.equals("getArtBagId")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 1003193809:
-                if (implMethodName.equals("getFileBelong")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1342178205:
-                if (implMethodName.equals("getFileName")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1342380108:
-                if (implMethodName.equals("getFileType")) {
-                    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/dnc/entity/DncArtBagLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getArtBagId();
-                    };
-                }
-                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/dnc/entity/DncArtBagLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getSuffix();
-                    };
-                }
-                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/dnc/entity/DncArtBagLog") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
-                    return (v0) -> {
-                        return v0.getOperationTime();
-                    };
-                }
-                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/dnc/entity/DncArtBagLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getStorage();
-                    };
-                }
-                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/dnc/entity/DncArtBagLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileBelong();
-                    };
-                }
-                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/dnc/entity/DncArtBagLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getFileName();
-                    };
-                }
-                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/dnc/entity/DncArtBagLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
     public DncArtBagLogServiceImpl(final OssBuilder ossBuilder) {
         this.ossBuilder = ossBuilder;
@@ -139,6 +37,15 @@
 
     @Override // org.springblade.modules.dnc.service.IDncArtBagLogService
     public IPage<DncArtBagLogVO> page(Query query, DncArtBagLogPageVO dncArtBagLogPageVO) {
+    	IPage<DncArtBagLog> page = page(Condition.getPage(query),Wrappers.<DncArtBagLog>lambdaQuery()
+    	        .eq(Func.isNotEmpty(dncArtBagLogPageVO.getBagId()), DncArtBagLog::getArtBagId, dncArtBagLogPageVO.getBagId())
+    	        .likeRight(Func.isNotEmpty(dncArtBagLogPageVO.getFileName()), DncArtBagLog::getFileName, dncArtBagLogPageVO.getFileName())
+    	        .eq(Func.isNotEmpty(dncArtBagLogPageVO.getFileClass()), DncArtBagLog::getSuffix, dncArtBagLogPageVO.getFileClass())
+    	        .eq(Func.isNotEmpty(dncArtBagLogPageVO.getFileType()), DncArtBagLog::getFileType, dncArtBagLogPageVO.getFileType())
+    	        .eq(Func.isNotEmpty(dncArtBagLogPageVO.getFileBelong()), DncArtBagLog::getFileBelong, dncArtBagLogPageVO.getFileBelong())
+    	        .eq(Func.isNotEmpty(dncArtBagLogPageVO.getStorage()), DncArtBagLog::getStorage, dncArtBagLogPageVO.getStorage())
+    	        .orderByDesc(DncArtBagLog::getOperationTime));
+    	/*
         IPage<DncArtBagLog> page = page(Condition.getPage(query), (Wrapper) Wrappers.lambdaQuery().eq(Func.isNotEmpty(dncArtBagLogPageVO.getBagId()), (v0) -> {
             return v0.getArtBagId();
         }, dncArtBagLogPageVO.getBagId()).likeRight(Func.isNotEmpty(dncArtBagLogPageVO.getFileName()), (v0) -> {
@@ -153,7 +60,7 @@
             return v0.getStorage();
         }, dncArtBagLogPageVO.getStorage()).orderByDesc((v0) -> {
             return v0.getOperationTime();
-        }));
+        }));*/
         IPage<DncArtBagLogVO> convert = DncArtBagLogConvert.INSTANCE.convert(page);
         convert.getRecords().forEach(dncArtBagLogVO -> {
             dncArtBagLogVO.setVersion(Func.isNotBlank(dncArtBagLogVO.getVersion()) ? dncArtBagLogVO.getVersion() + CommonConstant.FILE_SUFFIX : "");
@@ -170,7 +77,7 @@
 
     @Override // org.springblade.modules.dnc.service.IDncArtBagLogService
     public List<String> listFileClass() {
-        return (List) list().stream().map((v0) -> {
+        return list().stream().map((v0) -> {
             return v0.getSuffix();
         }).filter((v0) -> {
             return Func.isNotEmpty(v0);

--
Gitblit v1.9.3