From 86cdd920b68274185233383f69ddb974052b6b6f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 01 四月 2024 17:55:51 +0800
Subject: [PATCH] system模块修改

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/I18nDataServiceImpl.java |  130 ++++++++-----------------------------------
 1 files changed, 24 insertions(+), 106 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/I18nDataServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/I18nDataServiceImpl.java
index e4f51f5..31a4181 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/I18nDataServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/I18nDataServiceImpl.java
@@ -45,98 +45,6 @@
     private final StringRedisTemplate stringRedisTemplate;
     private final OssBuilder ossBuilder;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -1816126484:
-                if (implMethodName.equals("getLanguageTag")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -75622813:
-                if (implMethodName.equals("getCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 761390710:
-                if (implMethodName.equals("getRemark")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 1991785425:
-                if (implMethodName.equals("getMessage")) {
-                    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/system/entity/I18nData") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRemark();
-                    };
-                }
-                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/I18nData") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getMessage();
-                    };
-                }
-                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/I18nData") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getLanguageTag();
-                    };
-                }
-                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/I18nData") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getLanguageTag();
-                    };
-                }
-                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/I18nData") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getLanguageTag();
-                    };
-                }
-                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/I18nData") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/I18nData") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/I18nData") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/I18nData") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/I18nData") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
-
     public I18nDataServiceImpl(final StringRedisTemplate stringRedisTemplate, final OssBuilder ossBuilder) {
         this.stringRedisTemplate = stringRedisTemplate;
         this.ossBuilder = ossBuilder;
@@ -153,9 +61,9 @@
         }, i18nDataQO.getCode()).eq(Func.isNotEmpty(i18nDataQO.getLanguageTag()), (v0) -> {
             return v0.getLanguageTag();
         }, i18nDataQO.getLanguageTag()).and(Func.isNotEmpty(i18nDataQO.getCondition()), w -> {
-            LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) w.like((v0) -> {
+            LambdaQueryWrapper lambdaQueryWrapper =  w.like((v0) -> {
                 return v0.getMessage();
-            }, i18nDataQO.getCondition())).or()).like((v0) -> {
+            }, i18nDataQO.getCondition()).or().like((v0) -> {
                 return v0.getRemark();
             }, i18nDataQO.getCondition());
         });
@@ -168,16 +76,16 @@
 
     @Override // org.springblade.modules.system.service.I18nDataService
     public List<I18nData> listByCode(String code) {
-        return ((I18nDataMapper) this.baseMapper).selectList((Wrapper) Wrappers.lambdaQuery(I18nData.class).eq((v0) -> {
+        return this.baseMapper.selectList(Wrappers.lambdaQuery(I18nData.class).eq((v0) -> {
             return v0.getCode();
         }, code));
     }
 
     @Override // org.springblade.modules.system.service.I18nDataService
     public I18nData getByCodeAndLanguageTag(String code, String languageTag) {
-        return (I18nData) ((I18nDataMapper) this.baseMapper).selectOne((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery(I18nData.class).eq((v0) -> {
+        return this.baseMapper.selectOne(Wrappers.lambdaQuery(I18nData.class).eq((v0) -> {
             return v0.getCode();
-        }, code)).eq((v0) -> {
+        }, code).eq((v0) -> {
             return v0.getLanguageTag();
         }, languageTag));
     }
@@ -211,12 +119,16 @@
             BladeFile bladeFile = this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
             return bladeFile;
         }
+        
+        List<I18nData> list = data.stream().map(I18nDataConverter.INSTANCE::excelVoToPo).collect(Collectors.toList());
+        /*
         Stream<I18nDataExcelVO> stream = data.stream();
         I18nDataConverter i18nDataConverter = I18nDataConverter.INSTANCE;
         i18nDataConverter.getClass();
         List<I18nData> list = (List) stream.map(this::excelVoToPo).collect(Collectors.toList());
+        */
         if (CollectionUtil.isNotEmpty(list)) {
-            List<String> collectCode = (List) list.stream().map((v0) -> {
+            List<String> collectCode = list.stream().map((v0) -> {
                 return v0.getCode();
             }).collect(Collectors.toList());
             List<I18nData> existCodeList = list(Lambda.in((v0) -> {
@@ -229,10 +141,10 @@
                     item2.setId(exist.getId());
                 });
             });
-            updateBatchById((Collection) list.stream().filter(item -> {
+            updateBatchById( list.stream().filter(item -> {
                 return item.getId() != null;
             }).collect(Collectors.toList()));
-            saveBatch((Collection) list.stream().filter(item2 -> {
+            saveBatch(list.stream().filter(item2 -> {
                 return item2.getId() == null;
             }).collect(Collectors.toList()));
             return null;
@@ -264,28 +176,34 @@
     }
 
     private List<I18nData> exists(List<I18nDataExcelVO> list) {
-        Wrapper lambdaQuery = Wrappers.lambdaQuery(I18nData.class);
+        //Wrapper<I18nData> lambdaQuery = Wrappers.lambdaQuery(I18nData.class);
+        LambdaQueryWrapper<I18nData> lambdaQuery = Wrappers.lambdaQuery(I18nData.class);
         for (I18nDataExcelVO excelVO : list) {
             lambdaQuery.or(w -> {
-                String code = excelVO.getCode();
+            	String code = excelVO.getCode();
                 String languageTag = excelVO.getLanguageTag();
-                ((LambdaQueryWrapper) w.eq((v0) -> {
+                w.eq(I18nData::getCode, code).eq(I18nData::getLanguageTag, languageTag);
+                /*
+                w.eq((v0) -> {
                     return v0.getCode();
-                }, code)).eq((v0) -> {
+                }, code).eq((v0) -> {
                     return v0.getLanguageTag();
-                }, languageTag);
+                }, languageTag);*/
             });
         }
-        return ((I18nDataMapper) this.baseMapper).selectList(lambdaQuery);
+        return this.baseMapper.selectList(lambdaQuery);
     }
 
     @Override // org.springblade.modules.system.service.I18nDataService
     public BladeFile exportExcel(I18nDataQueryDTO i18nDataQO, HttpServletResponse response) {
         List<I18nData> list = queryList(i18nDataQO);
+        List<I18nDataExcelVO> excelVOS = list.stream().map(I18nDataConverter.INSTANCE::poToExcelVo).collect(Collectors.toList());
+        /*
         Stream<I18nData> stream = list.stream();
         I18nDataConverter i18nDataConverter = I18nDataConverter.INSTANCE;
         i18nDataConverter.getClass();
         List<I18nDataExcelVO> excelVOS = (List) stream.map(this::poToExcelVo).collect(Collectors.toList());
+        */
         String fileName = String.format("%s-%s.xlsx", "澶氳瑷�淇℃伅", DateUtil.time());
         MultipartFile multipartFile = ExcelUtil.exportToMultipartFile(fileName, "澶氳瑷�琛�", excelVOS, I18nDataExcelVO.class);
         return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);

--
Gitblit v1.9.3