From 153cc3fd4ef015a8b1390b2eef3d102c5859a5e7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 三月 2024 16:07:48 +0800
Subject: [PATCH] dnc Module error fix
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncOperationLogServiceImpl.java | 219 ++++++++++++------------------------------------------
1 files changed, 48 insertions(+), 171 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncOperationLogServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncOperationLogServiceImpl.java
index c535557..976e6c1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncOperationLogServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncOperationLogServiceImpl.java
@@ -1,22 +1,21 @@
package com.qianwen.smartman.modules.dnc.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;
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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.modules.dnc.convert.DncOperationLogConvert;
import com.qianwen.smartman.modules.dnc.dto.DncOperationLogDto;
import com.qianwen.smartman.modules.dnc.entity.DncOperationLog;
@@ -28,163 +27,11 @@
import com.qianwen.smartman.modules.dnc.vo.DncOperationLogVO;
import com.qianwen.smartman.modules.dnc.vo.LogSearchVO;
import com.qianwen.smartman.modules.dnc.vo.SuffixListVO;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/service/impl/DncOperationLogServiceImpl.class */
public class DncOperationLogServiceImpl extends BaseServiceImpl<DncOperationLogMapper, DncOperationLog> implements IDncOperationLogService {
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1409180181:
- if (implMethodName.equals("getSourceType")) {
- z = true;
- break;
- }
- break;
- case -1025799797:
- if (implMethodName.equals("getOperationType")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case 804592199:
- if (implMethodName.equals("getSuffix")) {
- z = true;
- break;
- }
- break;
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- z = true;
- break;
- }
- break;
- case 1342178205:
- if (implMethodName.equals("getFileName")) {
- 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/DncOperationLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- 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/DncOperationLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOperationType();
- };
- }
- 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/DncOperationLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOperationType();
- };
- }
- 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/DncOperationLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOperationType();
- };
- }
- 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/DncOperationLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getSuffix();
- };
- }
- 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/DncOperationLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getSuffix();
- };
- }
- 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/DncOperationLog") && 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- 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/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- 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/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- 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/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- 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/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- 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/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- 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/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- 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/DncOperationLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSourceType();
- };
- }
- 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/DncOperationLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSourceType();
- };
- }
- 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/DncOperationLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getFileName();
- };
- }
- 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/DncOperationLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getFileName();
- };
- }
- 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/DncOperationLog") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getFileName();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
+
@Override // org.springblade.modules.dnc.service.IDncOperationLogService
public IPage<DncOperationLogVO> listPages(String workstationId, LogSearchVO search, Query query) {
@@ -193,6 +40,16 @@
Date operationStartTime = search.getOperationStartTime();
Date operationEndTime = search.getOperationEndTime();
String operationType = search.getOperationType();
+
+ IPage<DncOperationLog> pages = page(Condition.getPage(query),Wrappers.<DncOperationLog>lambdaQuery()
+ .eq(DncOperationLog::getWorkstationId, workstationId)
+ .likeRight(Func.isNotEmpty(fileName), DncOperationLog::getFileName, fileName)
+ .eq(Func.isNotBlank(fileType), DncOperationLog::getSuffix, fileType)
+ .ge(Func.isNotEmpty(operationStartTime), DncOperationLog::getCreateTime, operationStartTime)
+ .le(Func.isNotEmpty(operationEndTime), DncOperationLog::getCreateTime, operationEndTime)
+ .eq(Func.isNotBlank(operationType), DncOperationLog::getOperationType, operationType)
+ .orderByDesc(DncOperationLog::getCreateTime));
+ /*
IPage<DncOperationLog> pages = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationId();
}, workstationId)).likeRight(Func.isNotEmpty(fileName), (v0) -> {
@@ -207,14 +64,16 @@
return v0.getOperationType();
}, operationType).orderByDesc((v0) -> {
return v0.getCreateTime();
- }));
- Optional ofNullable = Optional.ofNullable(pages);
+ }));*/
+ IPage<DncOperationLogVO> dncOperationLogVOIPage = Optional.<IPage<DncOperationLog>>ofNullable(pages).map(DncOperationLogConvert.INSTANCE::convert).orElse(new Page<>());
+ dncOperationLogVOIPage.getRecords().forEach(dncOperationLogVO -> dncOperationLogVO.setVersion((dncOperationLogVO.getVersion() == null) ? "" : (dncOperationLogVO.getVersion() + CommonConstant.FILE_SUFFIX)));
+ /*
DncOperationLogConvert dncOperationLogConvert = DncOperationLogConvert.INSTANCE;
dncOperationLogConvert.getClass();
- IPage<DncOperationLogVO> dncOperationLogVOIPage = (IPage) ofNullable.map(this::convert).orElse(new Page());
+ IPage<DncOperationLogVO> dncOperationLogVOIPage = ofNullable.map(this::convert).orElse(new Page());
dncOperationLogVOIPage.getRecords().forEach(dncOperationLogVO -> {
dncOperationLogVO.setVersion(dncOperationLogVO.getVersion() == null ? "" : dncOperationLogVO.getVersion() + CommonConstant.FILE_SUFFIX);
- });
+ });*/
return dncOperationLogVOIPage;
}
@@ -227,6 +86,15 @@
@Override // org.springblade.modules.dnc.service.IDncOperationLogService
public IPage<DncOperationLogVO> allDataPage(DncOperationLogSearchVO search, Query query) {
+ IPage<DncOperationLog> pages = page(Condition.getPage(query), Wrappers.<DncOperationLog>lambdaQuery()
+ .and(Func.isNotEmpty(search.getKeyWord()), i -> i.likeRight(DncOperationLog::getFileName, search.getKeyWord()).or()
+ .likeRight(DncOperationLog::getSuffix, search.getKeyWord()))
+
+ .eq(Func.isNotEmpty(search.getOperationType()), DncOperationLog::getOperationType, search.getOperationType())
+ .eq(Func.isNotEmpty(search.getSourceType()), DncOperationLog::getSourceType, search.getSourceType())
+ .between((Func.isNotEmpty(search.getStartTime()) && Func.isNotEmpty(search.getEndTime())), DncOperationLog::getCreateTime, search.getStartTime(), search.getEndTime())
+ .orderByDesc(DncOperationLog::getCreateTime));
+ /*
IPage<DncOperationLog> pages = page(Condition.getPage(query), (Wrapper) Wrappers.lambdaQuery().and(Func.isNotEmpty(search.getKeyWord()), i -> {
LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) i.likeRight((v0) -> {
return v0.getFileName();
@@ -241,8 +109,8 @@
return v0.getCreateTime();
}, search.getStartTime(), search.getEndTime()).orderByDesc((v0) -> {
return v0.getCreateTime();
- }));
- IPage<DncOperationLogVO> convert = DncOperationLogConvert.INSTANCE.convert((IPage) pages);
+ }));*/
+ IPage<DncOperationLogVO> convert = DncOperationLogConvert.INSTANCE.convert( pages);
convert.getRecords().forEach(dncOperationLogVO -> {
dncOperationLogVO.setVersion(Func.isNotBlank(dncOperationLogVO.getVersion()) ? dncOperationLogVO.getVersion() + CommonConstant.FILE_SUFFIX : "");
});
@@ -251,6 +119,15 @@
@Override // org.springblade.modules.dnc.service.IDncOperationLogService
public List<DncLogExcelVO> exportDncLog(DncOperationLogSearchVO dncOperationLogSearchVO) {
+ List<DncOperationLog> list = list(Wrappers.<DncOperationLog>lambdaQuery()
+ .and(Func.isNotEmpty(dncOperationLogSearchVO.getKeyWord()), i -> i.likeRight(DncOperationLog::getFileName, dncOperationLogSearchVO.getKeyWord()).or()
+ .likeRight(DncOperationLog::getSuffix, dncOperationLogSearchVO.getKeyWord()))
+
+ .eq(Func.isNotEmpty(dncOperationLogSearchVO.getOperationType()), DncOperationLog::getOperationType, dncOperationLogSearchVO.getOperationType())
+ .eq(Func.isNotEmpty(dncOperationLogSearchVO.getSourceType()), DncOperationLog::getSourceType, dncOperationLogSearchVO.getSourceType())
+ .between((Func.isNotEmpty(dncOperationLogSearchVO.getStartTime()) && Func.isNotEmpty(dncOperationLogSearchVO.getEndTime())), DncOperationLog::getCreateTime, dncOperationLogSearchVO.getStartTime(), dncOperationLogSearchVO.getEndTime())
+ .orderByDesc(DncOperationLog::getCreateTime));
+ /*
List<DncOperationLog> list = list((Wrapper) Wrappers.lambdaQuery().and(Func.isNotEmpty(dncOperationLogSearchVO.getKeyWord()), i -> {
LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) i.likeRight((v0) -> {
return v0.getFileName();
@@ -265,18 +142,18 @@
return v0.getCreateTime();
}, dncOperationLogSearchVO.getStartTime(), dncOperationLogSearchVO.getEndTime()).orderByDesc((v0) -> {
return v0.getCreateTime();
- }));
+ }));*/
if (Func.isNotEmpty(list)) {
- return (List) list.stream().map(s -> {
+ return list.stream().map(s -> {
return DncLogExcelVO.builder().fileName(s.getFileName()).operatorName(s.getOperatorName()).operationType(s.getOperationType()).operationTypeDesc(DncEnums.LogOperationType.getNameByCode(s.getOperationType())).sourceTypeDesc(DncEnums.LogFileSourceType.getNameByCode(s.getSourceType())).operationTime(s.getOperationTime()).sourceType(s.getSourceType()).sourcePathName(s.getSourcePathName()).targetPathName(s.getTargetPathName()).fileLocationDesc(DncEnums.FileLocation.getNameByCode(s.getFileLocation())).storageSpaceDec(DncEnums.StorageSpace.getNameByCode(s.getStorageSpace())).version((s.getVersion() != null ? s.getVersion() : CommonConstant.VERSION_NUM) + CommonConstant.FILE_SUFFIX).suffix(s.getSuffix()).build();
}).collect(Collectors.toList());
}
- return new ArrayList();
+ return new ArrayList<>();
}
@Override // org.springblade.modules.dnc.service.IDncOperationLogService
public SuffixListVO getSuffixList() {
- List<String> suffixList = (List) list().stream().map((v0) -> {
+ List<String> suffixList = list().stream().map((v0) -> {
return v0.getSuffix();
}).filter((v0) -> {
return Func.isNotEmpty(v0);
--
Gitblit v1.9.3