From c5736834f88a5fd43abadaec50dd2b1e6dceb4ba Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 15 九月 2022 10:36:52 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/SteProtocol.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java index 90f2103..87bcc77 100644 --- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java @@ -217,6 +217,7 @@ */ private String lastIo = "I"; + private String pakMk = "-"; public BasSte toSqlModel(BasSte basSte){ if (alarm!=null) { @@ -225,4 +226,17 @@ basSte.setWrkNo(taskNo); return basSte; } + + // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵�� + public Boolean isIdle() { + return this.statusType.equals(SteStatusType.IDLE) + && this.pakMk.equals("N") + && !isAlarm(); + } + + // 鏄惁澶勪簬鎶ヨ鐘舵�� + public Boolean isAlarm() { + return this.alarm > 0; + } + } -- Gitblit v1.9.1