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/WorkbenchCardServiceImpl.java | 71 ++++++++---------------------------
1 files changed, 17 insertions(+), 54 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/WorkbenchCardServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/WorkbenchCardServiceImpl.java
index dd5c4f8..1476eb8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/WorkbenchCardServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/WorkbenchCardServiceImpl.java
@@ -1,19 +1,20 @@
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.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.enums.MenuCategoryEnum;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.secure.utils.AuthUtil;
import com.qianwen.core.tool.utils.CollectionUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.enums.MenuCategoryEnum;
import com.qianwen.smartman.modules.system.convert.WorkbenchCardConvert;
import com.qianwen.smartman.modules.system.entity.WorkbenchCard;
import com.qianwen.smartman.modules.system.mapper.MenuMapper;
@@ -23,8 +24,6 @@
import com.qianwen.smartman.modules.system.vo.MenuVO;
import com.qianwen.smartman.modules.system.vo.WorkbenchCardListAddVO;
import com.qianwen.smartman.modules.system.vo.WorkbenchCardVO;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/service/impl/WorkbenchCardServiceImpl.class */
@@ -32,46 +31,6 @@
private final IWorkbenchService workbenchService;
private final MenuMapper menuMapper;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case 1590775033:
- if (implMethodName.equals("getCardKey")) {
- 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/modules/system/entity/WorkbenchCard") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCardKey();
- };
- }
- 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/WorkbenchCard") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkbenchId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public WorkbenchCardServiceImpl(final IWorkbenchService workbenchService, final MenuMapper menuMapper) {
this.workbenchService = workbenchService;
@@ -81,9 +40,12 @@
@Override // org.springblade.modules.system.service.IWorkbenchCardService
@Transactional(rollbackFor = {Exception.class})
public Boolean createWorkbenchCard(WorkbenchCardListAddVO workbenchCardListAddVO) {
+ remove(new QueryWrapper<WorkbenchCard>().lambda().eq(WorkbenchCard::getWorkbenchId, workbenchCardListAddVO.getWorkbenchId()));
+
+ /*
remove((Wrapper) new QueryWrapper().lambda().eq((v0) -> {
return v0.getWorkbenchId();
- }, workbenchCardListAddVO.getWorkbenchId()));
+ }, workbenchCardListAddVO.getWorkbenchId()));*/
List<WorkbenchCard> list = WorkbenchCardConvert.INSTANCE.convert1(workbenchCardListAddVO.getWorkbenchCardAddVOList());
if (CollectionUtil.isNotEmpty(list)) {
saveBatch(list);
@@ -98,24 +60,25 @@
@Override // org.springblade.modules.system.service.IWorkbenchCardService
public List<WorkbenchCardVO> getWorkbenchCardList(String workbenchId) {
- List<MenuVO> menuVOList;
- new ArrayList();
+ List<MenuVO> menuVOList = new ArrayList<>();
if (AuthUtil.isAdministrator()) {
menuVOList = this.menuMapper.grantTreeByCategoryForWorkBench(Arrays.asList(Integer.valueOf(MenuCategoryEnum.CARD.getStatus())));
} else {
menuVOList = this.menuMapper.getRoleMenuCardByConditionForWorkBench(Func.toStrList(AuthUtil.getUser().getRoleId()), Arrays.asList(Integer.valueOf(MenuCategoryEnum.CARD.getStatus())));
}
- List<String> cardKeyList = (List) menuVOList.stream().map((v0) -> {
+ List<String> cardKeyList = menuVOList.stream().map((v0) -> {
return v0.getCode();
}).distinct().collect(Collectors.toList());
if (CollectionUtil.isEmpty(cardKeyList)) {
- return new ArrayList();
+ return new ArrayList<>();
}
+ List<WorkbenchCard> list = list(Wrappers.<WorkbenchCard>query().lambda().eq(WorkbenchCard::getWorkbenchId, workbenchId).in(WorkbenchCard::getCardKey, cardKeyList));
+ /*
List<WorkbenchCard> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getWorkbenchId();
}, workbenchId)).in((v0) -> {
return v0.getCardKey();
- }, cardKeyList));
+ }, cardKeyList));*/
return WorkbenchCardConvert.INSTANCE.convert(list);
}
}
--
Gitblit v1.9.3