From 1b3757af81d2e37dd8b24d0df67f74cbff49bc48 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 08 九月 2022 12:40:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/SteProtocol.java |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 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 1890496..bc4eb2f 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -2,6 +2,7 @@
 
 import com.zy.asrs.entity.BasSte;
 import com.zy.core.enums.SteHisTaskStatusType;
+import com.zy.core.enums.SteLocaType;
 import com.zy.core.enums.SteStatusType;
 import lombok.Data;
 
@@ -33,6 +34,11 @@
     public SteStatusType statusType;
 
     /**
+     * 浠诲姟鍙�
+     */
+    public Integer taskNo = 0;
+
+    /**
      * 姝ｅ湪鎵ц浠诲姟
      */
     public Boolean execute;
@@ -46,18 +52,18 @@
     /**
      * 寮傚父鐮�1
      */
-    public Integer alarm;
+    public Short alarm;
 
 
     /**
      * 寮傚父鐮�2
      */
-    public Integer alarm0;
+    public Short alarm0;
 
     /**
      * 鐢垫睜鐢甸噺
      */
-    public Short charge;
+    public Float charge = 0.0F;
 
     /**
      * 婊＄數
@@ -70,15 +76,16 @@
     public Boolean lowCharge;
 
     /**
-     * 鐢垫睜棣堢數     0锛屾甯革紝1棣堢數
+     * 鐢垫睜棣堢數    0锛屾瑺鐢碉紝1浣庣數 2婊＄數
      */
     public Short feed;
-
 
     /**
      * 褰撳墠浣嶇疆     1锛岃繎鐐癸紝2杩滅偣锛�3A鐐癸紝4B鐐�
      */
     public Short loca;
+
+    public SteLocaType locaType;
 
     /**
      * 杩戠偣璺濈
@@ -88,7 +95,7 @@
     /**
      * 褰撳墠閫熷害
      */
-    public Double speed;
+    public Double speed = 0.0D;
 
     /**
      * 楂樹綆浣� 0锛屼綆浣嶏紝1楂樹綅
@@ -104,11 +111,6 @@
      * 鍦ㄨ建閬撲笂 0涓嶅湪锛�1鍦�
      */
     public Short track;
-
-    /**
-     * 浠诲姟鍙�
-     */
-    public Integer taskNo = 0;
 
     /**
      * 浠诲姟绫诲瀷
@@ -188,6 +190,16 @@
         this.status = SteStatusType.get(type).id.shortValue();
     }
 
+    public void setLoca(Short loca){
+        this.loca = loca;
+        this.locaType = SteLocaType.get(loca);
+    }
+
+    public void setLoca(SteLocaType type){
+        this.locaType = type;
+        this.loca = SteLocaType.get(type).id.shortValue();
+    }
+
     public void setHisTaskStatus(Short hisTaskStatus){
         this.hisTaskStatus = hisTaskStatus;
         this.hisTaskStatusType = SteHisTaskStatusType.get(hisTaskStatus);
@@ -205,6 +217,7 @@
      */
     private String lastIo = "I";
 
+    private String pakMk = "-";
 
     public BasSte toSqlModel(BasSte basSte){
         if (alarm!=null) {
@@ -213,4 +226,10 @@
         basSte.setWrkNo(taskNo);
         return basSte;
     }
+
+    // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+    public Boolean isIdle() {
+        return getStatusType().equals(SteStatusType.IDLE) && pakMk.equals("N");
+    }
+
 }

--
Gitblit v1.9.1