From dc40d10f7d8227d8b8216584ed19e4d41c57f0cd Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 08 五月 2024 12:14:39 +0800
Subject: [PATCH] 代码整理3
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.java | 30 +++++++-----------------------
1 files changed, 7 insertions(+), 23 deletions(-)
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 fde9275..086e621 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
@@ -30,7 +30,6 @@
import cn.hutool.json.JSONUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/WorkstationWcsUsageServiceImpl.class */
public class WorkstationWcsUsageServiceImpl extends ServiceImpl<WorkstationWcsUsageMapper, WorkstationWcsUsage> implements IWorkstationWcsUsageService {
private static final String WORKSTATION_WCS_USAGE_EXP = "blade:wcs:usage#259200";
private final IDictService dictService;
@@ -46,7 +45,7 @@
@Cacheable(cacheNames = {WORKSTATION_WCS_USAGE_EXP}, key = "'cps:id:'.concat(#id)")
/* renamed from: getById */
public WorkstationWcsUsage m202getById(Serializable id) {
- return (WorkstationWcsUsage) super.getById(id);
+ return super.getById(id);
}
@Override
@@ -69,17 +68,13 @@
}).collect(Collectors.toList());
}
- @Override // org.springblade.modules.cps.service.IWorkstationWcsUsageService
+ @Override
@Transactional
@CacheEvict(cacheNames = {WORKSTATION_WCS_USAGE_EXP}, allEntries = true)
public Boolean save(final WorkstationWcsUsageVO workstationWcsVO) {
Assert.isNull(workstationWcsVO.getId());
- Assert.isTrue(list(Lambda.eq((v0) -> {
- return v0.getUsageName();
- }, workstationWcsVO.getUsageName())).size() == 0, MessageUtils.message("workstation.wcs.usage.usageName.exists", new Object[0]), new Object[0]);
- Assert.isTrue(list(Lambda.eq((v0) -> {
- return v0.getUsageCode();
- }, workstationWcsVO.getUsageCode())).size() == 0, MessageUtils.message("workstation.wcs.usage.usageCode.exists", new Object[0]), new Object[0]);
+ Assert.isTrue(list(Lambda.eq(WorkstationWcsUsage::getUsageName, workstationWcsVO.getUsageName())).size() == 0, MessageUtils.message("workstation.wcs.usage.usageName.exists", new Object[0]), new Object[0]);
+ Assert.isTrue(list(Lambda.eq(WorkstationWcsUsage::getUsageCode, workstationWcsVO.getUsageCode())).size() == 0, MessageUtils.message("workstation.wcs.usage.usageCode.exists", new Object[0]), new Object[0]);
Assert.isTrue(Func.isEmpty(workstationWcsVO.getParameter()) || JSONUtil.isJsonObj(workstationWcsVO.getParameter()), MessageUtils.message("workstation.wcs.usage.parameter.nojson", new Object[0]), new Object[0]);
WorkstationWcsUsage usage = new WorkstationWcsUsage();
usage.setCollectType(workstationWcsVO.getCollectType());
@@ -89,7 +84,7 @@
return Boolean.valueOf(save(usage));
}
- @Override // org.springblade.modules.cps.service.IWorkstationWcsUsageService
+ @Override
@Transactional
@CacheEvict(cacheNames = {WORKSTATION_WCS_USAGE_EXP}, allEntries = true)
public Boolean update(final WorkstationWcsUsageVO workstationWcsVO) {
@@ -101,18 +96,7 @@
Assert.isTrue(
(list(Lambda.eq(WorkstationWcsUsage::getUsageCode, workstationWcsVO.getUsageCode()).ne(WorkstationWcsUsage::getId, workstationWcsVO.getId())).size() == 0),
MessageUtils.message("workstation.wcs.usage.usageCode.exists", new Object[0]), new Object[0]);
- /*
- Assert.isTrue(list((Wrapper) Lambda.eq((v0) -> {
- return v0.getUsageName();
- }, workstationWcsVO.getUsageName()).ne((v0) -> {
- return v0.getId();
- }, workstationWcsVO.getId())).size() == 0, MessageUtils.message("workstation.wcs.usage.usageName.exists", new Object[0]), new Object[0]);
- Assert.isTrue(list((Wrapper) Lambda.eq((v0) -> {
- return v0.getUsageCode();
- }, workstationWcsVO.getUsageCode()).ne((v0) -> {
- return v0.getId();
- }, workstationWcsVO.getId())).size() == 0, MessageUtils.message("workstation.wcs.usage.usageCode.exists", new Object[0]), new Object[0]);
- */
+
Assert.isTrue(Func.isEmpty(workstationWcsVO.getParameter()) || JSONUtil.isJsonObj(workstationWcsVO.getParameter()), MessageUtils.message("workstation.wcs.usage.parameter.nojson", new Object[0]), new Object[0]);
wcsUsageUsedValid(workstationWcsVO.getId(), oldUsage -> {
return Boolean.valueOf((oldUsage.getUsageCode().equals(workstationWcsVO.getUsageCode()) && oldUsage.getCollectType().equals(workstationWcsVO.getCollectType()) && oldUsage.getUsageName().equals(workstationWcsVO.getUsageName())) ? false : true);
@@ -126,7 +110,7 @@
return Boolean.valueOf(updateById(usage));
}
- @Override // org.springblade.modules.cps.service.IWorkstationWcsUsageService
+ @Override
@Transactional
@CacheEvict(cacheNames = {WORKSTATION_WCS_USAGE_EXP}, allEntries = true)
public Boolean remove(Long usageId) {
--
Gitblit v1.9.3