From 8b4f5b2b23023986db813242cd04f4650537decd Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 05 十一月 2025 16:51:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 141 +++++++++++++++++++++++++++++------------------
1 files changed, 87 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 49a760b..0ce9df7 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -12,53 +12,41 @@
@Data
public class CrnProtocol {
+ private Integer crnNo;
+
/**
* 1 = 鎵嬪姩妯″紡
* 2 = 鑷姩妯″紡
* 3 = 鐢佃剳妯″紡
- * 4 = 鎵嬪姩妯″紡鍚姩涓�
- * 5 = 鑷姩妯″紡鍚姩涓�
- * 6 = 鐢佃剳妯″紡鍚姩涓�
*/
- public short mode;
+ public Integer mode;
public CrnModeType modeType;
/**
- * 1 = 鎬ュ仠
- */
- public short eStop;
-
- /**
* 寮傚父鐮�
*/
- public short alarm;
+ public Integer alarm;
/**
* 浠诲姟鍙�
*/
- public short taskNo;
+ public Integer taskNo = 0;
/**
* 鍫嗗灈鏈哄綋鍓嶇姸鎬�
- * 0 = 鏈煡
- * 1 = 绌洪棽
- * 2 = 妫�鏌ヤ换鍔℃暟鎹�
- * 3 = 瀹氫綅鍒板彇璐т綅
- * 7 = 鍙栬揣瀹屾垚
- * 8 = 绛夊緟璋冨害鏌滃厑璁�
- * 9 = 绉诲姩鍒版斁璐т綅缃�
- * 10 = 鏀捐揣涓�
- * 13 = 鎼繍瀹屾垚
- * 14 = 绌鸿浇閬胯
- * 15 = 妫�鏌ヤ换鍔℃暟鎹�
- * 20 = 妫�鏌ユ簮浣嶇疆
- * 21 = 妫�鏌ョ洰鏍囦綅缃�
- * 50 = 绉诲姩浠诲姟
- * 98 = 浠诲姟瀹屾垚锛寃cs鏈‘璁�
- * 99 = 鎶ヨ
+ * 0锛氱┖闂诧紝鏃犱换鍔�
+ * 1锛氬彇璐у畾浣嶄腑
+ * 2锛氬彇璐т腑
+ * 3锛氬彇璐у畬鎴愶紝鏀捐揣瀹氫綅涓�
+ * 4锛氭斁璐т腑
+ * 5锛氬洖鍘熺偣涓�
+ * 6锛氬弽鍘熺偣
+ * 7锛氬簱浣嶇Щ浣�
+ * 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
+ * 99锛氭姤璀�
*/
- public short status;
+ public Integer status;
/**
* 鐘舵�佹灇涓�
@@ -68,12 +56,12 @@
/**
* 鍫嗗灈鏈哄綋鍓嶅垪鍙�
*/
- public short bay;
+ public Integer bay;
/**
* 鍫嗗灈鏈哄綋鍓嶅眰鍙�
*/
- public short level;
+ public Integer level;
/**
* 褰撳墠璐у弶浣嶇疆
@@ -81,16 +69,16 @@
* 1 = 璐у弶鍦ㄥ乏渚�
* 2 = 璐у弶鍦ㄥ彸渚�
*/
- public short forkPos;
+ public Integer forkPos;
- private CrnForkPosType forkPosType;
+ public CrnForkPosType forkPosType;
/**
* 褰撳墠杞借揣鍙颁綅缃�
* 0 = 涓嬪畾浣�
* 1 = 涓婂畾浣�
*/
- public short liftPos;
+ public Integer liftPos;
public CrnLiftPosType liftPosType;
@@ -99,71 +87,116 @@
* 0 = 鍦ㄥ畾浣�
* 1 = 涓嶅湪瀹氫綅
*/
- public short walkPos;
-
- /**
- * 鍫嗗灈鏈轰换鍔″畬鎴�
- */
- public short taskFinish;
+ public Integer walkPos;
/**
* 杞借揣鍙版湁鐗�
*/
- public short loaded;
+ public Integer loaded;
+
+ private Integer temp1;
+
+ private Integer temp2;
+
+ private Integer temp3;
+
+ private Integer temp4;
/**
- * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂�
+ * X琛岃蛋绾块�熷害m/min
*/
- public int xDistance;
+ private Integer xSpeed;
/**
- * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂�
+ * Y琛岃蛋绾块�熷害m/min
*/
- public int yDistance;
+ private Integer ySpeed;
/**
- * 鍫嗗灈鏈虹疮璁¤繍琛屾椂闀�
+ * Z琛岃蛋绾块�熷害m/min
*/
- public int duration;
+ private Integer zSpeed;
- public void setMode(Short mode) {
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
+ */
+ public Integer xDistance;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
+ */
+ public Integer yDistance;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
+ */
+ public Integer xDuration;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
+ */
+ public Integer yDuration;
+
+ /**
+ * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
+ * I:鍏ュ簱
+ * O:鍑哄簱
+ */
+ private String lastIo = "I";
+
+ /**
+ * 鍫嗗灈鏈烘墍鍦ㄥ贩閬�
+ */
+ private Integer crnLane = 1;
+
+ /**
+ * 鏃ュ織閲囬泦鏃堕棿
+ */
+ private Long deviceDataLog = System.currentTimeMillis();
+
+ /**
+ * 涓婁竴娆℃寚浠や笅鍙戞椂闂�
+ */
+ private Long lastCommandTime = System.currentTimeMillis();
+
+ public void setMode(Integer mode) {
this.mode = mode;
this.modeType = CrnModeType.get(mode);
}
public void setMode(CrnModeType type) {
this.modeType = type;
- this.mode = CrnModeType.get(type).id.shortValue();
+ this.mode = CrnModeType.get(type).id;
}
- public void setForkPos(Short forkPos) {
+ public void setForkPos(Integer forkPos) {
this.forkPos = forkPos;
this.forkPosType = CrnForkPosType.get(forkPos);
}
public void setForkPos(CrnForkPosType type) {
this.forkPosType = type;
- this.forkPos = CrnForkPosType.get(type).id.shortValue();
+ this.forkPos = CrnForkPosType.get(type).id;
}
- public void setLiftPos(Short liftPos) {
+ public void setLiftPos(Integer liftPos) {
this.liftPos = liftPos;
this.liftPosType = CrnLiftPosType.get(liftPos);
}
public void setLiftPos(CrnLiftPosType type) {
this.liftPosType = type;
- this.liftPos = CrnLiftPosType.get(type).id.shortValue();
+ this.liftPos = CrnLiftPosType.get(type).id;
}
- public void setStatus(Short status){
+ public void setStatus(Integer status){
this.status = status;
this.statusType = CrnStatusType.get(status);
}
public void setStatus(CrnStatusType type){
this.statusType = type;
- this.status = CrnStatusType.get(type).id.shortValue();
+ this.status = CrnStatusType.get(type).id;
}
}
--
Gitblit v1.9.1