From 84dea9976c29ac938fa018b8566c71461b056418 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 05 四月 2024 08:18:59 +0800
Subject: [PATCH] 增加log文件忽略配置
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java | 51 +++++++++++----------------------------------------
1 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java
index 4494275..39a889c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java
@@ -48,41 +48,6 @@
private final IWorkstationDynamicCollectService dynamicCollectService;
private final IWorkstationWcsUsageService workstationWcsUsageService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 764041336:
- if (implMethodName.equals("getUsageCode")) {
- 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/modules/cps/entity/WorkstationWcsUsage") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUsageCode();
- };
- }
- 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();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public VisualOutputServiceImpl(final SuperAggregateOutputMapper superAggregateOutputMapper, final IWorkstationService workstationService, final OutputWrapper outputWrapper, final IWorkstationDynamicCollectService dynamicCollectService, final IWorkstationWcsUsageService workstationWcsUsageService) {
this.superAggregateOutputMapper = superAggregateOutputMapper;
@@ -130,12 +95,17 @@
WorkstationChartSeriesDataVO chartSeriesDataVO = new WorkstationChartSeriesDataVO();
List<Workstation> xList = new ArrayList<>();
List<Long> workStationIdList = workstationShiftOutput.getWorkStationIdList();
- ArrayList arrayList = new ArrayList();
+
+ List<Long> arrayList = new ArrayList<>();
+ //ArrayList arrayList = new ArrayList();
+ List<Workstation> list = this.workstationService.list(Wrappers.<Workstation>lambdaQuery().in(Workstation::getId, workStationIdList));
+ /*
List<Workstation> list = this.workstationService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
- }, workStationIdList));
+ }, workStationIdList));*/
if (Func.isNotEmpty(list)) {
- ArrayList arrayList2 = new ArrayList();
+ List<SeriesItem> seriesItems = new ArrayList<>();
+ //ArrayList<Long> arrayList2 = new ArrayList<>();
list.forEach(s -> {
xList.add(s);
String calendarCode = s.getCalendarCode();
@@ -157,9 +127,10 @@
SeriesItem seriesItem = new SeriesItem();
seriesItem.setName(VisualConstant.SHIFT_OUTPUT);
seriesItem.setData(arrayList);
- arrayList2.add(seriesItem);
+ seriesItems.add(seriesItem);
chartSeriesDataVO.generateCategories(xList, 3);
- chartSeriesDataVO.setSeries(arrayList2);
+
+ chartSeriesDataVO.setSeries(seriesItems);
}
return chartSeriesDataVO;
}
--
Gitblit v1.9.3