From 0141c3ed55171b22dd998ba037166f67e69c9aa9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 四月 2024 22:22:14 +0800
Subject: [PATCH] 稼动率问题测试
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java | 14 ++++++++++----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/GalleryItemConvert.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/RpsTypeEnum.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/I18nDataConverter.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldOptionConvert.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/OpenTypeEnums.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java | 2 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/ApplicationConvert.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldConvert.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/OpenTypeDTO.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/GalleryConvert.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/BasCoderuleConvert.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateBusinessConvert.java | 1 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldRelationConvert.java | 1 -
14 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/OpenTypeDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/OpenTypeDTO.java
index 4fc4a3e..f80b4b3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/OpenTypeDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/OpenTypeDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/OpenTypeDTO.class */
public class OpenTypeDTO implements Serializable {
private static final long serialVersionUID = -5070419077538654764L;
private String type;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/OpenTypeEnums.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/OpenTypeEnums.java
index 4051c0f..6021072 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/OpenTypeEnums.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/OpenTypeEnums.java
@@ -3,7 +3,6 @@
import cn.hutool.core.lang.Assert;
import com.qianwen.smartman.common.constant.ExcelConstant;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/enums/OpenTypeEnums.class */
public enum OpenTypeEnums {
PARAM_KEY_TYPE("mdc_open_type"),
PARAM_KEY_SHIFT("mdc_open_shift"),
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/RpsTypeEnum.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/RpsTypeEnum.java
index ca8c891..2c0c3a0 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/RpsTypeEnum.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/RpsTypeEnum.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.mdc.enums;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/enums/RpsTypeEnum.class */
public enum RpsTypeEnum {
T1(1, "T1"),
T2(2, "T2"),
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 cad67ab..8955b54 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
@@ -67,7 +67,7 @@
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 = originalData2.stream().filter(e -> e.getRps().equals(4)).collect(Collectors.toList()).stream().mapToDouble(SuperAggregateState::getDurationCollect).sum();
/*
double running = ((List) originalData2.stream().filter(e -> {
return e.getRps().equals(4);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java
index 0338711..6dcdfce 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java
@@ -10,18 +10,24 @@
import com.qianwen.smartman.modules.mdc.entity.SuperAggregate;
import com.qianwen.smartman.modules.mdc.enums.OpenTypeEnums;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/utils/FilterOffUtils.class */
public class FilterOffUtils {
+ /**
+ * 杩囨护浼戞伅鏃ワ紵
+ * @param <R>
+ * @param data 鐘舵�佹暟鎹垪琛�
+ * @param openTypeEnums RUNNING/ALARM/OEE绛�
+ * @return
+ */
public static <R extends SuperAggregate> List<R> filterOffDay(List<R> data, OpenTypeEnums openTypeEnums) {
if (Func.isEmpty(data)) {
return data;
}
- boolean filterType = whetherToFilter(OpenTypeEnums.PARAM_KEY_TYPE, openTypeEnums);
- boolean filterShift = whetherToFilter(OpenTypeEnums.PARAM_KEY_SHIFT, openTypeEnums);
+ boolean filterType = whetherToFilter(OpenTypeEnums.PARAM_KEY_TYPE, openTypeEnums);//mdc_open_type
+ boolean filterShift = whetherToFilter(OpenTypeEnums.PARAM_KEY_SHIFT, openTypeEnums);//mdc_open_shift
if (!filterType && !filterShift) {
return data;
}
- return (List) data.stream().filter(item -> {
+ return data.stream().filter(item -> {
return (filterType && item.getShiftTimeType().equals(2)) ? false : true;
}).filter(item2 -> {
return !filterShift || item2.getShiftIndex().intValue() > 0;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/ApplicationConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/ApplicationConvert.java
index d9d3663..300b1b2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/ApplicationConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/ApplicationConvert.java
@@ -11,7 +11,6 @@
import com.qianwen.smartman.modules.system.entity.Application;
@Mapper
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/convert/ApplicationConvert.class */
public interface ApplicationConvert {
public static final ApplicationConvert INSTANCE = (ApplicationConvert) Mappers.getMapper(ApplicationConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/BasCoderuleConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/BasCoderuleConvert.java
index e4f16cf..d8ed424 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/BasCoderuleConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/BasCoderuleConvert.java
@@ -13,7 +13,6 @@
import com.qianwen.smartman.modules.system.vo.CodeRuleCountVO;
@Mapper(builder = @Builder(disableBuilder = true))
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/convert/BasCoderuleConvert.class */
public interface BasCoderuleConvert {
public static final BasCoderuleConvert INSTANCE = (BasCoderuleConvert) Mappers.getMapper(BasCoderuleConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateBusinessConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateBusinessConvert.java
index e46c1d8..3465ff2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateBusinessConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateBusinessConvert.java
@@ -12,7 +12,6 @@
import com.qianwen.smartman.modules.system.vo.CustomTemplateBusinessVO;
@Mapper(builder = @Builder(disableBuilder = true))
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/convert/CustomTemplateBusinessConvert.class */
public interface CustomTemplateBusinessConvert {
public static final CustomTemplateBusinessConvert INSTANCE = (CustomTemplateBusinessConvert) Mappers.getMapper(CustomTemplateBusinessConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldConvert.java
index 5040aa8..82fe9a6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldConvert.java
@@ -19,7 +19,6 @@
import com.qianwen.smartman.modules.system.vo.CustomTemplateFieldVO;
@Mapper(builder = @Builder(disableBuilder = true))
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/convert/CustomTemplateFieldConvert.class */
public interface CustomTemplateFieldConvert {
public static final CustomTemplateFieldConvert INSTANCE = (CustomTemplateFieldConvert) Mappers.getMapper(CustomTemplateFieldConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldOptionConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldOptionConvert.java
index 9004ef3..03a8d16 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldOptionConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldOptionConvert.java
@@ -12,7 +12,6 @@
import com.qianwen.smartman.modules.system.vo.CustomTemplateFieldOptionVO;
@Mapper(builder = @Builder(disableBuilder = true))
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/convert/CustomTemplateFieldOptionConvert.class */
public interface CustomTemplateFieldOptionConvert {
public static final CustomTemplateFieldOptionConvert INSTANCE = (CustomTemplateFieldOptionConvert) Mappers.getMapper(CustomTemplateFieldOptionConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldRelationConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldRelationConvert.java
index e324a75..3ed9b02 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldRelationConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/CustomTemplateFieldRelationConvert.java
@@ -12,7 +12,6 @@
import com.qianwen.smartman.modules.system.vo.CustomTemplateFieldRelationVO;
@Mapper(builder = @Builder(disableBuilder = true))
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/convert/CustomTemplateFieldRelationConvert.class */
public interface CustomTemplateFieldRelationConvert {
public static final CustomTemplateFieldRelationConvert INSTANCE = (CustomTemplateFieldRelationConvert) Mappers.getMapper(CustomTemplateFieldRelationConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/GalleryConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/GalleryConvert.java
index 53e9704..2b3ce68 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/GalleryConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/GalleryConvert.java
@@ -13,7 +13,6 @@
import com.qianwen.smartman.modules.system.vo.GalleryVO;
@Mapper(builder = @Builder(disableBuilder = true))
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/convert/GalleryConvert.class */
public interface GalleryConvert {
public static final GalleryConvert INSTANCE = (GalleryConvert) Mappers.getMapper(GalleryConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/GalleryItemConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/GalleryItemConvert.java
index b38ef30..bccddac 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/GalleryItemConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/GalleryItemConvert.java
@@ -12,7 +12,6 @@
import com.qianwen.smartman.modules.system.vo.GalleryItemVO;
@Mapper(builder = @Builder(disableBuilder = true))
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/convert/GalleryItemConvert.class */
public interface GalleryItemConvert {
public static final GalleryItemConvert INSTANCE = (GalleryItemConvert) Mappers.getMapper(GalleryItemConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/I18nDataConverter.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/I18nDataConverter.java
index dfdfb31..8c9a9a9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/I18nDataConverter.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/convert/I18nDataConverter.java
@@ -14,7 +14,6 @@
import com.qianwen.smartman.modules.system.vo.I18nDataPageVO;
@Mapper(builder = @Builder(disableBuilder = true))
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/convert/I18nDataConverter.class */
public interface I18nDataConverter {
public static final I18nDataConverter INSTANCE = (I18nDataConverter) Mappers.getMapper(I18nDataConverter.class);
--
Gitblit v1.9.3