From 871c0fce344b24c8046ec01173eca79b9e60c1d7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 三月 2024 22:36:06 +0800
Subject: [PATCH] mdc提交1
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackStatus.java | 5
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java | 72 +
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackDetailStatus.java | 5
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.java | 144 +--
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.java | 469 ++++---------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackDetailServiceImpl.java | 235 +-----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java | 5
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java | 134 +--
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java | 74 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java | 199 ++----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java | 9
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/MdcConvertUtil.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/AlarmServiceImpl.java | 95 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatisticsServiceImpl.java | 5
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java | 166 ++---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java | 63 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationFeedbackController.java | 181 +----
17 files changed, 663 insertions(+), 1,200 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationFeedbackController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationFeedbackController.java
index fd08bab..c1842cc 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationFeedbackController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationFeedbackController.java
@@ -1,28 +1,32 @@
package com.qianwen.smartman.modules.mdc.controller;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.lang.Assert;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
-import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
+
import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
-import com.qianwen.smartman.common.utils.Lambda;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.scanner.modular.stereotype.ApiResource;
import com.qianwen.core.tool.api.R;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.RegionCache;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
+import com.qianwen.smartman.modules.cps.vo.WorkstationVO;
import com.qianwen.smartman.modules.mdc.dto.WorkstationEndAndStartImmediateFeedBackDTO;
import com.qianwen.smartman.modules.mdc.dto.WorkstationEndImmediateFeedBackDTO;
import com.qianwen.smartman.modules.mdc.dto.WorkstationFeedBackQueryDTO;
@@ -39,15 +43,12 @@
import com.qianwen.smartman.modules.mdc.vo.WorkstationFeedbackInfoVO;
import com.qianwen.smartman.modules.mdc.wrapper.WorkstationFeedBackDetailWrapper;
import com.qianwen.smartman.modules.mdc.wrapper.WorkstationFeedbackWrapper;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.lang.Assert;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
@Api(value = "宸ヤ綅鍙嶉", tags = {"宸ヤ綅鍙嶉"})
@ApiResource({"blade-cps/workstation-wcs-feedback"})
@@ -57,119 +58,6 @@
private final IWorkstationFeedbackService wcsFeedbackService;
private final IWorkstationService workstationService;
private final IWorkstationFeedbackDetailService detailService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -2138899559:
- if (implMethodName.equals("getStartTime")) {
- z = true;
- break;
- }
- break;
- case -1249346575:
- if (implMethodName.equals("getWcs")) {
- z = true;
- break;
- }
- break;
- case -570382830:
- if (implMethodName.equals("getEndTime")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case 328290672:
- if (implMethodName.equals("getCancel")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- 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/mdc/entity/WorkstationFeedback") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
- return (v0) -> {
- return v0.getCancel();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getEndTime();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWcs();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getStartTime();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getStartTime();
- };
- }
- 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/modules/mdc/entity/WorkstationFeedbackDetail") && 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/modules/mdc/entity/WorkstationFeedback") && 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/modules/mdc/entity/WorkstationFeedback") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public WorkstationFeedbackController(final IWorkstationFeedbackService wcsFeedbackService, final IWorkstationService workstationService, final IWorkstationFeedbackDetailService detailService) {
this.wcsFeedbackService = wcsFeedbackService;
@@ -193,7 +81,7 @@
if (feedback == null) {
WorkstationFeedbackDetail detail = this.detailService.latestFeedbackByWorkstationId(workstationId);
if (detail == null) {
- return R.data((Object) null);
+ return R.data( null);
}
return R.data(WorkstationFeedbackWrapper.entityVO(detail));
}
@@ -204,6 +92,19 @@
@ApiOperationSupport
@ApiOperation("宸ヤ綅鍙嶉鍒嗛〉鍒楄〃鏌ヨ")
public R<IPage<WorkstationFeedBackDetailVO>> page(Query query, @RequestBody WorkstationFeedBackQueryDTO queryDTO) {
+ IPage<WorkstationFeedbackDetail> page = this.detailService.page(Condition.getPage(query),
+
+ Lambda.eq(WorkstationFeedbackDetail::getStatus, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue()))
+ .eq(WorkstationFeedbackDetail::getCancel, Boolean.FALSE)
+ .in(Func.isNotEmpty(queryDTO.getWorkstationGroupId()), WorkstationFeedbackDetail::getWorkstationId, this.workstationService
+ .getWorkstationByGroupIds(ListUtil.toList(new String[] { queryDTO.getWorkstationGroupId() })).stream().map(WorkstationVO::getId).collect(Collectors.toList()))
+
+ .eq(Func.isNotEmpty(queryDTO.getWorkstationId()), WorkstationFeedbackDetail::getWorkstationId, queryDTO.getWorkstationId())
+ .ge(Func.isNotEmpty(queryDTO.getStartDate()), WorkstationFeedbackDetail::getStartTime, queryDTO.getStartDate())
+ .le(Func.isNotEmpty(queryDTO.getEndDate()), WorkstationFeedbackDetail::getEndTime, queryDTO.getEndDate())
+ .in(Func.isNotEmpty(queryDTO.getFeedBackStatus()), WorkstationFeedbackDetail::getWcs, queryDTO.getFeedBackStatus())
+ .nested(Func.isNotEmpty(queryDTO.getStartDate()), w -> w.apply(Func.isNotEmpty(queryDTO.getStartDate()), String.format("'%s' between start_time and end_time", new Object[] { queryDTO.getStartDate() }), new Object[0]).or().apply(Func.isNotEmpty(queryDTO.getEndDate()), String.format("'%s' between start_time and end_time", new Object[] { queryDTO.getEndDate() }), new Object[0]).orderByDesc(WorkstationFeedbackDetail::getStartTime)));
+ /*
IPage<WorkstationFeedbackDetail> page = this.detailService.page(Condition.getPage(query), (Wrapper) ((ExtraLambdaQueryWrapper) Lambda.eq((v0) -> {
return v0.getStatus();
}, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue())).eq((v0) -> {
@@ -224,7 +125,7 @@
((ExtraLambdaQueryWrapper) w.apply(Func.isNotEmpty(queryDTO.getStartDate()), String.format("'%s' between start_time and end_time", queryDTO.getStartDate()), new Object[0]).or()).apply(Func.isNotEmpty(queryDTO.getEndDate()), String.format("'%s' between start_time and end_time", queryDTO.getEndDate()), new Object[0]);
}).orderByDesc((v0) -> {
return v0.getStartTime();
- }));
+ }));*/
return R.data(WorkstationFeedBackDetailWrapper.build().pageVO(page));
}
@@ -293,6 +194,10 @@
@ApiOperation(value = "鏌ヨ宸ヤ綅鐘舵��", notes = "鏌ヨ鏄惁鏈夋湭璁＄畻鐨勫弽棣堣褰�, true:鏈夋鍦ㄨ绠楃殑璁板綍, false: 娌℃湁")
public R<Boolean> feedbackStatus(@RequestBody List<Long> workstationIds) {
Assert.notEmpty(workstationIds);
+ boolean exist = (this.wcsFeedbackService.count(Lambda.in(WorkstationFeedback::getWorkstationId, workstationIds)
+ .nested(w -> w.eq(WorkstationFeedback::getStatus, FeedbackStatus.SYNCING.getValue())
+ .or().eq(WorkstationFeedback::getStatus, FeedbackStatus.WAIT_SYNC.getValue()))) != 0);
+ /*
boolean exist = this.wcsFeedbackService.count((Wrapper) Lambda.in((v0) -> {
return v0.getWorkstationId();
}, workstationIds).nested(w -> {
@@ -301,7 +206,7 @@
}, FeedbackStatus.SYNCING.getValue())).or()).eq((v0) -> {
return v0.getStatus();
}, FeedbackStatus.WAIT_SYNC.getValue());
- })) != 0;
+ })) != 0;*/
return R.data(Boolean.valueOf(exist));
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackDetailStatus.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackDetailStatus.java
index d740b56..23d7418 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackDetailStatus.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackDetailStatus.java
@@ -2,7 +2,6 @@
import java.util.stream.Stream;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/enums/FeedbackDetailStatus.class */
public enum FeedbackDetailStatus {
DELETE("浣滃簾", 2),
WAIT_EFFECT("寰呯敓鏁�", 0),
@@ -28,8 +27,10 @@
if (value == null) {
return null;
}
+ return Stream.<FeedbackDetailStatus>of(values()).filter(item -> (item.getValue() == value.intValue())).findFirst().orElse(null);
+ /*
return (FeedbackDetailStatus) Stream.of((Object[]) values()).filter(item -> {
return item.getValue() == value.intValue();
- }).findFirst().orElse(null);
+ }).findFirst().orElse(null);*/
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackStatus.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackStatus.java
index 2eb117c..f7d055d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackStatus.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackStatus.java
@@ -28,8 +28,11 @@
if (value == null) {
return null;
}
+
+ return Stream.<FeedbackStatus>of(values()).filter(item -> (item.getValue().intValue() == value.intValue())).findFirst().orElse(null);
+ /*
return (FeedbackStatus) Stream.of((Object[]) values()).filter(item -> {
return item.getValue().intValue() == value.intValue();
- }).findFirst().orElse(null);
+ }).findFirst().orElse(null);*/
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/AlarmServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/AlarmServiceImpl.java
index b7cdabe..4bf8b74 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/AlarmServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/AlarmServiceImpl.java
@@ -1,12 +1,9 @@
package com.qianwen.smartman.modules.mdc.service.impl;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@@ -15,13 +12,15 @@
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.constant.DateConstant;
-import com.qianwen.smartman.common.constant.ExcelConstant;
-import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
-import com.qianwen.smartman.common.utils.LocalDateUtil;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
@@ -29,11 +28,17 @@
import com.qianwen.core.tool.utils.CollectionUtil;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.DateConstant;
+import com.qianwen.smartman.common.constant.ExcelConstant;
+import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
+import com.qianwen.smartman.common.utils.LocalDateUtil;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.dto.ShiftInfoDTO;
import com.qianwen.smartman.modules.cps.mapper.WorkstationMapper;
import com.qianwen.smartman.modules.cps.service.IShiftDetailService;
import com.qianwen.smartman.modules.cps.vo.WorkstationVO;
import com.qianwen.smartman.modules.mdc.convert.AlarmConvert;
+import com.qianwen.smartman.modules.mdc.entity.SuperAggregate;
import com.qianwen.smartman.modules.mdc.entity.SuperAlarm;
import com.qianwen.smartman.modules.mdc.enums.OpenTypeEnums;
import com.qianwen.smartman.modules.mdc.enums.StatisticalMethodEnum;
@@ -50,11 +55,10 @@
import com.qianwen.smartman.modules.mdc.vo.AlarmSummaryGraphVO;
import com.qianwen.smartman.modules.mdc.vo.SplitFilterListVO;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.util.StrUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/AlarmServiceImpl.class */
public class AlarmServiceImpl implements IAlarmService {
private static final Logger log = LoggerFactory.getLogger(AlarmServiceImpl.class);
private final SuperAlarmMapper alarmMapper;
@@ -73,23 +77,23 @@
@Override // org.springblade.modules.mdc.service.IAlarmService
public IPage<AlarmDataSheetVO> pageAlarm(Query query, AlarmShiftSearchVO vo) {
if (Func.isNull(vo.getWorkstationId())) {
- return new Page();
+ return new Page<>();
}
LocalDate queryTime = vo.getQueryTime();
List<SuperAlarm> list = this.alarmMapper.selectListAlarm(vo, DateUtil.format(queryTime, "yyyyMMdd"));
- Map<String, List<SuperAlarm>> map = (Map) FilterOffUtils.filterOffDay(list, OpenTypeEnums.ALARM_ANALYSIS).stream().collect(Collectors.groupingBy(c -> {
+ Map<String, List<SuperAlarm>> map = FilterOffUtils.filterOffDay(list, OpenTypeEnums.ALARM_ANALYSIS).stream().collect(Collectors.groupingBy(c -> {
return c.getCode() + c.getMessage();
}));
Integer size = query.getSize();
Integer current = query.getCurrent();
- Page page = new Page(current.intValue(), size.intValue(), map.size());
+ Page<AlarmDataSheetVO> page = new Page<>(current.intValue(), size.intValue(), map.size());
if (map.size() == 0) {
return page;
}
List<SuperAlarm> alarms = this.alarmMapper.selectListAlarm(vo, DateUtil.format(queryTime, "yyyyMMdd"));
List<AlarmDataSheetVO> res = AlarmConvert.INSTANCE.convert(FilterOffUtils.filterOffDay(alarms, OpenTypeEnums.ALARM_ANALYSIS));
List<AlarmDataSheetVO> alarmDataSheetVOS = new ArrayList<>();
- Map<String, List<AlarmDataSheetVO>> resMap = (Map) res.stream().collect(Collectors.groupingBy(c2 -> {
+ Map<String, List<AlarmDataSheetVO>> resMap = res.stream().collect(Collectors.groupingBy(c2 -> {
return c2.getAlarmCode() + c2.getAlarmMsg();
}));
resMap.values().forEach(alarmDataSheetVOList -> {
@@ -109,12 +113,19 @@
@Override // org.springblade.modules.mdc.service.IAlarmService
public BladeFile exportAlarm(AlarmShiftSearchExcelVO vo) {
BladeFile bladeFile;
- List<SuperAlarm> superAlarms = (List) FilterOffUtils.filterOffDay(this.alarmMapper.selectListAlarmByShift(LocalDateTimeUtils.formatTimeLocalDate(vo.getStartTime(), "yyyyMMdd"), LocalDateTimeUtils.formatTimeLocalDate(vo.getEndTime(), "yyyyMMdd"), vo.getWorkstationId()), OpenTypeEnums.ALARM_ANALYSIS).stream().sorted(Comparator.comparing((v0) -> {
+
+ List<SuperAlarm> superAlarms = this.alarmMapper.selectListAlarmByShift(LocalDateTimeUtils.formatTimeLocalDate(vo.getStartTime(), "yyyyMMdd"), LocalDateTimeUtils.formatTimeLocalDate(vo.getEndTime(), "yyyyMMdd"), vo.getWorkstationId());
+ superAlarms = FilterOffUtils.filterOffDay(superAlarms, OpenTypeEnums.ALARM_ANALYSIS);
+ superAlarms.sort(Comparator.comparing(SuperAggregate::getFactoryDate));
+ Collections.reverse(superAlarms);
+ //superAlarms = superAlarms.stream().collect(Collectors.toList());
+ /*
+ List<SuperAlarm> superAlarms = FilterOffUtils.filterOffDay(this.alarmMapper.selectListAlarmByShift(LocalDateTimeUtils.formatTimeLocalDate(vo.getStartTime(), "yyyyMMdd"), LocalDateTimeUtils.formatTimeLocalDate(vo.getEndTime(), "yyyyMMdd"), vo.getWorkstationId()), OpenTypeEnums.ALARM_ANALYSIS).stream().sorted(Comparator.comparing((v0) -> {
return v0.getFactoryDate();
- }).reversed()).collect(Collectors.toList());
+ }).reversed()).collect(Collectors.toList());*/
WorkstationVO workstationVO = (WorkstationVO) this.workstationMapper.queryWorkstationAndGroup(Condition.getPage(new Query().setSize(-1)), Lists.newArrayList(new Long[]{vo.getWorkstationId()})).getRecords().get(0);
if (vo.getEnums().equals(StatisticalMethodEnum.SHIFT)) {
- List<SuperAlarm> superAlarms2 = (List) superAlarms.stream().filter(s -> {
+ List<SuperAlarm> superAlarms2 = superAlarms.stream().filter(s -> {
return s.getShiftIndex().intValue() > 0;
}).collect(Collectors.toList());
List<ShiftInfoDTO> shiftInfoDtoList = this.shiftDetailService.getShiftInfoDtoList(Lists.newArrayList(new Long[]{vo.getWorkstationId()}), vo.getStartTime(), vo.getEndTime());
@@ -126,25 +137,25 @@
}
private BladeFile exportShift(List<SuperAlarm> superAlarms, WorkstationVO workstationVO, List<ShiftInfoDTO> shiftInfoDtoList) {
- Map<String, List<SuperAlarm>> mapGroupByShift = (Map) superAlarms.stream().collect(Collectors.groupingBy(s -> {
+ Map<String, List<SuperAlarm>> mapGroupByShift = superAlarms.stream().collect(Collectors.groupingBy(s -> {
return s.getFactoryDate() + "-" + s.getShiftIndex();
}));
List<AlarmDataSheetExcel> alarmDataSheetExcelList = new ArrayList<>();
String shift = MessageUtils.message("mdc.excel.alarm.shift", new Object[0]);
- Map<String, String> shiftIndexToName = (Map) shiftInfoDtoList.stream().collect(Collectors.toMap(s2 -> {
+ Map<String, String> shiftIndexToName = shiftInfoDtoList.stream().collect(Collectors.toMap(s2 -> {
return s2.getDate().replace("-", "") + "-" + s2.getShiftIndex();
}, (v0) -> {
return v0.getIndexName();
}));
Map<String, List<SuperAlarm>> result = new LinkedHashMap<>();
mapGroupByShift.entrySet().stream().sorted(Map.Entry.comparingByKey(Comparator.reverseOrder())).forEachOrdered(x -> {
- List list = (List) result.put(x.getKey(), x.getValue());
+ List<SuperAlarm> list = result.put(x.getKey(), x.getValue());
});
- result.forEach(k, v -> {
- Map<String, List<SuperAlarm>> mapGroupByAlarmCodeAndMessage = (Map) v.stream().collect(Collectors.groupingBy(s3 -> {
+ result.forEach((k, v) -> {
+ Map<String, List<SuperAlarm>> mapGroupByAlarmCodeAndMessage = v.stream().collect(Collectors.groupingBy(s3 -> {
return s3.getCode() + "-" + s3.getMessage();
}));
- mapGroupByAlarmCodeAndMessage.forEach(key, value -> {
+ mapGroupByAlarmCodeAndMessage.forEach((key, value) -> {
String alarmMessage;
AlarmDataSheetExcel alarmDataSheetExcel = new AlarmDataSheetExcel();
String[] split = k.split("-");
@@ -177,15 +188,15 @@
String the = MessageUtils.message("mdc.efficiency.analysis.the", new Object[0]);
String week = MessageUtils.message("mdc.efficiency.analysis.week", new Object[0]);
if (statisticalMethodEnum.equals(StatisticalMethodEnum.DAY)) {
- map = (Map) superAlarms.stream().collect(Collectors.groupingBy(s -> {
+ map = superAlarms.stream().collect(Collectors.groupingBy(s -> {
return String.valueOf(s.getFactoryDate());
}));
} else if (statisticalMethodEnum.equals(StatisticalMethodEnum.WEEK)) {
- map = (Map) superAlarms.stream().collect(Collectors.groupingBy(s2 -> {
+ map = superAlarms.stream().collect(Collectors.groupingBy(s2 -> {
return s2.getFactoryYear() + "-" + s2.getFactoryWeek();
}));
} else {
- map = (Map) superAlarms.stream().collect(Collectors.groupingBy(s3 -> {
+ map = superAlarms.stream().collect(Collectors.groupingBy(s3 -> {
return s3.getFactoryYear() + "-" + s3.getFactoryMonth();
}));
}
@@ -194,11 +205,11 @@
map.entrySet().stream().sorted(Map.Entry.comparingByKey(Comparator.reverseOrder())).forEachOrdered(x -> {
List list = (List) result.put(x.getKey(), x.getValue());
});
- result.forEach(k, v -> {
- Map<String, List<SuperAlarm>> mapGroupByAlarmCodeAndMessage = (Map) v.stream().collect(Collectors.groupingBy(s4 -> {
+ result.forEach((k, v) -> {
+ Map<String, List<SuperAlarm>> mapGroupByAlarmCodeAndMessage = v.stream().collect(Collectors.groupingBy(s4 -> {
return s4.getCode() + "-" + s4.getMessage();
}));
- mapGroupByAlarmCodeAndMessage.forEach(key, value -> {
+ mapGroupByAlarmCodeAndMessage.forEach((key, value) -> {
String alarmMessage;
String[] split = k.split("-");
AlarmDataSheetExcelForOther alarmDataSheetExcelForOther = new AlarmDataSheetExcelForOther();
@@ -236,7 +247,7 @@
return new AlarmSummaryGraphVO();
}
List<SuperAlarm> alarms = this.alarmMapper.queryAlarm(null, vo, DateUtil.format(vo.getQueryTime(), "yyyyMMdd"));
- Map<String, Integer> map = (Map) FilterOffUtils.filterOffDay(alarms, OpenTypeEnums.ALARM_ANALYSIS).stream().collect(Collectors.groupingBy((v0) -> {
+ Map<String, Integer> map = FilterOffUtils.filterOffDay(alarms, OpenTypeEnums.ALARM_ANALYSIS).stream().collect(Collectors.groupingBy((v0) -> {
return v0.getCode();
}, Collectors.reducing(0, e -> {
return 1;
@@ -253,7 +264,7 @@
if (Func.isEmpty(shiftInfoDtoList)) {
return new ArrayList();
}
- return (List) shiftInfoDtoList.stream().map(shiftInfoDTO -> {
+ return shiftInfoDtoList.stream().map(shiftInfoDTO -> {
AlarmDataSheetShiftVO alarmDataSheetShiftVO = new AlarmDataSheetShiftVO();
vo.setShiftIndex(shiftInfoDTO.getShiftIndex());
Query query = new Query();
@@ -272,9 +283,9 @@
String shift = MessageUtils.message("mdc.excel.alarm.shift", new Object[0]);
List<ShiftInfoDTO> shiftInfoDtoList = this.shiftDetailService.getShiftInfoDtoList(Lists.newArrayList(new Long[]{vo.getWorkstationId()}), vo.getQueryTime(), vo.getQueryTime());
if (Func.isEmpty(shiftInfoDtoList)) {
- return new ArrayList();
+ return new ArrayList<>();
}
- return (List) shiftInfoDtoList.stream().map(shiftInfoDTO -> {
+ return shiftInfoDtoList.stream().map(shiftInfoDTO -> {
AlarmSummaryGraphShiftVO alarmSummaryGraphShiftVO = new AlarmSummaryGraphShiftVO();
alarmSummaryGraphShiftVO.setShiftIndex(shiftInfoDTO.getShiftIndex());
alarmSummaryGraphShiftVO.setShiftIndexName(Func.isNotEmpty(shiftInfoDTO.getIndexName()) ? shiftInfoDTO.getIndexName() : StrUtil.format("{}{}", new Object[]{shift, shiftInfoDTO.getShiftIndex()}));
@@ -295,7 +306,7 @@
set.add(i.getCode() + i.getMessage() + i.getFactoryDate());
}
});
- Map<String, List<SuperAlarm>> countMap = (Map) tempList.stream().collect(Collectors.groupingBy(c -> {
+ Map<String, List<SuperAlarm>> countMap = tempList.stream().collect(Collectors.groupingBy(c -> {
return c.getFactoryDate() + c.getCode();
}));
List<AlarmDataSheetExcelForOther> result = new ArrayList<>();
@@ -332,12 +343,12 @@
});
Map<String, List<SuperAlarm>> countMap = new HashMap<>();
if (StatisticalMethodEnum.WEEK.equals(vo.getEnums())) {
- countMap = (Map) tempList.stream().collect(Collectors.groupingBy(c -> {
+ countMap = tempList.stream().collect(Collectors.groupingBy(c -> {
return c.getFactoryYear() + "" + c.getFactoryWeek() + c.getCode();
}));
}
if (StatisticalMethodEnum.MONTH.equals(vo.getEnums())) {
- countMap = (Map) tempList.stream().collect(Collectors.groupingBy(c2 -> {
+ countMap = tempList.stream().collect(Collectors.groupingBy(c2 -> {
return c2.getFactoryYear() + "" + c2.getFactoryMonth() + c2.getCode();
}));
}
@@ -368,12 +379,12 @@
splitFilterListVO.getItems().forEach(i -> {
if (map.containsKey(i.getYear())) {
if (StatisticalMethodEnum.WEEK.equals(vo.getEnums())) {
- List<Integer> week = (List) map.get(i.getYear());
+ List<Integer> week = map.get(i.getYear());
week.add(i.getWeek());
map.put(i.getYear(), week);
}
if (StatisticalMethodEnum.MONTH.equals(vo.getEnums())) {
- List<Integer> month = (List) map.get(i.getYear());
+ List<Integer> month = map.get(i.getYear());
month.add(i.getMonth());
map.put(i.getYear(), month);
return;
@@ -381,12 +392,12 @@
return;
}
if (StatisticalMethodEnum.WEEK.equals(vo.getEnums())) {
- ArrayList arrayList = new ArrayList();
+ List<Integer> arrayList = new ArrayList<>();
arrayList.add(i.getWeek());
map.put(i.getYear(), arrayList);
}
if (StatisticalMethodEnum.MONTH.equals(vo.getEnums())) {
- ArrayList arrayList2 = new ArrayList();
+ List<Integer> arrayList2 = new ArrayList<>();
arrayList2.add(i.getMonth());
map.put(i.getYear(), arrayList2);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.java
index 66156a0..2164fe8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.java
@@ -1,12 +1,5 @@
package com.qianwen.smartman.modules.mdc.service.impl;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.math.BigDecimal;
import java.time.DayOfWeek;
import java.time.LocalDate;
@@ -17,20 +10,28 @@
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+
import javax.servlet.http.HttpServletResponse;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.constant.MdcConstant;
-import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
-import com.qianwen.smartman.common.utils.LocalDateUtil;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.oss.model.BladeFile;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.constant.MdcConstant;
+import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
+import com.qianwen.smartman.common.utils.LocalDateUtil;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.WorkstationConvert;
import com.qianwen.smartman.modules.cps.dto.ShiftInfoDTO;
import com.qianwen.smartman.modules.cps.entity.Workstation;
@@ -60,8 +61,8 @@
import com.qianwen.smartman.modules.mdc.vo.StatisticsVO;
import com.qianwen.smartman.modules.mdc.wrapper.StatisticsWrapper;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.util.StrUtil;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.class */
@@ -80,52 +81,6 @@
private final Integer SHIFT3 = 3;
private final Integer SHIFT4 = 4;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -75106384:
- if (implMethodName.equals("getType")) {
- z = false;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
public EfficiencyAnalysisServiceImpl(final ISuperAggregateStateService superAggregateStateService, final IWorkstationService workstationService, final StatisticsWrapper wrapper, final WorkstationMapper workstationMapper, final OssBuilder ossBuilder, final IShiftDetailService shiftDetailService, final IStatisticsService statisticsService) {
this.superAggregateStateService = superAggregateStateService;
this.workstationService = workstationService;
@@ -141,17 +96,19 @@
List<SuperAggregateState> superAggregateStates;
List<String> workStationIdList = statisticsAnalysisQueryVO.getWorkStationIdList();
if (Func.isEmpty(workStationIdList)) {
+ workStationIdList = this.workstationService.list(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode()).eq(Workstation::getStatus, CommonConstant.ENABLE)).stream().map(s -> Func.toStr(s.getId())).collect(Collectors.toList());
+ /*
workStationIdList = (List) this.workstationService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getType();
}, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).stream().map(s -> {
return Func.toStr(s.getId());
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
}
IPage<WorkstationVO> workstationVOPage = this.workstationMapper.queryWorkstationAndGroup(Condition.getPage(query), Func.toLongList(workStationIdList));
IPage<Workstation> workstationPage = WorkstationConvert.INSTANCE.convert(workstationVOPage);
- List<Long> workstationIds = (List) workstationPage.getRecords().stream().map((v0) -> {
+ List<Long> workstationIds = workstationPage.getRecords().stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<IntervalDateDto> intervalDates = LocalDateTimeUtils.getIntervalDate(statisticsAnalysisQueryVO.getStartDate(), statisticsAnalysisQueryVO.getEndDate());
@@ -160,7 +117,7 @@
} else {
superAggregateStates = this.superAggregateStateService.getStatusData(workstationIds, statisticsAnalysisQueryVO.getStatisticalMethod(), statisticsAnalysisQueryVO.getStartDate(), statisticsAnalysisQueryVO.getEndDate());
}
- List<SuperAggregate> superAggregateList = (List) superAggregateStates.stream().filter(x -> {
+ List<SuperAggregate> superAggregateList = superAggregateStates.stream().filter(x -> {
return x.getWcs().intValue() > 0;
}).collect(Collectors.toList());
StatisticsWrapperDto statisticsWrapperDto = new StatisticsWrapperDto(superAggregateList, statisticsAnalysisQueryVO, intervalDates, workstationPage, MdcConstant.STATE);
@@ -222,15 +179,17 @@
List<SuperAggregateState> superAggregateStates;
List<String> workStationIdList = statisticsAnalysisQueryVO.getWorkStationIdList();
if (Func.isEmpty(workStationIdList)) {
+ workStationIdList = (List<String>)this.workstationService.list(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode()).eq(Workstation::getStatus, CommonConstant.ENABLE)).stream().map(s -> Func.toStr(s.getId())).collect(Collectors.toList());
+ /*
workStationIdList = (List) this.workstationService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getType();
}, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).stream().map(s -> {
return Func.toStr(s.getId());
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
}
- List<Long> workstationIds = (List) workStationIdList.stream().map(Long::valueOf).collect(Collectors.toList());
+ List<Long> workstationIds = workStationIdList.stream().map(Long::valueOf).collect(Collectors.toList());
if (Func.isEmpty(workstationIds)) {
return exportEmpty(statisticsAnalysisQueryVO.getStatisticalMethod(), statisticsAnalysisQueryVO.getProductivityType());
}
@@ -240,13 +199,13 @@
} else {
superAggregateStates = this.superAggregateStateService.getStatusData(workstationIds, statisticsAnalysisQueryVO.getStatisticalMethod(), statisticsAnalysisQueryVO.getStartDate(), statisticsAnalysisQueryVO.getEndDate());
}
- List<SuperAggregateState> superAggregateStates2 = (List) superAggregateStates.stream().filter(x -> {
+ List<SuperAggregateState> superAggregateStates2 = superAggregateStates.stream().filter(x -> {
return x.getWcs().intValue() > 0;
}).collect(Collectors.toList());
List<WorkstationVO> workstationVOList = this.workstationMapper.queryWorkstationAndGroup(Condition.getPage(new Query().setSize(-1)), workstationIds).getRecords();
if (StatisticalMethodEnum.SHIFT.equals(statisticsAnalysisQueryVO.getStatisticalMethod())) {
List<ShiftInfoDTO> shiftInfoDtoList = this.shiftDetailService.getShiftInfoDtoList(workstationIds, statisticsAnalysisQueryVO.getStartDate(), statisticsAnalysisQueryVO.getEndDate());
- Map<String, String> shiftInfoMap = (Map) shiftInfoDtoList.stream().collect(Collectors.toMap(s2 -> {
+ Map<String, String> shiftInfoMap = shiftInfoDtoList.stream().collect(Collectors.toMap(s2 -> {
return s2.getDate() + "-" + s2.getWorkstationId() + "-" + s2.getShiftIndex();
}, (v0) -> {
return v0.getIndexName();
@@ -267,8 +226,16 @@
List<List<String>> head = new ArrayList<>();
List<List<Object>> data = new ArrayList<>();
String fileName2 = String.format("%s-%s.xlsx", name, DateUtil.time());
- MultipartFile multipartFile2 = ExcelStrategyUtil.customerExport(fileName2, name, head, data);
- return this.ossBuilder.tempTemplate().putFile(multipartFile2.getOriginalFilename(), multipartFile2);
+ MultipartFile multipartFile2;
+ try {
+ multipartFile2 = ExcelStrategyUtil.customerExport(fileName2, name, head, data);
+ return this.ossBuilder.tempTemplate().putFile(multipartFile2.getOriginalFilename(), multipartFile2);
+ } catch (Exception e) {
+ log.error("瀵煎嚭閿欒",e);
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+
}
private BladeFile export(List<SuperAggregateState> superAggregateList, List<WorkstationVO> workstationVOList, StatisticsAnalysisQueryVO statisticsAnalysisQueryVO) {
@@ -286,50 +253,59 @@
buildData(data, workstationVOList, statisticsAnalysisQueryVO, items, superAggregateList);
String name = getName(statisticsAnalysisQueryVO.getProductivityType());
String fileName = String.format("%s-%s.xlsx", name, DateUtil.time());
- MultipartFile multipartFile = ExcelStrategyUtil.customerExport(fileName, name, head, data);
- return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
+ try {
+ MultipartFile multipartFile = ExcelStrategyUtil.customerExport(fileName, name, head, data);
+ return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
+ } catch (Exception e) {
+ log.error("瀵煎嚭閿欒",e);
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
}
private void buildData(List<List<Object>> data, List<WorkstationVO> workstationVOList, StatisticsAnalysisQueryVO statisticsAnalysisQueryVO, Collection<SplitFilterVO> items, List<SuperAggregateState> superAggregateList) {
workstationVOList.forEach(workstationVO -> {
- List<Long> keyList;
- Map<Long, List<SuperAggregateState>> map;
- ArrayList arrayList = new ArrayList();
+ //List<Long> keyList;
+ //Map<Long, List<SuperAggregateState>> map;
+ ArrayList<Object> arrayList = new ArrayList<>();
arrayList.add(workstationVO.getGroupName());
arrayList.add(workstationVO.getCode());
arrayList.add(workstationVO.getName());
- new ArrayList();
- new HashMap();
+
+ List<Long> keyList = new ArrayList<>();
+ Map<Long, List<SuperAggregateState>> map = new HashMap<>();
+ /*new ArrayList();
+ new HashMap();*/
Long workstationId = workstationVO.getId();
switch (statisticsAnalysisQueryVO.getStatisticalMethod()) {
case WEEK:
- keyList = (List) items.stream().map(s -> {
+ keyList = items.stream().map(s -> {
return Long.valueOf(workstationId.longValue() + s.getYear().intValue() + s.getWeek().intValue());
}).collect(Collectors.toList());
- map = (Map) superAggregateList.stream().collect(Collectors.groupingBy(s2 -> {
+ map = superAggregateList.stream().collect(Collectors.groupingBy(s2 -> {
return Long.valueOf(s2.getWorkstationId().longValue() + s2.getFactoryYear().intValue() + s2.getFactoryWeek().intValue());
}));
break;
case DAY:
- keyList = (List) items.stream().map(s3 -> {
+ keyList = items.stream().map(s3 -> {
return Long.valueOf(workstationId.longValue() + Integer.parseInt(s3.getDate().replace("-", "")));
}).collect(Collectors.toList());
- map = (Map) superAggregateList.stream().collect(Collectors.groupingBy(s4 -> {
+ map = superAggregateList.stream().collect(Collectors.groupingBy(s4 -> {
return Long.valueOf(s4.getWorkstationId().longValue() + s4.getFactoryDate().intValue());
}));
break;
default:
- keyList = (List) items.stream().map(s5 -> {
+ keyList = items.stream().map(s5 -> {
return Long.valueOf(workstationId.longValue() + s5.getYear().intValue() + s5.getMonth().intValue());
}).collect(Collectors.toList());
- map = (Map) superAggregateList.stream().collect(Collectors.groupingBy(s6 -> {
+ map = superAggregateList.stream().collect(Collectors.groupingBy(s6 -> {
return Long.valueOf(s6.getWorkstationId().longValue() + s6.getFactoryYear().intValue() + s6.getFactoryMonth().intValue());
}));
break;
}
Map<Long, List<SuperAggregateState>> finalMap = map;
keyList.forEach(key -> {
- List<SuperAggregateState> superAggregateStates = (List) finalMap.get(key);
+ List<SuperAggregateState> superAggregateStates = finalMap.get(key);
if (Func.isEmpty(superAggregateStates)) {
arrayList.add(ZERO);
return;
@@ -365,7 +341,7 @@
public BladeFile exportShift(List<IntervalDateDto> intervalDates, List<SuperAggregateState> superAggregateList, List<WorkstationVO> workstationVOList, List<Integer> shiftIndexList, ProductivityTypeEnum productivityTypeEnum, Map<String, String> shiftInfoMap) {
String message = MessageUtils.message("mdc.not.schedule", new Object[0]);
- Map<String, List<SuperAggregateState>> map = (Map) superAggregateList.stream().collect(Collectors.groupingBy(s -> {
+ Map<String, List<SuperAggregateState>> map = superAggregateList.stream().collect(Collectors.groupingBy(s -> {
return s.getFactoryDate() + "-" + s.getWorkstationId() + "-" + s.getShiftIndex();
}));
List<EfficiencyAnalysisExport> efficiencyAnalysisExportList = new ArrayList<>();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java
index 37340ce..544b284 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java
@@ -1,31 +1,31 @@
package com.qianwen.smartman.modules.mdc.service.impl;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-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.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.constant.ExcelConstant;
-import com.qianwen.smartman.common.constant.MdcConstant;
-import com.qianwen.smartman.common.constant.ShiftConstant;
-import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.oss.model.BladeFile;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.constant.ExcelConstant;
+import com.qianwen.smartman.common.constant.MdcConstant;
+import com.qianwen.smartman.common.constant.ShiftConstant;
+import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.WorkstationConvert;
import com.qianwen.smartman.modules.cps.dto.ShiftInfoDTO;
import com.qianwen.smartman.modules.cps.entity.Workstation;
@@ -53,8 +53,8 @@
import com.qianwen.smartman.modules.mdc.vo.StatisticsVO;
import com.qianwen.smartman.modules.mdc.wrapper.StatisticsWrapper;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.util.StrUtil;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/OutputStatisticsServiceImpl.class */
@@ -70,52 +70,6 @@
private static final Logger log = LoggerFactory.getLogger(OutputStatisticsServiceImpl.class);
private static final String FILENAME = String.format("%s-%s.xlsx", ExcelConstant.OUTPUT_ACCOUNT, DateUtil.time());
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -75106384:
- if (implMethodName.equals("getType")) {
- z = false;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
public OutputStatisticsServiceImpl(final IWorkstationService workstationService, final ISuperAggregateOutputService superAggregateOutputService, final StatisticsWrapper wrapper, final WorkstationMapper workstationMapper, final IShiftDetailService shiftDetailService, final OssBuilder ossBuilder, final IStatisticsService statisticsService) {
this.workstationService = workstationService;
this.superAggregateOutputService = superAggregateOutputService;
@@ -130,17 +84,20 @@
public StatisticsVO outputStatistics(StatisticsAnalysisQueryVO statisticsAnalysisQueryVO, Query query) {
List<String> workStationIdList = statisticsAnalysisQueryVO.getWorkStationIdList();
if (Func.isEmpty(workStationIdList)) {
+ workStationIdList = this.workstationService.list(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode())
+ .eq(Workstation::getStatus, CommonConstant.ENABLE)).stream().map(s -> Func.toStr(s.getId())).collect(Collectors.toList());
+ /*
workStationIdList = (List) this.workstationService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getType();
}, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).stream().map(s -> {
return Func.toStr(s.getId());
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
}
IPage<WorkstationVO> workstationVOPage = this.workstationMapper.queryWorkstationAndGroup(Condition.getPage(query), Func.toLongList(workStationIdList));
IPage<Workstation> workstationPage = WorkstationConvert.INSTANCE.convert(workstationVOPage);
- List<Long> workstationIds = (List) workstationPage.getRecords().stream().map((v0) -> {
+ List<Long> workstationIds = workstationPage.getRecords().stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<IntervalDateDto> intervalDates = LocalDateTimeUtils.getIntervalDate(statisticsAnalysisQueryVO.getStartDate(), statisticsAnalysisQueryVO.getEndDate());
@@ -155,15 +112,19 @@
StatisticalMethodEnum statisticalMethod = analysisQueryVO.getStatisticalMethod();
List<String> workStationIdList = analysisQueryVO.getWorkStationIdList();
if (Func.isEmpty(workStationIdList)) {
+ workStationIdList = (List<String>)this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
+ .eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode())
+ .eq(Workstation::getStatus, CommonConstant.ENABLE)).stream().map(s -> Func.toStr(s.getId())).collect(Collectors.toList());
+ /*
workStationIdList = (List) this.workstationService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getType();
}, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).stream().map(s -> {
return Func.toStr(s.getId());
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
}
- List<Long> workstationIds = (List) workStationIdList.stream().map(Long::valueOf).collect(Collectors.toList());
+ List<Long> workstationIds = workStationIdList.stream().map(Long::valueOf).collect(Collectors.toList());
if (Func.isEmpty(workstationIds)) {
return exportEmpty(statisticalMethod);
}
@@ -173,7 +134,7 @@
List<WorkstationVO> workstationVOList = this.workstationMapper.queryWorkstationAndGroup(Condition.getPage(new Query().setSize(-1)), workstationIds).getRecords();
if (StatisticalMethodEnum.SHIFT.equals(statisticalMethod)) {
List<ShiftInfoDTO> shiftInfoDtoList = this.shiftDetailService.getShiftInfoDtoList(workstationIds, analysisQueryVO.getStartDate(), analysisQueryVO.getEndDate());
- Map<String, String> shiftInfoMap = (Map) shiftInfoDtoList.stream().collect(Collectors.toMap(s2 -> {
+ Map<String, String> shiftInfoMap = shiftInfoDtoList.stream().collect(Collectors.toMap(s2 -> {
return s2.getDate() + "-" + s2.getWorkstationId() + "-" + s2.getShiftIndex();
}, (v0) -> {
return v0.getIndexName();
@@ -191,8 +152,15 @@
}
List<List<String>> heads = new ArrayList<>();
List<List<Object>> columnData = new ArrayList<>();
- MultipartFile multipartFile = ExcelStrategyUtil.customerExport(FILENAME, ExcelConstant.OUTPUT_ACCOUNT, heads, columnData);
- return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
+ MultipartFile multipartFile;
+ try {
+ multipartFile = ExcelStrategyUtil.customerExport(FILENAME, ExcelConstant.OUTPUT_ACCOUNT, heads, columnData);
+ return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
+ } catch (Exception e) {
+ log.error("瀵煎嚭閿欒",e);
+ throw new RuntimeException(e);
+ }
+
}
private BladeFile exportOutputs(List<SuperAggregateOutput> aggregateOutputs, List<WorkstationVO> workstationVOList, StatisticsAnalysisQueryVO statisticsAnalysisQueryVO) {
@@ -208,12 +176,17 @@
Collection<SplitFilterVO> items = splitFilterListVO.getItems();
buildExcelHeads(heads, items, statisticalMethod);
buildExcelData(columnData, workstationVOList, statisticsAnalysisQueryVO, items, aggregateOutputs);
- MultipartFile multipartFile = ExcelStrategyUtil.customerExport(FILENAME, ExcelConstant.OUTPUT_ACCOUNT, heads, columnData);
- return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
+ try {
+ MultipartFile multipartFile = ExcelStrategyUtil.customerExport(FILENAME, ExcelConstant.OUTPUT_ACCOUNT, heads, columnData);
+ return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
+ } catch (Exception e) {
+ log.error("瀵煎嚭閿欒",e);
+ throw new RuntimeException(e);
+ }
}
public BladeFile exportOutputShift(List<IntervalDateDto> intervalDates, List<SuperAggregate> superAggregates, List<WorkstationVO> workstationVOList, List<Integer> shiftIndexList, Map<String, String> shiftInfoMap) {
- Map<String, List<SuperAggregate>> map = (Map) superAggregates.stream().collect(Collectors.groupingBy(s -> {
+ Map<String, List<SuperAggregate>> map =superAggregates.stream().collect(Collectors.groupingBy(s -> {
return s.getFactoryDate() + "-" + s.getWorkstationId() + "-" + s.getShiftIndex();
}));
List<OutputShiftIndexSheetExcel> sheetExcels = new ArrayList<>();
@@ -230,7 +203,7 @@
buildEmptyData(index, excel, MessageUtils.message("mdc.not.schedule", new Object[0]));
return;
}
- List<SuperAggregate> superAggregateList = (List) map.get(intDayKey);
+ List<SuperAggregate> superAggregateList = map.get(intDayKey);
if (Func.isEmpty(superAggregateList)) {
buildData(index, excel, shiftName, ZERO);
return;
@@ -250,40 +223,41 @@
workstationVOList.forEach(workstationVO -> {
List<Long> keyList;
Map<Long, List<SuperAggregateOutput>> map;
- ArrayList arrayList = new ArrayList();
+ List<Object> arrayList = new ArrayList<>();
arrayList.add(workstationVO.getGroupName());
arrayList.add(workstationVO.getCode());
arrayList.add(workstationVO.getName());
+
Long workstationId = workstationVO.getId();
switch (statisticalMethod) {
case DAY:
- keyList = (List) items.stream().map(s -> {
+ keyList = items.stream().map(s -> {
return Long.valueOf(workstationId.longValue() + Integer.parseInt(s.getDate().replace("-", "")));
}).collect(Collectors.toList());
- map = (Map) aggregateOutputs.stream().collect(Collectors.groupingBy(s2 -> {
+ map = aggregateOutputs.stream().collect(Collectors.groupingBy(s2 -> {
return Long.valueOf(s2.getWorkstationId().longValue() + s2.getFactoryDate().intValue());
}));
break;
case WEEK:
- keyList = (List) items.stream().map(s3 -> {
+ keyList = items.stream().map(s3 -> {
return Long.valueOf(workstationId.longValue() + s3.getYear().intValue() + s3.getWeek().intValue());
}).collect(Collectors.toList());
- map = (Map) aggregateOutputs.stream().collect(Collectors.groupingBy(s4 -> {
+ map = aggregateOutputs.stream().collect(Collectors.groupingBy(s4 -> {
return Long.valueOf(s4.getWorkstationId().longValue() + s4.getFactoryYear().intValue() + s4.getFactoryWeek().intValue());
}));
break;
default:
- keyList = (List) items.stream().map(s5 -> {
+ keyList = items.stream().map(s5 -> {
return Long.valueOf(workstationId.longValue() + s5.getYear().intValue() + s5.getMonth().intValue());
}).collect(Collectors.toList());
- map = (Map) aggregateOutputs.stream().collect(Collectors.groupingBy(s6 -> {
+ map = aggregateOutputs.stream().collect(Collectors.groupingBy(s6 -> {
return Long.valueOf(s6.getWorkstationId().longValue() + s6.getFactoryYear().intValue() + s6.getFactoryMonth().intValue());
}));
break;
}
Map<Long, List<SuperAggregateOutput>> finalMap = map;
keyList.forEach(key -> {
- List<SuperAggregateOutput> superAggregateOutputs = (List) finalMap.get(key);
+ List<SuperAggregateOutput> superAggregateOutputs = finalMap.get(key);
if (Func.isEmpty(superAggregateOutputs)) {
arrayList.add(ZERO);
} else {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
index a56d30e..78b302d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
@@ -115,14 +115,14 @@
String workstationId = vo.getWorkstationId();
Integer flag = vo.getFlag();
String item = vo.getItem();
- long total = ((Long) Optional.ofNullable(this.parameterMapper.countProcessParameter(item, Long.valueOf(startTime), Long.valueOf(endTime), workstationId)).orElse(0L)).longValue();
- Page page = new Page(current, size, total);
+ long total = Optional.ofNullable(this.parameterMapper.countProcessParameter(item, Long.valueOf(startTime), Long.valueOf(endTime), workstationId)).orElse(0L).longValue();
+ Page<ProcessParameterRealVO> page = new Page<>(current, size, total);
if (total == 0) {
return page;
}
List<ProcessParameterVO> res = this.parameterMapper.pageProcessParameter(Integer.valueOf(size), Integer.valueOf((current - 1) * size), Long.valueOf(startTime), Long.valueOf(endTime), item, workstationId);
Map<String, String> map = getWcsMap();
- List<ProcessParameterRealVO> collect = (List) res.stream().map(c -> {
+ List<ProcessParameterRealVO> collect = res.stream().map(c -> {
String value;
if (MdcConstant.FLAG.equals(flag)) {
value = (String) map.get(c.getValue());
@@ -137,7 +137,7 @@
@Override // org.springblade.modules.mdc.service.IProcessParameterService
public List<WorkstationWcsDmpDTO> processParam(String workstationId) {
- List<WorkstationWcsDmpDTO> vos = (List) WorkstationCache.getWorkstationWcsList(workstationId).stream().filter((v0) -> {
+ List<WorkstationWcsDmpDTO> vos =WorkstationCache.getWorkstationWcsList(workstationId).stream().filter((v0) -> {
return v0.getProcessParameter();
}).collect(Collectors.toList());
if (Func.isEmpty(vos)) {
@@ -161,7 +161,12 @@
@Override // org.springblade.modules.mdc.service.IProcessParameterService
public BladeFile exportProcessParam(ProcessParamExcelVO vo) {
- return exportByHour(vo);
+ try {
+ return exportByHour(vo);
+ } catch (Exception e) {
+ log.error("exportProcessParam寮傚父",e);
+ throw new RuntimeException(e);
+ }
}
@Override // org.springblade.modules.mdc.service.IProcessParameterService
@@ -200,17 +205,32 @@
Map<String, String> nameMap = Maps.newHashMap();
Set<String> codes = Sets.newHashSet();
buildWcsMap(colorMap, nameMap, codes);
- List<StatusDTO> collect = (List) processParameterList.stream().filter(c -> {
+ List<StatusDTO> list = processParameterList.stream().filter(c -> codes.contains(c.getValue())).map(param -> StatusDTO.builder().time(DateUtil.formatDateTime(DateUtil.fromMilliseconds(param.getRealTime().longValue()))).name((String)nameMap.get(param.getValue())).color((String)colorMap.get(param.getValue())).value(param.getValue()).build()).collect(Collectors.toList());
+ /*
+ List<StatusDTO> collect = processParameterList.stream().filter(c -> {
return codes.contains(c.getValue());
}).map(param -> {
return StatusDTO.builder().time(DateUtil.formatDateTime(DateUtil.fromMilliseconds(param.getRealTime().longValue()))).name((String) nameMap.get(param.getValue())).color((String) colorMap.get(param.getValue())).value(param.getValue()).build();
- }).collect(Collectors.toList());
- return CollectParamResVO.builder().collectItem(dmpDTO.getDescription()).collectRealItem(dmpDTO.getName()).data(collect).build();
+ }).collect(Collectors.toList());*/
+ return CollectParamResVO.<StatusDTO>builder()
+ .collectItem(dmpDTO.getDescription())
+ .collectRealItem(dmpDTO.getName())
+ .data(list)
+ .build();
+ //return CollectParamResVO.builder().collectItem(dmpDTO.getDescription()).collectRealItem(dmpDTO.getName()).data(list).build();
}
+ List<ParamDTO> collect = processParameterList.stream().map(param -> ParamDTO.builder().time(DateUtil.formatDateTime(DateUtil.fromMilliseconds(param.getRealTime().longValue()))).value(param.getValue()).build()).collect(Collectors.toList());
+ return CollectParamResVO.<ParamDTO>builder()
+ .collectItem(dmpDTO.getDescription())
+ .collectRealItem(dmpDTO.getName())
+ .data(collect)
+ .build();
+ /*
List<ParamDTO> collect2 = (List) processParameterList.stream().map(param2 -> {
return ParamDTO.builder().time(DateUtil.formatDateTime(DateUtil.fromMilliseconds(param2.getRealTime().longValue()))).value(param2.getValue()).build();
}).collect(Collectors.toList());
return CollectParamResVO.builder().collectItem(dmpDTO.getDescription()).collectRealItem(dmpDTO.getName()).data(collect2).build();
+ */
}
private void buildWcsMap(Map<String, String> colorMap, Map<String, String> nameMap, Set<String> codes) {
@@ -257,11 +277,11 @@
LocalDate lastDays = ((LocalDate) ListUtils.getLast(dates)).plusDays(1L);
dates.add(firstDays);
dates.add(lastDays);
- List<ShiftTimeDetailVO> shiftDetailDates = this.calendarService.getShiftDetailDates(workstation.getCalendarCode(), (List) dates.stream().distinct().collect(Collectors.toList()));
+ List<ShiftTimeDetailVO> shiftDetailDates = this.calendarService.getShiftDetailDates(workstation.getCalendarCode(), dates.stream().distinct().collect(Collectors.toList()));
if (Func.isEmpty(shiftDetailDates)) {
return Lists.newArrayList();
}
- return (List) shiftDetailDates.stream().map(shiftTime -> {
+ return shiftDetailDates.stream().map(shiftTime -> {
LocalDate date = shiftTime.getCalendarDate();
LocalDateTime startTime = LocalDateTime.of(date, LocalTime.MIN).plusMinutes(shiftTime.getShiftStartTime().intValue());
LocalDateTime endTime = LocalDateTime.of(date, LocalTime.MIN).plusMinutes(shiftTime.getShiftEndTime().intValue());
@@ -282,20 +302,20 @@
throw new ServiceException(MessageUtils.message("mdc.process.time.not.null", new Object[0]));
}
String workstationId = vo.getWorkstationId();
- List<WorkstationWcsDmpDTO> vos = (List) WorkstationCache.getWorkstationWcsList(workstationId).stream().filter((v0) -> {
+ List<WorkstationWcsDmpDTO> vos = WorkstationCache.getWorkstationWcsList(workstationId).stream().filter((v0) -> {
return v0.getProcessParameter();
}).collect(Collectors.toList());
if (Func.isEmpty(vos)) {
return new ProcessParameterResVO();
}
- Map<String, WorkstationWcsDmpDTO> collectItemMap = (Map) vos.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, WorkstationWcsDmpDTO> collectItemMap = vos.stream().collect(Collectors.toMap((v0) -> {
return v0.getName();
}, v -> {
return v;
}));
log.info("宸ヤ綅鐨勯噰闆嗛」:{}", vos);
WorkstationWcsDmpDTO wcs = WorkstationCache.getDmpStatus(workstationId);
- List<String> collectItems = (List) vos.stream().map((v0) -> {
+ List<String> collectItems = vos.stream().map((v0) -> {
return v0.getName();
}).collect(Collectors.toList());
List<ProcessParameterVO> dtoList = oldProcessParameterList(startTime, endTime, collectItems, workstationId);
@@ -319,13 +339,13 @@
if (Func.isNull(workstation)) {
return new ProcessParameterResVO();
}
- List<WorkstationWcsDmpDTO> vos = (List) WorkstationCache.getWorkstationWcsList(workstationId).stream().filter((v0) -> {
+ List<WorkstationWcsDmpDTO> vos = WorkstationCache.getWorkstationWcsList(workstationId).stream().filter((v0) -> {
return v0.getProcessParameter();
}).collect(Collectors.toList());
if (Func.isEmpty(vos)) {
return new ProcessParameterResVO();
}
- Map<String, WorkstationWcsDmpDTO> collectItemMap = (Map) vos.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, WorkstationWcsDmpDTO> collectItemMap = vos.stream().collect(Collectors.toMap((v0) -> {
return v0.getName();
}, v -> {
return v;
@@ -336,7 +356,7 @@
return (ProcessParameterResVO) Optional.ofNullable(timeSliceShift).map(time -> {
Date startTime = time.getStartTime();
Date endTime = time.getEndTime();
- List<String> collectItems = (List) vos.stream().map((v0) -> {
+ List<String> collectItems = vos.stream().map((v0) -> {
return v0.getName();
}).collect(Collectors.toList());
List<ProcessParameterVO> parameterList = oldProcessParameterList(startTime, endTime, collectItems, workstationId);
@@ -360,7 +380,7 @@
}
List<WorkstationWcsDmpDTO> vos = getWorkstationWcsDmpDTO(isFilterProcessParameter, workstationId);
if (isFilterProcessParameter.booleanValue()) {
- vos = (List) vos.stream().filter((v0) -> {
+ vos = vos.stream().filter((v0) -> {
return v0.getProcessParameter();
}).collect(Collectors.toList());
}
@@ -432,7 +452,7 @@
}
private List<List<Object>> buildExcelContentByHour(List<WorkstationWcsDmpDTO> collectItem, List<NewParamDTO> parameterList, WorkstationWcsDmpDTO wcs, Workstation workstation, String groupName, List<CalendarShiftDTO> timeShiftAll) {
- List<Tuple> times = (List) timeShiftAll.stream().map(calendarShiftDTO -> {
+ List<Tuple> times = timeShiftAll.stream().map(calendarShiftDTO -> {
Date startTime = DateUtil.plusMinutes(DateUtil.parse(calendarShiftDTO.getCalendarDate(), DateConstant.PATTERN_DATE), calendarShiftDTO.getShiftStartTime().intValue());
Date endTime = DateUtil.plusMinutes(DateUtil.parse(calendarShiftDTO.getCalendarDate(), DateConstant.PATTERN_DATE), calendarShiftDTO.getShiftEndTime().intValue());
long start = startTime.getTime();
@@ -447,7 +467,7 @@
parameterList.forEach(dto -> {
Long time = dto.getTs();
Map<String, Object> valueMap = JsonUtil.toMap(dto.getV());
- ArrayList newArrayList = Lists.newArrayList();
+ ArrayList<Object> newArrayList = Lists.newArrayList();
newArrayList.add(groupName);
newArrayList.add(code);
newArrayList.add(name);
@@ -512,14 +532,14 @@
nameMap.put(globalWcs.getCode(), globalWcs.getName());
codes.add(globalWcs.getCode());
}
- Map<String, List<ProcessParameterVO>> map = (Map) dtoList.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<String, List<ProcessParameterVO>> map = dtoList.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getCollectItem();
}));
List<ProParamResDTO> res = Lists.newArrayList();
- map.forEach(k, v -> {
+ map.forEach((k, v) -> {
ProParamResDTO dto;
if (Func.isNotEmpty(wcs) && wcs.getName().equals(k)) {
- List<ProcessWcsDTO> collect = (List) v.stream().filter(c -> {
+ List<ProcessWcsDTO> collect = v.stream().filter(c -> {
return codes.contains(c.getValue());
}).map(c2 -> {
return ProcessWcsDTO.builder().realTime(c2.getRealTime()).time(DateUtil.format(c2.getTime(), "yyyy-MM-dd HH:mm:ss.SSS")).name((String) nameMap.get(c2.getValue())).value(c2.getValue()).color((String) colorMap.get(c2.getValue())).build();
@@ -528,7 +548,7 @@
})).collect(Collectors.toList());
dto = ProParamResDTO.builder().collectRealItem(k).collectItem(wcs.getDescription()).dataType(wcs.getWcsDataType()).statusData(collect).build();
} else {
- List<ProcessParameterRealVO> collect2 = (List) v.stream().map(c3 -> {
+ List<ProcessParameterRealVO> collect2 = v.stream().map(c3 -> {
return ProcessParameterRealVO.builder().realTime(c3.getRealTime()).time(DateUtil.format(c3.getTime(), "yyyy-MM-dd HH:mm:ss.SSS")).collectItem(c3.getCollectItem()).value(c3.getValue()).build();
}).sorted(Comparator.comparing((v0) -> {
return v0.getTime();
@@ -573,7 +593,7 @@
Long time = dto.getTs();
Map<String, Object> valueMap = JsonUtil.toMap(dto.getV());
String firstContent = DateUtil.format(DateUtil.fromMilliseconds(time.longValue()), "yyyy-MM-dd HH:mm:ss.SSS");
- ArrayList newArrayList = Lists.newArrayList(new Object[]{firstContent});
+ ArrayList<Object> newArrayList = Lists.newArrayList(new Object[]{firstContent});
buildContent(vos, valueMap, wcs, wcsMap, newArrayList);
res.add(newArrayList);
});
@@ -598,7 +618,7 @@
private Map<String, String> getWcsMap() {
List<GlobalWcs> globalWcs = listGlobalWcs();
- return (Map) globalWcs.stream().collect(Collectors.toMap((v0) -> {
+ return globalWcs.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, (v0) -> {
return v0.getName();
@@ -608,7 +628,7 @@
private List<WorkstationWcsDmpDTO> getWorkstationWcsDmpDTO(Boolean isFilterProcessParameter, String workstationId) {
List<WorkstationWcsDmpDTO> vos = WorkstationCache.getWorkstationWcsList(workstationId);
if (isFilterProcessParameter.booleanValue()) {
- vos = (List) vos.stream().filter((v0) -> {
+ vos = vos.stream().filter((v0) -> {
return v0.getProcessParameter();
}).collect(Collectors.toList());
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatisticsServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatisticsServiceImpl.java
index a9a5099..f303785 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatisticsServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatisticsServiceImpl.java
@@ -22,7 +22,6 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/StatisticsServiceImpl.class */
public class StatisticsServiceImpl implements IStatisticsService {
@Override // org.springblade.modules.mdc.service.IStatisticsService
public SplitFilterListVO organizeQueryConditions(AnalysisFilterVO input) {
@@ -44,7 +43,7 @@
buildMonthData(intervalDateDtoList, result);
}
SplitFilterListVO vo = new SplitFilterListVO();
- vo.setItems((Collection) result.stream().map(c -> {
+ vo.setItems( result.stream().map(c -> {
SplitFilterVO voItem = new SplitFilterVO();
voItem.setTitle(c.getTitle());
voItem.setDate(c.getDate());
@@ -97,7 +96,7 @@
IntervalDateDto intervalDateDto = intervalDateDtoList.get(0);
List<String> dayList = intervalDateDto.getDayList();
dayList.forEach(day -> {
- shiftKeyNameMap.forEach(shiftIndex, shiftName -> {
+ shiftKeyNameMap.forEach((shiftIndex, shiftName) -> {
String code = StrUtil.format("{}_{}", new Object[]{day, shiftIndex});
String title = StrUtil.format("{}-{}", new Object[]{day, shiftKeyNameMap.get(String.valueOf(shiftIndex))});
LocalDate localDate = LocalDateUtil.stringToLocalDate(day, DateConstant.PATTERN_DATE);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java
index bebc97f..58d60d6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java
@@ -1,12 +1,5 @@
package com.qianwen.smartman.modules.mdc.service.impl;
-import cn.hutool.core.util.NumberUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.time.LocalDate;
@@ -24,8 +17,20 @@
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+import com.qianwen.core.excel.util.ExcelUtil;
+import com.qianwen.core.mp.base.BaseEntity;
+import com.qianwen.core.oss.model.BladeFile;
+import com.qianwen.core.tool.utils.DateUtil;
+import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.cache.cps.WorkstationCache;
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.common.constant.DateConstant;
@@ -34,10 +39,6 @@
import com.qianwen.smartman.common.utils.CommonUtil;
import com.qianwen.smartman.common.utils.ListUtils;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
-import com.qianwen.core.excel.util.ExcelUtil;
-import com.qianwen.core.oss.model.BladeFile;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.enums.WorkstationTypeEnum;
@@ -67,73 +68,16 @@
import com.qianwen.smartman.modules.mdc.vo.excel.StatusRecordExcelVO;
import com.qianwen.smartman.modules.mdc.wrapper.WorkstationFeedbackWrapper;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.util.NumberUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/StatusRecordServiceImpl.class */
public class StatusRecordServiceImpl implements IStatusRecordService {
private static final Logger log = LoggerFactory.getLogger(StatusRecordServiceImpl.class);
private final ISuperAggregateStateService superAggregateStateService;
private final ITimeUsedAnalysisService timeUsedAnalysisService;
private final IWorkstationService workstationService;
private final OssBuilder ossBuilder;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -75106384:
- if (implMethodName.equals("getType")) {
- z = false;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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");
- }
public StatusRecordServiceImpl(final ISuperAggregateStateService superAggregateStateService, final ITimeUsedAnalysisService timeUsedAnalysisService, final IWorkstationService workstationService, final OssBuilder ossBuilder) {
this.superAggregateStateService = superAggregateStateService;
@@ -147,6 +91,14 @@
List<StatusRecordDateVO> result = new ArrayList<>();
List<WorkstationInfoVO> workstationList = statusRecordDateSelectVO.getWorkstationInfoList();
if (Func.isEmpty(workstationList)) {
+ workstationList = (List<WorkstationInfoVO>)this.workstationService.list(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode()).eq(BaseEntity::getStatus, CommonConstant.ENABLE)).stream().map(s -> {
+ WorkstationInfoVO workstationInfoVO = new WorkstationInfoVO();
+ workstationInfoVO.setId(s.getId());
+ workstationInfoVO.setName(s.getName());
+ workstationInfoVO.setCode(s.getCode());
+ return workstationInfoVO;
+ }).collect(Collectors.toList());
+ /*
workstationList = (List) this.workstationService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getType();
}, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
@@ -157,19 +109,19 @@
workstationInfoVO.setName(s.getName());
workstationInfoVO.setCode(s.getCode());
return workstationInfoVO;
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
}
page.setTotal(workstationList.size());
- List<WorkstationInfoVO> workstationList2 = (List) workstationList.stream().skip((page.getCurrent() - 1) * page.getSize()).limit(page.getSize()).collect(Collectors.toList());
- List<Long> workstationIdList = (List) workstationList2.stream().map((v0) -> {
+ List<WorkstationInfoVO> workstationList2 = workstationList.stream().skip((page.getCurrent() - 1) * page.getSize()).limit(page.getSize()).collect(Collectors.toList());
+ List<Long> workstationIdList = workstationList2.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<SuperAggregateState> superAggregateStateList = this.superAggregateStateService.getStatusData(workstationIdList, null, statusRecordDateSelectVO.getDate(), statusRecordDateSelectVO.getDate());
- Map<Long, List<SuperAggregateState>> workstationStatusMap = (Map) superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, List<SuperAggregateState>> workstationStatusMap = superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
workstationList2.forEach(x -> {
- StatusRecordDateVO statusRecord = new StatusRecordDateVO().setWorkstationInfo(x).setStatusRecordList(StatusRecordConvert.INSTANCE.convert((List) workstationStatusMap.get(x.getId())));
+ StatusRecordDateVO statusRecord = new StatusRecordDateVO().setWorkstationInfo(x).setStatusRecordList(StatusRecordConvert.INSTANCE.convert(workstationStatusMap.get(x.getId())));
result.add(statusRecord);
});
return page.setRecords(result);
@@ -181,11 +133,11 @@
Long workstationId = statusRecordWorkstationSelectVO.getWorkstationId();
List<LocalDate> dateList = LocalDateTimeUtils.getDateList(statusRecordWorkstationSelectVO.getStartDate(), statusRecordWorkstationSelectVO.getEndDate());
page.setTotal(dateList.size());
- List<LocalDate> dateList2 = (List) dateList.stream().skip((page.getCurrent() - 1) * page.getSize()).limit(page.getSize()).collect(Collectors.toList());
+ List<LocalDate> dateList2 = dateList.stream().skip((page.getCurrent() - 1) * page.getSize()).limit(page.getSize()).collect(Collectors.toList());
statusRecordWorkstationSelectVO.setStartDate((LocalDate) ListUtils.getFirst(dateList2));
statusRecordWorkstationSelectVO.setEndDate((LocalDate) ListUtils.getLast(dateList2));
List<SuperAggregateState> superAggregateStateList = this.superAggregateStateService.getStatusData(Arrays.asList(workstationId), null, statusRecordWorkstationSelectVO.getStartDate(), statusRecordWorkstationSelectVO.getEndDate());
- Map<String, List<SuperAggregateState>> dateStatusMap = (Map) superAggregateStateList.stream().collect(Collectors.groupingBy(x -> {
+ Map<String, List<SuperAggregateState>> dateStatusMap = superAggregateStateList.stream().collect(Collectors.groupingBy(x -> {
return DateUtil.format(x.getStartTime(), DateConstant.PATTERN_DATE);
}, LinkedHashMap::new, Collectors.toList()));
long daysBetween = LocalDateTimeUtils.getDifference(statusRecordWorkstationSelectVO.getStartDate(), statusRecordWorkstationSelectVO.getEndDate()).intValue();
@@ -201,13 +153,13 @@
public List<ChartDataVO> getTimeDistribution(StatusRecordDetailSelectVO statusRecordDetailSelectVO) {
List<ChartDataVO> result = new ArrayList<>();
List<SuperAggregateState> superAggregateStateList = this.superAggregateStateService.getStatusData(Arrays.asList(statusRecordDetailSelectVO.getWorkstationId()), null, statusRecordDetailSelectVO.getDate(), statusRecordDetailSelectVO.getDate());
- Map<Integer, Long> wcsMap = (Map) superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Integer, Long> wcsMap = superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWcs();
}, HashMap::new, Collectors.summingLong((v0) -> {
return v0.getDurationCollect();
})));
for (Map.Entry<Integer, Long> entry : wcsMap.entrySet()) {
- ChartDataVO chartData = new ChartDataVO().setName(entry.getKey() + "").setValue(Double.valueOf(BigDecimal.valueOf(entry.getValue().longValue()).divide(BigDecimal.valueOf(60000L), 2, 4).doubleValue()));
+ ChartDataVO<Object> chartData = new ChartDataVO<>().setName(entry.getKey() + "").setValue(Double.valueOf(BigDecimal.valueOf(entry.getValue().longValue()).divide(BigDecimal.valueOf(60000L), 2, 4).doubleValue()));
result.add(chartData);
}
return result;
@@ -241,11 +193,11 @@
List<SuperAggregateState> superAggregateStateList = statusData;
List<ShiftIndexNameDTO> shiftIndexList = getWorkstationShiftIndexList(workstationId, statusRecordDetailSelectVO.getDate());
Optional.ofNullable(shiftIndexList).ifPresent(p -> {
- Map<Integer, List<SuperAggregateState>> shiftIndexStatusMap = (Map) superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Integer, List<SuperAggregateState>> shiftIndexStatusMap =superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getShiftIndex();
}));
p.forEach(x -> {
- List<StatusRecordVO> listRecord = (List) Optional.ofNullable(StatusRecordConvert.INSTANCE.convert((List) shiftIndexStatusMap.get(x.getShiftIndex()))).map(list -> {
+ List<StatusRecordVO> listRecord = Optional.ofNullable(StatusRecordConvert.INSTANCE.convert( shiftIndexStatusMap.get(x.getShiftIndex()))).map(list -> {
return statusRecordDetailSelectVO.isHumanFeedback() ? WorkstationFeedbackWrapper.entityVO((List<StatusRecordVO>) list) : list;
}).orElse(null);
StatusRecordShiftIndexChartVO statusRecord = new StatusRecordShiftIndexChartVO().setShiftIndex(x.getShiftIndex()).setShiftIndexName(x.getShiftIndexName()).setStatusRecordList(listRecord);
@@ -268,18 +220,18 @@
List<SuperAggregateState> superAggregateStateList = statusData;
List<ShiftIndexNameDTO> shiftIndexList = getWorkstationShiftIndexList(workstationId, statusRecordDetailSelectVO.getDate());
Optional.ofNullable(shiftIndexList).ifPresent(p -> {
- Map<Integer, List<SuperAggregateState>> shiftIndexStatusMap = (Map) superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Integer, List<SuperAggregateState>> shiftIndexStatusMap = superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getShiftIndex();
}));
p.forEach(x -> {
HashMap<String, String> hashMap = new HashMap<>(16);
hashMap.put("shiftIndex", x.getShiftIndex() + "");
hashMap.put("shiftIndexName", x.getShiftIndexName());
- List<SuperAggregateState> shiftIndexStatusList = (List) shiftIndexStatusMap.get(x.getShiftIndex());
+ List<SuperAggregateState> shiftIndexStatusList = shiftIndexStatusMap.get(x.getShiftIndex());
if (Func.isNotEmpty(shiftIndexStatusList)) {
hashMap.put("oee", EifficiencyUtils.calculationResults(shiftIndexStatusList, ProductivityTypeEnum.OEE) + "");
hashMap.put("fault", EifficiencyUtils.calculationResults(shiftIndexStatusList, ProductivityTypeEnum.ALARM) + "");
- HashMap<Integer, Long> wcsMap = (HashMap) shiftIndexStatusList.stream().collect(Collectors.groupingBy((v0) -> {
+ HashMap<Integer, Long> wcsMap = shiftIndexStatusList.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWcs();
}, HashMap::new, Collectors.summingLong((v0) -> {
return v0.getDurationCollect();
@@ -300,16 +252,20 @@
List<Workstation> workstations;
List<WorkstationInfoVO> infoList = vo.getWorkstationInfoList();
if (Func.isEmpty(infoList)) {
+ workstations = this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
+ .eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode())
+ .eq(Workstation::getStatus, CommonConstant.ENABLE));
+ /*
workstations = this.workstationService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getType();
}, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE));
- ids = (List) workstations.stream().map((v0) -> {
+ }, CommonConstant.ENABLE));*/
+ ids = workstations.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
} else {
- ids = (List) infoList.stream().map((v0) -> {
+ ids = infoList.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
workstations = this.workstationService.listByIds(ids);
@@ -317,7 +273,7 @@
if (Func.isEmpty(workstations)) {
return exportEmpty();
}
- Map<Long, Workstation> workstationMap = (Map) workstations.stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, Workstation> workstationMap = workstations.stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, v -> {
return v;
@@ -329,11 +285,9 @@
for (LocalDate endTime = vo.getEndTime(); endTime.compareTo((ChronoLocalDate) startTime) >= 0; endTime = endTime.minusDays(1L)) {
List<SuperAggregateState> superAggregateStateList = this.superAggregateStateService.getStatusData(ids, null, endTime, endTime);
LocalDate finalEndTime = endTime;
- List<StatusRecordExport> collect = (List) superAggregateStateList.stream().sorted(Comparator.comparing((v0) -> {
- return v0.getWorkstationId();
- }).thenComparing((v0) -> {
- return v0.getStartTime();
- })).map(state -> {
+ //SuperAggregateState state;
+
+ List<StatusRecordExport> collect = superAggregateStateList.stream().sorted(Comparator.comparing(SuperAggregateState::getWorkstationId).thenComparing(SuperAggregateState::getStartTime)).map(state -> {
Long workstationId = state.getWorkstationId();
GroupWorkDTO groupWorkDTO = (GroupWorkDTO) groupWorkMap.getOrDefault(workstationId, new GroupWorkDTO());
Workstation infoVO = (Workstation) workstationMap.getOrDefault(workstationId, new Workstation());
@@ -369,10 +323,10 @@
LocalDateTime end = LocalDateTime.of(date, LocalTime.MAX);
List<SuperAggregateState> res = this.superAggregateStateService.crossDay(start, end);
if (Func.isEmpty(res)) {
- return new ArrayList();
+ return new ArrayList<>();
}
List<List<SuperAggregateStateVO>> list = Lists.newArrayList();
- List<SuperAggregateState> collect = (List) res.stream().flatMap(state -> {
+ List<SuperAggregateState> collect = res.stream().flatMap(state -> {
List<SuperAggregateState> states = crossState(state, date);
List<SuperAggregateStateVO> vos = StatusRecordConvert.INSTANCE.convertState(states);
list.add(vos);
@@ -387,6 +341,16 @@
List<StatusRecordDateVO> result = new ArrayList<>();
List<WorkstationInfoVO> workstationList = statusRecordDateTimeSelectVO.getWorkstationInfoList();
if (Func.isEmpty(workstationList)) {
+ workstationList = this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
+ .eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode())
+ .eq(Workstation::getStatus, CommonConstant.ENABLE)).stream().map(s -> {
+ WorkstationInfoVO workstationInfoVO = new WorkstationInfoVO();
+ workstationInfoVO.setId(s.getId());
+ workstationInfoVO.setName(s.getName());
+ workstationInfoVO.setCode(s.getCode());
+ return workstationInfoVO;
+ }).collect(Collectors.toList());
+ /*
workstationList = (List) this.workstationService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getType();
}, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
@@ -397,19 +361,19 @@
workstationInfoVO.setName(s.getName());
workstationInfoVO.setCode(s.getCode());
return workstationInfoVO;
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
}
page.setTotal(workstationList.size());
- List<WorkstationInfoVO> workstationList2 = (List) workstationList.stream().skip((page.getCurrent() - 1) * page.getSize()).limit(page.getSize()).collect(Collectors.toList());
- List<Long> workstationIdList = (List) workstationList2.stream().map((v0) -> {
+ List<WorkstationInfoVO> workstationList2 = workstationList.stream().skip((page.getCurrent() - 1) * page.getSize()).limit(page.getSize()).collect(Collectors.toList());
+ List<Long> workstationIdList = workstationList2.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<SuperAggregateState> superAggregateStateList = this.superAggregateStateService.getStatusDataByTime(workstationIdList, statusRecordDateTimeSelectVO.getStartTime(), statusRecordDateTimeSelectVO.getEndTime());
- Map<Long, List<SuperAggregateState>> workstationStatusMap = (Map) superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, List<SuperAggregateState>> workstationStatusMap = superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
workstationList2.forEach(x -> {
- StatusRecordDateVO statusRecord = new StatusRecordDateVO().setWorkstationInfo(x).setStatusRecordList(StatusRecordConvert.INSTANCE.convert((List) workstationStatusMap.get(x.getId())));
+ StatusRecordDateVO statusRecord = new StatusRecordDateVO().setWorkstationInfo(x).setStatusRecordList(StatusRecordConvert.INSTANCE.convert(workstationStatusMap.get(x.getId())));
result.add(statusRecord);
});
return page.setRecords(result);
@@ -421,7 +385,7 @@
private Map<String, String> getWcs() {
List<GlobalWcs> defaultWcs = WorkstationCache.getDefaultWcs();
- return (Map) defaultWcs.stream().collect(Collectors.toMap((v0) -> {
+ return defaultWcs.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, (v0) -> {
return v0.getName();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java
index 60db7e0..a83eda9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java
@@ -1,9 +1,5 @@
package com.qianwen.smartman.modules.mdc.service.impl;
-import cn.hutool.core.date.LocalDateTimeUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Timestamp;
@@ -13,20 +9,24 @@
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.qianwen.core.tool.utils.DateUtil;
+import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.common.constant.DateConstant;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
+import com.qianwen.smartman.modules.mdc.entity.SuperAggregate;
import com.qianwen.smartman.modules.mdc.entity.SuperAggregateState;
import com.qianwen.smartman.modules.mdc.enums.OpenTypeEnums;
import com.qianwen.smartman.modules.mdc.enums.StatisticalMethodEnum;
@@ -35,38 +35,15 @@
import com.qianwen.smartman.modules.mdc.service.ISuperAggregateStateService;
import com.qianwen.smartman.modules.mdc.utils.FilterOffUtils;
import com.qianwen.smartman.modules.mdc.vo.StatusTimeTopVO;
-import org.springframework.stereotype.Service;
+
+import cn.hutool.core.date.LocalDateTimeUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/SuperAggregateStateServiceImpl.class */
public class SuperAggregateStateServiceImpl implements ISuperAggregateStateService {
private static final Logger log = LoggerFactory.getLogger(SuperAggregateStateServiceImpl.class);
private final SuperAggregateStateMapper baseMapper;
private final SuperAggregateStateFeedbackMapper aggregateStateFeedbackMapper;
private final IWorkstationService workstationService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public SuperAggregateStateServiceImpl(final SuperAggregateStateMapper baseMapper, final SuperAggregateStateFeedbackMapper aggregateStateFeedbackMapper, final IWorkstationService workstationService) {
this.baseMapper = baseMapper;
@@ -111,13 +88,18 @@
@Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
public List<StatusTimeTopVO> getStatusTimeByWcs(List<Long> workstationIds, LocalDateTime startTime, LocalDateTime endTime, Integer status, Integer top) {
List<StatusTimeTopVO> voList = new ArrayList<>();
+ Map<Long, Workstation> workstationMap = this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
+ .eq(Workstation::getStatus, CommonConstant.ENABLE)).stream().collect(Collectors.toMap(Workstation::getId, Function.identity()));
+ /*
Map<Long, Workstation> workstationMap = (Map) this.workstationService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
- }, Function.identity()));
+ }, Function.identity()));*/
List<SuperAggregateState> equipmentStatusDuration = this.baseMapper.getEquipmentStatusDuration(workstationIds, LocalDateTimeUtil.format(startTime, DateConstant.PATTERN_DATE_TIME), LocalDateTimeUtil.format(endTime, DateConstant.PATTERN_DATE_TIME), status);
- Map<Long, Long> timeMap = (Map) ((Map) buildDuration(startTime, FilterOffUtils.filterOffDay(equipmentStatusDuration, OpenTypeEnums.TIME_USED_ANALYSIS)).stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, Long> timeMap = buildDuration(startTime, equipmentStatusDuration).stream().collect(Collectors.groupingBy(SuperAggregate::getWorkstationId, Collectors.summingLong(SuperAggregateState::getDurationCollect))).entrySet().stream().sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).limit(top.intValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, java.util.LinkedHashMap::new));
+ /*
+ Map<Long, Long> timeMap = (buildDuration(startTime, FilterOffUtils.filterOffDay(equipmentStatusDuration, OpenTypeEnums.TIME_USED_ANALYSIS)).stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}, Collectors.summingLong((v0) -> {
return v0.getDurationCollect();
@@ -125,10 +107,10 @@
return v0.getKey();
}, (v0) -> {
return v0.getValue();
- }, oldValue, newValue -> {
+ }, (oldValue, newValue) -> {
return oldValue;
- }, LinkedHashMap::new));
- timeMap.forEach(k, v -> {
+ }, LinkedHashMap::new));*/
+ timeMap.forEach((k, v) -> {
StatusTimeTopVO statusTimeTopVO = new StatusTimeTopVO();
statusTimeTopVO.setValue(Double.valueOf(secondToHour(v)));
statusTimeTopVO.setWorkstation((Workstation) workstationMap.get(k));
@@ -184,12 +166,15 @@
@Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
public void saveState(List<SuperAggregateState> collect) {
- Map<Long, List<SuperAggregateState>> map = (Map) collect.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, List<SuperAggregateState>> map = collect.stream().collect(Collectors.groupingBy(SuperAggregate::getWorkstationId));
+ map.forEach(this.baseMapper::saveState);
+ /*
+ Map<Long, List<SuperAggregateState>> map = collect.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
SuperAggregateStateMapper superAggregateStateMapper = this.baseMapper;
superAggregateStateMapper.getClass();
- map.forEach(this::saveState);
+ map.forEach(this::saveState);*/
}
@Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
index 7b1064e..b7f5149 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
@@ -42,13 +42,13 @@
@Override // org.springblade.modules.mdc.service.ISuperNewCollectService
public void insertData(Set<String> workstationIds) {
- List<NewParamSaveDTO> data = (List) workstationIds.stream().map(workstationId -> {
+ List<NewParamSaveDTO> data = workstationIds.stream().map(workstationId -> {
Map<String, Object> realTimeData = WorkstationCache.getWorkstationAllCollect(workstationId);
if (Func.isNotEmpty(realTimeData)) {
int size = realTimeData.size();
long time = DateUtil.now().getTime();
Map<String, String> valuesMap = new HashMap<>(size);
- realTimeData.forEach(n, telemetry -> {
+ realTimeData.forEach((n, telemetry) -> {
if (!n.toUpperCase().contains(CollectConstant.ALARM)) {
TelemetryDataResponseDTO dto = (TelemetryDataResponseDTO) telemetry;
String v = dto.getV();
@@ -66,8 +66,11 @@
return Func.notNull(v0);
}).collect(Collectors.toList());
List<List<NewParamSaveDTO>> groupList = CommonUtil.groupList(data, 10);
+
+ groupList.forEach(this.collectJsonMapper::insertValueJson);
+ /*
SuperCollectJsonMapper superCollectJsonMapper = this.collectJsonMapper;
superCollectJsonMapper.getClass();
- groupList.forEach(this::insertValueJson);
+ groupList.forEach(this::insertValueJson);*/
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.java
index fbe81e0..d908fb6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.java
@@ -1,12 +1,5 @@
package com.qianwen.smartman.modules.mdc.service.impl;
-import cn.hutool.core.util.NumberUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.chrono.ChronoLocalDate;
@@ -21,10 +14,24 @@
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+import com.qianwen.core.excel.util.ExcelUtil;
+import com.qianwen.core.log.exception.ServiceException;
+import com.qianwen.core.mp.support.Condition;
+import com.qianwen.core.mp.support.Query;
+import com.qianwen.core.oss.model.BladeFile;
+import com.qianwen.core.tool.support.Kv;
+import com.qianwen.core.tool.utils.DateUtil;
+import com.qianwen.core.tool.utils.Func;
+import com.qianwen.core.tool.utils.StringUtil;
import com.qianwen.smartman.common.cache.cps.TimeSliceCache;
import com.qianwen.smartman.common.cache.cps.WorkstationCache;
import com.qianwen.smartman.common.constant.CalendarConstant;
@@ -35,15 +42,6 @@
import com.qianwen.smartman.common.enums.DefaultWcsEnum;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.core.excel.util.ExcelUtil;
-import com.qianwen.core.log.exception.ServiceException;
-import com.qianwen.core.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.oss.model.BladeFile;
-import com.qianwen.core.tool.support.Kv;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.core.tool.utils.StringUtil;
import com.qianwen.smartman.modules.cps.entity.CommonGroup;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
import com.qianwen.smartman.modules.cps.entity.ShiftDetail;
@@ -74,11 +72,10 @@
import com.qianwen.smartman.modules.mdc.vo.WorkstationBandShiftVO;
import com.qianwen.smartman.modules.mdc.vo.excel.TimeUsedExcelVO;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.util.NumberUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.class */
public class TimeUsedAnalysisServiceImpl implements ITimeUsedAnalysisService {
private static final Logger log = LoggerFactory.getLogger(TimeUsedAnalysisServiceImpl.class);
private final SuperAggregateStateMapper baseMapper;
@@ -88,197 +85,6 @@
private final ISuperAggregateStateService stateService;
private final OssBuilder ossBuilder;
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 = true;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case -75106384:
- if (implMethodName.equals("getType")) {
- 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 985326823:
- if (implMethodName.equals("getGroupCategory")) {
- z = true;
- break;
- }
- break;
- case 1273356481:
- if (implMethodName.equals("getCalendarCode")) {
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCalendarCode();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCalendarCode();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCalendarCode();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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();
- };
- }
- 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.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/modules/cps/entity/CommonGroup") && 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/modules/cps/entity/CommonGroup") && 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/modules/cps/entity/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupType();
- };
- }
- 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();
- };
- }
- 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/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;
- 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/modules/cps/entity/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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.getCode();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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();
- };
- }
- 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();
- };
- }
- 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;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public TimeUsedAnalysisServiceImpl(final SuperAggregateStateMapper baseMapper, final IWorkstationService workstationService, final ICommonGroupService commonGroupService, final CalendarMapper calendarMapper, final ISuperAggregateStateService stateService, final OssBuilder ossBuilder, final ICalendarService calendarService) {
this.baseMapper = baseMapper;
@@ -304,6 +110,13 @@
StatisticalMethodEnum methodEnum = stationVO.getEnums();
List<String> ids = stationVO.getIds();
LocalDate queryTime = stationVO.getQueryTime();
+ IPage<Workstation> page = this.workstationService.page(Condition.getPage(query),Wrappers.<Workstation>lambdaQuery()
+ .in(Func.isNotEmpty(ids), Workstation::getId, ids)
+ .eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode())
+ .eq(Workstation::getStatus, CommonConstant.ENABLE)
+ .isNotNull(Workstation::getCalendarCode)
+ .orderByAsc(Workstation::getCode));
+ /*
IPage<Workstation> page = this.workstationService.page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in(Func.isNotEmpty(ids), (v0) -> {
return v0.getId();
}, ids).eq((v0) -> {
@@ -314,7 +127,7 @@
return v0.getCalendarCode();
})).orderByAsc((v0) -> {
return v0.getCode();
- }));
+ }));*/
long total = page.getTotal();
List<Workstation> workstations = page.getRecords();
if (Func.isEmpty(workstations)) {
@@ -341,14 +154,15 @@
}
private TimeUsedAnalysisWorkstationVO buildTimeUsedAnalysisDay(List<Workstation> workstations, LocalDate queryTime) {
- List<Long> ids = (List) workstations.stream().map((v0) -> {
+ List<Long> ids = workstations.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<NameIdDTO> workStationDetails = Lists.newArrayList();
List<List<CountStatusDTO>> countStatus = Lists.newArrayList();
- Set<Integer> wcsList = (Set) listGlobalWcs().stream().map(c -> {
+ Set<Integer> wcsList = listGlobalWcs().stream().map(c -> {
return Integer.valueOf(Integer.parseInt(c.getCode()));
}).collect(Collectors.toSet());
+
List<SuperAggregateState> stateList = this.baseMapper.dateState(DateUtil.format(queryTime, "yyyyMMdd"), ids);
Map<Long, Map<Integer, Long>> map = buildStateMap(wcsList, stateList);
for (Workstation workstation : workstations) {
@@ -362,12 +176,12 @@
}
private TimeUsedAnalysisWorkstationVO buildTimeUsedAnalysisWeek(List<Workstation> workstations, Integer year, Integer week) {
- List<Long> ids = (List) workstations.stream().map((v0) -> {
+ List<Long> ids = workstations.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<NameIdDTO> workStationDetails = Lists.newArrayList();
List<List<CountStatusDTO>> countStatus = Lists.newArrayList();
- Set<Integer> wcsList = (Set) listGlobalWcs().stream().map(c -> {
+ Set<Integer> wcsList = listGlobalWcs().stream().map(c -> {
return Integer.valueOf(Integer.parseInt(c.getCode()));
}).collect(Collectors.toSet());
List<SuperAggregateState> stateList = this.baseMapper.weekState(ids, year, week);
@@ -383,12 +197,12 @@
}
private TimeUsedAnalysisWorkstationVO buildTimeUsedAnalysisMonth(List<Workstation> workstations, Integer year, Integer month) {
- List<Long> ids = (List) workstations.stream().map((v0) -> {
+ List<Long> ids = workstations.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<NameIdDTO> workStationDetails = Lists.newArrayList();
List<List<CountStatusDTO>> countStatus = Lists.newArrayList();
- Set<Integer> wcsList = (Set) listGlobalWcs().stream().map(c -> {
+ Set<Integer> wcsList = listGlobalWcs().stream().map(c -> {
return Integer.valueOf(Integer.parseInt(c.getCode()));
}).collect(Collectors.toSet());
List<SuperAggregateState> stateList = this.baseMapper.yearState(ids, year, month);
@@ -407,21 +221,21 @@
List<NameIdDTO> workStationDetails = Lists.newArrayList();
List<List<CountStatusDTO>> countStatus = Lists.newArrayList();
IPage<Workstation> workstationPages = this.workstationService.listWorkStationOnShiftIndex(ids, queryTime, query, shiftIndex, WorkstationTypeEnum.MACHINE.getCode());
- Set<Integer> wcsList = (Set) listGlobalWcs().stream().map(c -> {
+ Set<Integer> wcsList = listGlobalWcs().stream().map(c -> {
return Integer.valueOf(Integer.parseInt(c.getCode()));
}).collect(Collectors.toSet());
- LinkedHashMap<String, List<Workstation>> calendarMap = (LinkedHashMap) workstationPages.getRecords().stream().collect(Collectors.groupingBy((v0) -> {
+ LinkedHashMap<String, List<Workstation>> calendarMap = workstationPages.getRecords().stream().collect(Collectors.groupingBy((v0) -> {
return v0.getCalendarCode();
}, LinkedHashMap::new, Collectors.toList()));
- calendarMap.forEach(calendarCode, workStationsList -> {
- List<Long> workStationIds = (List) workStationsList.stream().map((v0) -> {
+ calendarMap.forEach((calendarCode, workStationsList) -> {
+ List<Long> workStationIds = workStationsList.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<SuperAggregateState> stateList = this.baseMapper.shiftState(workStationIds, DateUtil.format(queryTime, "yyyyMMdd"), shiftIndex, calendarCode);
Map<Long, Map<Integer, Long>> map = buildStateMap(wcsList, stateList);
- Iterator it = workStationsList.iterator();
+ Iterator<Workstation> it = workStationsList.iterator();
while (it.hasNext()) {
- Workstation workstation = (Workstation) it.next();
+ Workstation workstation = it.next();
workStationDetails.add(NameIdDTO.builder().id(workstation.getId()).name(workstation.getName() + "\n" + workstation.getCode()).build());
Long id = workstation.getId();
Map<Integer, Long> countResults = mergeMap(map.get(id), wcsList);
@@ -439,13 +253,24 @@
LocalDate queryTime = stationVO.getQueryTime();
String groupType = stationVO.getGroupType();
String groupCategory = stationVO.getGroupCategory();
+ long total = this.commonGroupService.count(Wrappers.<CommonGroup>lambdaQuery()
+ .eq(CommonGroup::getGroupType, groupType)
+ .eq(CommonGroup::getGroupCategory, groupCategory)
+ .in(Func.isNotEmpty(ids), CommonGroup::getId, ids));
+ /*
long total = this.commonGroupService.count(((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getGroupType();
}, groupType)).eq((v0) -> {
return v0.getGroupCategory();
}, groupCategory)).in(Func.isNotEmpty(ids), (v0) -> {
return v0.getId();
- }, ids));
+ }, ids));*/
+ IPage<CommonGroup> page = this.commonGroupService.page(Condition.getPage(query), Wrappers.<CommonGroup>lambdaQuery()
+ .eq(CommonGroup::getGroupType, groupType)
+ .eq(CommonGroup::getGroupCategory, groupCategory)
+ .in(Func.isNotEmpty(ids), CommonGroup::getId, ids)
+ .orderByAsc(CommonGroup::getCode));
+ /*
IPage<CommonGroup> page = this.commonGroupService.page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getGroupType();
}, groupType)).eq((v0) -> {
@@ -454,14 +279,15 @@
return v0.getId();
}, ids).orderByAsc((v0) -> {
return v0.getCode();
- }));
+ }));*/
List<CommonGroup> groups = page.getRecords();
if (Func.isEmpty(groups)) {
return new TimeUsedAnalysisWorkstationVO();
}
- Map<Long, Set<Long>> groupWorkstationMap = this.commonGroupService.groupWorkstationMap((List) groups.stream().map(c -> {
+ Map<Long, Set<Long>> groupWorkstationMap = this.commonGroupService.groupWorkstationMap(groups.stream().map(c -> {
return String.valueOf(c.getId());
}).collect(Collectors.toList()));
+
switch (methodEnum) {
case DAY:
res = buildTimeUsedAnalysisGroupDay(groups, groupWorkstationMap, queryTime);
@@ -473,25 +299,9 @@
res = buildTimeUsedAnalysisGroupMonth(groups, groupWorkstationMap, stationVO.getYear(), stationVO.getMonth());
break;
default:
- Map<Long, Set<Long>> newGroupWorkstationMap = new HashMap<>(groupWorkstationMap.size());
- Integer shiftIndex = stationVO.getShiftIndex();
- Set<Long> workIds = this.workstationService.findByIndexAndDateAndTypeAndYear(Integer.valueOf(queryTime.getYear()), DateUtil.format(queryTime, "yyyyMMdd"), shiftIndex, WorkstationTypeEnum.MACHINE.getCode());
- groupWorkstationMap.forEach(k, v -> {
- Stream stream = v.stream();
- workIds.getClass();
- if (stream.anyMatch((v1) -> {
- return r1.contains(v1);
- })) {
- newGroupWorkstationMap.put(k, v);
- }
- });
- if (Func.isEmpty(newGroupWorkstationMap)) {
- res = new TimeUsedAnalysisWorkstationVO();
- break;
- } else {
- res = buildTimeUsedAnalysisGroupShift(groups, newGroupWorkstationMap, queryTime, shiftIndex);
- break;
- }
+ res = this.buildTimeUsedAnalysisShift(ids, queryTime, stationVO.getShiftIndex(), query);
+ break;
+
}
res.setTotal(Long.valueOf(total));
return res;
@@ -505,9 +315,9 @@
Long id = group.getId();
Set<Long> workstationIds = groupWorkstationMap.get(id);
if (Func.isEmpty(workstationIds)) {
- countStatus.add(buildCountStatus(new HashMap(10)));
+ countStatus.add(buildCountStatus(new HashMap<>(10)));
} else {
- Set<Integer> wcsList = (Set) listGlobalWcs().stream().map(c -> {
+ Set<Integer> wcsList = listGlobalWcs().stream().map(c -> {
return Integer.valueOf(Integer.parseInt(c.getCode()));
}).collect(Collectors.toSet());
List<SuperAggregateState> stateEndTimeNotNullList = this.baseMapper.dateState(DateUtil.format(queryTime, "yyyyMMdd"), Lists.newArrayList(workstationIds));
@@ -528,9 +338,9 @@
Long id = group.getId();
Set<Long> workstationIds = groupWorkstationMap.get(id);
if (Func.isEmpty(workstationIds)) {
- countStatus.add(buildCountStatus(new HashMap(10)));
+ countStatus.add(buildCountStatus(new HashMap<>(10)));
} else {
- Set<Integer> wcsList = (Set) listGlobalWcs().stream().map(c -> {
+ Set<Integer> wcsList = listGlobalWcs().stream().map(c -> {
return Integer.valueOf(Integer.parseInt(c.getCode()));
}).collect(Collectors.toSet());
List<SuperAggregateState> stateEndTimeNotNullList = this.baseMapper.weekState(Lists.newArrayList(workstationIds), year, week);
@@ -551,9 +361,9 @@
Long id = group.getId();
Set<Long> workstationIds = groupWorkstationMap.get(id);
if (Func.isEmpty(workstationIds)) {
- countStatus.add(buildCountStatus(new HashMap(10)));
+ countStatus.add(buildCountStatus(new HashMap<>(10)));
} else {
- Set<Integer> wcsList = (Set) listGlobalWcs().stream().map(c -> {
+ Set<Integer> wcsList = listGlobalWcs().stream().map(c -> {
return Integer.valueOf(Integer.parseInt(c.getCode()));
}).collect(Collectors.toSet());
List<SuperAggregateState> stateEndTimeNotNullList = this.baseMapper.yearState(Lists.newArrayList(workstationIds), year, month);
@@ -569,26 +379,26 @@
private TimeUsedAnalysisWorkstationVO buildTimeUsedAnalysisGroupShift(List<CommonGroup> groups, Map<Long, Set<Long>> groupWorkstationMap, LocalDate queryTime, Integer shiftIndex) {
List<NameIdDTO> workStationDetails = Lists.newArrayList();
List<List<CountStatusDTO>> countStatus = Lists.newArrayList();
- List<Long> ids = (List) groupWorkstationMap.values().stream().flatMap((v0) -> {
+ List<Long> ids = groupWorkstationMap.values().stream().flatMap((v0) -> {
return v0.stream();
}).distinct().collect(Collectors.toList());
Map<Long, String> calendarMap = findWorkstationCalendarCode(ids);
- Map<Long, CommonGroup> groupMap = (Map) groups.stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, CommonGroup> groupMap = groups.stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, v -> {
return v;
}));
- groupWorkstationMap.forEach(groupId, workstationIds -> {
+ groupWorkstationMap.forEach((groupId, workstationIds) -> {
CommonGroup group = (CommonGroup) groupMap.getOrDefault(groupId, new CommonGroup());
workStationDetails.add(NameIdDTO.builder().id(group.getId()).name(group.getName()).build());
if (Func.isEmpty(workstationIds)) {
- countStatus.add(buildCountStatus(new HashMap(10)));
+ countStatus.add(buildCountStatus(new HashMap<>(10)));
return;
}
- Set<Integer> wcsList = (Set) listGlobalWcs().stream().map(c -> {
+ Set<Integer> wcsList = listGlobalWcs().stream().map(c -> {
return Integer.valueOf(Integer.parseInt(c.getCode()));
}).collect(Collectors.toSet());
- List<SuperAggregateState> superAggregateStates = (List) workstationIds.stream().map(wId -> {
+ List<SuperAggregateState> superAggregateStates = workstationIds.stream().map(wId -> {
return this.baseMapper.countStatsShift(String.valueOf(wId), DateUtil.format(queryTime, "yyyyMMdd"), shiftIndex, String.valueOf(calendarMap.get(wId)));
}).filter((v0) -> {
return Func.isNotEmpty(v0);
@@ -607,20 +417,25 @@
private Map<Long, String> findWorkstationCalendarCode(List<Long> workstationIds) {
if (Func.isEmpty(workstationIds)) {
- return new HashMap(10);
+ return new HashMap<>(10);
}
+ return this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
+ .in(Workstation::getId, workstationIds))
+ .stream()
+ .collect(Collectors.toMap(Workstation::getId, Workstation::getCalendarCode));
+ /*
return (Map) this.workstationService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
}, workstationIds)).stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, (v0) -> {
return v0.getCalendarCode();
- }));
+ }));*/
}
private List<CountStatusDTO> buildCountStatus(Map<Integer, Long> map) {
List<GlobalWcs> list = listGlobalWcs();
- return (List) list.stream().map(value -> {
+ return list.stream().map(value -> {
String code = value.getCode();
Long count = (Long) map.getOrDefault(Integer.valueOf(Integer.parseInt(code)), 0L);
return CountStatusDTO.builder().count(count).statusName(value.getName()).code(code).build();
@@ -630,7 +445,7 @@
private Map<Long, Map<Integer, Long>> buildStateMap(Set<Integer> wcsList, List<SuperAggregateState> stateList) {
List<SuperAggregateState> stateList2 = FilterOffUtils.filterOffDay(stateList, OpenTypeEnums.TIME_USED_ANALYSIS);
Timestamp ts = new Timestamp(System.currentTimeMillis());
- return (Map) stateList2.stream().peek(c -> {
+ return stateList2.stream().peek(c -> {
Timestamp endTime = c.getEndTime();
if (endTime == null) {
c.setEndTime(ts);
@@ -649,7 +464,7 @@
private Map<Integer, Long> buildStateGroupMap(Set<Integer> wcsList, List<SuperAggregateState> stateList) {
Timestamp ts = new Timestamp(System.currentTimeMillis());
- return (Map) stateList.stream().peek(c -> {
+ return stateList.stream().peek(c -> {
Timestamp endTime = c.getEndTime();
if (endTime == null) {
c.setEndTime(ts);
@@ -693,15 +508,18 @@
public Map<Long, List<ShiftIndexNameDTO>> queryWorkStationShiftIndex(List<Long> workstationIds, LocalDate localDate) {
Map<Long, List<ShiftIndexNameDTO>> idToValue = Kv.newMap();
workstationIds.forEach(workstationId -> {
+ Workstation workstation = this.workstationService.getOne(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getId, workstationId)
+ .eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode()).isNotNull(Workstation::getCalendarCode));
+ /*
Workstation workstation = (Workstation) this.workstationService.getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getId();
}, workstationId)).eq((v0) -> {
return v0.getType();
}, WorkstationTypeEnum.MACHINE.getCode())).isNotNull((v0) -> {
return v0.getCalendarCode();
- }));
+ }));*/
if (Func.isEmpty(workstation)) {
- idToValue.put(workstationId, new ArrayList());
+ idToValue.put(workstationId, new ArrayList<>());
}
if (workstation != null) {
List<ShiftIndexNameDTO> dtos = this.calendarService.queryShiftIndexName(workstation.getCalendarCode(), Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate));
@@ -715,19 +533,23 @@
public Map<Long, List<ShiftIndexNameDTO>> queryBatchWorkStationShiftIndex(List<Long> workstationIdList, LocalDate localDate) {
Map<Long, List<ShiftIndexNameDTO>> idToValue = Kv.newMap();
List<Workstation> workstations = this.workstationService.listByIds(workstationIdList);
- Map<String, List<Workstation>> collect = (Map) workstations.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<String, List<Workstation>> collect = workstations.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getCalendarCode();
}));
- List<String> calendarCodeList = (List) workstations.stream().map((v0) -> {
+ List<String> calendarCodeList = workstations.stream().map((v0) -> {
return v0.getCalendarCode();
}).distinct().collect(Collectors.toList());
calendarCodeList.forEach(calendarCode -> {
List<ShiftIndexNameDTO> shiftIndexNameDTOList = this.calendarService.queryShiftIndexName(calendarCode, Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate));
- List<Long> workstationIds = (List) ((List) collect.get(calendarCode)).stream().map((v0) -> {
+
+ List<Long> workstationIds = collect.get(calendarCode).stream().map(Workstation::getId).collect(Collectors.toList());
+ /*
+ List<Long> workstationIds = collect.get(calendarCode).stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
+ */
workstationIds.forEach(workstationId -> {
- List list = (List) idToValue.put(workstationId, shiftIndexNameDTOList);
+ List list = idToValue.put(workstationId, shiftIndexNameDTOList);
});
});
return idToValue;
@@ -739,12 +561,16 @@
StatisticalMethodEnum enums = vo.getEnums();
List<Long> ids = vo.getIds();
if (Func.isEmpty(ids)) {
+ workstations = this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
+ .eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode())
+ .eq(Workstation::getStatus, CommonConstant.ENABLE));
+ /*
workstations = this.workstationService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getType();
}, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE));
- ids = (List) workstations.stream().map((v0) -> {
+ }, CommonConstant.ENABLE));*/
+ ids = workstations.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
} else {
@@ -753,7 +579,7 @@
if (Func.isEmpty(ids)) {
return exportEmpty(vo.getEnums());
}
- Map<Long, Workstation> workstationMap = (Map) workstations.stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, Workstation> workstationMap = workstations.stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, v -> {
return v;
@@ -815,28 +641,26 @@
return Lists.newArrayList();
}
List<TimeUsedDateExcel> timeUsedExports = Lists.newArrayList();
- Map<String, Map<Long, List<SuperAggregateState>>> stateMap = (Map) filterData.stream().sorted(Comparator.comparing((v0) -> {
- return v0.getFactoryYear();
- }).reversed().thenComparing((v0) -> {
- return v0.getFactoryMonth();
- }).reversed()).collect(Collectors.groupingBy(c -> {
+ Map<String, Map<Long, List<SuperAggregateState>>> stateMap = filterData.stream().sorted(Comparator.comparing(SuperAggregateState::getFactoryYear).reversed().thenComparing(SuperAggregateState::getFactoryMonth).reversed()).collect(Collectors.groupingBy(c -> {
return c.getFactoryYear() + "-" + c.getFactoryMonth();
}, Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
})));
- stateMap.forEach(date, stats -> {
- stats.forEach(workstationId, statsList -> {
+ stateMap.forEach((date, stats) -> {
+ stats.forEach((workstationId, statsList) -> {
Workstation workstation = (Workstation) workstationMap.getOrDefault(workstationId, new Workstation());
GroupWorkDTO groupWork = (GroupWorkDTO) groupWorkMap.getOrDefault(workstationId, new GroupWorkDTO());
- Map<Integer, String> wcsMap = getWcsMap((Set) listGlobalWcs().stream().map(c2 -> {
+ Map<Integer, String> wcsMap = getWcsMap(listGlobalWcs().stream().map(c2 -> {
return Integer.valueOf(Integer.parseInt(c2.getCode()));
}).collect(Collectors.toSet()), statsList);
timeUsedExports.add(TimeUsedDateExcel.builder().date(date).groupName(groupWork.getName()).workstationCode(workstation.getCode()).workstationName(workstation.getName()).running(wcsMap.get(DefaultWcsEnum.RUNNING.getCode())).standby(wcsMap.get(DefaultWcsEnum.STANDBY.getCode())).debugging(wcsMap.get(DefaultWcsEnum.DEBUGGING.getCode())).alarm(wcsMap.get(DefaultWcsEnum.ALARM.getCode())).offline(wcsMap.get(DefaultWcsEnum.OFFLINE.getCode())).build());
});
});
+ timeUsedExports.sort(Comparator.comparing(TimeUsedDateExcel::getDate).reversed());
+ /*
timeUsedExports.sort(Comparator.comparing((v0) -> {
return v0.getDate();
- }).reversed());
+ }).reversed());*/
return timeUsedExports;
}
@@ -859,9 +683,7 @@
if (Func.isEmpty(filterData)) {
return Lists.newArrayList();
}
- Map<String, Map<Long, List<SuperAggregateState>>> stateMap = (Map) filterData.stream().sorted(Comparator.comparing((v0) -> {
- return v0.getFactoryYear();
- }).reversed().thenComparing((v0) -> {
+ Map<String, Map<Long, List<SuperAggregateState>>> stateMap = filterData.stream().sorted(Comparator.comparing(SuperAggregateState::getFactoryYear).reversed().thenComparing((v0) -> {
return v0.getFactoryWeek();
}).reversed()).collect(Collectors.groupingBy(c -> {
return c.getFactoryYear() + "-" + c.getFactoryWeek();
@@ -869,19 +691,21 @@
return v0.getWorkstationId();
})));
List<TimeUsedDateExcel> timeUsedExports = Lists.newArrayList();
- stateMap.forEach(date, stats -> {
- stats.forEach(workstationId, statsList -> {
- Workstation workstation = (Workstation) workstationMap.getOrDefault(workstationId, new Workstation());
- GroupWorkDTO groupWork = (GroupWorkDTO) groupWorkMap.getOrDefault(workstationId, new GroupWorkDTO());
- Map<Integer, String> wcsMap = getWcsMap((Set) listGlobalWcs().stream().map(c2 -> {
+ stateMap.forEach((date, stats) -> {
+ stats.forEach((workstationId, statsList) -> {
+ Workstation workstation = workstationMap.getOrDefault(workstationId, new Workstation());
+ GroupWorkDTO groupWork = groupWorkMap.getOrDefault(workstationId, new GroupWorkDTO());
+ Map<Integer, String> wcsMap = getWcsMap(listGlobalWcs().stream().map(c2 -> {
return Integer.valueOf(Integer.parseInt(c2.getCode()));
}).collect(Collectors.toSet()), statsList);
timeUsedExports.add(TimeUsedDateExcel.builder().date(getWeek(date)).groupName(groupWork.getName()).workstationCode(workstation.getCode()).workstationName(workstation.getName()).running(wcsMap.get(DefaultWcsEnum.RUNNING.getCode())).standby(wcsMap.get(DefaultWcsEnum.STANDBY.getCode())).debugging(wcsMap.get(DefaultWcsEnum.DEBUGGING.getCode())).alarm(wcsMap.get(DefaultWcsEnum.ALARM.getCode())).offline(wcsMap.get(DefaultWcsEnum.OFFLINE.getCode())).build());
});
});
+ timeUsedExports.sort(Comparator.comparing(TimeUsedDateExcel::getDate).reversed());
+ /*
timeUsedExports.sort(Comparator.comparing((v0) -> {
return v0.getDate();
- }).reversed());
+ }).reversed());*/
return timeUsedExports;
}
@@ -900,27 +724,27 @@
if (Func.isEmpty(statusData)) {
return Lists.newArrayList();
}
- Map<Integer, Map<Long, List<SuperAggregateState>>> map = (Map) statusData.stream().sorted(Comparator.comparing((v0) -> {
- return v0.getFactoryDate();
- }).reversed()).collect(Collectors.groupingBy((v0) -> {
+ Map<Integer, Map<Long, List<SuperAggregateState>>> map = statusData.stream().sorted(Comparator.comparing(SuperAggregateState::getFactoryDate).reversed()).collect(Collectors.groupingBy((v0) -> {
return v0.getFactoryDate();
}, Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
})));
List<TimeUsedDateExcel> timeUsedExports = Lists.newArrayList();
- map.forEach(date, status -> {
- status.forEach(workstationId, statsList -> {
- Workstation workstation = (Workstation) workstationMap.getOrDefault(workstationId, new Workstation());
- GroupWorkDTO groupWork = (GroupWorkDTO) groupWorkMap.getOrDefault(workstationId, new GroupWorkDTO());
- Map<Integer, String> wcsMap = getWcsMap((Set) listGlobalWcs().stream().map(c -> {
+ map.forEach((date, status) -> {
+ status.forEach((workstationId, statsList) -> {
+ Workstation workstation = workstationMap.getOrDefault(workstationId, new Workstation());
+ GroupWorkDTO groupWork = groupWorkMap.getOrDefault(workstationId, new GroupWorkDTO());
+ Map<Integer, String> wcsMap = getWcsMap(listGlobalWcs().stream().map(c -> {
return Integer.valueOf(Integer.parseInt(c.getCode()));
}).collect(Collectors.toSet()), statsList);
timeUsedExports.add(TimeUsedDateExcel.builder().date(getDay(date)).groupName(groupWork.getName()).workstationCode(workstation.getCode()).workstationName(workstation.getName()).running(wcsMap.get(DefaultWcsEnum.RUNNING.getCode())).standby(wcsMap.get(DefaultWcsEnum.STANDBY.getCode())).debugging(wcsMap.get(DefaultWcsEnum.DEBUGGING.getCode())).alarm(wcsMap.get(DefaultWcsEnum.ALARM.getCode())).offline(wcsMap.get(DefaultWcsEnum.OFFLINE.getCode())).build());
});
});
+ timeUsedExports.sort(Comparator.comparing(TimeUsedDateExcel::getDate).reversed());
+ /*
timeUsedExports.sort(Comparator.comparing((v0) -> {
return v0.getDate();
- }).reversed());
+ }).reversed());*/
return timeUsedExports;
}
@@ -953,22 +777,22 @@
if (Func.isEmpty(workstations)) {
endTime = endTime.minusDays(1L);
} else {
- List<Long> wIds = (List) workstations.stream().map((v0) -> {
+ List<Long> wIds = workstations.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
- Map<Long, Workstation> workstationMap = (Map) workstations.stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, Workstation> workstationMap = workstations.stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, v -> {
return v;
}));
- Map<String, List<Workstation>> calendarCodeMap = (Map) workstations.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<String, List<Workstation>> calendarCodeMap = workstations.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getCalendarCode();
}));
LocalDate finalEndTime = endTime;
Map<String, Map<Integer, ShiftDetail>> shiftNameMap = new HashMap<>(calendarCodeMap.size());
- calendarCodeMap.forEach(calendarCode, wList -> {
+ calendarCodeMap.forEach((calendarCode, wList) -> {
List<ShiftDetail> timeShiftDetail = TimeSliceCache.getTimeShiftDetail(calendarCode, finalEndTime);
- Map<Integer, ShiftDetail> map = (Map) timeShiftDetail.stream().collect(Collectors.toMap((v0) -> {
+ Map<Integer, ShiftDetail> map = timeShiftDetail.stream().collect(Collectors.toMap((v0) -> {
return v0.getShiftIndex();
}, v2 -> {
return v2;
@@ -991,7 +815,7 @@
if (Func.isEmpty(states)) {
return Lists.newArrayList();
}
- Map<Long, Map<Integer, List<SuperAggregateState>>> stateMap = (Map) states.stream().filter(c -> {
+ Map<Long, Map<Integer, List<SuperAggregateState>>> stateMap = states.stream().filter(c -> {
return MdcConstant.SHIFT_INDEX.contains(c.getShiftIndex());
}).collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
@@ -999,15 +823,15 @@
return v0.getShiftIndex();
})));
List<TimeUsedExport> res = Lists.newArrayList();
- stateMap.forEach(workstationId, shiftMap -> {
+ stateMap.forEach((workstationId, shiftMap) -> {
Workstation workstation = (Workstation) workstationMap.getOrDefault(workstationId, new Workstation());
GroupWorkDTO groupWorkDTO = (GroupWorkDTO) groupWorkMap.getOrDefault(workstationId, new GroupWorkDTO());
- shiftMap.forEach(shiftIndex, stateList -> {
+ shiftMap.forEach((shiftIndex, stateList) -> {
if (MdcConstant.SHIFT_INDEX.contains(shiftIndex)) {
- String shiftName = (String) Optional.ofNullable(shiftNameMap.get(workstation.getCalendarCode())).map(m -> {
+ String shiftName = Optional.ofNullable(shiftNameMap.get(workstation.getCalendarCode())).map(m -> {
return ((ShiftDetail) m.getOrDefault(shiftIndex, new ShiftDetail())).getIndexName();
}).orElse(MessageUtils.message("calendar.page.shift.model.shift", new Object[0]) + shiftIndex);
- Map<Integer, String> wcsMap = getWcsMap((Set) listGlobalWcs().stream().map(c2 -> {
+ Map<Integer, String> wcsMap = getWcsMap(listGlobalWcs().stream().map(c2 -> {
return Integer.valueOf(Integer.parseInt(c2.getCode()));
}).collect(Collectors.toSet()), stateList);
TimeUsedExport build = TimeUsedExport.builder().date(date).groupName(groupWorkDTO.getName()).workstationCode(workstation.getCode()).workstationName(workstation.getName()).shiftName(shiftName).running(wcsMap.get(DefaultWcsEnum.RUNNING.getCode())).standby(wcsMap.get(DefaultWcsEnum.STANDBY.getCode())).debugging(wcsMap.get(DefaultWcsEnum.DEBUGGING.getCode())).alarm(wcsMap.get(DefaultWcsEnum.ALARM.getCode())).offline(wcsMap.get(DefaultWcsEnum.OFFLINE.getCode())).build();
@@ -1019,7 +843,7 @@
}
private Map<Integer, String> getWcsMap(Set<Integer> wcsList, List<SuperAggregateState> states) {
- Map<Integer, Long> map = (Map) states.stream().filter(c -> {
+ Map<Integer, Long> map = states.stream().filter(c -> {
return (!wcsList.contains(c.getValueCollect()) || c.getValueCollect() == null || c.getDurationCollect() == null) ? false : true;
}).collect(Collectors.groupingBy((v0) -> {
return v0.getValueCollect();
@@ -1046,6 +870,12 @@
private WorkstationBandShiftVO getWorkShiftIndexName(QueryShiftIndexNameVO vo) {
List<String> ids = vo.getIds();
LocalDate localDate = vo.getLocalDate();
+ List<Workstation> workstations = this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
+ .in(Func.isNotEmpty(ids), Workstation::getId, ids)
+ .eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode())
+ .isNotNull(Workstation::getCalendarCode)
+ .orderByAsc(Workstation::getCode));
+ /*
List<Workstation> workstations = this.workstationService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in(Func.isNotEmpty(ids), (v0) -> {
return v0.getId();
}, ids).eq((v0) -> {
@@ -1054,12 +884,12 @@
return v0.getCalendarCode();
})).orderByAsc((v0) -> {
return v0.getCode();
- }));
+ }));*/
return getWorkstationBandShiftVO(localDate, workstations);
}
private WorkstationBandShiftVO getWorkstationBandShiftVO(LocalDate localDate, List<Workstation> workstations) {
- Map<String, List<Workstation>> calendarCodeMap = (Map) workstations.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<String, List<Workstation>> calendarCodeMap = workstations.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getCalendarCode();
}));
if (Func.isEmpty(calendarCodeMap)) {
@@ -1067,7 +897,7 @@
}
if (calendarCodeMap.size() == 1) {
List<MixShiftDetailsDTO> result = Lists.newArrayList();
- calendarCodeMap.forEach(calendarCode, workstationList -> {
+ calendarCodeMap.forEach((calendarCode, workstationList) -> {
List<ShiftIndexNameDTO> shiftDetails = this.calendarService.queryShiftIndexName(calendarCode, Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate));
this.calendarService.queryShiftIndexName(calendarCode, Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate));
for (ShiftIndexNameDTO shiftDetail : shiftDetails) {
@@ -1081,7 +911,7 @@
List<ShiftIndexNameDTO> shiftTwo = Lists.newArrayList();
List<ShiftIndexNameDTO> shiftThree = Lists.newArrayList();
List<ShiftIndexNameDTO> shiftFour = Lists.newArrayList();
- calendarCodeMap.forEach(calendarCode2, workstationList2 -> {
+ calendarCodeMap.forEach((calendarCode2, workstationList2) -> {
List<ShiftIndexNameDTO> shiftDetails = this.calendarService.queryShiftIndexName(calendarCode2, Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate));
for (ShiftIndexNameDTO shiftDetail : shiftDetails) {
if (CalendarConstant.ONE.equals(shiftDetail.getShiftIndex())) {
@@ -1125,17 +955,22 @@
String groupType = vo.getGroupType();
String groupCategory = vo.getGroupCategory();
LocalDate localDate = vo.getLocalDate();
+ List<CommonGroup> commonGroups = this.commonGroupService.list(Wrappers.<CommonGroup>lambdaQuery()
+ .eq(CommonGroup::getGroupType, groupType)
+ .eq(CommonGroup::getGroupCategory, groupCategory)
+ .in(Func.isNotEmpty(ids), CommonGroup::getId, ids));
+ /*
List<CommonGroup> commonGroups = this.commonGroupService.list(((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getGroupType();
}, groupType)).eq((v0) -> {
return v0.getGroupCategory();
}, groupCategory)).in(Func.isNotEmpty(ids), (v0) -> {
return v0.getId();
- }, ids));
+ }, ids));*/
if (Func.isEmpty(commonGroups)) {
return new WorkstationBandShiftVO();
}
- List<String> groupIds = (List) commonGroups.stream().map(c -> {
+ List<String> groupIds = commonGroups.stream().map(c -> {
return String.valueOf(c.getId());
}).collect(Collectors.toList());
List<Workstation> workstations = this.workstationService.listWorkStationByGroupId(groupIds);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java
index a77b47b..1f7007e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java
@@ -1,10 +1,5 @@
package com.qianwen.smartman.modules.mdc.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
@@ -19,17 +14,22 @@
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.cps.WorkstationCache;
-import com.qianwen.smartman.common.constant.DateConstant;
-import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
-import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.tool.utils.CollectionUtil;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.cps.WorkstationCache;
+import com.qianwen.smartman.common.constant.DateConstant;
+import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
+import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
import com.qianwen.smartman.modules.cps.entity.Workstation;
@@ -49,7 +49,6 @@
import com.qianwen.smartman.modules.mdc.vo.StatusAnalysisWorkstationVO;
import com.qianwen.smartman.modules.mdc.vo.StatusTimeTotalDetailVO;
import com.qianwen.smartman.modules.mdc.vo.StatusTimeTotalVO;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.class */
@@ -63,41 +62,6 @@
private final SuperProcessParameterMapper superProcessParameterMapper;
private final IWorkstationService workstationService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -75106384:
- if (implMethodName.equals("getType")) {
- z = false;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public WorkstationAnalysisServiceImpl(final SuperAggregateStateMapper superAggregateStateMapper, final SuperAlarmMapper superAlarmMapper, final IGlobalWcsService globalWcsService, final WorkstationMapper workstationMapper, final SuperProcessParameterMapper superProcessParameterMapper, final IWorkstationService workstationService) {
this.superAggregateStateMapper = superAggregateStateMapper;
@@ -153,12 +117,12 @@
result.setGroupId(groupId);
result.setGroupName(groupName);
List<Workstation> workstationList = this.workstationMapper.listWorkStationByGroupId(Arrays.asList(groupId));
- List<Long> workstationIdList = (List) workstationList.stream().map((v0) -> {
+ List<Long> workstationIdList = workstationList.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
Long totalTime = Long.valueOf(new BigDecimal(DateUtil.toDate(LocalDateTime.now()).getTime()).subtract(new BigDecimal(DateUtil.toDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN)).getTime())).multiply(new BigDecimal(workstationIdList.size())).longValue());
List<GlobalWcs> list = this.globalWcsService.getGlobalWcsList(GlobalWcsTypeEnum.DEFAULT);
- Map<String, String> dictBizMap = (Map) list.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, String> dictBizMap = list.stream().collect(Collectors.toMap((v0) -> {
return v0.getCode();
}, (v0) -> {
return v0.getName();
@@ -209,22 +173,26 @@
@Override // org.springblade.modules.mdc.service.IWorkstationAnalysisService
public List<DeviceStatusStatisticsVO> deviceStatusStatistics() {
List<GlobalWcs> wcsList = WorkstationCache.getDefaultWcs();
+ List<Workstation> workstationList = this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
+ .eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode())
+ .eq(Workstation::getStatus, TrayEnum.StatusEnum.ACTIVATING.getStatus()));
+ /*
List<Workstation> workstationList = this.workstationService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getType();
}, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
return v0.getStatus();
- }, TrayEnum.StatusEnum.ACTIVATING.getStatus()));
+ }, TrayEnum.StatusEnum.ACTIVATING.getStatus()));*/
if (Func.isEmpty(workstationList)) {
- return (List) wcsList.stream().map(c -> {
+ return wcsList.stream().map(c -> {
return DeviceStatusStatisticsVO.builder().status(c.getCode()).statusName(c.getName()).deviceNum(0L).build();
}).collect(Collectors.toList());
}
- Set<String> wIds = (Set) workstationList.stream().map((v0) -> {
+ Set<String> wIds = workstationList.stream().map((v0) -> {
return v0.getId();
}).map((v0) -> {
return String.valueOf(v0);
}).collect(Collectors.toSet());
- Map<String, Long> deviceMap = (Map) wIds.stream().map(wId -> {
+ Map<String, Long> deviceMap = wIds.stream().map(wId -> {
Map<String, Object> realTimeData = WorkstationCache.getWorkstationAllCollect(wId);
WorkstationWcsDmpDTO dmpDTO = WorkstationCache.getDmpStatus(wId);
if (Func.isNotEmpty(realTimeData) && Func.notNull(dmpDTO) && realTimeData.containsKey(dmpDTO.getName())) {
@@ -233,7 +201,7 @@
}
List<WorkstationCollectData> workstationCollectData = this.superProcessParameterMapper.queryLastParameter(wId);
if (Func.isNotEmpty(workstationCollectData)) {
- Map<String, Object> resultMapping = (Map) workstationCollectData.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Object> resultMapping = workstationCollectData.stream().collect(Collectors.toMap((v0) -> {
return v0.getN();
}, item -> {
TelemetryDataResponseDTO result = new TelemetryDataResponseDTO();
@@ -253,7 +221,7 @@
}).collect(Collectors.groupingBy(c2 -> {
return c2;
}, Collectors.counting()));
- return (List) wcsList.stream().map(w -> {
+ return wcsList.stream().map(w -> {
return DeviceStatusStatisticsVO.builder().status(w.getCode()).statusName(w.getName()).deviceNum((Long) deviceMap.getOrDefault(w.getCode(), 0L)).build();
}).collect(Collectors.toList());
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackDetailServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackDetailServiceImpl.java
index 6e3459f..438f552 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackDetailServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackDetailServiceImpl.java
@@ -1,9 +1,5 @@
package com.qianwen.smartman.modules.mdc.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.lang.invoke.SerializedLambda;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
@@ -13,14 +9,20 @@
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.ExtCacheConstant;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
-import com.qianwen.smartman.common.utils.Lambda;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qianwen.core.cache.utils.CacheUtil;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.ExtCacheConstant;
+import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.mdc.dto.WorkstationNoImmediateFeedBackDTO;
+import com.qianwen.smartman.modules.mdc.entity.WorkstationFeedback;
import com.qianwen.smartman.modules.mdc.entity.WorkstationFeedbackDetail;
import com.qianwen.smartman.modules.mdc.enums.FeedbackDetailStatus;
import com.qianwen.smartman.modules.mdc.enums.FeedbackStatus;
@@ -28,161 +30,10 @@
import com.qianwen.smartman.modules.mdc.service.IWorkstationFeedbackDetailService;
import com.qianwen.smartman.modules.mdc.service.IWorkstationFeedbackService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/WorkstationFeedbackDetailServiceImpl.class */
+
public class WorkstationFeedbackDetailServiceImpl extends ServiceImpl<WorkstationFeedbackDetailMapper, WorkstationFeedbackDetail> implements IWorkstationFeedbackDetailService {
private final IWorkstationFeedbackService workstationFeedbackService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -2138899559:
- if (implMethodName.equals("getStartTime")) {
- z = true;
- break;
- }
- break;
- case -570382830:
- if (implMethodName.equals("getEndTime")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 328290672:
- if (implMethodName.equals("getCancel")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
- return (v0) -> {
- return v0.getCancel();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
- return (v0) -> {
- return v0.getCancel();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
- return (v0) -> {
- return v0.getCancel();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getEndTime();
- };
- }
- 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/mdc/entity/WorkstationFeedback") && 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/modules/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getStartTime();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getStartTime();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getStartTime();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getStartTime();
- };
- }
- 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/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getStartTime();
- };
- }
- 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/modules/mdc/entity/WorkstationFeedback") && 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/modules/mdc/entity/WorkstationFeedbackDetail") && 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/modules/mdc/entity/WorkstationFeedbackDetail") && 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/modules/mdc/entity/WorkstationFeedbackDetail") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public WorkstationFeedbackDetailServiceImpl(final IWorkstationFeedbackService workstationFeedbackService) {
this.workstationFeedbackService = workstationFeedbackService;
@@ -190,6 +41,10 @@
@Override // org.springblade.modules.mdc.service.IWorkstationFeedbackDetailService
public List<WorkstationFeedbackDetail> cancelFeedback(final LocalDate queryDate, final Long workstationId) {
+ return list(Lambda.eq(WorkstationFeedbackDetail::getWorkstationId, workstationId)
+ .dayBetween(queryDate, WorkstationFeedbackDetail::getStartTime, WorkstationFeedbackDetail::getEndTime)
+ .eq(WorkstationFeedbackDetail::getCancel, Boolean.valueOf(true)).orderByDesc(WorkstationFeedbackDetail::getStartTime));
+ /*
return list((Wrapper) ((ExtraLambdaQueryWrapper) Lambda.eq((v0) -> {
return v0.getWorkstationId();
}, workstationId).dayBetween(queryDate, (v0) -> {
@@ -200,13 +55,31 @@
return v0.getCancel();
}, true)).orderByDesc((v0) -> {
return v0.getStartTime();
- }));
+ }));*/
}
@Override // org.springblade.modules.mdc.service.IWorkstationFeedbackDetailService
@Transactional
public boolean cancelWorkstationFeedbacks(final List<String> ids) {
List<WorkstationFeedbackDetail> detailList = new ArrayList<>();
+ boolean match = ids.stream().map(this::getById).peek(detailList::add).map(WorkstationFeedbackDetail::getFeedbackId).map(this.workstationFeedbackService::getById).map(WorkstationFeedback::getStatus).allMatch(FeedbackStatus.SYNCED.getValue()::equals);
+
+ //final boolean match = ids.stream().map((Function<? super Object, ?>)this::getById).peek(detailList::add).map((Function<? super Object, ?>)WorkstationFeedbackDetail::getFeedbackId).map((Function<? super Object, ?>)this.workstationFeedbackService::getById).map((Function<? super Object, ?>)WorkstationFeedback::getStatus).allMatch(FeedbackStatus.SYNCED.getValue()::equals);
+ if (match) {
+
+ detailList.forEach(detail -> {
+ //workstationFeedbackService.lambdaUpdate().se
+ this.workstationFeedbackService.lambdaUpdate().set(WorkstationFeedback::getStatus, FeedbackStatus.WAIT_SYNC.getValue())
+ .eq(WorkstationFeedback::getId, detail.getFeedbackId()).update();
+ //this.workstationFeedbackService.lambdaUpdate().set(WorkstationFeedback::getStatus, (Object)FeedbackStatus.WAIT_SYNC.getValue())).eq((Object)WorkstationFeedback::getId, (Object)detail.getFeedbackId())).update();
+ detail.setCancel(true);
+ detail.setCancelTime(new Date());
+ this.updateById(detail);
+ });
+ this.evictCancelFeedback(detailList);
+ return true;
+ }
+ /*
Stream<R> map = ids.stream().map((v1) -> {
return getById(v1);
});
@@ -241,7 +114,7 @@
});
evictCancelFeedback(detailList);
return true;
- }
+ }*/
throw new ServiceException("瀛樺湪鍙嶉鏈畬鎴愪笉鍏佽鎿嶄綔");
}
@@ -253,7 +126,7 @@
Stream.iterate(start, d -> {
return d.plusDays(1L);
}).limit(distance + 1).forEach(date -> {
- String key = String.valueOf(feedback.getWorkstationId()).concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(Func.formatDate(date));
+ String key = String.valueOf(feedback.getWorkstationId()).concat(":").concat(Func.formatDate(date));
CacheUtil.evict(ExtCacheConstant.WORK_FEEDBACK_DETAIL, "list:cancel:workstationId:", key, false);
});
});
@@ -265,6 +138,13 @@
}
private Wrapper<WorkstationFeedbackDetail> todayConditionWrapper(final Long workstationId) {
+ return Lambda.<WorkstationFeedbackDetail>create()
+ .dayBetween(LocalDate.now(), WorkstationFeedbackDetail::getStartTime, WorkstationFeedbackDetail::getStartTime)
+ .eq(WorkstationFeedbackDetail::getWorkstationId, workstationId)
+ .orderByDesc(WorkstationFeedbackDetail::getStartTime)
+ .eq(WorkstationFeedbackDetail::getCancel, Boolean.valueOf(false))
+ .eq(WorkstationFeedbackDetail::getStatus, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue()));
+ /*
return (Wrapper) ((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.create().dayBetween(LocalDate.now(), (v0) -> {
return v0.getStartTime();
}, (v0) -> {
@@ -277,7 +157,7 @@
return v0.getCancel();
}, false)).eq((v0) -> {
return v0.getStatus();
- }, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue()));
+ }, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue()));*/
}
@Override // org.springblade.modules.mdc.service.IWorkstationFeedbackDetailService
@@ -288,27 +168,32 @@
@Override // org.springblade.modules.mdc.service.IWorkstationFeedbackDetailService
public WorkstationFeedbackDetail latestFeedbackByWorkstationId(Long workstationId) {
+ return this.baseMapper.latestFeedbackByWorkstationId(Lambda.eq(WorkstationFeedbackDetail::getWorkstationId, workstationId)
+ .eq(WorkstationFeedbackDetail::getStatus, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue())));
+ /*
return ((WorkstationFeedbackDetailMapper) this.baseMapper).latestFeedbackByWorkstationId((Wrapper) Lambda.eq((v0) -> {
return v0.getWorkstationId();
}, workstationId).eq((v0) -> {
return v0.getStatus();
- }, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue())));
+ }, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue())));*/
}
@Override // org.springblade.modules.mdc.service.IWorkstationFeedbackDetailService
public boolean overwriteFeedbackCheck(final WorkstationNoImmediateFeedBackDTO noImmediateFeedBackDTO) {
+ /*;
+ return noImmediateFeedBackDTO.getWorkstationIds().stream().
+ anyMatch(workstationId -> ((Boolean)Optional.<WorkstationFeedbackDetail>ofNullable(this.baseMapper.overwriteFeedbackCheck(Lambda.eq(WorkstationFeedbackDetail::getWorkstationId, workstationId).ne(WorkstationFeedbackDetail::getCancel, true)).ne(WorkstationFeedbackDetail::getStatus, Integer.valueOf(FeedbackDetailStatus.DELETE.getValue()))).nested(()))).map(()).orElse(Boolean.valueOf(false))).booleanValue());
+ */
+ //FeedbackDetailStatus.DELETE.getValue()
return noImmediateFeedBackDTO.getWorkstationIds().stream().anyMatch(workstationId -> {
- return ((Boolean) Optional.ofNullable(((WorkstationFeedbackDetailMapper) this.baseMapper).overwriteFeedbackCheck((Wrapper) ((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.eq((v0) -> {
- return v0.getWorkstationId();
- }, workstationId).ne((v0) -> {
- return v0.getCancel();
- }, true)).ne((v0) -> {
- return v0.getStatus();
- }, Integer.valueOf(FeedbackDetailStatus.DELETE.getValue()))).nested(w -> {
- ExtraLambdaQueryWrapper extraLambdaQueryWrapper = (ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) w.apply("{0} between start_time and end_time", new Object[]{noImmediateFeedBackDTO.getStartTime()})).or()).apply("{0} between start_time and end_time", new Object[]{noImmediateFeedBackDTO.getEndTime()});
+ return Optional.ofNullable(this.baseMapper.overwriteFeedbackCheck(Lambda.<WorkstationFeedbackDetail>eq(WorkstationFeedbackDetail::getWorkstationId, workstationId)
+ .ne(WorkstationFeedbackDetail::getCancel, true)
+ .ne(WorkstationFeedbackDetail::getStatus,FeedbackDetailStatus.DELETE.getValue())
+ .nested(w -> {
+ ExtraLambdaQueryWrapper extraLambdaQueryWrapper = w.apply("{0} between start_time and end_time", new Object[]{noImmediateFeedBackDTO.getStartTime()}).or().apply("{0} between start_time and end_time", new Object[]{noImmediateFeedBackDTO.getEndTime()});
}))).map(feedback -> {
- return Boolean.valueOf(feedback.getEndTime().compareTo(noImmediateFeedBackDTO.getStartTime()) != 0);
- }).orElse(false)).booleanValue();
+ return feedback.getEndTime().compareTo(noImmediateFeedBackDTO.getStartTime()) != 0;
+ }).orElse(false).booleanValue();
});
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
index 603b7d6..d6fddb0 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
@@ -1,11 +1,6 @@
package com.qianwen.smartman.modules.mdc.service.impl;
-import cn.hutool.core.collection.ListUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.io.Serializable;
-import java.lang.invoke.SerializedLambda;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.ZoneId;
@@ -21,11 +16,15 @@
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import javax.annotation.Resource;
-import com.qianwen.smartman.common.constant.ExtCacheConstant;
-import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
-import com.qianwen.smartman.common.utils.Lambda;
+
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qianwen.core.cache.utils.CacheUtil;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.support.BaseEntityWrapper;
@@ -35,6 +34,9 @@
import com.qianwen.core.secure.utils.AuthUtil;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.ExtCacheConstant;
+import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.cps.entity.Employee;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.service.IEmployeeService;
@@ -56,9 +58,7 @@
import com.qianwen.smartman.modules.mdc.vo.WorkstationFeedbackInfoVO;
import com.qianwen.smartman.modules.mdc.wrapper.WorkstationFeedbackWrapper;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import cn.hutool.core.collection.ListUtil;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.class */
@@ -78,112 +78,12 @@
private IWorkstationFeedbackService selfService;
@Resource
private IEmployeeService employeeService;
- static final /* synthetic */ boolean $assertionsDisabled;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -2138899559:
- if (implMethodName.equals("getStartTime")) {
- z = true;
- break;
- }
- break;
- case -570382830:
- if (implMethodName.equals("getEndTime")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = true;
- break;
- }
- break;
- case -99273003:
- if (implMethodName.equals("getFeedbackType")) {
- z = false;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- 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/mdc/entity/WorkstationFeedback") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getFeedbackType();
- };
- }
- 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/mdc/entity/WorkstationFeedback") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getFeedbackType();
- };
- }
- 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/mdc/entity/WorkstationFeedback") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- 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/mdc/entity/WorkstationFeedback") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- 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/mdc/entity/WorkstationFeedback") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getEndTime();
- };
- }
- 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/mdc/entity/WorkstationFeedback") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getEndTime();
- };
- }
- 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/mdc/entity/WorkstationFeedback") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getEndTime();
- };
- }
- 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;
- 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/mdc/entity/WorkstationFeedback") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getStartTime();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
- static {
- $assertionsDisabled = !WorkstationFeedbackServiceImpl.class.desiredAssertionStatus();
- }
-
+
/* JADX WARN: Type inference failed for: r0v11, types: [org.springblade.modules.mdc.service.impl.WorkstationFeedbackServiceImpl$1] */
@Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
public IPage<WorkstationFeedbackInfoVO> workstationPage(Query query, boolean excludeImmediate) {
final List<WorkstationFeedback> immediateFeedback = this.selfService.getImmediateFeedback();
- final List<Long> workstationList = (List) immediateFeedback.stream().map((v0) -> {
+ final List<Long> workstationList = immediateFeedback.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
IPage<Workstation> page = this.workstationService.page(Condition.getPage(query), Lambda.notIn(excludeImmediate && Func.isNotEmpty(immediateFeedback), (v0) -> {
@@ -218,22 +118,29 @@
@Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
public List<WorkstationFeedback> getImmediateFeedback() {
+ return list(Lambda.eq(WorkstationFeedback::getFeedbackType, Integer.valueOf(FeedbackType.IMMEDIATE.getValue()))
+ .isNull(WorkstationFeedback::getEndTime));
+ /*
return list((Wrapper) Lambda.eq((v0) -> {
return v0.getFeedbackType();
}, Integer.valueOf(FeedbackType.IMMEDIATE.getValue())).isNull((v0) -> {
return v0.getEndTime();
- }));
+ }));*/
}
@Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
public WorkstationFeedback getImmediateFeedback(Serializable workstationId) {
+ return getOne(Lambda.eq(WorkstationFeedback::getWorkstationId, workstationId)
+ .eq(WorkstationFeedback::getFeedbackType, Integer.valueOf(FeedbackType.IMMEDIATE.getValue()))
+ .isNull(WorkstationFeedback::getEndTime));
+ /*
return (WorkstationFeedback) getOne((Wrapper) ((ExtraLambdaQueryWrapper) Lambda.eq((v0) -> {
return v0.getWorkstationId();
}, workstationId).eq((v0) -> {
return v0.getFeedbackType();
}, Integer.valueOf(FeedbackType.IMMEDIATE.getValue()))).isNull((v0) -> {
return v0.getEndTime();
- }));
+ }));*/
}
@Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
@@ -241,7 +148,7 @@
public boolean startFeedbackByImmediate(WorkstationImmediateFeedBackDTO dto) {
Date now = new Date();
for (String workstationId : dto.getWorkstationIds()) {
- this.redisLockClient.lockFair(ExtCacheConstant.WORK_FEEDBACK.concat(SystemPropertyUtils.VALUE_SEPARATOR.concat(workstationId)), 30L, 100L, () -> {
+ this.redisLockClient.lockFair(ExtCacheConstant.WORK_FEEDBACK.concat(":".concat(workstationId)), 30L, 100L, () -> {
WorkstationFeedback oldFeedback = this.selfService.getImmediateFeedback(workstationId);
if (oldFeedback != null && oldFeedback.getWcs().equals(dto.getWcs())) {
return false;
@@ -279,7 +186,7 @@
dto.setEndTime(new Date());
}
for (String workstationId : dto.getWorkstationIds()) {
- this.redisLockClient.lockFair(ExtCacheConstant.WORK_FEEDBACK.concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(workstationId), 30L, 100L, () -> {
+ this.redisLockClient.lockFair(ExtCacheConstant.WORK_FEEDBACK.concat(":").concat(workstationId), 30L, 100L, () -> {
existTimeOverImmediateFeedbackException(dto);
WorkstationFeedback addFeedback = new WorkstationFeedback();
addFeedback.setWorkstationId(Long.valueOf(Long.parseLong(workstationId)));
@@ -317,12 +224,17 @@
Stream.iterate(start, d -> {
return d.plusDays(1L);
}).limit(distance + 1).forEach(date -> {
- String key = String.valueOf(workstationId).concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(Func.formatDate(date));
+ String key = String.valueOf(workstationId).concat(":").concat(Func.formatDate(date));
CacheUtil.evict(IWorkstationFeedbackService.WORK_FEEDBACK_EXP3, GROUP_FEEDBACK_CACHE_KEY, key, false);
});
}
private void existTimeOverImmediateFeedbackException(WorkstationNoImmediateFeedBackDTO dto) {
+ if (dto.getWorkstationIds().stream().map(this.selfService::getImmediateFeedback).filter(Objects::nonNull).anyMatch(feedback ->
+ (dto.getStartTime().getTime() >= feedback.getStartTime().getTime() || dto.getEndTime().getTime() >= feedback.getStartTime().getTime())))
+ throw new ServiceException("瀛樺湪姝ｅ湪鍙嶉鐨勭姸鎬侊紝璇峰厛缁撴潫褰撳墠鍙嶉鍐嶆彁浜ゃ��");
+ /*
+
Stream<String> stream = dto.getWorkstationIds().stream();
IWorkstationFeedbackService iWorkstationFeedbackService = this.selfService;
iWorkstationFeedbackService.getClass();
@@ -334,7 +246,7 @@
return dto.getStartTime().getTime() >= feedback.getStartTime().getTime() || dto.getEndTime().getTime() >= feedback.getStartTime().getTime();
})) {
throw new ServiceException("瀛樺湪姝ｅ湪鍙嶉鐨勭姸鎬侊紝璇峰厛缁撴潫褰撳墠鍙嶉鍐嶆彁浜ゃ��");
- }
+ }*/
}
private Employee getEmployeeById() {
@@ -394,6 +306,16 @@
}
private List<WorkstationFeedback> allFeedbackByWorkstationId(final LocalDate statusTime, final Serializable workstationId) {
+ return Stream.concat(
+ Stream.<Serializable>of(workstationId).map(this.selfService::getImmediateFeedback)
+ .filter(Objects::nonNull)
+ .filter(feedback -> (statusTime == null || DateUtil.formatDate(feedback.getStartTime()).equals(statusTime.toString()))),
+ list(Lambda.eq(WorkstationFeedback::getWorkstationId, workstationId)
+ .dayBetween(statusTime, WorkstationFeedback::getStartTime, WorkstationFeedback::getEndTime))
+ .stream()
+ .filter(Objects::nonNull))
+ .collect(Collectors.toList());
+ /*
Stream of = Stream.of(workstationId);
IWorkstationFeedbackService iWorkstationFeedbackService = this.selfService;
iWorkstationFeedbackService.getClass();
@@ -409,13 +331,13 @@
return v0.getEndTime();
})).stream().filter((v0) -> {
return Objects.nonNull(v0);
- })).collect(Collectors.toList());
+ })).collect(Collectors.toList());*/
}
@Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
public List<StatusRecordVO> groupStatusRecordWithFeedbackCache(final LocalDate statusTime, final Long workstationId, final List<StatusRecordVO> recordList) {
List<StatusRecordVO> statusRecordList = recordList == null ? new ArrayList<>() : recordList;
- List<StatusRecordVO> cancelList = (List) this.feedbackDetailService.cancelFeedback(statusTime, workstationId).stream().map(feedback -> {
+ List<StatusRecordVO> cancelList = this.feedbackDetailService.cancelFeedback(statusTime, workstationId).stream().map(feedback -> {
StatusRecordVO t = new StatusRecordVO();
t.setStartTime(new Timestamp(feedback.getStartTime().getTime()));
t.setEndTime(new Timestamp(feedback.getEndTime().getTime()));
@@ -424,12 +346,12 @@
t.setWcs(-1);
return t;
}).collect(Collectors.toList());
- String key = String.join(SystemPropertyUtils.VALUE_SEPARATOR, workstationId + "", statusTime.toString());
+ String key = String.join(":", workstationId + "", statusTime.toString());
if (statusTime.compareTo((ChronoLocalDate) LocalDate.now()) == 0) {
List<StatusRecordVO> statusRecordVOList = groupStatusRecordWithFeedback(statusTime, workstationId, statusRecordList, cancelList);
return filterDateStatusRecord(statusRecordVOList, statusTime);
}
- GroupFeedbackCacheDTO statusData = (GroupFeedbackCacheDTO) CacheUtil.get(IWorkstationFeedbackService.WORK_FEEDBACK_EXP3, GROUP_FEEDBACK_CACHE_KEY, key, () -> {
+ GroupFeedbackCacheDTO statusData = CacheUtil.get(IWorkstationFeedbackService.WORK_FEEDBACK_EXP3, GROUP_FEEDBACK_CACHE_KEY, key, () -> {
GroupFeedbackCacheDTO dto = new GroupFeedbackCacheDTO();
List<StatusRecordVO> list = groupStatusRecordWithFeedback(statusTime, workstationId, statusRecordList, cancelList);
dto.setRecordList(list);
@@ -437,6 +359,16 @@
dto.setCancelNum(cancelList.size());
return dto;
}, false);
+
+ //assert statusData != null;
+ if (statusData.getStatusNum() != statusRecordList.size() || statusData.getCancelNum() != cancelList.size()) {
+ //CacheUtil.evict("blade:feedback#259200", "group:feedback:list:", key, Boolean.valueOf(false));
+ CacheUtil.evict(IWorkstationFeedbackService.WORK_FEEDBACK_EXP3, GROUP_FEEDBACK_CACHE_KEY, key, false);
+ return groupStatusRecordWithFeedbackCache(statusTime, workstationId, statusRecordList);
+ }
+ return filterDateStatusRecord(statusData.getRecordList(), statusTime);
+
+ /*
if ($assertionsDisabled || statusData != null) {
if (statusData.getStatusNum() != statusRecordList.size() || statusData.getCancelNum() != cancelList.size()) {
CacheUtil.evict(IWorkstationFeedbackService.WORK_FEEDBACK_EXP3, GROUP_FEEDBACK_CACHE_KEY, key, false);
@@ -445,14 +377,15 @@
return filterDateStatusRecord(statusData.getRecordList(), statusTime);
}
throw new AssertionError();
+ */
}
private List<StatusRecordVO> groupStatusRecordWithFeedback(final LocalDate statusTime, final Long workstationId, final List<StatusRecordVO> statusRecordList, final List<StatusRecordVO> cancelList) {
- List<StatusRecordVO> sourceList = (List) Stream.concat(allFeedbackByWorkstationId(statusTime, workstationId).stream().map(WorkstationFeedbackWrapper::entityRecordVO), cancelList.stream()).sorted(Comparator.comparing((v0) -> {
+ List<StatusRecordVO> sourceList = Stream.concat(allFeedbackByWorkstationId(statusTime, workstationId).stream().map(WorkstationFeedbackWrapper::entityRecordVO), cancelList.stream()).sorted(Comparator.comparing((v0) -> {
return v0.getFeedbackTime();
})).collect(Collectors.toList());
List<StatusRecordVO> feedbackList = groupStatusRecordWithFeedback(sourceList, statusTime);
- List<StatusRecordVO> sourceList2 = (List) Stream.concat(statusRecordList.stream().peek(status -> {
+ List<StatusRecordVO> sourceList2 = Stream.concat(statusRecordList.stream().peek(status -> {
status.setFeedbackTime(status.getStartTime());
}), feedbackList.stream()).sorted(Comparator.comparing((v0) -> {
return v0.getFeedbackTime();
@@ -468,18 +401,18 @@
return v0.getEndTime();
})).distinct().sorted(Comparator.comparing((v0) -> {
return v0.getTime();
- })).reduce(first, second -> {
- Optional reduce = sourceList.stream().filter(item -> {
+ })).reduce((first, second) -> {
+ Optional<StatusRecordVO> reduce = sourceList.stream().filter(item -> {
return first.getTime() - item.getStartTime().getTime() >= 0 && item.getEndTime().getTime() - second.getTime() >= 0;
- }).reduce(a, b -> {
+ }).reduce((a, b) -> {
if (!b.isHumanFeedback() && a.isHumanFeedback()) {
return a;
}
return b;
});
- StatusRecordConvert statusRecordConvert = StatusRecordConvert.INSTANCE;
- statusRecordConvert.getClass();
- reduce.map(this::convert).ifPresent(record -> {
+ //StatusRecordConvert statusRecordConvert = StatusRecordConvert.INSTANCE;
+ //statusRecordConvert.getClass();
+ reduce.map(StatusRecordConvert.INSTANCE::convert).ifPresent(record -> {
record.setStartTime(first);
record.setEndTime(second);
System.out.println(first + " -> " + second + " wcs=" + record.getWcs());
@@ -492,7 +425,7 @@
});
return second;
});
- return (List) targetList.stream().filter(item -> {
+ return targetList.stream().filter(item -> {
return !item.getWcs().equals(-1) && item.getEndTime().getTime() - item.getStartTime().getTime() >= 1000 && item.getStartTime().toLocalDateTime().toLocalDate().compareTo((ChronoLocalDate) statusTime) <= 0 && item.getEndTime().toLocalDateTime().toLocalDate().compareTo((ChronoLocalDate) statusTime) >= 0;
}).collect(Collectors.toList());
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java
index 8b0d0a7..cad67ab 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java
@@ -10,7 +10,6 @@
import com.qianwen.smartman.modules.mdc.enums.ProductivityTypeEnum;
import com.qianwen.smartman.modules.mdc.enums.RpsTypeEnum;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/utils/EifficiencyUtils.class */
public class EifficiencyUtils {
public static Double openShiftTypeCalculationResults(List<SuperAggregateState> superAggregateStates, ProductivityTypeEnum productivityType) {
Double v;
@@ -68,11 +67,13 @@
double sum = originalData2.stream().mapToDouble((v0) -> {
return v0.getDurationCollect();
}).sum();
+ double running = originalData2.stream().filter(e -> e.getRps().equals(Integer.valueOf(4))).collect(Collectors.toList()).stream().mapToDouble(SuperAggregateState::getDurationCollect).sum();
+ /*
double running = ((List) originalData2.stream().filter(e -> {
return e.getRps().equals(4);
}).collect(Collectors.toList())).stream().mapToDouble((v0) -> {
return v0.getDurationCollect();
- }).sum();
+ }).sum();*/
result = sum != 0.0d ? Double.parseDouble(NumberUtil.decimalFormat(MdcConstant.RATE_FORMAT, running / sum)) : 0.0d;
}
return Double.valueOf(result);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/MdcConvertUtil.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/MdcConvertUtil.java
index 5382dbe..1dc76fe 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/MdcConvertUtil.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/MdcConvertUtil.java
@@ -13,7 +13,7 @@
}
public static Map<String, String> keyNameToMap(List<KeyNameDTO> keyNameList) {
- return (Map) ((List) Optional.ofNullable(keyNameList).orElse(new ArrayList())).stream().collect(Collectors.toMap((v0) -> {
+ return Optional.ofNullable(keyNameList).orElse(new ArrayList<>()).stream().collect(Collectors.toMap((v0) -> {
return v0.getKey();
}, (v0) -> {
return v0.getName();
--
Gitblit v1.9.3