From 522dafb06be3374f27d087c370bcf06027e0f1cc Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 11 五月 2024 14:08:07 +0800
Subject: [PATCH] 增加代码注释
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackStatus.java | 3 +++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackType.java | 3 +++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/RpsTypeEnum.java | 6 ++++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregate.java | 9 +++++++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java | 11 ++++++++++-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateOutput.java | 2 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java | 19 +++++++++++++++++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAlarm.java | 4 +++-
8 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregate.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregate.java
index 4b994e3..d00b917 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregate.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregate.java
@@ -2,6 +2,9 @@
import java.io.Serializable;
+/**
+ * 鑱氬悎琛ㄧ殑鍩虹被
+ */
public class SuperAggregate implements Serializable {
private static final long serialVersionUID = 1074211007569731042L;
private String calendarCode;
@@ -9,8 +12,14 @@
private Integer factoryMonth;
private Integer factoryWeek;
private Integer factoryDate;
+ /**
+ * 鐝
+ */
private Integer shiftIndex;
private Integer shiftTimeType;
+ /**
+ * 宸ヤ綔鍙�
+ */
private Long workstationId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateOutput.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateOutput.java
index f2ffe03..8baceb8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateOutput.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateOutput.java
@@ -14,7 +14,7 @@
private String productName;
private Long employeeId;
- @Override // org.springblade.modules.mdc.entity.SuperAggregate
+ @Override
public boolean equals(final Object o) {
if (o == this) {
return true;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java
index d29435b..5a639e8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java
@@ -5,16 +5,25 @@
public class SuperAggregateState extends SuperAggregate {
private Timestamp startTime;
private Timestamp endTime;
+ /**
+ * 閲囬泦鐨勬湡闂�/鏃堕暱銆傚崟浣嶇?
+ */
private Long durationCollect;
private Integer valueCollect;
+ /**
+ * 宸ュ喌
+ */
private Integer wcs;
+ /**
+ * 鏁堢巼锛�
+ */
private Integer rps;
private Boolean isDeleted;
private Integer isPlan;
private Long employeeId;
private Long feedbackId;
- @Override // org.springblade.modules.mdc.entity.SuperAggregate
+ @Override
public boolean equals(final Object o) {
if (o == this) {
return true;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAlarm.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAlarm.java
index 123387e..557ae36 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAlarm.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAlarm.java
@@ -2,7 +2,9 @@
import java.io.Serializable;
import java.sql.Timestamp;
-
+/**
+ * 璁惧鎶ヨ
+ */
public class SuperAlarm extends SuperAggregate implements Serializable {
private static final long serialVersionUID = 1123326427413588953L;
private Timestamp ts;
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 5c01046..08567f5 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
@@ -2,6 +2,9 @@
import java.util.stream.Stream;
+/**
+ * 鍙嶉鐘舵��
+ */
public enum FeedbackStatus {
WAIT_SYNC("寰呮墽琛�", 1),
SYNCING("鎵ц涓�", 2),
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackType.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackType.java
index 81822f3..0439bae 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackType.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackType.java
@@ -1,5 +1,8 @@
package com.qianwen.smartman.modules.mdc.enums;
+/**
+ * 鍙嶉绫诲瀷
+ */
public enum FeedbackType {
TIME_RANGE("鏃堕棿娈靛弽棣�", 0),
IMMEDIATE("鍗虫椂鍙嶉", 1);
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 2c0c3a0..e345d0b 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,9 +1,15 @@
package com.qianwen.smartman.modules.mdc.enums;
public enum RpsTypeEnum {
+ /**
+ * T1杩愯
+ */
T1(1, "T1"),
T2(2, "T2"),
T3(3, "T3"),
+ /**
+ * T4鎶ヨ
+ */
T4(4, "T4"),
T5(5, "T5"),
T6(6, "T6");
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 8955b54..fcf4c03 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,6 +10,9 @@
import com.qianwen.smartman.modules.mdc.enums.ProductivityTypeEnum;
import com.qianwen.smartman.modules.mdc.enums.RpsTypeEnum;
+/**
+ * 鏁堢巼璁＄畻
+ */
public class EifficiencyUtils {
public static Double openShiftTypeCalculationResults(List<SuperAggregateState> superAggregateStates, ProductivityTypeEnum productivityType) {
Double v;
@@ -43,6 +46,11 @@
return v;
}
+ /**
+ * 璁＄畻杩愯鐜囷紵
+ * @param originalData
+ * @return
+ */
public static Double calculationRunning(List<SuperAggregateState> originalData) {
List<SuperAggregateState> originalData2 = FilterOffUtils.filterOffDay(originalData, OpenTypeEnums.RUNNING);
double result = 0.0d;
@@ -60,10 +68,16 @@
return Double.valueOf(result);
}
+ /**
+ * 璁＄畻鎶ヨ鐜�
+ * @param originalData
+ * @return
+ */
public static Double calculationAlarm(List<SuperAggregateState> originalData) {
List<SuperAggregateState> originalData2 = FilterOffUtils.filterOffDay(originalData, OpenTypeEnums.ALARM);
double result = 0.0d;
if (Func.isNotEmpty(originalData2)) {
+ //鎬绘椂闂�
double sum = originalData2.stream().mapToDouble((v0) -> {
return v0.getDurationCollect();
}).sum();
@@ -79,6 +93,11 @@
return Double.valueOf(result);
}
+ /**
+ * 璁＄畻OEE绋煎姩鐜�
+ * @param originalData
+ * @return
+ */
public static Double calculationOee(List<SuperAggregateState> originalData) {
List<SuperAggregateState> originalData2 = FilterOffUtils.filterOffDay(originalData, OpenTypeEnums.OEE);
double result = 0.0d;
--
Gitblit v1.9.3