From 4684d271ea0107097209f7de0951bf451e48df21 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 三月 2024 19:16:36 +0800
Subject: [PATCH] tpm模块修复
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainItemServiceImpl.java | 249 ++++++-------------------------------------------
1 files changed, 33 insertions(+), 216 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainItemServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainItemServiceImpl.java
index 25e33e1..3a8c2cf 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainItemServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainItemServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
@@ -34,6 +35,7 @@
import com.qianwen.smartman.modules.cps.dto.MaintainItemExportDTO;
import com.qianwen.smartman.modules.cps.dto.MaintainItemUpdateVO;
import com.qianwen.smartman.modules.cps.entity.MaintainItem;
+import com.qianwen.smartman.modules.cps.entity.MaintainProjectItem;
import com.qianwen.smartman.modules.cps.excel.MaintainItemExcel;
import com.qianwen.smartman.modules.cps.excel.MaintainItemImport;
import com.qianwen.smartman.modules.cps.mapper.MaintainItemMapper;
@@ -48,174 +50,16 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+/**
+ * 淇濆吇椤圭殑鏈嶅姟
+ */
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/MaintainItemServiceImpl.class */
public class MaintainItemServiceImpl extends BladeServiceImpl<MaintainItemMapper, MaintainItem> implements IMaintainItemService {
private final IMaintainProjectItemService maintainProjectItemService;
private final IMaintainPlanService maintainPlanService;
private final IMaintainPlanItemService maintainPlanItemService;
private final OssBuilder ossBuilder;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 517353092:
- if (implMethodName.equals("getItemId")) {
- z = true;
- break;
- }
- break;
- case 771206363:
- if (implMethodName.equals("getTenantId")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- z = false;
- 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/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/cps/entity/MaintainProjectItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- 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/cps/entity/MaintainItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- 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/cps/entity/MaintainItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- 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 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/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- 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/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- 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/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/cps/entity/MaintainItem") && 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/cps/entity/MaintainItem") && 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/cps/entity/MaintainItem") && 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/cps/entity/MaintainItem") && 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/cps/entity/MaintainItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public MaintainItemServiceImpl(final IMaintainProjectItemService maintainProjectItemService, final IMaintainPlanService maintainPlanService, final IMaintainPlanItemService maintainPlanItemService, final OssBuilder ossBuilder) {
this.maintainProjectItemService = maintainProjectItemService;
@@ -266,44 +110,29 @@
@Override // org.springblade.modules.cps.service.IMaintainItemService
public List<MaintainItemVO> queryMaintainItemList(String keyWord) {
- List<MaintainItem> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
- return v0.getTenantId();
- }, AuthUtil.getTenantId()).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE)).and(Func.isNotEmpty(keyWord), i -> {
- LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) i.likeRight((v0) -> {
- return v0.getName();
- }, keyWord)).or()).likeRight((v0) -> {
- return v0.getCode();
- }, keyWord);
- }).orderByAsc((v0) -> {
- return v0.getCode();
- }));
+ //MaintainItem::getName MaintainItem::getCode
+ List<MaintainItem> list = list(Wrappers.<MaintainItem>query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainItem::getTenantId, AuthUtil.getTenantId())
+ .eq(MaintainItem::getStatus, CommonConstant.ENABLE)
+ .and(Func.isNotEmpty(keyWord), i -> {
+ LambdaQueryWrapper<MaintainItem> lambdaQueryWrapper = i.likeRight(MaintainItem::getName, keyWord).or().likeRight(MaintainItem::getCode, keyWord);
+ }).orderByAsc(MaintainItem::getCode));
return MaintainItemConvert.INSTANCE.convert(list);
}
- @Override // org.springblade.modules.cps.service.IMaintainItemService
+ @Override // org.springblade.modules.cps.service.IMaintainItemService MaintainItem::getCreateTime
public IPage<MaintainItemVO> queryMaintainItemListPage(String keyWord, Query query, Integer status) {
- IPage<MaintainItem> pages = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
- return v0.getTenantId();
- }, AuthUtil.getTenantId()).eq((v0) -> {
- return v0.getStatus();
- }, status == null ? CommonConstant.ENABLE : status)).and(Func.isNotEmpty(keyWord), i -> {
- LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) i.likeRight((v0) -> {
- return v0.getName();
- }, keyWord)).or()).likeRight((v0) -> {
- return v0.getCode();
- }, keyWord);
- }).orderByDesc((v0) -> {
- return v0.getCreateTime();
- }, new SFunction[]{(v0) -> {
- return v0.getId();
- }}));
- return (IPage) Optional.ofNullable(pages).map(p -> {
- Page page = new Page(p.getCurrent(), p.getSize(), p.getTotal());
+ IPage<MaintainItem> pages = page(Condition.getPage(query), Wrappers.<MaintainItem>query().lambda()
+ .eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainItem::getTenantId, AuthUtil.getTenantId())
+ .eq(MaintainItem::getStatus, status == null ? CommonConstant.ENABLE : status)
+ .and(Func.isNotEmpty(keyWord), i -> {
+ LambdaQueryWrapper<MaintainItem> lambdaQueryWrapper = i.likeRight(MaintainItem::getName, keyWord).or().likeRight(MaintainItem::getCode, keyWord);
+ }).orderByDesc(Arrays.asList(MaintainItem::getCreateTime,MaintainItem::getId)));
+
+ return Optional.ofNullable(pages).map(p -> {
+ Page<MaintainItemVO> page = new Page<>(p.getCurrent(), p.getSize(), p.getTotal());
page.setRecords(MaintainItemConvert.INSTANCE.convert(p.getRecords()));
return page;
- }).orElse(new Page());
+ }).orElse(new Page<>());
}
@Override // org.springblade.modules.cps.service.IMaintainItemService
@@ -311,9 +140,7 @@
public Boolean deleteMaintainItem(List<String> ids, Integer type) {
if (StatusType.REMOVE.getType().equals(type)) {
removeByIds(Func.toLongList(ids));
- this.maintainProjectItemService.remove((Wrapper) Wrappers.query().lambda().in((v0) -> {
- return v0.getItemId();
- }, ids));
+ this.maintainProjectItemService.remove(Wrappers.<MaintainProjectItem>query().lambda().in(MaintainProjectItem::getItemId, ids));
}
return Boolean.valueOf(changeStatus(Func.toLongList(ids), CommonConstant.DEACTIVATE));
}
@@ -340,10 +167,8 @@
if (data.size() > 200) {
throw new ServiceException(MessageUtils.message("excel.import.size.failed", new Object[0]));
}
- List<MaintainItem> maintainItemList = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE));
- Set<String> codeSet = (Set) maintainItemList.stream().map((v0) -> {
+ List<MaintainItem> maintainItemList = list(Wrappers.<MaintainItem>lambdaQuery().eq(MaintainItem::getStatus, CommonConstant.ENABLE));
+ Set<String> codeSet = maintainItemList.stream().map((v0) -> {
return v0.getCode();
}).collect(Collectors.toSet());
Boolean flag = Boolean.TRUE;
@@ -379,9 +204,9 @@
}
}
if (!flag.booleanValue()) {
- MultipartFile multipartFile = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "淇濆吇椤瑰鍏ュけ璐ユā鏉�" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "淇濆吇椤硅〃", (List) data.stream().filter(x -> {
+ MultipartFile multipartFile = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "淇濆吇椤瑰鍏ュけ璐ユā鏉�" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "淇濆吇椤硅〃", data.stream().filter(x -> {
return Func.isNotEmpty(x.getFailReason());
- }).collect(Collectors.toList()), (Object) null, (AbstractMergeStrategy) null);
+ }).collect(Collectors.toList()), null, (AbstractMergeStrategy) null);
BladeFile bladeFile = this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
return bladeFile;
}
@@ -398,11 +223,7 @@
}
private boolean checkCodeStopIsExist(String code) {
- MaintainItem maintainItem = (MaintainItem) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCode();
- }, code)).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ MaintainItem maintainItem = getOne(Wrappers.<MaintainItem>lambdaQuery().eq(MaintainItem::getCode, code).eq(MaintainItem::getStatus, CommonConstant.DEACTIVATE));
if (maintainItem != null) {
return Boolean.TRUE.booleanValue();
}
@@ -410,15 +231,11 @@
}
private boolean checkCodeIsExist(String code, Long id) {
- List<MaintainItem> maintainItemList = this.baseMapper.selectList(((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
- return v0.getTenantId();
- }, AuthUtil.getTenantId()).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE)).eq((v0) -> {
- return v0.getCode();
- }, code)).notIn(Func.isNotEmpty(id), (v0) -> {
- return v0.getId();
- }, new Object[]{id}));
+ List<MaintainItem> maintainItemList = this.baseMapper.selectList(Wrappers.<MaintainItem>query().lambda()
+ .eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainItem::getTenantId, AuthUtil.getTenantId())
+ .eq(MaintainItem::getStatus, CommonConstant.ENABLE)
+ .eq(MaintainItem::getCode, code)
+ .notIn(Func.isNotEmpty(id), MaintainItem::getId, id));
return maintainItemList != null && maintainItemList.size() > 0;
}
}
--
Gitblit v1.9.3