From d19f16214e16b1a33b71fd8f63662a35d8a2dc04 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 11 四月 2024 00:11:46 +0800
Subject: [PATCH] 修改lambda错误，增加swagger开关
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/InterfaceConfigFieldController.java | 10 ++++------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/InterfaceConfigFieldServiceImpl.java | 9 ++-------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DictServiceImpl.java | 14 +++++++-------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/GalleryServiceImpl.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/common/config/SwaggerConfiguration.java | 4 ++++
smart-starter-swagger/src/main/java/com/qianwen/core/swagger/SwaggerUtil.java | 2 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/InterfaceConfigServiceImpl.java | 1 -
smart-man-boot/src/main/resources/application.yml | 1 +
smart-man-boot/src/main/java/com/qianwen/smartman/common/launch/SwaggerPlugin.java | 5 ++++-
9 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/config/SwaggerConfiguration.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/config/SwaggerConfiguration.java
index 85bd630..eacbdce 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/config/SwaggerConfiguration.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/config/SwaggerConfiguration.java
@@ -14,6 +14,8 @@
import com.qianwen.core.swagger.SwaggerProperties;
import com.qianwen.core.swagger.SwaggerUtil;
import com.qianwen.smartman.modules.dmpLog.constant.DmpLogSyncConstant;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.plugin.core.config.EnablePluginRegistries;
@@ -33,6 +35,8 @@
@EnableSwagger
@Configuration
@EnablePluginRegistries({SwaggerPlugin.class})
+
+
public class SwaggerConfiguration {
private final SwaggerProperties swaggerProperties;
private final OpenApiExtensionResolver openApiExtensionResolver;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/launch/SwaggerPlugin.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/launch/SwaggerPlugin.java
index 82cbc8d..31367de 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/launch/SwaggerPlugin.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/launch/SwaggerPlugin.java
@@ -4,6 +4,7 @@
import cn.hutool.core.util.StrUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
@@ -15,9 +16,11 @@
@Component
@Order(-2147481647)
+@ConditionalOnProperty(name ="enable" ,prefix = "swagger",havingValue = "true",matchIfMissing = true)
public class SwaggerPlugin implements OperationBuilderPlugin {
private static final Logger log = LoggerFactory.getLogger(SwaggerPlugin.class);
-
+
+ @Override
public void apply(OperationContext operationContext) {
RequestMappingContext requestContext = (RequestMappingContext) BeanUtil.getProperty(operationContext, "requestContext");
WebMvcRequestHandler handler = (WebMvcRequestHandler) BeanUtil.getProperty(requestContext, "handler");
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/InterfaceConfigFieldController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/InterfaceConfigFieldController.java
index e990fa9..59de1e1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/InterfaceConfigFieldController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/InterfaceConfigFieldController.java
@@ -40,7 +40,6 @@
@Api(value = "鍔ㄦ�佹帴鍙ｅ瓧娈电鐞�", tags = {"鍔ㄦ�佹帴鍙ｅ瓧娈电鐞�"})
@ApiResource({"blade-system/interface-config-field"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/controller/InterfaceConfigFieldController.class */
public class InterfaceConfigFieldController extends BladeController {
private IInterfaceConfigFieldService interfaceConfigFieldService;
@@ -62,9 +61,8 @@
@ApiOperation(value = "鎺ュ彛瀛楁琛ㄥ垪琛�", notes = "浼犲叆map")
public R<List<InterfaceConfigFieldVO>> list(@RequestParam @ApiIgnore Map<String, Object> params) {
String configId = (String) params.get("configId");
- List<InterfaceConfigField> list = this.interfaceConfigFieldService.list(Condition.getQueryWrapper(params, InterfaceConfigField.class).lambda().eq(Func.isNotBlank(configId), (v0) -> {
- return v0.getConfigId();
- }, configId));
+ List<InterfaceConfigField> list = this.interfaceConfigFieldService.list(Condition.getQueryWrapper(params, InterfaceConfigField.class).lambda().eq(Func.isNotBlank(configId),
+ InterfaceConfigField::getConfigId, configId));
List<InterfaceConfigFieldVO> collect = list.stream().map(item -> {
InterfaceConfigFieldVO convert = InterfaceConfigFieldConvert.INSTANCE.convert(item);
convert.setRelationFieldNames(Optional.ofNullable(this.interfaceConfigFieldService.findRelation(item)).map(f -> {
@@ -81,7 +79,7 @@
@GetResource({"/count"})
@ApiOperation(value = "鎺ュ彛瀛楁琛ㄧ粺璁″��", notes = "浼犲叆map")
public R<Long> count(@RequestParam @ApiIgnore Map<String, Object> params) {
- Long count = Long.valueOf(this.interfaceConfigFieldService.count(Condition.getQueryWrapper(params, InterfaceConfigField.class)));
+ Long count = this.interfaceConfigFieldService.count(Condition.getQueryWrapper(params, InterfaceConfigField.class));
return R.data(count);
}
@@ -114,7 +112,7 @@
@ApiOperationSupport(order = 6)
@DeleteResource({"/remove"})
@ApiOperation(value = "鎺ュ彛瀛楁琛ㄥ垹闄�", notes = "浼犲叆ids")
- public R remove(@ApiParam(value = "涓婚敭", required = true) @RequestBody List<String> ids) {
+ public R<Void> remove(@ApiParam(value = "涓婚敭", required = true) @RequestBody List<String> ids) {
if (ids.isEmpty()) {
return R.status(false);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DictServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DictServiceImpl.java
index c5b778a..8585a7d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DictServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DictServiceImpl.java
@@ -28,22 +28,22 @@
@Service
public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements IDictService {
- @Override // org.springblade.modules.system.service.IDictService
+ @Override
public IPage<DictVO> selectDictPage(IPage<DictVO> page, DictVO dict) {
return page.setRecords(this.baseMapper.selectDictPage(page, dict));
}
- @Override // org.springblade.modules.system.service.IDictService
+ @Override
public List<DictVO> tree() {
return ForestNodeMerger.merge(this.baseMapper.tree());
}
- @Override // org.springblade.modules.system.service.IDictService
+ @Override
public List<DictVO> parentTree() {
return ForestNodeMerger.merge(this.baseMapper.parentTree());
}
- @Override // org.springblade.modules.system.service.IDictService
+ @Override
public String getValue(String code, String dictKey) {
return Func.toStr(this.baseMapper.getValue(code, dictKey), "");
}
@@ -53,7 +53,7 @@
return this.baseMapper.getList(code);
}
- @Override // org.springblade.modules.system.service.IDictService
+ @Override
public boolean submit(Dict dict) {
LambdaQueryWrapper<Dict> lqw = Wrappers.<Dict>query().lambda().eq(Dict::getCode, dict.getCode()).eq(Dict::getDictKey, dict.getDictKey());
Long cnt = this.baseMapper.selectCount(Func.isEmpty(dict.getId()) ? lqw : lqw.notIn(Dict::getId, new Object[] { dict.getId() }));
@@ -102,7 +102,7 @@
return removeByIds(Func.toLongList(ids));
}
- @Override // org.springblade.modules.system.service.IDictService
+ @Override
public IPage<DictVO> parentList(Map<String, Object> dict, Query query) {
IPage<Dict> page = page(Condition.getPage(query), Condition.getQueryWrapper(dict, Dict.class).lambda().eq(Dict::getParentId, BladeConstant.TOP_PARENT_ID).orderByAsc(Dict::getSort));
/*
@@ -114,7 +114,7 @@
return DictWrapper.build().pageVO(page);
}
- @Override // org.springblade.modules.system.service.IDictService
+ @Override
public List<DictVO> childList(Map<String, Object> dict, Long parentId) {
if (parentId.longValue() < 0) {
return new ArrayList<>();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/GalleryServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/GalleryServiceImpl.java
index e3a52d7..0688ac1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/GalleryServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/GalleryServiceImpl.java
@@ -7,6 +7,5 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/service/impl/GalleryServiceImpl.class */
public class GalleryServiceImpl extends BaseServiceImpl<GalleryMapper, Gallery> implements IGalleryService {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/InterfaceConfigFieldServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/InterfaceConfigFieldServiceImpl.java
index 4d42437..8404178 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/InterfaceConfigFieldServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/InterfaceConfigFieldServiceImpl.java
@@ -15,13 +15,8 @@
public class InterfaceConfigFieldServiceImpl extends BaseServiceImpl<InterfaceConfigFieldMapper, InterfaceConfigField> implements IInterfaceConfigFieldService {
- @Override // org.springblade.modules.system.service.IInterfaceConfigFieldService
+ @Override
public List<InterfaceConfigField> findRelation(InterfaceConfigField field) {
- if (StringUtils.isEmpty(field.getRelationField())) {
- return null;
- }
- return list(Lambda.eq((v0) -> {
- return v0.getId();
- }, field.getRelationField()));
+ return StringUtils.isEmpty(field.getRelationField()) ? null : list(Lambda.eq(InterfaceConfigField::getId, field.getRelationField()));
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/InterfaceConfigServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/InterfaceConfigServiceImpl.java
index db5ccde..b1faadc 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/InterfaceConfigServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/InterfaceConfigServiceImpl.java
@@ -7,6 +7,5 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/service/impl/InterfaceConfigServiceImpl.class */
public class InterfaceConfigServiceImpl extends BaseServiceImpl<InterfaceConfigMapper, InterfaceConfig> implements IInterfaceConfigService {
}
diff --git a/smart-man-boot/src/main/resources/application.yml b/smart-man-boot/src/main/resources/application.yml
index 69ae256..064d1a4 100644
--- a/smart-man-boot/src/main/resources/application.yml
+++ b/smart-man-boot/src/main/resources/application.yml
@@ -132,6 +132,7 @@
#swagger鍏叡淇℃伅
swagger:
+ enable: true
title: smart 鎺ュ彛鏂囨。绯荤粺
description: smart 鎺ュ彛鏂囨。绯荤粺
version: 2.8.2.RELEASE
diff --git a/smart-starter-swagger/src/main/java/com/qianwen/core/swagger/SwaggerUtil.java b/smart-starter-swagger/src/main/java/com/qianwen/core/swagger/SwaggerUtil.java
index 720e866..144fc28 100644
--- a/smart-starter-swagger/src/main/java/com/qianwen/core/swagger/SwaggerUtil.java
+++ b/smart-starter-swagger/src/main/java/com/qianwen/core/swagger/SwaggerUtil.java
@@ -8,7 +8,7 @@
import springfox.documentation.RequestHandler;
import springfox.documentation.service.ApiKey;
-/* loaded from: blade-starter-swagger-9.3.0.0-SNAPSHOT.jar:org/springblade/core/swagger/SwaggerUtil.class */
+
public class SwaggerUtil {
public static Predicate<RequestHandler> basePackages(final List<String> basePackages) {
return input -> {
--
Gitblit v1.9.3