From 85bb45834b1a2fd993d9f8653c48d14efc12a59e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 四月 2024 12:09:46 +0800
Subject: [PATCH] 去掉无用注释
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java | 311 ++++++++++++---------------------------------------
1 files changed, 73 insertions(+), 238 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java
index 8e29084..3590997 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java
@@ -1,26 +1,20 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.alibaba.excel.write.merge.AbstractMergeStrategy;
-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.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
-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;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.constant.ExcelConstant;
-import com.qianwen.smartman.common.enums.StatusType;
-import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.smartman.common.utils.ValidatorUtils;
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.service.impl.BladeServiceImpl;
@@ -31,6 +25,11 @@
import com.qianwen.core.tool.utils.CollectionUtil;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.constant.ExcelConstant;
+import com.qianwen.smartman.common.enums.StatusType;
+import com.qianwen.smartman.common.utils.MessageUtils;
+import com.qianwen.smartman.common.utils.ValidatorUtils;
import com.qianwen.smartman.modules.cps.convert.DeviceTypeConvert;
import com.qianwen.smartman.modules.cps.entity.DeviceType;
import com.qianwen.smartman.modules.cps.entity.Machine;
@@ -43,210 +42,32 @@
import com.qianwen.smartman.modules.cps.vo.DeviceTypeUpdateVO;
import com.qianwen.smartman.modules.cps.vo.DeviceTypeVO;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/DeviceTypeServiceImpl.class */
public class DeviceTypeServiceImpl extends BladeServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
private final OssBuilder ossBuilder;
private final IMachineService machineService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -274920090:
- if (implMethodName.equals("getMachineTypeId")) {
- z = true;
- break;
- }
- break;
- 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 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/DeviceType") && 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/DeviceType") && 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/modules/cps/entity/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getMachineTypeId();
- };
- }
- 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/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();
- };
- }
- 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 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/DeviceType") && 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/DeviceType") && 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/DeviceType") && 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/DeviceType") && 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/DeviceType") && 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/DeviceType") && 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/DeviceType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public DeviceTypeServiceImpl(final OssBuilder ossBuilder, final IMachineService machineService) {
this.ossBuilder = ossBuilder;
this.machineService = machineService;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public DeviceType createDeviceType(DeviceTypeAddVO deviceTypeAddVO) {
+ //DeviceType d;d.getTenantId()
+ Long count = Long.valueOf(count(Wrappers.<DeviceType>lambdaQuery()
+ .eq(DeviceType::getCode, deviceTypeAddVO.getCode())
+ .eq(DeviceType::getStatus, CommonConstant.ENABLE)
+ .eq(DeviceType::getTenantId, AuthUtil.getTenantId())));
+ /*
Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCode();
}, deviceTypeAddVO.getCode())).eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).eq((v0) -> {
return v0.getTenantId();
- }, AuthUtil.getTenantId())));
+ }, AuthUtil.getTenantId())));*/
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.workstation.device.type.code.already.exists", new Object[0]));
}
@@ -260,26 +81,29 @@
}
private boolean checkUnableType(String code) {
- DeviceType deviceType = (DeviceType) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCode();
- }, code)).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ DeviceType deviceType = getOne(Wrappers.<DeviceType>lambdaQuery().eq(DeviceType::getCode, code).eq(DeviceType::getStatus, CommonConstant.DEACTIVATE));
+
if (deviceType != null) {
- return Boolean.TRUE.booleanValue();
+ return true;
}
- return Boolean.FALSE.booleanValue();
+ return false;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public DeviceType updateDeviceType(DeviceTypeUpdateVO deviceTypeUpdateVO) {
- Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
+ Long count = Long.valueOf(count(Wrappers.<DeviceType>lambdaQuery()
+ .eq(DeviceType::getCode, checkExistDeviceType(deviceTypeUpdateVO.getId()).getCode())
+ .eq(DeviceType::getTenantId, AuthUtil.getTenantId())
+ .ne(DeviceType::getId, deviceTypeUpdateVO.getId())));
+
+ /*
+ Long count = Long.valueOf(count(Wrappers.<DeviceType>lambdaQuery().eq((v0) -> {
return v0.getCode();
}, checkExistDeviceType(Long.valueOf(deviceTypeUpdateVO.getId().longValue())).getCode())).eq((v0) -> {
return v0.getTenantId();
}, AuthUtil.getTenantId())).ne((v0) -> {
return v0.getId();
- }, deviceTypeUpdateVO.getId())));
+ }, deviceTypeUpdateVO.getId())));*/
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.workstation.device.type.code.already.exists", new Object[0]));
}
@@ -292,8 +116,18 @@
return deviceType;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public IPage<DeviceTypeVO> pageDeviceType(String keyWord, Integer status, Query query) {
+ //DeviceType::getTenantId DeviceType::getName
+ IPage<DeviceType> page = page(Condition.getPage(query), Wrappers.<DeviceType>lambdaUpdate()
+ .eq(DeviceType::getTenantId, AuthUtil.getTenantId())
+ .eq(DeviceType::getStatus, (status == null) ? CommonConstant.ENABLE : status)
+ .and(Func.isNotEmpty(keyWord), wrapper -> wrapper.likeRight(DeviceType::getCode, keyWord).or().likeRight(DeviceType::getName, keyWord))
+
+ .orderByDesc(Arrays.asList(DeviceType::getCreateTime, DeviceType::getId) )
+ );
+
+ /*
IPage<DeviceType> page = page(Condition.getPage(query), (Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
return v0.getTenantId();
}, AuthUtil.getTenantId())).eq((v0) -> {
@@ -308,25 +142,24 @@
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 -> {
+ IPage<DeviceTypeVO> page2 = new Page<>(p.getCurrent(), p.getSize(), p.getTotal());
page2.setRecords(DeviceTypeConvert.INSTANCE.convert(p.getRecords()));
return page2;
- }).orElse(new Page());
+ }).orElse(new Page<>());
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public DeviceTypeVO getDeviceTypeById(Long id) {
DeviceType deviceType = checkExistDeviceType(id);
return DeviceTypeConvert.INSTANCE.convert(deviceType);
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public Boolean deleteDeviceTypeByIds(List<Long> ids, Integer type) {
- List<Machine> machineList = this.machineService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getMachineTypeId();
- }, ids));
+ List<Machine> machineList = this.machineService.list(Wrappers.<Machine>lambdaQuery().in(Machine::getMachineTypeId, ids));
+
if (StatusType.REMOVE.getType().equals(type)) {
if (CollectionUtil.isNotEmpty(machineList)) {
throw new ServiceException(MessageUtils.message("cps.work.station.already.associated.with.the.device", new Object[0]));
@@ -343,9 +176,15 @@
}
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public List<DeviceTypeExcel> listDeviceType(String keyword, Integer status) {
- List<DeviceType> deviceTypes = list((Wrapper) Wrappers.lambdaQuery().eq(status != null, (v0) -> {
+ List<DeviceType> deviceTypes = list(Wrappers.<DeviceType>lambdaQuery()
+ .eq((status != null), DeviceType::getStatus, status)
+ .and(Func.isNotEmpty(keyword), wrapper -> wrapper.likeRight(DeviceType::getCode, keyword).or().likeRight(DeviceType::getName, keyword))
+
+ .eq(Func.isNotEmpty(AuthUtil.getTenantId()), DeviceType::getTenantId, AuthUtil.getTenantId()).orderByAsc(DeviceType::getCode));
+ /*
+ List<DeviceType> deviceTypes2 = list((Wrapper) Wrappers.lambdaQuery().eq(status != null, (v0) -> {
return v0.getStatus();
}, status).and(Func.isNotEmpty(keyword), wrapper -> {
LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) wrapper.likeRight((v0) -> {
@@ -357,12 +196,12 @@
return v0.getTenantId();
}, AuthUtil.getTenantId()).orderByAsc((v0) -> {
return v0.getCode();
- }));
+ }));*/
List<DeviceTypeExcel> list = DeviceTypeConvert.INSTANCE.convert1(deviceTypes);
return list;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public BladeFile importDeviceType(List<DeviceTypeExcel> data) {
if (Func.isEmpty(data)) {
throw new ServiceException(MessageUtils.message("excel.import.data.can.not.be.null", new Object[0]));
@@ -370,10 +209,9 @@
if (data.size() > 200) {
throw new ServiceException(MessageUtils.message("excel.import.size.failed", new Object[0]));
}
- List<DeviceType> deviceTypes = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE));
- Set<String> codeSet = (Set) deviceTypes.stream().map((v0) -> {
+ //DeviceType::getStatus
+ List<DeviceType> deviceTypes = list(Wrappers.<DeviceType>lambdaQuery().eq(DeviceType::getStatus, CommonConstant.ENABLE));
+ Set<String> codeSet = deviceTypes.stream().map((v0) -> {
return v0.getCode();
}).collect(Collectors.toSet());
Boolean flag = Boolean.TRUE;
@@ -407,7 +245,7 @@
}
}
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);
BladeFile bladeFile = this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
@@ -425,14 +263,14 @@
return null;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public List<DeviceTypeVO> getDeviceTypeAllList() {
List<DeviceType> list = list();
List<DeviceTypeVO> result = DeviceTypeConvert.INSTANCE.convert(list);
return result;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public BladeFile export(DeviceTypeExcelVO deviceTypeExcelVO) {
List<DeviceTypeExcel> list = listDeviceType(deviceTypeExcelVO.getKeyWord(), deviceTypeExcelVO.getStatus());
String fileName = String.format("%s-%s.xlsx", "鏈哄櫒绫诲瀷鏁版嵁", DateUtil.time());
@@ -450,11 +288,8 @@
}
boolean checkCodeIsExist(String code) {
- DeviceType one = (DeviceType) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCode();
- }, code)).eq((v0) -> {
- return v0.getTenantId();
- }, AuthUtil.getTenantId()));
+ DeviceType one = getOne(Wrappers.<DeviceType>lambdaQuery().eq(DeviceType::getCode, code)
+ .eq(DeviceType::getTenantId, AuthUtil.getTenantId()));
return Func.isNotEmpty(one);
}
}
--
Gitblit v1.9.3