From f4c155cd69fd0048bb0b1a06b578eb050aedd25b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 17 二月 2023 15:37:11 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/SteProtocol.java |  156 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 140 insertions(+), 16 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 ceeaeeb..10e9009 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -4,6 +4,7 @@
 import com.core.common.SpringUtils;
 import com.zy.asrs.entity.BasSte;
 import com.zy.asrs.service.BasSteService;
+import com.zy.core.News;
 import com.zy.core.enums.SteHisTaskStatusType;
 import com.zy.core.enums.SteLocaType;
 import com.zy.core.enums.SteStatusType;
@@ -202,6 +203,141 @@
     // 鍑哄簱鍙栫┖
     private Boolean outEmpty;
 
+    // 绌挎杞﹀紓甯� ------------------------------------------------------------------------
+
+    /**
+     * 1.鍗囬檷瓒呮椂鎶ヨ
+     */
+    private boolean liftErr;
+
+    /**
+     * 3.鍏ュ簱鍙栫┖鎶ヨ
+     */
+    private boolean inFetchErr;
+
+    /**
+     * 4.鍑哄簱鍙栫┖鎶ヨ
+     */
+    private boolean outFetchErr;
+
+    /**
+     * 5.闃叉挒淇濇姢
+     */
+    private boolean antiErr;
+
+    /**
+     * 6.鍗囬檷鎺ヨ繎寮�鍏虫晠闅�
+     */
+    private boolean liftSwitchErr;
+
+    /**
+     * 7.杞ㄩ亾妫�娴嬫姤璀�
+     */
+    private boolean trackErr;
+
+    /**
+     * 8.璁惧杩愯瓒呮椂鎶ヨ
+     */
+    private boolean timeoutErr;
+
+    /**
+     * 9.閫氫俊閿欒鎶ヨ
+     */
+    private boolean connectErr;
+
+    /**
+     * 10.璁惧鎬ュ仠
+     */
+    private boolean emergencyErr;
+
+    /**
+     * 11.浠诲姟绫诲瀷缂哄け
+     */
+    private boolean taskTypeErr;
+
+    /**
+     * 12.浠诲姟鍙风己澶�
+     */
+    private boolean taskNoErr;
+
+    /**
+     * 13.杩愯涓湁鏂颁换鍔�
+     */
+    private boolean newTaskErr;
+
+    /**
+     * 14.鏁呴殰涓湁浠诲姟
+     */
+    private boolean errTaskErr;
+
+    /**
+     * 15.杩愯涓仠姝�
+     */
+    private boolean stopErr;
+
+    /**
+     * 16.鑴辨満妯″紡涓嬫湁浠诲姟
+     */
+    private boolean offlineTaskErr;
+
+    /**
+     * 17.鏉′欢鏈弧瓒冲惎鍔ㄤ换鍔�
+     */
+    private boolean startTaskErr;
+
+    /**
+     * 18.浣庣數鍘嬫椂鏈変换鍔�
+     */
+    private boolean voltageTaskErr;
+
+    /**
+     * 64.璁惧鏁呴殰鏍囧織浣�
+     */
+    private boolean devpErr;
+    // 绌挎杞﹀紓甯� ------------------------------------------------------------------------
+
+    // 绌挎杞︽彁绀轰俊鎭� ------------------------------------------------------------------------
+    /**
+     * 65.鑱旀満鐘舵��
+     */
+    private boolean online;
+
+    /**
+     * 66.涓嶅湪杞ㄩ亾涓�
+     */
+    private boolean notOnTrack;
+
+    /**
+     * 67.浣庣數閲忔彁閱�
+     */
+    private boolean lowVoltage;
+
+    /**
+     * 68.浜忕數涓�
+     */
+    private boolean electricityLoss;
+
+    /**
+     * 69.寮哄埗琛岃蛋鍚姩
+     */
+    private boolean forcedTravel;
+
+    /**
+     * 70.婕旂ず妯″紡寮�鍚�
+     */
+    private boolean demoMode;
+
+    /**
+     * 71.鍏呯數鍒峰凡鎺ラ��
+     */
+    private boolean brushConnect;
+
+//    /**
+//     * 71.鍏呯數鍒峰凡鎺ラ��
+//     */
+//    private boolean brushConnect;
+
+
     public void setStatus(Short status){
         this.status = status;
         this.statusType = SteStatusType.get(status);
@@ -277,7 +413,7 @@
                 String chargeLine = SpringUtils.getBean(BasSteService.class).selectById(this.steNo).getChargeLine();
                 return charge > Float.parseFloat(chargeLine);
             } catch (Exception e) {
-                log.error("fail", e);
+                News.error("fail", e);
                 return false;
             }
         }
@@ -289,22 +425,10 @@
     }
 
     public Boolean isEnable() {
-        if (Cools.isEmpty(row)) {
-            if (row == 0) {
-                return false;
-            }
+        if (Cools.isEmpty(row, bay, lev)) {
+            return false;
         }
-        if (Cools.isEmpty(bay)) {
-            if (bay == 0) {
-                return false;
-            }
-        }
-        if (Cools.isEmpty(lev)) {
-            if (lev == 0) {
-                return false;
-            }
-        }
-        return true;
+        return row > 0 && bay > 0 && lev > 0;
     }
 
 }

--
Gitblit v1.9.1