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 | 239 +++++++++++++++++++----------------------------------------
1 files changed, 76 insertions(+), 163 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 3865f04..0ce9df7 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -1,6 +1,5 @@
package com.zy.core.model.protocol;
-import com.zy.asrs.entity.BasCrnp;
import com.zy.core.enums.CrnForkPosType;
import com.zy.core.enums.CrnLiftPosType;
import com.zy.core.enums.CrnModeType;
@@ -13,29 +12,26 @@
@Data
public class CrnProtocol {
+ private Integer crnNo;
+
/**
* 1 = 鎵嬪姩妯″紡
* 2 = 鑷姩妯″紡
* 3 = 鐢佃剳妯″紡
*/
- public Short mode;
+ public Integer mode;
public CrnModeType modeType;
/**
- * 1 = 鎬ュ仠
- */
- public Short eStop;
-
- /**
* 寮傚父鐮�
*/
- public Short alarm;
+ public Integer alarm;
/**
* 浠诲姟鍙�
*/
- public Short taskNo = 0;
+ public Integer taskNo = 0;
/**
* 鍫嗗灈鏈哄綋鍓嶇姸鎬�
@@ -50,7 +46,7 @@
* 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
* 99锛氭姤璀�
*/
- public Short status;
+ public Integer status;
/**
* 鐘舵�佹灇涓�
@@ -60,12 +56,12 @@
/**
* 鍫嗗灈鏈哄綋鍓嶅垪鍙�
*/
- public Short bay;
+ public Integer bay;
/**
* 鍫嗗灈鏈哄綋鍓嶅眰鍙�
*/
- public Short level;
+ public Integer level;
/**
* 褰撳墠璐у弶浣嶇疆
@@ -73,7 +69,7 @@
* 1 = 璐у弶鍦ㄥ乏渚�
* 2 = 璐у弶鍦ㄥ彸渚�
*/
- public Short forkPos;
+ public Integer forkPos;
public CrnForkPosType forkPosType;
@@ -82,7 +78,7 @@
* 0 = 涓嬪畾浣�
* 1 = 涓婂畾浣�
*/
- public Short liftPos;
+ public Integer liftPos;
public CrnLiftPosType liftPosType;
@@ -91,187 +87,55 @@
* 0 = 鍦ㄥ畾浣�
* 1 = 涓嶅湪瀹氫綅
*/
- public Short walkPos;
-
- /**
- * 鍫嗗灈鏈轰换鍔″畬鎴�
- */
- public Short taskFinish;
+ public Integer walkPos;
/**
* 杞借揣鍙版湁鐗�
*/
- public Short loaded;
+ public Integer loaded;
- /**
- * 寮傚父鐮侊紙鏁板�兼樉绀猴級
- */
- private Short alarm1;
+ private Integer temp1;
- private boolean[] temp1;
+ private Integer temp2;
- private CrnTemp1 crnTemp1;
+ private Integer temp3;
- private Short temp2;
-
- private Short temp3;
-
- private Short temp4;
-
- /**
- * 寮傚父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;
-
- /**
- * 寮傚父5
- */
- private boolean[] error5;
-
- private CrnError5 crnError5;
-
- /**
- * 寮傚父6
- */
- private boolean[] error6;
-
- private CrnError6 crnError6;
+ private Integer temp4;
/**
* X琛岃蛋绾块�熷害m/min
*/
- private Float xSpeed;
+ private Integer xSpeed;
/**
* Y琛岃蛋绾块�熷害m/min
*/
- private Float ySpeed;
+ private Integer ySpeed;
/**
* Z琛岃蛋绾块�熷害m/min
*/
- private Float zSpeed;
+ private Integer zSpeed;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
*/
- public Float xDistance;
+ public Integer xDistance;
/**
* 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
*/
- public Float yDistance;
+ public Integer yDistance;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
*/
- public Float xDuration;
+ public Integer xDuration;
/**
* 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
*/
- public Float yDuration;
-
- public void setMode(Short mode) {
- this.mode = mode;
- this.modeType = CrnModeType.get(mode);
- }
-
- public void setMode(CrnModeType type) {
- this.modeType = type;
- this.mode = CrnModeType.get(type).id.shortValue();
- }
-
- public void setForkPos(Short forkPos) {
- this.forkPos = forkPos;
- this.forkPosType = CrnForkPosType.get(forkPos);
- }
-
- public void setForkPos(CrnForkPosType type) {
- this.forkPosType = type;
- this.forkPos = CrnForkPosType.get(type).id.shortValue();
- }
-
- public void setLiftPos(Short liftPos) {
- this.liftPos = liftPos;
- this.liftPosType = CrnLiftPosType.get(liftPos);
- }
-
- public void setLiftPos(CrnLiftPosType type) {
- this.liftPosType = type;
- this.liftPos = CrnLiftPosType.get(type).id.shortValue();
- }
-
- public void setStatus(Short status){
- this.status = status;
- this.statusType = CrnStatusType.get(status);
- }
-
- public void setStatus(CrnStatusType type){
- this.statusType = type;
- 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 void setTemp1(boolean[] 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];
- }
+ public Integer yDuration;
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
@@ -280,10 +144,59 @@
*/
private String lastIo = "I";
+ /**
+ * 鍫嗗灈鏈烘墍鍦ㄥ贩閬�
+ */
+ private Integer crnLane = 1;
- public BasCrnp toSqlModel(BasCrnp basCrnp){
- basCrnp.setCrnErr(alarm1.longValue());
- basCrnp.setWrkNo(taskNo.intValue());
- return basCrnp;
+ /**
+ * 鏃ュ織閲囬泦鏃堕棿
+ */
+ 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;
+ }
+
+ 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;
+ }
+
+ 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;
+ }
+
+ 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;
+ }
+
}
--
Gitblit v1.9.1