From 608f20e0d5d8f95d9bbb917e95e2913682deb77d Mon Sep 17 00:00:00 2001
From: PC <PC@PC1RHZ4L>
Date: 星期日, 31 三月 2024 10:00:00 +0800
Subject: [PATCH] Merge branch 'master' of http://wangzq@www.beijingsoft.cn:9090/r/smart.git
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MalfunctionTypeServiceImpl.java | 204 ++++++++++----------------------------------------
1 files changed, 42 insertions(+), 162 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MalfunctionTypeServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MalfunctionTypeServiceImpl.java
index fd2265a..05a759c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MalfunctionTypeServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MalfunctionTypeServiceImpl.java
@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.lang.invoke.SerializedLambda;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
@@ -43,149 +45,6 @@
public class MalfunctionTypeServiceImpl extends BladeServiceImpl<MalfunctionTypeMapper, MalfunctionType> implements IMalfunctionTypeService {
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 761390710:
- if (implMethodName.equals("getRemark")) {
- 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/MalfunctionType") && 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/MalfunctionType") && 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/modules/cps/entity/MalfunctionType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getRemark();
- };
- }
- 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();
- };
- }
- 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/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 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/cps/entity/MalfunctionType") && 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/MalfunctionType") && 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/MalfunctionType") && 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/MalfunctionType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
public MalfunctionTypeServiceImpl(final OssBuilder ossBuilder) {
this.ossBuilder = ossBuilder;
}
@@ -206,15 +65,26 @@
@Override // org.springblade.modules.cps.service.IMalfunctionTypeService
public Boolean deleteMalfunctionTypeByIdList(List<Long> malfunctionTypeIds, Integer type) {
if (StatusType.REMOVE.getType().equals(type)) {
+ return Boolean.valueOf(remove(Wrappers.<MalfunctionType>lambdaQuery().in(MalfunctionType::getId, malfunctionTypeIds)));
+ /*
return Boolean.valueOf(remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
- }, malfunctionTypeIds)));
+ }, malfunctionTypeIds)));*/
}
return Boolean.valueOf(changeStatus(malfunctionTypeIds, CommonConstant.DEACTIVATE));
}
@Override // org.springblade.modules.cps.service.IMalfunctionTypeService
public IPage<MalfunctionTypeVO> listPage(Query query, String keyWord, Integer status) {
+ IPage<MalfunctionType> page = page(Condition.getPage(query), Wrappers.<MalfunctionType>query()
+ .lambda()
+ .eq(MalfunctionType::getStatus, (status == null) ? CommonConstant.ENABLE : status)
+ .likeRight(Func.isNotEmpty(keyWord), MalfunctionType::getName, keyWord)
+ .or()
+ .likeRight(Func.isNotEmpty(keyWord), MalfunctionType::getCode, keyWord)
+ .orderByDesc(Arrays.asList(MalfunctionType::getCreateTime, MalfunctionType::getId)));
+
+ /*
IPage<MalfunctionType> page = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getStatus();
}, status == null ? CommonConstant.ENABLE : status)).likeRight(Func.isNotEmpty(keyWord), (v0) -> {
@@ -225,12 +95,12 @@
return v0.getCreateTime();
}, new SFunction[]{(v0) -> {
return v0.getId();
- }}));
- return (IPage) Optional.ofNullable(page).map(p -> {
- Page page2 = new Page(p.getCurrent(), p.getSize(), p.getTotal());
+ }}));*/
+ return Optional.ofNullable(page).map(p -> {
+ Page<MalfunctionTypeVO> page2 = new Page<>(p.getCurrent(), p.getSize(), p.getTotal());
page2.setRecords(MalfunctionTypeConvert.INSTANCE.convert(p.getRecords()));
return page2;
- }).orElse(new Page());
+ }).orElse(new Page<>());
}
@Override // org.springblade.modules.cps.service.IMalfunctionTypeService
@@ -248,9 +118,7 @@
throw new ServiceException(MessageUtils.message("excel.import.size.failed", new Object[0]));
}
HashMap<String, Object> codeMap = new HashMap<>(16);
- List<MalfunctionType> malfunctionTypeList = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE));
+ List<MalfunctionType> malfunctionTypeList = list(Wrappers.<MalfunctionType>lambdaQuery().eq(MalfunctionType::getStatus, CommonConstant.ENABLE));
if (Func.isNotEmpty(malfunctionTypeList)) {
malfunctionTypeList.forEach(x -> {
codeMap.put(x.getCode(), null);
@@ -264,9 +132,9 @@
}
}
if (!flag) {
- MultipartFile multipartFile = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "malfunctionTypeFailTemplate" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "鏁呴殰绫诲瀷琛�", (List) data.stream().filter(x2 -> {
+ MultipartFile multipartFile = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "malfunctionTypeFailTemplate" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "鏁呴殰绫诲瀷琛�", data.stream().filter(x2 -> {
return Func.isNotEmpty(x2.getFailReason());
- }).collect(Collectors.toList()), (Object) null, (AbstractMergeStrategy) null);
+ }).collect(Collectors.toList()), null, null);
return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
}
data.forEach(x3 -> {
@@ -282,22 +150,26 @@
Long id = malfunctionTypeVO.getId();
String name = malfunctionTypeVO.getName();
String remark = malfunctionTypeVO.getRemark();
+ return Boolean.valueOf(update(Wrappers.<MalfunctionType>lambdaUpdate()
+ .set(Func.isNotBlank(name), MalfunctionType::getName, name)
+ .set(MalfunctionType::getRemark, remark)
+ .eq(MalfunctionType::getId, id)));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set(Func.isNotBlank(name), (v0) -> {
return v0.getName();
}, name)).set((v0) -> {
return v0.getRemark();
}, remark)).eq((v0) -> {
return v0.getId();
- }, id)));
+ }, id)));*/
}
@Override // org.springblade.modules.cps.service.IMalfunctionTypeService
public List<MalfunctionTypeRecordVO> getCodeAndRecord() {
- List<MalfunctionType> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE)).orderByDesc((v0) -> {
- return v0.getCode();
- }));
+ List<MalfunctionType> list = list(Wrappers.<MalfunctionType>lambdaQuery()
+ .eq(MalfunctionType::getStatus, CommonConstant.ENABLE)
+ .orderByDesc(MalfunctionType::getCode));
+
return MalfunctionTypeRecordConvert.INSTANCE.convert(list);
}
@@ -325,11 +197,14 @@
}
private boolean checkUnableMalfunctionTypeVO(String code) {
+ MalfunctionType malfunctionType = getOne(Wrappers.<MalfunctionType>lambdaQuery().eq(MalfunctionType::getCode, code)
+ .eq(MalfunctionType::getStatus, CommonConstant.DEACTIVATE));
+ /*
MalfunctionType malfunctionType = (MalfunctionType) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCode();
}, code)).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ }, CommonConstant.DEACTIVATE));*/
if (malfunctionType != null) {
return Boolean.TRUE.booleanValue();
}
@@ -337,13 +212,18 @@
}
private void checkMalfunctionTypeVO(MalfunctionTypeVO malfunctionTypeVO) {
- Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(malfunctionTypeVO.getId()), (v0) -> {
+ Long count = Long.valueOf(count(Wrappers.<MalfunctionType>lambdaQuery()
+ .ne(Func.isNotEmpty(malfunctionTypeVO.getId()), MalfunctionType::getId, malfunctionTypeVO.getId())
+ .eq(MalfunctionType::getStatus, CommonConstant.ENABLE)
+ .eq(MalfunctionType::getCode, malfunctionTypeVO.getCode())));
+ /*
+ Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) Wrappers.<MalfunctionType>lambdaQuery().ne(Func.isNotEmpty(malfunctionTypeVO.getId()), (v0) -> {
return v0.getId();
}, malfunctionTypeVO.getId()).eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).eq((v0) -> {
return v0.getCode();
- }, malfunctionTypeVO.getCode())));
+ }, malfunctionTypeVO.getCode())));*/
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.malfunction.type.code.already.exists", new Object[0]));
}
--
Gitblit v1.9.3