From ec2552d891e163bd9054e0554188afc575bcdb70 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 07 五月 2024 14:17:36 +0800
Subject: [PATCH] 初始化测试问题修改
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualServiceImpl.java | 198 ++++++++++--------------------------------------
1 files changed, 43 insertions(+), 155 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualServiceImpl.java
index 907006b..9c5b42c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualServiceImpl.java
@@ -1,27 +1,28 @@
package com.qianwen.smartman.modules.visual.service.impl;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ZipUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.Lambda;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+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.oss.model.BladeFile;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
import com.qianwen.smartman.modules.resource.service.IOssService;
import com.qianwen.smartman.modules.visual.dto.VisualDTO;
@@ -34,9 +35,9 @@
import com.qianwen.smartman.modules.visual.service.IVisualService;
import com.qianwen.smartman.modules.visual.utils.VisualUtils;
import com.qianwen.smartman.modules.visual.vo.VisualInfoVO;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ZipUtil;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/service/impl/VisualServiceImpl.class */
@@ -46,136 +47,6 @@
private final OssBuilder ossBuilder;
private final IOssService ossService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1492779276:
- if (implMethodName.equals("getGroupName")) {
- z = true;
- break;
- }
- break;
- case -621871631:
- if (implMethodName.equals("getVisualId")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 964243849:
- if (implMethodName.equals("getGroupIndex")) {
- z = false;
- break;
- }
- break;
- case 1283554731:
- if (implMethodName.equals("getBackgroundUrl")) {
- z = true;
- break;
- }
- break;
- case 1966196898:
- if (implMethodName.equals("getTitle")) {
- z = true;
- break;
- }
- break;
- case 2128411252:
- if (implMethodName.equals("getCategory")) {
- 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/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getGroupIndex();
- };
- }
- 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/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getGroupIndex();
- };
- }
- 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/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupName();
- };
- }
- 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/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupName();
- };
- }
- 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/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTitle();
- };
- }
- 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/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getCategory();
- };
- }
- 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 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/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getBackgroundUrl();
- };
- }
- 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/visual/entity/VisualConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVisualId();
- };
- }
- 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/visual/entity/VisualConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVisualId();
- };
- }
- 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/visual/entity/VisualConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVisualId();
- };
- }
- 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/visual/entity/VisualConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVisualId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public VisualServiceImpl(final IVisualConfigService configService, final IVisualGlobalApiService globalApiService, final OssBuilder ossBuilder, final IOssService ossService) {
this.configService = configService;
@@ -187,9 +58,11 @@
@Override // org.springblade.modules.visual.service.IVisualService
public VisualDTO detail(Long id) {
Visual visual = (Visual) getById(id);
+ VisualConfig visualConfig = this.configService.getOne(Wrappers.<VisualConfig>query().lambda().eq(VisualConfig::getVisualId, id));
+ /*
VisualConfig visualConfig = (VisualConfig) this.configService.getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getVisualId();
- }, id));
+ }, id));*/
VisualDTO dto = new VisualDTO();
dto.setVisual(visual);
dto.setConfig(visualConfig);
@@ -202,11 +75,13 @@
if (StringUtils.isEmpty(visual.getGroupName())) {
return null;
}
+ List<Visual> list = list(Lambda.eq(Visual::getGroupName, visual.getGroupName()).orderByAsc(Visual::getGroupIndex));
+ /*
List<Visual> list = list((Wrapper) Lambda.eq((v0) -> {
return v0.getGroupName();
}, visual.getGroupName()).orderByAsc((v0) -> {
return v0.getGroupIndex();
- }));
+ }));*/
if (list.size() <= 1) {
return null;
}
@@ -223,11 +98,13 @@
if (StringUtils.isEmpty(visual.getGroupName())) {
return null;
}
+ List<Visual> list = list(Lambda.eq(Visual::getGroupName, visual.getGroupName()).orderByDesc(Visual::getGroupIndex));
+ /*
List<Visual> list = list((Wrapper) Lambda.eq((v0) -> {
return v0.getGroupName();
}, visual.getGroupName()).orderByDesc((v0) -> {
return v0.getGroupIndex();
- }));
+ }));*/
if (list.size() <= 1) {
return null;
}
@@ -236,7 +113,7 @@
}).findFirst().map(item2 -> {
return item2.getId();
}).orElseGet(() -> {
- return ((Visual) list.get(0)).getId();
+ return list.get(0).getId();
});
}
@@ -271,9 +148,12 @@
@Transactional(rollbackFor = {Exception.class})
public Long copyVisual(Long id) {
Visual visual = (Visual) getById(id);
+
+ VisualConfig visualConfig = (VisualConfig)this.configService.getOne(Wrappers.<VisualConfig>query().lambda().eq(VisualConfig::getVisualId, id));
+ /*
VisualConfig visualConfig = (VisualConfig) this.configService.getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getVisualId();
- }, id));
+ }, id));*/
if (visual != null && visualConfig != null) {
visual.setId(null);
visualConfig.setId(null);
@@ -308,6 +188,9 @@
@Override // org.springblade.modules.visual.service.IVisualService
public List<VisualInfoVO> detailsByCatalog(Integer catalogId) {
+ List<Visual> list = list(Lambda.eq((catalogId != null), Visual::getCategory, catalogId)
+ .select(Visual::getId, Visual::getTitle, Visual::getBackgroundUrl ));
+ /*
List<Visual> list = list(Lambda.eq(catalogId != null, (v0) -> {
return v0.getCategory();
}, catalogId).select((v0) -> {
@@ -316,17 +199,17 @@
return v0.getTitle();
}, (v0) -> {
return v0.getBackgroundUrl();
- }));
+ }));*/
if (list == null || list.isEmpty()) {
return Collections.emptyList();
}
- List<Long> visualIds = (List) list.stream().map((v0) -> {
+ List<Long> visualIds = list.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<VisualConfig> config = this.configService.list(Lambda.in((v0) -> {
return v0.getVisualId();
}, visualIds));
- return (List) config.stream().map(item -> {
+ return config.stream().map(item -> {
Visual match = (Visual) list.stream().filter(visual -> {
return visual.getId().equals(item.getVisualId());
}).findFirst().orElse(null);
@@ -380,7 +263,12 @@
public void visualZipImport(MultipartFile zipFile, Integer category) {
String localFileName = IdWorker.get32UUID() + ".zip";
File localZipFile = new File("static/visual/" + localFileName);
- FileUtils.copyToFile(zipFile.getInputStream(), localZipFile);
+ try {
+ FileUtils.copyToFile(zipFile.getInputStream(), localZipFile);
+ } catch (IOException e) {
+ log.error("鍙鍖栧鍏ラ敊璇�",e);
+ throw new ServiceException("鍙鍖栧鍏ラ敊璇�"+e.getMessage());
+ }
visualZipImport(localZipFile, category);
}
@@ -388,16 +276,16 @@
public void visualZipImport(File zipFile, Integer category) {
File distFile = ZipUtil.unzip(zipFile);
File[] files = distFile.listFiles();
- File imagesDir = (File) Stream.of((Object[]) files).filter(file -> {
+ File imagesDir = (File) Stream.of(files).filter(file -> {
return file.isDirectory() && "images".equalsIgnoreCase(file.getName());
}).findFirst().orElse(null);
if (imagesDir == null) {
- String[] jsFilesText = (String[]) Stream.of((Object[]) files).filter(file2 -> {
+ String[] jsFilesText = (String[]) Stream.of( files).filter(file2 -> {
return file2.isFile() && file2.getName().endsWith("js");
}).map(item -> {
return FileUtil.readString(item, "utf-8");
- }).toArray(x$0 -> {
- return new String[x$0];
+ }).toArray(x -> {
+ return new String[x];
});
File distFile2 = VisualUtils.visualDownload(jsFilesText);
visualZipImport(distFile2, category);
--
Gitblit v1.9.3