From da7fd6e806e227ea9dce34b00eceec79b9e377e6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 09 四月 2024 23:30:38 +0800
Subject: [PATCH] 可以执行后台访问了，修改了一部分查询，lamda改为方法引用才行
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.java | 6 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompController.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java | 4
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DictServiceImpl.java | 4
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompServiceImpl.java | 16 +--
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsUsageController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java | 37 ++++-----
smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/LicenseUtil.java | 9 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompTypeController.java | 5 -
smart-starter-swagger/src/main/java/com/qianwen/core/swagger/EnableSwagger.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/ExtraLambdaQueryWrapper.java | 42 +++------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java | 49 ++++++------
smart-starter-log/src/main/java/com/qianwen/core/log/aspect/RequestLogAspect.java | 20 ++--
smart-man-boot/src/main/java/com/qianwen/smartman/common/launch/SwaggerPlugin.java | 1
14 files changed, 82 insertions(+), 115 deletions(-)
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 39d1c05..82cbc8d 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
@@ -15,7 +15,6 @@
@Component
@Order(-2147481647)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/common/launch/SwaggerPlugin.class */
public class SwaggerPlugin implements OperationBuilderPlugin {
private static final Logger log = LoggerFactory.getLogger(SwaggerPlugin.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/ExtraLambdaQueryWrapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/ExtraLambdaQueryWrapper.java
index fe0bb71..40bdff6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/ExtraLambdaQueryWrapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/ExtraLambdaQueryWrapper.java
@@ -14,7 +14,6 @@
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import java.io.Serializable;
-import java.lang.invoke.SerializedLambda;
import java.text.MessageFormat;
import java.time.LocalDate;
import java.util.Collection;
@@ -30,8 +29,13 @@
public class ExtraLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, ExtraLambdaQueryWrapper<T>> implements Query<ExtraLambdaQueryWrapper<T>, T, SFunction<T, ?>> {
- public static final DbType MASTER_DB_TYPE;
- private SharedString sqlSelect;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7355848306213787157L;
+
+ public static final DbType MASTER_DB_TYPE;
+ private SharedString sqlSelect = new SharedString();
private static final String ORACLE_NUM = "ROWNUM <= {}";
private static final String MYSQL_NUM = "limit {}";
private DbType dbType;
@@ -57,9 +61,9 @@
setEntity(entity);
initNeed();
}
-
+
private ExtraLambdaQueryWrapper(Class<T> entityClass) {
- //this.sqlSelect = new SharedString();
+
super.setEntityClass(entityClass);
super.initNeed();
}
@@ -123,9 +127,9 @@
case ORACLE:
wrapper.and(q->{q.last(StrUtil.format("ROWNUM <= {}", new Object[]{num}));});
return;
- default:
- wrapper.last(StrUtil.format("limit {}", new Object[] { num }));
- return;
+ default:
+ wrapper.last(StrUtil.format("limit {}", new Object[] { num }));
+ return;
}
});
@@ -195,8 +199,8 @@
}
public ExtraLambdaQueryWrapper<T> orderBy(boolean condition, SFunction<T, ?> column, boolean isAsc, Collection<?> values) {
-
- String param = columnsToString(new SFunction[] { column });
+ String param = columnsToString(column );
+ //String param = columnsToString(new SFunction[] { column });
String sqlData = String.format(values
.stream().map(it -> (it instanceof String) ? "'%s'" : "%s").collect(Collectors.joining(",")), values
.toArray());
@@ -235,23 +239,7 @@
*/
}
- /* JADX INFO: Access modifiers changed from: package-private */
- /* renamed from: org.springblade.common.utils.ExtraLambdaQueryWrapper$1 reason: invalid class name */
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/common/utils/ExtraLambdaQueryWrapper$1.class */
- public static /* synthetic */ class AnonymousClass1 {
- static final /* synthetic */ int[] $SwitchMap$com$baomidou$mybatisplus$annotation$DbType = new int[DbType.values().length];
-
- static {
- try {
- $SwitchMap$com$baomidou$mybatisplus$annotation$DbType[DbType.ORACLE.ordinal()] = 1;
- } catch (NoSuchFieldError e) {
- }
- try {
- $SwitchMap$com$baomidou$mybatisplus$annotation$DbType[DbType.DM.ordinal()] = 2;
- } catch (NoSuchFieldError e2) {
- }
- }
- }
+
private String left(SFunction<T, ?> column, int len) {
String param = columnsToString(new SFunction[] { column });
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/LicenseUtil.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/LicenseUtil.java
index a6f6cf7..c93dec1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/LicenseUtil.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/LicenseUtil.java
@@ -6,7 +6,6 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.lang.invoke.SerializedLambda;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
@@ -115,9 +114,7 @@
if (licenseMap.get(tenantId) != null) {
return licenseMap.get(tenantId);
}
- Tenant tenant = (Tenant) tenantMapper.selectOne(Lambda.eq((v0) -> {
- return v0.getTenantId();
- }, tenantId));
+ Tenant tenant = (Tenant) tenantMapper.selectOne(Lambda.eq(Tenant::getTenantId, tenantId));
if (Func.isNotEmpty(tenant.getBladeLicense())) {
licenseMap.put(Func.toStr(tenant.getTenantId()), tenant.getBladeLicense());
}
@@ -131,9 +128,7 @@
Tenant tenant = new Tenant();
tenant.setTenantId(tenantId);
tenant.setBladeLicense(encrypt);
- tenantMapper.update(tenant, Lambda.eq((v0) -> {
- return v0.getTenantId();
- }, tenant.getTenantId()));
+ tenantMapper.update(tenant, Lambda.eq(Tenant::getTenantId, tenant.getTenantId()));
}
public static LicenseDetailDTO loadLicense(String tenantId) throws LicenseException {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsUsageController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsUsageController.java
index a26441f..5f34075 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsUsageController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsUsageController.java
@@ -31,7 +31,6 @@
@RestController
@ApiResource({"blade-cps/workstation-wcs-usage"})
@Validated
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/WorkstationWcsUsageController.class */
public class WorkstationWcsUsageController extends BladeController {
private final IWorkstationWcsUsageService workstationWcsUsageService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
index e536d8b..f9e8f7c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
@@ -1,14 +1,7 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import cn.hutool.core.io.IoUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.aliyuncs.utils.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import java.io.File;
import java.io.FileReader;
-import java.lang.invoke.SerializedLambda;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.Collection;
@@ -16,7 +9,9 @@
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+
import javax.sql.DataSource;
+
import org.apache.commons.io.FileUtils;
import org.apache.ibatis.jdbc.ScriptRunner;
import org.slf4j.Logger;
@@ -24,15 +19,25 @@
import org.smartboot.license.client.License;
import org.smartboot.license.client.LicenseEntity;
import org.smartboot.license.client.LicenseException;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.constant.FmsConstant;
-import com.qianwen.smartman.common.utils.LicenseUtil;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.core.env.Environment;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.utils.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.redis.cache.BladeRedis;
import com.qianwen.core.tool.api.ResultCode;
import com.qianwen.core.tool.utils.DigestUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.constant.FmsConstant;
+import com.qianwen.smartman.common.utils.LicenseUtil;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.enums.AppEnum;
import com.qianwen.smartman.modules.cps.mapper.InitMapper;
import com.qianwen.smartman.modules.cps.mapper.TdengineMapper;
@@ -47,15 +52,10 @@
import com.qianwen.smartman.modules.system.service.IApplicationService;
import com.qianwen.smartman.modules.visual.entity.VisualConfig;
import com.qianwen.smartman.modules.visual.service.IVisualConfigService;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
+import cn.hutool.core.io.IoUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/InitServiceImpl.class */
public class InitServiceImpl implements IInitService {
private static final Logger log = LoggerFactory.getLogger(InitServiceImpl.class);
private final InitMapper initMapper;
@@ -83,17 +83,17 @@
this.environment = environment;
}
- @Override // org.springblade.modules.cps.service.IInitService
+ @Override
public Boolean checkIsNeedInit() {
return Boolean.valueOf(this.initMapper.checkIsNeedInit(this.configVO.getDatabase(), this.configVO.getType()).intValue() <= 0);
}
- @Override // org.springblade.modules.cps.service.IInitService
+ @Override
public ConfigVO getConfig() {
return this.configVO;
}
- @Override // org.springblade.modules.cps.service.IInitService
+ @Override
public List<AppVO> getApp() {
List<AppVO> result = new ArrayList<>();
AppEnum[] values = AppEnum.values();
@@ -110,7 +110,7 @@
return result;
}
- @Override // org.springblade.modules.cps.service.IInitService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean initSystem(InitSettingVO initSettingVO) {
try {
@@ -162,7 +162,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IInitService
+ @Override
public Boolean init(InitSettingVO initSettingVO) {
if (!checkIsNeedInit().booleanValue()) {
throw new ServiceException(MessageUtils.message("system.has.been.initialized", new Object[0]));
@@ -207,7 +207,7 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IInitService
+ @Override
public LicenseDetailDTO licenseDetail() {
try {
Boolean needInit = checkIsNeedInit();
@@ -218,6 +218,7 @@
LicenseEntity licenseEntity = new License().loadLicense(text);
return (LicenseDetailDTO) JSONObject.parseObject(new String(licenseEntity.getData()), LicenseDetailDTO.class);
} catch (LicenseException e) {
+ log.error("鍔犺浇licenseDetail閿欒",e);
return null;
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.java
index 64254e4..fde9275 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.java
@@ -49,7 +49,7 @@
return (WorkstationWcsUsage) super.getById(id);
}
- @Override // org.springblade.modules.cps.service.IWorkstationWcsUsageService
+ @Override
@Cacheable(cacheNames = {WORKSTATION_WCS_USAGE_EXP}, key = "'usage:list'")
public List<WorkstationWcsUsageVO> listVO() {
Map<Integer, String> wcsMap = this.dictService.getList(DictConstant.WORKSTATION_PARAM_TYPE).stream().collect(Collectors.toMap(dict -> {
@@ -57,9 +57,7 @@
}, (v0) -> {
return v0.getDictValue();
}));
- return list(Lambda.asc((v0) -> {
- return v0.getCollectType();
- })).stream().map(it -> {
+ return list(Lambda.asc(WorkstationWcsUsage::getCollectType)).stream().map(it -> {
WorkstationWcsUsageVO vo = new WorkstationWcsUsageVO();
vo.setId(Func.toStr(it.getId()));
vo.setCollectType(it.getCollectType());
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java
index eeb72a9..a080ece 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java
@@ -1,18 +1,18 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-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.utils.Lambda;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+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.tool.utils.Func;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.WorkstationWorkbenchConvert;
import com.qianwen.smartman.modules.cps.entity.WorkstationWorkbench;
import com.qianwen.smartman.modules.cps.mapper.WorkstationWorkbenchMapper;
@@ -30,9 +30,6 @@
import com.qianwen.smartman.modules.trace.entity.TraceRelatedWorkstation;
import com.qianwen.smartman.modules.trace.service.ITraceFlowSettingsService;
import com.qianwen.smartman.modules.trace.service.ITraceRelatedWorkstationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
@Service
public class WorkstationWorkbenchServiceImpl extends BaseServiceImpl<WorkstationWorkbenchMapper, WorkstationWorkbench> implements IWorkstationWorkbenchService {
@@ -51,7 +48,7 @@
private final Integer DEFAULT = 1;
- @Override // org.springblade.modules.cps.service.IWorkstationWorkbenchService
+ @Override
public Boolean saveWorkstationWorkbench(WorkstationWorkbenchVO vo) {
WorkstationWorkbench workbench = (WorkstationWorkbench)getOne(Wrappers.<WorkstationWorkbench>query().lambda()
.eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId())
@@ -71,7 +68,7 @@
throw new ServiceException(MessageUtils.message("work.station.work.bench.name.already.exist", new Object[0]));
}
- @Override // org.springblade.modules.cps.service.IWorkstationWorkbenchService
+ @Override
public MachineInformationVO listWorkstationWorkbench(Long workstationId) {
TransferDirectory transferDirectory;
MachineInformationVO machineInformationVO = new MachineInformationVO();
@@ -96,17 +93,15 @@
machineInformationVO.setDeviceType(workstationVO.getDeviceType());
machineInformationVO.setWorkstationName(workstationVO.getName());
machineInformationVO.setProperties(workstationVO.getProperties());
- DncWsRelationTd relationTd = (DncWsRelationTd) this.dncWsRelationTdService.getOne(Lambda.eq((v0) -> {
- return v0.getWorkstationId();
- }, workstationId));
+ DncWsRelationTd relationTd = (DncWsRelationTd) this.dncWsRelationTdService.getOne(Lambda.eq(DncWsRelationTd::getWorkstationId, workstationId));
machineInformationVO.setTransmissionMode(workstationVO.getTransmissionMethod());
- if (Func.isNotEmpty(relationTd) && (transferDirectory = (TransferDirectory) this.transferDirectoryService.getById(relationTd.getTransferDirectorId())) != null) {
+ if (Func.isNotEmpty(relationTd) && (transferDirectory = this.transferDirectoryService.getById(relationTd.getTransferDirectorId())) != null) {
machineInformationVO.setFtpCatalogue(transferDirectory.getName());
}
return machineInformationVO;
}
- @Override // org.springblade.modules.cps.service.IWorkstationWorkbenchService
+ @Override
public Boolean deleteWorkstationWorkbench(WorkstationWorkbenchVO vo) {
if (vo.getWorkbenchDefault().equals(this.DEFAULT)) {
throw new ServiceException(MessageUtils.message("work.station.default.work.bench.not.delete", new Object[0]));
@@ -151,7 +146,7 @@
return Boolean.valueOf(remove);
}
- @Override // org.springblade.modules.cps.service.IWorkstationWorkbenchService
+ @Override
public Boolean updateWorkstationWorkbench(WorkstationWorkbenchVO vo) {
WorkstationWorkbench workbench = getOne(Wrappers.<WorkstationWorkbench>query().lambda()
.eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId())
@@ -181,7 +176,7 @@
public List<WorkstationOfWorkbenchVO> listByGroupId(Long groupId, Long settingsId, String keyWord) {
List<Long> groupIds = this.workstationService.productionLineList(groupId);
if (Func.isEmpty(groupId)) {
- return ((WorkstationWorkbenchMapper) this.baseMapper).listByGroupId(groupIds, keyWord);
+ return this.baseMapper.listByGroupId(groupIds, keyWord);
}
List<Long> settingsIdList = this.traceFlowSettingsService.list(Wrappers.<TraceFlowSettings>lambdaQuery()
.eq(TraceFlowSettings::getWorkstationGroupId, groupId)
@@ -196,7 +191,7 @@
return v0.getId();
}).collect(Collectors.toList());*/
if (Func.isEmpty(settingsIdList)) {
- return ((WorkstationWorkbenchMapper) this.baseMapper).listByGroupId(groupIds, keyWord);
+ return this.baseMapper.listByGroupId(groupIds, keyWord);
}
List<Long> workstationIdList = this.traceRelatedWorkstationService.list(Wrappers.<TraceRelatedWorkstation>lambdaQuery()
.in(TraceRelatedWorkstation::getTraceFlowSettingId, settingsIdList))
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java
index eb48689..5896971 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java
@@ -151,9 +151,11 @@
@GetResource({"/info"})
@ApiOperation(value = "閰嶇疆淇℃伅", notes = "浼犲叆domain")
public R<Kv> info(String domain) {
+ Tenant tenant = this.tenantService.getOne(Lambda.eq(Tenant::getTenantId, "000000"));
+ /*
Tenant tenant = (Tenant) this.tenantService.getOne(Lambda.eq((v0) -> {
return v0.getTenantId();
- }, "000000"));
+ }, "000000"));*/
Kv kv = Kv.create();
if (tenant != null) {
kv.set("tenantId", tenant.getTenantId()).set("domain", tenant.getDomainName()).set("backgroundUrl", tenant.getBackgroundUrl()).set("identify", LicenseUtil.getMac());
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 7da7786..c5b778a 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
@@ -48,7 +48,7 @@
return Func.toStr(this.baseMapper.getValue(code, dictKey), "");
}
- @Override // org.springblade.modules.system.service.IDictService
+ @Override
public List<Dict> getList(String code) {
return this.baseMapper.getList(code);
}
@@ -89,7 +89,7 @@
return saveOrUpdate(dict);
}
- @Override // org.springblade.modules.system.service.IDictService
+ @Override
public boolean removeDict(String ids) {
Long cnt = this.baseMapper.selectCount(Wrappers.<Dict>query().lambda().in(Dict::getParentId, Func.toLongList(ids)));
/*
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompController.java
index d8e2145..c6f9292 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompController.java
@@ -37,7 +37,7 @@
@Api(value = "澶у睆缁勪欢绠＄悊", tags = {"澶у睆缁勪欢绠＄悊"})
@ApiResource({"blade-visual/visual-comp"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/controller/VisualCompController.class */
+
public class VisualCompController extends BladeController {
private IVisualCompService visualCompService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompTypeController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompTypeController.java
index e52de53..85965d2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompTypeController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompTypeController.java
@@ -40,7 +40,6 @@
@Api(value = "澶у睆缁勪欢鍒嗙被绠＄悊", tags = {"澶у睆缁勪欢鍒嗙被绠＄悊"})
@ApiResource({"blade-visual/visual-comp-type"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/controller/VisualCompTypeController.class */
public class VisualCompTypeController extends BladeController {
private IVisualCompTypeService visualCompTypeService;
@@ -64,9 +63,7 @@
@ApiOperation(value = "澶у睆缁勪欢鍒嗙被鍒楄〃锛屾爲缁撴瀯", notes = "浼犲叆map")
@PreAuth
public R<List<VisualCompTypeVO>> list(@RequestParam @ApiIgnore Map<String, Object> params) {
- List<VisualCompType> list = this.visualCompTypeService.list(Condition.getQueryWrapper(params, VisualCompType.class).lambda().orderByAsc((v0) -> {
- return v0.getOrderNum();
- }));
+ List<VisualCompType> list = this.visualCompTypeService.list(Condition.getQueryWrapper(params, VisualCompType.class).lambda().orderByAsc(VisualCompType::getOrderNum));
List<VisualCompTypeVO> vos = VisualCompTypeConvert.INSTANCE.convert(list);
List<VisualCompTypeVO> tree = ForestNodeMerger.merge(vos);
return R.data(tree);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompServiceImpl.java
index 324c851..f3effca 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompServiceImpl.java
@@ -57,9 +57,7 @@
String typeStr = (String) map.get("type");
List<String> typeList = null;
if (StringUtils.isNotEmpty(typeStr)) {
- VisualCompType type = (VisualCompType) this.visualCompTypeService.getOne(Lambda.eq((v0) -> {
- return v0.getType();
- }, typeStr));
+ VisualCompType type = (VisualCompType) this.visualCompTypeService.getOne(Lambda.eq(VisualCompType::getType, typeStr));
if (type.getParentId().longValue() == 0L) {
typeList = (List<String>)this.visualCompTypeService.list(Lambda.eq(VisualCompType::getParentId, type.getId()).select(VisualCompType::getType ))
.stream().map(VisualCompType::getType).collect(Collectors.toList());
@@ -89,22 +87,20 @@
return convert;
}
- @Override // org.springblade.modules.visual.service.IVisualCompService
+ @Override
public void wrapper(List<VisualCompVO> voList) {
- List<VisualCompType> typeList = this.visualCompTypeService.list(Lambda.ne((v0) -> {
- return v0.getParentId();
- }, 0));
+ List<VisualCompType> typeList = this.visualCompTypeService.list(Lambda.ne(VisualCompType::getParentId, 0));
voList.parallelStream().forEach(item -> {
- VisualCompType visualCompType = (VisualCompType) typeList.stream().filter(type -> {
+ VisualCompType visualCompType = typeList.stream().filter(type -> {
return item.getType().equals(type.getType());
}).findFirst().orElse(null);
- item.setTypeName((String) Optional.ofNullable(visualCompType).map((v0) -> {
+ item.setTypeName(Optional.ofNullable(visualCompType).map((v0) -> {
return v0.getName();
}).orElse(null));
});
}
- @Override // org.springblade.modules.visual.service.IVisualCompService
+ @Override
public BladeFile componentZipDownload(List<Long> componentIds) {
List<String> jsonTexts = list(Lambda.<VisualComp>in((componentIds != null && componentIds.size() != 0), VisualComp::getId, componentIds))
diff --git a/smart-starter-log/src/main/java/com/qianwen/core/log/aspect/RequestLogAspect.java b/smart-starter-log/src/main/java/com/qianwen/core/log/aspect/RequestLogAspect.java
index 4017c58..cc17894 100644
--- a/smart-starter-log/src/main/java/com/qianwen/core/log/aspect/RequestLogAspect.java
+++ b/smart-starter-log/src/main/java/com/qianwen/core/log/aspect/RequestLogAspect.java
@@ -1,46 +1,44 @@
package com.qianwen.core.log.aspect;
-import java.io.InputStream;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.core.launch.log.BladeLogLevel;
-import com.qianwen.core.log.props.BladeRequestLogProperties;
-import com.qianwen.core.tool.jackson.JsonUtil;
-import com.qianwen.core.tool.utils.ClassUtil;
-import com.qianwen.core.tool.utils.StringUtil;
-import com.qianwen.core.tool.utils.WebUtil;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.MethodParameter;
-import org.springframework.core.io.InputStreamSource;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.context.request.WebRequest;
import org.springframework.web.multipart.MultipartFile;
+import com.qianwen.core.launch.log.BladeLogLevel;
+import com.qianwen.core.log.props.BladeRequestLogProperties;
+import com.qianwen.core.tool.jackson.JsonUtil;
+import com.qianwen.core.tool.utils.ClassUtil;
+import com.qianwen.core.tool.utils.StringUtil;
+import com.qianwen.core.tool.utils.WebUtil;
+
@Aspect
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = {"blade.log.request.enabled"}, havingValue = "true", matchIfMissing = true)
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
-/* loaded from: blade-starter-log-9.3.0.0-SNAPSHOT.jar:org/springblade/core/log/aspect/RequestLogAspect.class */
public class RequestLogAspect {
private static final Logger log = LoggerFactory.getLogger(RequestLogAspect.class);
private final BladeRequestLogProperties properties;
diff --git a/smart-starter-swagger/src/main/java/com/qianwen/core/swagger/EnableSwagger.java b/smart-starter-swagger/src/main/java/com/qianwen/core/swagger/EnableSwagger.java
index cfa4f4c..f1695d4 100644
--- a/smart-starter-swagger/src/main/java/com/qianwen/core/swagger/EnableSwagger.java
+++ b/smart-starter-swagger/src/main/java/com/qianwen/core/swagger/EnableSwagger.java
@@ -11,6 +11,5 @@
@EnableSwagger2WebMvc
@Documented
@Retention(RetentionPolicy.RUNTIME)
-/* loaded from: blade-starter-swagger-9.3.0.0-SNAPSHOT.jar:org/springblade/core/swagger/EnableSwagger.class */
public @interface EnableSwagger {
}
--
Gitblit v1.9.3