From 86cdd920b68274185233383f69ddb974052b6b6f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 01 四月 2024 17:55:51 +0800
Subject: [PATCH] system模块修改
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/WorkbenchServiceImpl.java | 246 +++++++++++-------------------------------------
1 files changed, 57 insertions(+), 189 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/WorkbenchServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/WorkbenchServiceImpl.java
index f673d2e..ba0653b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/WorkbenchServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/WorkbenchServiceImpl.java
@@ -1,19 +1,19 @@
package com.qianwen.smartman.modules.system.service.impl;
-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.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.lang.invoke.SerializedLambda;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.secure.utils.AuthUtil;
import com.qianwen.core.tool.utils.CollectionUtil;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.system.constant.IsSystemConstant;
import com.qianwen.smartman.modules.system.constant.StatusConstant;
import com.qianwen.smartman.modules.system.convert.WorkbenchConvert;
@@ -27,9 +27,6 @@
import com.qianwen.smartman.modules.system.service.IWorkbenchTemplateCardService;
import com.qianwen.smartman.modules.system.service.IWorkbenchTemplateService;
import com.qianwen.smartman.modules.system.vo.WorkbenchVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/service/impl/WorkbenchServiceImpl.class */
@@ -42,174 +39,12 @@
@Autowired
private IWorkbenchTemplateCardService workbenchTemplateCardService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = true;
- break;
- }
- break;
- case -75145708:
- if (implMethodName.equals("getSort")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- z = true;
- break;
- }
- break;
- case 1071504093:
- if (implMethodName.equals("getCreateUser")) {
- z = false;
- break;
- }
- break;
- case 1615686148:
- if (implMethodName.equals("getWorkbenchId")) {
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getCreateUser();
- };
- }
- 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.getCreateUser();
- };
- }
- 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.getCreateUser();
- };
- }
- 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.getCreateUser();
- };
- }
- 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.getCreateUser();
- };
- }
- 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/system/entity/Workbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSort();
- };
- }
- 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();
- };
- }
- 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/system/entity/Workbench") && 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/system/entity/Workbench") && 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/system/entity/Workbench") && 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/system/entity/WorkbenchCard") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkbenchId();
- };
- }
- 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/system/entity/WorkbenchTemplateCard") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkbenchId();
- };
- }
- 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/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();
- };
- }
- 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();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
@Override // org.springblade.modules.system.service.IWorkbenchService
public List<WorkbenchVO> listWorkbench(Integer status) {
+ List<Workbench> list = list(Wrappers.<Workbench>query().lambda().eq(Workbench::getCreateUser, AuthUtil.getUserId())
+ .eq((status != null), Workbench::getStatus, status).orderByAsc(Arrays.asList(Workbench::getSort, Workbench::getCreateTime) ));
+ /*
List<Workbench> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getCreateUser();
}, AuthUtil.getUserId())).eq(status != null, (v0) -> {
@@ -218,18 +53,20 @@
return v0.getSort();
}, new SFunction[]{(v0) -> {
return v0.getCreateTime();
- }}));
+ }}));*/
List<WorkbenchVO> workbenchVOS = WorkbenchConvert.INSTANCE.convert(list);
return workbenchVOS;
}
@Override // org.springblade.modules.system.service.IWorkbenchService
public Workbench addWorkbench(String name) {
+ Workbench result = getOne(Wrappers.<Workbench>query().lambda().eq(Workbench::getName, name).eq(Workbench::getCreateUser, AuthUtil.getUserId()));
+ /*
Workbench result = (Workbench) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getName();
}, name)).eq((v0) -> {
return v0.getCreateUser();
- }, AuthUtil.getUserId()));
+ }, AuthUtil.getUserId()));*/
if (result == null) {
Workbench workbench = new Workbench();
workbench.setCreateUser(AuthUtil.getUserId());
@@ -243,59 +80,87 @@
@Override // org.springblade.modules.system.service.IWorkbenchService
public Boolean updateWorkbench(WorkbenchVO workbenchVO) {
+ Long number = Long.valueOf(count(Wrappers.<Workbench>query().lambda()
+ .ne(Workbench::getId, workbenchVO.getId())
+ .eq(Workbench::getName, workbenchVO.getName())
+ .eq(Workbench::getCreateUser, AuthUtil.getUserId())));
+ /*
Long number = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().ne((v0) -> {
return v0.getId();
}, workbenchVO.getId())).eq((v0) -> {
return v0.getName();
}, workbenchVO.getName())).eq((v0) -> {
return v0.getCreateUser();
- }, AuthUtil.getUserId())));
+ }, AuthUtil.getUserId())));*/
if (number.compareTo((Long) 0L) == 0) {
+ return Boolean.valueOf(update(Wrappers.<Workbench>update().lambda().eq(Workbench::getId, workbenchVO.getId()).set(Workbench::getName, workbenchVO.getName())));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().eq((v0) -> {
return v0.getId();
}, workbenchVO.getId())).set((v0) -> {
return v0.getName();
- }, workbenchVO.getName())));
+ }, workbenchVO.getName())));*/
}
throw new ServiceException(MessageUtils.message("work.bench.name.already.exist", new Object[0]));
}
@Override // org.springblade.modules.system.service.IWorkbenchService
public Boolean switchWorkbench(Long id, Integer status) {
+ Long count = Long.valueOf(count(Wrappers.<Workbench>query().lambda()
+ .eq(Workbench::getCreateUser, AuthUtil.getUserId())
+ .eq(Workbench::getStatus, StatusConstant.open)));
+ /*
Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getCreateUser();
}, AuthUtil.getUserId())).eq((v0) -> {
return v0.getStatus();
- }, StatusConstant.open)));
+ }, StatusConstant.open)));*/
if (count.longValue() <= 1 && status.intValue() == 0) {
throw new ServiceException(MessageUtils.message("work.bench.at.least.one", new Object[0]));
}
+
+ return Boolean.valueOf(update(Wrappers.<Workbench>update().lambda().eq(Workbench::getId, id).set(Workbench::getStatus, status)));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().eq((v0) -> {
return v0.getId();
}, id)).set((v0) -> {
return v0.getStatus();
- }, status)));
+ }, status)));*/
}
@Override // org.springblade.modules.system.service.IWorkbenchService
public Boolean deleteWorkbench(Long id) {
+ Workbench bench = getOne(Wrappers.<Workbench>query().lambda().eq(Workbench::getId, id));
+
+ if (bench.getIsSystem().equals(IsSystemConstant.IsSystem)) {
+ throw new ServiceException(MessageUtils.message("system.work.bench.can.not.delete", new Object[0]));
+ }
+
+ //.getIsSystem().equals(IsSystemConstant.IsSystem)
+ /*
if (((Workbench) getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getId();
}, id))).getIsSystem().equals(IsSystemConstant.IsSystem)) {
throw new ServiceException(MessageUtils.message("system.work.bench.can.not.delete", new Object[0]));
- }
+ }*/
+ Long count = Long.valueOf(count(Wrappers.<Workbench>query().lambda().eq(Workbench::getCreateUser, AuthUtil.getUserId())));
+ /*
Long count = Long.valueOf(count((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getCreateUser();
- }, AuthUtil.getUserId())));
+ }, AuthUtil.getUserId())));*/
if (count.longValue() <= 1) {
throw new ServiceException(MessageUtils.message("work.bench.at.least.one", new Object[0]));
}
+ boolean resultWorkbench = remove(Wrappers.<Workbench>query().lambda().eq(Workbench::getId, id));
+ /*
boolean resultWorkbench = remove((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getId();
- }, id));
+ }, id));*/
+ this.workbenchCardService.remove(Wrappers.<WorkbenchCard>query().lambda().eq(WorkbenchCard::getWorkbenchId, id));
+ /*
this.workbenchCardService.remove((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getWorkbenchId();
- }, id));
+ }, id));*/
return Boolean.valueOf(resultWorkbench);
}
@@ -315,12 +180,15 @@
workbench.setIsSystem(Integer.valueOf("1"));
workbench.setCreateUser(userId);
workbench.setSort(i.getSort());
+ List<WorkbenchTemplateCard> workbenchTemplateCardList = this.workbenchTemplateCardService.list(Wrappers.<WorkbenchTemplateCard>query().lambda()
+ .eq(WorkbenchTemplateCard::getWorkbenchId, i.getId()));
+ /*
List<WorkbenchTemplateCard> workbenchTemplateCardList = this.workbenchTemplateCardService.list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getWorkbenchId();
- }, i.getId()));
+ }, i.getId()));*/
if (!CollectionUtil.isEmpty(workbenchTemplateCardList)) {
save(workbench);
- List<WorkbenchCard> list = (List) workbenchTemplateCardList.stream().map(bean -> {
+ List<WorkbenchCard> list = workbenchTemplateCardList.stream().map(bean -> {
WorkbenchCard workbenchCard = new WorkbenchCard();
workbenchCard.setWorkbenchId(workbench.getId());
workbenchCard.setCardKey(bean.getCardKey());
--
Gitblit v1.9.3