From 814d22fe09dd6f20563e3f6dd9ccc0ab317b615e Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Mon, 28 Sep 2020 21:03:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E8=AD=A6=20mes?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/bean/MesTaktAlarmContinuousConfig.java     |  8 +++++
 .../i3plus/pojo/mes/bean/MesTaktAlarmRecord.java   | 10 ++++--
 .../estsh/i3plus/pojo/mes/model/AlarmMessage.java  | 41 ++++++++++++++++++++++
 3 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java
index 9e6a71c..9990170 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java
@@ -47,4 +47,12 @@ public class MesTaktAlarmContinuousConfig extends BaseBean implements Serializab
     @ApiParam("发生次数")
     private Integer continuousCount;
 
+    @Column(name = "IS_STOP_LINE")
+    @ApiParam("是否停线")
+    private Integer isStopLine;
+
+    @Column(name = "IS_TRIGGER_ANDON")
+    @ApiParam("是否触发安灯")
+    private Integer isTriggerAndon;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java
index 0d8d058..b506e6a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java
@@ -49,7 +49,11 @@ public class MesTaktAlarmRecord extends BaseBean implements Serializable {
     @ApiParam("节拍 秒数")
     private Integer taktSecond;
 
-    @Column(name = "IS_ABNORMAL")
-    @ApiParam("是否异常")
-    private Integer isAbnormal = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+    @Column(name = "LEVEL_CODE")
+    @ApiParam("异常等级")
+    private String levelCode;
+
+    @Column(name = "IS_PROCESSED")
+    @ApiParam("异常等级")
+    private Integer isProcessed = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java
new file mode 100644
index 0000000..6c8428b
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java
@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmRecord;
+import lombok.Data;
+
+import java.util.concurrent.Delayed;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/9/28 13:26
+ * @desc
+ */
+@Data
+public class AlarmMessage implements Delayed {
+
+    private MesTaktAlarmRecord taktAlarmRecord;
+
+    private long time;
+
+    public AlarmMessage(MesTaktAlarmRecord taktAlarmRecord, long time, TimeUnit unit) {
+        this.taktAlarmRecord = taktAlarmRecord;
+        this.time = System.currentTimeMillis() + (time > 0 ? unit.toMillis(time) : 0);
+    }
+
+    @Override
+    public long getDelay(TimeUnit unit) {
+        return time - System.currentTimeMillis();
+    }
+
+    @Override
+    public int compareTo(Delayed o) {
+        AlarmMessage alarmMessage = (AlarmMessage) o;
+        long diff = this.time - alarmMessage.time;
+        if (diff <= 0) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
+}