From c41b0d4083a7d67b85a895dcda535f3bcf7c0272 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 16 五月 2024 09:03:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 114 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 70 insertions(+), 44 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 c2f073a..30c7d1e 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -13,6 +13,8 @@
@Data
public class CrnProtocol {
+ private Integer crnNo;
+
/**
* 1 = 鎵嬪姩妯″紡
* 2 = 鑷姩妯″紡
@@ -31,11 +33,13 @@
* 寮傚父鐮�
*/
public Short alarm;
+ public Short alarmTwo;
/**
* 浠诲姟鍙�
*/
public Short taskNo = 0;
+ public Short taskNoTwo = 0;
/**
* 鍫嗗灈鏈哄綋鍓嶇姸鎬�
@@ -51,11 +55,13 @@
* 99锛氭姤璀�
*/
public Short status;
+ public Short statusTwo;
/**
* 鐘舵�佹灇涓�
*/
public CrnStatusType statusType;
+ public CrnStatusType statusTypeTwo;
/**
* 鍫嗗灈鏈哄綋鍓嶅垪鍙�
@@ -74,8 +80,10 @@
* 2 = 璐у弶鍦ㄥ彸渚�
*/
public Short forkPos;
+ public Short forkPosTwo;
public CrnForkPosType forkPosType;
+ public CrnForkPosType forkPosTypeTwo;
/**
* 褰撳墠杞借揣鍙颁綅缃�
@@ -83,8 +91,10 @@
* 1 = 涓婂畾浣�
*/
public Short liftPos;
+ public Short liftPosTwo;
public CrnLiftPosType liftPosType;
+ public CrnLiftPosType liftPosTypeTwo;
/**
* 璧拌鍦ㄥ畾浣�
@@ -94,21 +104,12 @@
public Short walkPos;
/**
- * 鍫嗗灈鏈轰换鍔″畬鎴�
- */
- public Short taskFinish;
-
- /**
* 杞借揣鍙版湁鐗�
*/
public Short loaded;
+ public Short loadedTwo;
- /**
- * 寮傚父鐮侊紙鏁板�兼樉绀猴級
- */
- private Short alarm1;
-
- private boolean[] temp1;
+ private Short temp1;
private CrnTemp1 crnTemp1;
@@ -215,6 +216,16 @@
this.forkPos = CrnForkPosType.get(type).id.shortValue();
}
+ public void setForkPosTwo(Short forkPosTwo) {
+ this.forkPosTwo = forkPosTwo;
+ this.forkPosTypeTwo = CrnForkPosType.get(forkPosTwo);
+ }
+
+ public void setForkPosTwo(CrnForkPosType typeTwo) {
+ this.forkPosTypeTwo = typeTwo;
+ this.forkPosTwo = CrnForkPosType.get(typeTwo).id.shortValue();
+ }
+
public void setLiftPos(Short liftPos) {
this.liftPos = liftPos;
this.liftPosType = CrnLiftPosType.get(liftPos);
@@ -225,9 +236,24 @@
this.liftPos = CrnLiftPosType.get(type).id.shortValue();
}
+ public void setLiftPosTwo(Short liftPosTwo) {
+ this.liftPosTwo = liftPosTwo;
+ this.liftPosTypeTwo = CrnLiftPosType.get(liftPosTwo);
+ }
+
+ public void setLiftPosTwo(CrnLiftPosType typeTwo) {
+ this.liftPosTypeTwo = typeTwo;
+ this.liftPosTwo = CrnLiftPosType.get(typeTwo).id.shortValue();
+ }
+
public void setStatus(Short status){
this.status = status;
this.statusType = CrnStatusType.get(status);
+ }
+
+ public void setStatusTwo(Short statusTwo){
+ this.statusTwo = statusTwo;
+ this.statusTypeTwo = CrnStatusType.get(statusTwo);
}
public void setStatus(CrnStatusType type){
@@ -235,42 +261,12 @@
this.status = CrnStatusType.get(type).id.shortValue();
}
- public void setError1(boolean[] error1){
- this.error1 = error1;
- this.crnError1 = new CrnError1();
- this.crnError1.walkOverspeedErr = error1[1];
- this.crnError1.walkOverspeedRangeErr = error1[2];
- this.crnError1.walkSpeedOffsetErr = error1[3];
- this.crnError1.walkLocationOffsetErr = error1[4];
- this.crnError1.walkDiastimeterErr = error1[5];
- this.crnError1.walkOutsideErr = error1[6];
- this.crnError1.walkLimitSwitchErr = error1[7];
- this.crnError1.walkBrakeErr = error1[8];
- this.crnError1.walkDiastimeterFau = error1[9];
- this.crnError1.liftOverSpeedErr = error1[10];
- this.crnError1.liftOverspeedRangeErr = error1[11];
- this.crnError1.liftSpeedOffsetErr = error1[12];
- this.crnError1.liftLocationOffsetErr = error1[13];
- this.crnError1.liftDiastimeterErr = error1[14];
- this.crnError1.liftOutsideErr = error1[15];
+ public Short getTemp1() {
+ return temp1;
}
-
- public void setTemp1(boolean[] temp1) {
+ public void setTemp1(Short temp1) {
this.temp1 = temp1;
- this.crnTemp1 = new CrnTemp1();
- this.crnTemp1.liftLimitSwitchErr = temp1[0];
- this.crnTemp1.liftBrakeErr = temp1[1];
- this.crnTemp1.liftDiastimeterFau = temp1[2];
- this.crnTemp1.stop = temp1[3];
- this.crnTemp1.warn = temp1[4];
- this.crnTemp1.overHighErr = temp1[5];
- this.crnTemp1.leftOverWidthErr = temp1[6];
- this.crnTemp1.rightOverWidthErr = temp1[7];
- this.crnTemp1.leftOverLenErr = temp1[8];
- this.crnTemp1.rightOverLenErr = temp1[9];
- this.crnTemp1.pakinThenLoadedErr = temp1[10];
- this.crnTemp1.pakOutThenNoneErr = temp1[11];
}
/**
@@ -286,6 +282,36 @@
basCrnp.setCrnErr(alarm.longValue());
}
basCrnp.setWrkNo(taskNo.intValue());
+ basCrnp.setWrkNoTwo(taskNoTwo.intValue());
return basCrnp;
}
+
+ public void setxSpeed(Short xSpeed) {
+ this.xSpeed = Float.valueOf(xSpeed);
+ }
+
+ public void setySpeed(Short ySpeed) {
+ this.ySpeed = Float.valueOf(ySpeed);
+ }
+
+ public void setzSpeed(Short zSpeed) {
+ this.zSpeed = Float.valueOf(zSpeed);
+ }
+
+ public void setxDistance(Short xDistance) {
+ this.xDistance = Float.valueOf(xDistance);
+ }
+
+ public void setyDistance(Short yDistance) {
+ this.yDistance = Float.valueOf(yDistance);
+ }
+
+ public void setxDuration(Short xDuration) {
+ this.xDuration = Float.valueOf(xDuration);
+ }
+
+ public void setyDuration(Short yDuration) {
+ this.yDuration = Float.valueOf(yDuration);
+ }
+
}
--
Gitblit v1.9.1