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 | 106 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 31 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 7bd122b..bc4eb2f 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -1,7 +1,9 @@
package com.zy.core.model.protocol;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.core.enums.*;
+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;
/**
@@ -22,51 +24,68 @@
public Short mode;
/**
- * 鍫嗗灈鏈哄綋鍓嶇姸鎬�
- * 0锛氱┖闂诧紝鏃犱换鍔�
- * 1锛氬彇璐у畾浣嶄腑
- * 2锛氬彇璐т腑
- * 3锛氬彇璐у畬鎴愶紝鏀捐揣瀹氫綅涓�
- * 4锛氭斁璐т腑
- * 5锛氬洖鍘熺偣涓�
- * 6锛氬弽鍘熺偣
- * 7锛氬簱浣嶇Щ浣�
- * 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
- * 99锛氭姤璀�
+ IDLE(0, "绌洪棽"),
+ MOVING(1, "浣滀笟涓�"),
+ SOS(2, "鎶ヨ"),
+ WAITING(3, "浠诲姟瀹屾垚绛夊緟WCS纭"),
*/
public Short status;
- /**
- * 鐘舵�佹灇涓�
- */
public SteStatusType statusType;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ public Integer taskNo = 0;
+
+ /**
+ * 姝ｅ湪鎵ц浠诲姟
+ */
+ public Boolean execute;
+
+ /**
+ * 浠诲姟瀹屾垚锛岀瓑寰匴CS纭
+ */
+ public Boolean waiting;
+
/**
* 寮傚父鐮�1
*/
- public Integer alarm;
+ public Short alarm;
/**
* 寮傚父鐮�2
*/
- public Integer alarm0;
+ public Short alarm0;
/**
* 鐢垫睜鐢甸噺
*/
- public Short charge;
+ public Float charge = 0.0F;
/**
- * 鐢垫睜棣堢數 0锛屾甯革紝1棣堢數
+ * 婊＄數
+ */
+ public Boolean fullCharge;
+
+ /**
+ * 浣庣數閲�
+ */
+ public Boolean lowCharge;
+
+ /**
+ * 鐢垫睜棣堢數 0锛屾瑺鐢碉紝1浣庣數 2婊＄數
*/
public Short feed;
-
/**
* 褰撳墠浣嶇疆 1锛岃繎鐐癸紝2杩滅偣锛�3A鐐癸紝4B鐐�
*/
public Short loca;
+
+ public SteLocaType locaType;
/**
* 杩戠偣璺濈
@@ -76,7 +95,7 @@
/**
* 褰撳墠閫熷害
*/
- public Double speed;
+ public Double speed = 0.0D;
/**
* 楂樹綆浣� 0锛屼綆浣嶏紝1楂樹綅
@@ -92,11 +111,6 @@
* 鍦ㄨ建閬撲笂 0涓嶅湪锛�1鍦�
*/
public Short track;
-
- /**
- * 浠诲姟鍙�
- */
- public Integer taskNo = 0;
/**
* 浠诲姟绫诲瀷
@@ -125,8 +139,11 @@
/**
* 杩囪处鎸囦护鐘舵��
+ * 0鍒濆 1鎵ц瀹屾垚 2鍒犻櫎
*/
public Short hisTaskStatus;
+
+ public SteHisTaskStatusType hisTaskStatusType;
/**
* 鐩樼偣鏁伴噺
@@ -173,6 +190,26 @@
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);
+ }
+
+ public void setHisTaskStatus(SteHisTaskStatusType type){
+ this.hisTaskStatusType = type;
+ this.hisTaskStatus = SteHisTaskStatusType.get(type).id.shortValue();
+ }
+
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
* I:鍏ュ簱
@@ -180,12 +217,19 @@
*/
private String lastIo = "I";
+ private String pakMk = "-";
- public BasCrnp toSqlModel(BasCrnp basCrnp){
+ public BasSte toSqlModel(BasSte basSte){
if (alarm!=null) {
- basCrnp.setCrnErr(alarm.longValue());
+ basSte.setSteErr(alarm.longValue());
}
- basCrnp.setWrkNo(taskNo);
- return basCrnp;
+ basSte.setWrkNo(taskNo);
+ return basSte;
}
+
+ // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+ public Boolean isIdle() {
+ return getStatusType().equals(SteStatusType.IDLE) && pakMk.equals("N");
+ }
+
}
--
Gitblit v1.9.1