From c904f735e0b8a488ef56744c08f8e10258639bce Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 15:54:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   99 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 91 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 28513ec..897b1bc 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -4,6 +4,9 @@
 import com.zy.asrs.entity.CommandInfo;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
  * Created by vincent on 2020/8/6
@@ -23,29 +26,32 @@
     private Short staNo;
 
     // ----------------------------------------------------------------
-    // 鑷姩
+    // 杈撻�佺嚎 ==銆� 姘皵1
     private boolean autoing;
 
-    // 鏈夌墿
+    // 杈撻�佺嚎 ==銆� 姘皵2
     private boolean loading;
 
-    // 鍙叆
+    // 杈撻�佺嚎 ==銆� 姘皵3
     private boolean inEnable;
 
-    // 鍙嚭
+    // 杈撻�佺嚎 ==銆� 姘皵4
     private boolean outEnable;
 
-    // 绌烘澘淇″彿
+    // 姘皵1 ==銆� 涓嬫枡浣�
     private boolean emptyMk;
 
-    // 婊℃墭鐩�
+    // 姘皵2 ==銆� 涓嬫枡浣�
     private boolean fullPlt;
 
     // 楂�
-    private boolean high;
+    private boolean high = false;
 
-    // 浣�
+    // 姘皵4 ==銆� 涓嬫枡浣�
     private boolean low;
+
+    //姘皵3 ==銆� 涓嬫枡浣�
+    private boolean car;
 
     // 閿佸畾鏍囪
     private boolean pakMk = true;
@@ -59,6 +65,83 @@
     //鎸囦护ID
     private Integer commandId;
 
+    //鏉＄爜
+    private String barcode = null;
+
+    // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+    // 鍓嶈秴闄�
+    private boolean frontErr = false;
+
+    // 鍚庤秴闄�
+    private boolean backErr = false;
+
+    // 楂樿秴闄�
+    private boolean highErr = false;
+
+    // 宸﹁秴闄�
+    private boolean leftErr = false;
+
+    // 鍙宠秴闄�
+    private boolean rightErr = false;
+
+    // 瓒呴噸
+    private boolean weightErr = false;
+
+    // 鎵爜澶辫触
+    private boolean barcodeErr = false;
+
+    //鏁呴殰-----------------------------------------------------------------------
+    private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅�
+
+    private Boolean infraredErr = false; //鍏夌數寮傚父
+
+    private Boolean outTimeErr = false; //杩愯瓒呮椂
+
+    private Boolean seizeSeatErr = false; //鍗犱綅瓒呮椂
+
+    private Boolean wrkYgoodsN = false;//鏈変换鍔℃棤璐ф晠闅�
+
+    private Boolean inverterErr = false; //鍙橀鍣ㄦ晠闅�
+
+    private Boolean contactErr = false; //鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+
+    private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+
+    private List<Integer> alarm;
+
+
+    public List<Integer> getAlarm(){
+        List<Integer> alarm = new ArrayList<>();
+        if (breakerErr){
+            alarm.add(1);
+        }
+        if (infraredErr){
+            alarm.add(2);
+        }
+        if (outTimeErr){
+            alarm.add(3);
+        }
+        if (seizeSeatErr){
+            alarm.add(4);
+        }
+        if (wrkYgoodsN){
+            alarm.add(5);
+        }
+        if (inverterErr){
+            alarm.add(6);
+        }
+        if (contactErr){
+            alarm.add(7);
+        }
+        if (upcontactErr){
+            alarm.add(8);
+        }
+        return alarm;
+    }
+
+
+
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
         basDevp.setDevNo(siteId);

--
Gitblit v1.9.1