From b773661de485d9748386bfdd15a7ac7cd399be36 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 02 四月 2024 11:20:34 +0800
Subject: [PATCH] visual修复
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualDataSourceServiceImpl.java | 92 +++++++++++++--------------------------------
1 files changed, 27 insertions(+), 65 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualDataSourceServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualDataSourceServiceImpl.java
index 344a3f3..923a7bc 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualDataSourceServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualDataSourceServiceImpl.java
@@ -1,25 +1,24 @@
package com.qianwen.smartman.modules.visual.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+import com.qianwen.core.tool.node.ForestNodeMerger;
+import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.cache.cps.TimeSliceCache;
import com.qianwen.smartman.common.cache.cps.WorkstationCache;
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.common.constant.CommonGroupConstant;
import com.qianwen.smartman.common.constant.VisualConstant;
import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
-import com.qianwen.core.tool.node.ForestNodeMerger;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.convert.CommonGroupConvert;
import com.qianwen.smartman.modules.cps.dto.CurrentShiftInfoDTO;
import com.qianwen.smartman.modules.cps.entity.CommonGroup;
@@ -34,7 +33,6 @@
import com.qianwen.smartman.modules.visual.service.IVisualDataSourceService;
import com.qianwen.smartman.modules.visual.vo.DropDownVO;
import com.qianwen.smartman.modules.visual.vo.WorkStationTreeVO;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/service/impl/VisualDataSourceServiceImpl.class */
@@ -44,54 +42,6 @@
private final IShiftModelService shiftModelService;
private final ICalendarService calendarService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1492577373:
- if (implMethodName.equals("getGroupType")) {
- z = false;
- break;
- }
- break;
- case -1041904421:
- if (implMethodName.equals("getParentId")) {
- z = true;
- break;
- }
- break;
- case 985326823:
- if (implMethodName.equals("getGroupCategory")) {
- 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/cps/entity/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupType();
- };
- }
- 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/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getGroupCategory();
- };
- }
- 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/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public VisualDataSourceServiceImpl(final ICommonGroupService commonGroupService, final IDictService dictService, final IShiftModelService shiftModelService, final ICalendarService calendarService) {
this.commonGroupService = commonGroupService;
@@ -104,17 +54,21 @@
public List<WorkStationTreeVO> workstationDataSource() {
CommonGroupTypeVO commonGroupTypeVO = new CommonGroupTypeVO().setGroupCategory(CommonGroupConstant.DEFAULT_CATEGORY).setStatus(CommonConstant.ENABLE).setGroupType(CommonGroupTypeEnum.WORKSTATION.getName());
List<WorkstationInGroupVO> list = this.commonGroupService.groupWorkstationList(commonGroupTypeVO);
+
+ List<WorkStationTreeVO> vos = hasChildGroup(list).stream().map(CommonGroupConvert.INSTANCE::convertToChart).collect(Collectors.toList());
+ /*
Stream<WorkstationInGroupVO> stream = hasChildGroup(list).stream();
CommonGroupConvert commonGroupConvert = CommonGroupConvert.INSTANCE;
commonGroupConvert.getClass();
List<WorkStationTreeVO> vos = (List) stream.map(this::convertToChart).collect(Collectors.toList());
+ */
return ForestNodeMerger.merge(vos);
}
@Override // org.springblade.modules.visual.service.IVisualDataSourceService
public List<DropDownVO> timeLevelDataSource() {
List<Dict> dictList = this.dictService.getList(VisualConstant.VISUAL_TIME_LEVEL);
- return (List) dictList.stream().map(dict -> {
+ return dictList.stream().map(dict -> {
return DropDownVO.builder().id(dict.getDictKey()).name(dict.getDictValue()).build();
}).collect(Collectors.toList());
}
@@ -125,7 +79,7 @@
List<ShiftModel> list = this.shiftModelService.list();
List<DropDownVO> dropDownVOList = new ArrayList<>();
if (Func.isNotEmpty(list)) {
- dropDownVOList = (List) list.stream().map(shiftModel -> {
+ dropDownVOList = list.stream().map(shiftModel -> {
return DropDownVO.builder().id(String.valueOf(shiftModel.getId())).name(shiftModel.getName()).build();
}).collect(Collectors.toList());
}
@@ -138,13 +92,13 @@
if (Func.isEmpty(collect)) {
CommonGroupTypeVO commonGroupTypeVO = new CommonGroupTypeVO().setGroupCategory(CommonGroupConstant.DEFAULT_CATEGORY).setStatus(CommonConstant.ENABLE).setGroupType(CommonGroupTypeEnum.WORKSTATION.getName());
List<WorkstationInGroupVO> commonList = this.commonGroupService.groupWorkstationList(commonGroupTypeVO);
- List<String> calendarCodeList = (List) commonList.stream().map((v0) -> {
+ List<String> calendarCodeList = commonList.stream().map((v0) -> {
return v0.getCalendarCode();
}).filter((v0) -> {
return Func.isNotEmpty(v0);
}).distinct().collect(Collectors.toList());
Map<String, CurrentShiftInfoDTO> currentShiftInfo = TimeSliceCache.getCurrentShiftInfo(calendarCodeList);
- collect = (List) commonList.stream().filter(workstationInGroupVO -> {
+ collect = commonList.stream().filter(workstationInGroupVO -> {
CurrentShiftInfoDTO currentShiftInfoDTO = (CurrentShiftInfoDTO) currentShiftInfo.get(workstationInGroupVO.getCalendarCode());
Boolean flag = workstationInGroupVO.getIsGroup();
if (Func.isNotEmpty(currentShiftInfoDTO)) {
@@ -155,15 +109,18 @@
}).collect(Collectors.toList());
WorkstationCache.setShiftWorkStation(collect, id);
}
+
+ List<WorkStationTreeVO> vos = hasChildGroup(collect).stream().map(CommonGroupConvert.INSTANCE::convertToChart).collect(Collectors.toList());
+ /*
Stream<WorkstationInGroupVO> stream = hasChildGroup(collect).stream();
CommonGroupConvert commonGroupConvert = CommonGroupConvert.INSTANCE;
commonGroupConvert.getClass();
- List<WorkStationTreeVO> vos = (List) stream.map(this::convertToChart).collect(Collectors.toList());
+ List<WorkStationTreeVO> vos = (List) stream.map(this::convertToChart).collect(Collectors.toList());*/
return ForestNodeMerger.merge(vos);
}
private List<WorkstationInGroupVO> hasChildGroup(List<WorkstationInGroupVO> list) {
- Set<Long> groupIds = (Set) list.stream().filter((v0) -> {
+ Set<Long> groupIds = list.stream().filter((v0) -> {
return v0.getIsWorkstation();
}).map((v0) -> {
return v0.getParentId();
@@ -179,7 +136,7 @@
if (res.size() == CommonGroupConstant.SIZE.intValue() && res.contains(root.getId())) {
return Lists.newArrayList();
}
- return (List) list.stream().filter(c -> {
+ return list.stream().filter(c -> {
return res.contains(c.getId()) || c.getIsWorkstation().booleanValue();
}).collect(Collectors.toList());
}
@@ -194,12 +151,17 @@
}
private CommonGroup findRoot() {
+ return this.commonGroupService.getOne(Wrappers.<CommonGroup>lambdaQuery()
+ .eq(CommonGroup::getGroupCategory, CommonGroupConstant.DEFAULT_CATEGORY)
+ .eq(CommonGroup::getGroupType, CommonGroupTypeEnum.WORKSTATION.getName())
+ .eq(CommonGroup::getParentId, CommonGroupConstant.ROOT));
+ /*
return (CommonGroup) this.commonGroupService.getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getGroupCategory();
}, CommonGroupConstant.DEFAULT_CATEGORY)).eq((v0) -> {
return v0.getGroupType();
}, CommonGroupTypeEnum.WORKSTATION.getName())).eq((v0) -> {
return v0.getParentId();
- }, CommonGroupConstant.ROOT));
+ }, CommonGroupConstant.ROOT));*/
}
}
--
Gitblit v1.9.3