From d5449236ef0b3adafb3e4cc872f50479efa0ce7b Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 三月 2025 16:10:29 +0800
Subject: [PATCH] 配置信息
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 143 ++++++++++++++++++++---------------------------
1 files changed, 62 insertions(+), 81 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 baa789a..6e22c96 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -221,92 +221,81 @@
* 杞借揣鍙版湁鐗�
*/
public Short loaded;
-
- /**
- * 鍫嗗灈鏈哄瀭鐩存晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm1 = 0;
-
- /**
- * 鍫嗗灈鏈烘按骞虫晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm2 = 0;;
-
- /**
- * 鍫嗗灈鏈鸿揣鍙夋晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm3 = 0;;
-
- /**
- * 鍫嗗灈鏈虹姸鎬佹晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm4 = 0;;
-
- /**
- * 寮傚父1
- */
- private boolean[] error1;
-
- private CrnError1 crnError1;
-
- /**
- * 寮傚父2
- */
- private boolean[] error2;
-
- private CrnError2 crnError2;
-
- /**
- * 寮傚父3
- */
- private boolean[] error3;
-
- private CrnError3 crnError3;
-
- /**
- * 寮傚父4
- */
- private boolean[] error4;
-
- private CrnError4 crnError4;
-
- /**
- * X琛岃蛋绾块�熷害m/min
- */
- private Float xSpeed = 0F;
-
- /**
- * Y琛岃蛋绾块�熷害m/min
- */
- private Float ySpeed = 0F;
-
- /**
- * Z琛岃蛋绾块�熷害m/min
- */
- private Float zSpeed = 0F;
-
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
*/
public Float xDistance = 0F;
-
/**
* 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
*/
public Float yDistance = 0F;
-
+ ;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
*/
public Float xDuration = 0F;
-
+ ;
/**w
* 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
*/
public Float yDuration = 0F;
-
+ ;
+ /**
+ * 鍫嗗灈鏈哄瀭鐩存晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
+ */
+ private Integer alarm1 = 0;
+ /**
+ * 鍫嗗灈鏈烘按骞虫晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
+ */
+ private Integer alarm2 = 0;
+ /**
+ * 鍫嗗灈鏈鸿揣鍙夋晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
+ */
+ private Integer alarm3 = 0;
+ /**
+ * 鍫嗗灈鏈虹姸鎬佹晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
+ */
+ private Integer alarm4 = 0;
+ /**
+ * 寮傚父1
+ */
+ private boolean[] error1;
+ private CrnError1 crnError1;
+ /**
+ * 寮傚父2
+ */
+ private boolean[] error2;
+ private CrnError2 crnError2;
+ /**
+ * 寮傚父3
+ */
+ private boolean[] error3;
+ private CrnError3 crnError3;
+ /**
+ * 寮傚父4
+ */
+ private boolean[] error4;
+ private CrnError4 crnError4;
+ /**
+ * X琛岃蛋绾块�熷害m/min
+ */
+ private Float xSpeed = 0F;
+ /**
+ * Y琛岃蛋绾块�熷害m/min
+ */
+ private Float ySpeed = 0F;
+ /**
+ * Z琛岃蛋绾块�熷害m/min
+ */
+ private Float zSpeed = 0F;
//鎸囦护ID
private Integer commandId;
+ /**
+ * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
+ * I:鍏ュ簱
+ * O:鍑哄簱
+ */
+ private String lastIo = "I";
public void setMode(Short mode) {
this.mode = mode;
@@ -338,12 +327,12 @@
this.liftPos = CrnLiftPosType.get(type).id.shortValue();
}
- public void setStatus(Short status){
+ public void setStatus(Short status) {
this.status = status;
this.statusType = CrnStatusType.get(status);
}
- public void setStatus(CrnStatusType type){
+ public void setStatus(CrnStatusType type) {
this.statusType = type;
this.status = CrnStatusType.get(type).id.shortValue();
}
@@ -353,7 +342,7 @@
this.fingerPosType = CrnFingerPosType.get(type);
}
- public void setError1(boolean[] error1){
+ public void setError1(boolean[] error1) {
this.error1 = error1;
this.crnError1 = new CrnError1();
this.crnError1.remoteStop = error1[0];
@@ -374,7 +363,7 @@
this.crnError1.leftOverWidthErr2 = error1[15];
}
- public void setError2(boolean[] error2){
+ public void setError2(boolean[] error2) {
this.error2 = error2;
this.crnError2 = new CrnError2();
this.crnError2.leftOverLenErr1 = error2[0];
@@ -425,15 +414,7 @@
this.crnError4.zLooseBrakeTimeout = error4[3];
}
- /**
- * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
- * I:鍏ュ簱
- * O:鍑哄簱
- */
- private String lastIo = "I";
-
-
- public BasCrnp toSqlModel(BasCrnp basCrnp){
+ public BasCrnp toSqlModel(BasCrnp basCrnp) {
basCrnp.setCrnErr(alarm.longValue());
basCrnp.setWrkNo(taskNo.intValue());
return basCrnp;
--
Gitblit v1.9.1