From 82374fe4b32d58956810f445b7889f1a370f1ab9 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 27 十月 2025 15:26:13 +0800
Subject: [PATCH] #配置信号
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 401 +++++++++++++++++++++++++-------------------------------
1 files changed, 180 insertions(+), 221 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 761a91a..623e52c 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -1,7 +1,11 @@
package com.zy.core.model.protocol;
+import com.zy.asrs.entity.BasCrnErrorLog;
import com.zy.asrs.entity.BasCrnp;
-import com.zy.core.enums.*;
+import com.zy.core.enums.CrnForkPosType;
+import com.zy.core.enums.CrnLiftPosType;
+import com.zy.core.enums.CrnModeType;
+import com.zy.core.enums.CrnStatusType;
import lombok.Data;
/**
@@ -9,6 +13,8 @@
*/
@Data
public class CrnProtocol {
+
+ private Integer crnNo;
/**
* 1 = 鎵嬪姩妯″紡
@@ -20,19 +26,14 @@
public CrnModeType modeType;
/**
- * 鍫嗗灈鏈轰换鍔″畬鎴�
- */
- public Short taskFinish;
-
- /**
- * 鏍￠獙缁撴灉 1琛ㄧず妫�楠屾垚鍔�
- */
- public Short valid;
-
- /**
* 1 = 鎬ュ仠
*/
public Short eStop;
+
+ /**
+ * 寮傚父鐮�
+ */
+ public Short alarm;
/**
* 浠诲姟鍙�
@@ -70,116 +71,6 @@
public Short level;
/**
- * 鍫嗗灈鏈哄綋鍓嶆帓
- */
- public Short row;
-
- /**
- * 鍫嗗灈鏈哄綋鍓嶅贩閬撳彿
- */
- public Short lane;
-
- /**
- * 鍫嗗灈鏈洪�氳鐘舵��
- */
- public Boolean connStatus;
-
- /**
- * 鐢宠鍏ュ簱淇
- */
- public Boolean correction;
-
- /**
- * 鎵樼洏鍙烽敊
- */
- public Boolean tuError;
-
- /**
- * 鍙栬揣鏃犵
- */
- public Boolean noneError;
-
- /**
- * 鍙岄噸鍏ュ簱
- */
- public Boolean stockError;
-
- /**
- * 浣滀笟鏁版嵁鏃犳晥
- */
- public Boolean jobInvalid;
-
- /**
- * 绌洪棽鐘舵��
- */
- public Boolean idle;
-
- /**
- * 鎺у埗鏌滀娇鑳�
- */
- public Boolean control;
-
- /**
- * 鍋滃噯
- */
- public Boolean stopQuasi;
-
- /**
- * 杩愯
- */
- public Boolean running;
-
- /**
- * 鏁呴殰
- */
- public Boolean fault;
-
- /**
- * 璐у弶涓綅
- */
- public Boolean forkHome;
- /**
- * 鍗曚几浣嶈揣鍙夊乏浣�
- */
- public Boolean forkSingleLeft;
- /**
- * 鍗曚几浣嶈揣鍙夊彸浣�
- */
- public Boolean forkSingleRight;
- /**
- * 鍙屼几浣嶈揣鍙夊乏浣�
- */
- public Boolean forkDoubleLeft;
- /**
- * 鍙屼几浣嶈揣鍙夊彸浣�
- */
- public Boolean forkDoubleRight;
- /**
- * 鍗曚几浣嶉珮浣�
- */
- public Boolean singleHigh;
- /**
- * 鍗曚几浣嶄綆浣�
- */
- public Boolean singleLow;
- /**
- * 鍙屼几浣嶉珮浣�
- */
- public Boolean doubleHigh;
- /**
- * 鍙屼几浣嶄綆浣�
- */
- public Boolean doubleLow;
- /**
- * 绔欏彴楂樹綅
- */
- public Boolean platformHigh;
- /**
- * 绔欏彴浣庝綅
- */
- public Boolean platformLow;
-
- /**
* 褰撳墠璐у弶浣嶇疆
* 0 = 璐у弶鍘熶綅
* 1 = 璐у弶鍦ㄥ乏渚�
@@ -206,39 +97,19 @@
public Short walkPos;
/**
- * 鎷ㄦ寚浣嶇疆
- * 0 = 涓嶅湪瀹氫綅
- * 1 = 涓婂畾浣�
- * 2 = 涓嬪畾浣�
- */
- public Short fingerPos;
-
- public CrnFingerPosType fingerPosType;
-
- /**
* 杞借揣鍙版湁鐗�
*/
public Short loaded;
- /**
- * 鍫嗗灈鏈哄瀭鐩存晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm1;
+ private Short temp1;
- /**
- * 鍫嗗灈鏈烘按骞虫晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm2;
+ private CrnTemp1 crnTemp1;
- /**
- * 鍫嗗灈鏈鸿揣鍙夋晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm3;
+ private Short temp2;
- /**
- * 鍫嗗灈鏈虹姸鎬佹晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm4;
+ private Short temp3;
+
+ private Short temp4;
/**
* 寮傚父1
@@ -267,6 +138,20 @@
private boolean[] error4;
private CrnError4 crnError4;
+
+ /**
+ * 寮傚父5
+ */
+ private boolean[] error5;
+
+ private CrnError5 crnError5;
+
+ /**
+ * 寮傚父6
+ */
+ private boolean[] error6;
+
+ private CrnError6 crnError6;
/**
* X琛岃蛋绾块�熷害m/min
@@ -302,6 +187,118 @@
* 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
*/
public Float yDuration;
+
+ //鍫嗗灈鏈洪厤缃俊鍙�--------------------------------------------------------------
+ // 鏁呴殰璇诲彇閿佸畾鏍囪
+ private boolean errorMk = false;
+ //鍐欏叆鏍囪
+ private boolean writeMk = true;
+ private Boolean ibDriveFault = false; // 琛岃蛋鍙橀鍣ㄦ晠闅�
+ private Boolean ibSupplyFault = false; // 鎻愪緵鍙橀鍣ㄦ晠闅�
+ private Boolean ibForkDriveFault = false; // 璐у弶鍙橀鍣ㄦ晠闅�
+ private Boolean ibDriveCircuitFault = false; // 琛岃蛋鏂矾鍣ㄦ晠闅�
+ private Boolean ibLiftCircuitFault = false; // 鎻愬崌鏂矾鍣ㄦ晠闅�
+ private Boolean ibForkCircuitFault = false; // 璐у弶鏂矾鍣ㄦ晠闅�
+ private Boolean ibForwardLimit = false; // 鍓嶈繘闄愪綅
+ private Boolean ibReverseLimit = false; // 鍚庨��闄愪綅
+ private Boolean ibDriveStart = false; // 琛岃蛋鍘熺偣
+ private Boolean ibForwardBrakeSpeed = false; // 鍓嶈繘寮哄埗浣庨��
+ private Boolean ibReverseBrakeSpeed = false; // 鍚庨��寮哄埗浣庨��
+ private Boolean ibUpLimit = false; // 涓婂崌闄愪綅
+ private Boolean ibDownLimit = false; // 涓嬮檺闄愪綅
+ private Boolean ibUpOrigin = false; // 鎻愬崌鍘熺偣
+ private Boolean ibUpBrakeSpeed = false; // 涓婂崌寮哄埗浣庨��
+ private Boolean ibDownBrakeSpeed = false; // 涓嬮檷寮哄埗浣庨��
+ private Boolean ibPlatformSignal = false; // 杞借揣鍙版帰璐�
+ private Boolean ibForkMidSignal = false; // 璐у弶涓綅淇″彿
+ private Boolean ibForkLeftLimit = false; // 璐у弶宸︽瀬闄�
+ private Boolean ibForkRightLimit = false; // 璐у弶鍙虫瀬闄�
+ private Boolean ibFrontOverLimit = false; // 鍓嶈秴闄�
+ private Boolean ibRearOverLimit = false; // 鍚庤秴闄�
+ private Boolean ibLeftOverLimit = false; // 宸﹁秴闄�
+ private Boolean ibRightOverLimit = false; // 鍙宠秴闄�
+ private Boolean ibHighOverLimit1 = false; // 楂樿秴闄�1
+ private Boolean ibHighOverLimit2 = false; // 楂樿秴闄�2
+ private Boolean ibHighOverLimit3 = false; // 楂樿秴闄�3
+ private Boolean ibOneExtendLeftLoad1 = false; // 涓�浼稿乏渚ф帰璐�1
+ private Boolean ibOneExtendLeftLoad2 = false; // 涓�浼稿乏渚ф帰璐�2
+ private Boolean ibOneExtendRightLoad1 = false; // 涓�浼稿彸渚ф帰璐�1
+ private Boolean ibOneExtendRightLoad2 = false; // 涓�浼稿彸渚ф帰璐�2
+ private Boolean ibTwoExtendLeftLoad1 = false; // 浜屼几宸︿晶鎺㈣揣1
+ private Boolean ibTwoExtendLeftLoad2 = false; // 浜屼几宸︿晶鎺㈣揣2
+ private Boolean ibTwoExtendRightLoad1 = false; // 浜屼几鍙充晶鎺㈣揣1
+ private Boolean ibTwoExtendRightLoad2 = false; // 浜屼几鍙充晶鎺㈣揣2
+ private Boolean ibSpeedSignal1 = false; // 瓒呴�熶俊鍙�1
+ private Boolean ibSpeedSignal2 = false; // 瓒呴�熶俊鍙�2
+ private Boolean ibOverweightSignal1 = false; // 瓒呴噸淇″彿1
+ private Boolean ibOverweightSignal2 = false; // 瓒呴噸淇″彿2
+ private Boolean ibRopeReleaseSignal1 = false; // 鏉剧怀淇″彿1
+ private Boolean ibRopeReleaseSignal2 = false; // 鏉剧怀淇″彿2
+ private Boolean ibSafetyClamp = false; // 瀹夊叏閽�
+ private Boolean ibTightener = false; // 寮犵揣鍣�
+ private Boolean ibSpeedLimiter = false; // 闄愰�熷櫒
+ private Boolean ibSafetyDoorOpen = false; // 瀹夊叏闂ㄦ墦寮�
+ //-------------------------------------------------------------------
+
+ public BasCrnErrorLog toSqlModelError() {
+ BasCrnErrorLog basCrnErrorLog = new BasCrnErrorLog();
+
+ // 閿欒瀛楁杞崲
+ basCrnErrorLog.setCrnNo(crnNo);
+ basCrnErrorLog.setIbDriveFault(ibDriveFault ? "Y" : "N"); // 琛岃蛋鍙橀鍣ㄦ晠闅�
+ basCrnErrorLog.setIbSupplyFault(ibSupplyFault ? "Y" : "N"); // 鎻愪緵鍙橀鍣ㄦ晠闅�
+ basCrnErrorLog.setIbForkDriveFault(ibForkDriveFault ? "Y" : "N"); // 璐у弶鍙橀鍣ㄦ晠闅�
+ basCrnErrorLog.setIbDriveCircuitFault(ibDriveCircuitFault ? "Y" : "N"); // 琛岃蛋鏂矾鍣ㄦ晠闅�
+ basCrnErrorLog.setIbLiftCircuitFault(ibLiftCircuitFault ? "Y" : "N"); // 鎻愬崌鏂矾鍣ㄦ晠闅�
+ basCrnErrorLog.setIbForkCircuitFault(ibForkCircuitFault ? "Y" : "N"); // 璐у弶鏂矾鍣ㄦ晠闅�
+ basCrnErrorLog.setIbForwardLimit(ibForwardLimit ? "Y" : "N"); // 鍓嶈繘闄愪綅
+ basCrnErrorLog.setIbReverseLimit(ibReverseLimit ? "Y" : "N"); // 鍚庨��闄愪綅
+ basCrnErrorLog.setIbDriveStart(ibDriveStart ? "Y" : "N"); // 琛岃蛋鍘熺偣
+ basCrnErrorLog.setIbForwardBrakeSpeed(ibForwardBrakeSpeed ? "Y" : "N"); // 鍓嶈繘寮哄埗浣庨��
+ basCrnErrorLog.setIbReverseBrakeSpeed(ibReverseBrakeSpeed ? "Y" : "N"); // 鍚庨��寮哄埗浣庨��
+ basCrnErrorLog.setIbUpLimit(ibUpLimit ? "Y" : "N"); // 涓婂崌闄愪綅
+ basCrnErrorLog.setIbDownLimit(ibDownLimit ? "Y" : "N"); // 涓嬮檺闄愪綅
+ basCrnErrorLog.setIbUpOrigin(ibUpOrigin ? "Y" : "N"); // 鎻愬崌鍘熺偣
+ basCrnErrorLog.setIbUpBrakeSpeed(ibUpBrakeSpeed ? "Y" : "N"); // 涓婂崌寮哄埗浣庨��
+ basCrnErrorLog.setIbDownBrakeSpeed(ibDownBrakeSpeed ? "Y" : "N"); // 涓嬮檷寮哄埗浣庨��
+ basCrnErrorLog.setIbPlatformSignal(ibPlatformSignal ? "Y" : "N"); // 杞借揣鍙版帰璐�
+ basCrnErrorLog.setIbForkMidSignal(ibForkMidSignal ? "Y" : "N"); // 璐у弶涓綅淇″彿
+ basCrnErrorLog.setIbForkLeftLimit(ibForkLeftLimit ? "Y" : "N"); // 璐у弶宸︽瀬闄�
+ basCrnErrorLog.setIbForkRightLimit(ibForkRightLimit ? "Y" : "N"); // 璐у弶鍙虫瀬闄�
+ basCrnErrorLog.setIbFrontOverLimit(ibFrontOverLimit ? "Y" : "N"); // 鍓嶈秴闄�
+ basCrnErrorLog.setIbRearOverLimit(ibRearOverLimit ? "Y" : "N"); // 鍚庤秴闄�
+ basCrnErrorLog.setIbLeftOverLimit(ibLeftOverLimit ? "Y" : "N"); // 宸﹁秴闄�
+ basCrnErrorLog.setIbRightOverLimit(ibRightOverLimit ? "Y" : "N"); // 鍙宠秴闄�
+ basCrnErrorLog.setIbHighOverLimit1(ibHighOverLimit1 ? "Y" : "N"); // 楂樿秴闄�1
+ basCrnErrorLog.setIbHighOverLimit2(ibHighOverLimit2 ? "Y" : "N"); // 楂樿秴闄�2
+ basCrnErrorLog.setIbHighOverLimit3(ibHighOverLimit3 ? "Y" : "N"); // 楂樿秴闄�3
+ basCrnErrorLog.setIbOneExtendLeftLoad1(ibOneExtendLeftLoad1 ? "Y" : "N"); // 涓�浼稿乏渚ф帰璐�1
+ basCrnErrorLog.setIbOneExtendLeftLoad2(ibOneExtendLeftLoad2 ? "Y" : "N"); // 涓�浼稿乏渚ф帰璐�2
+ basCrnErrorLog.setIbOneExtendRightLoad1(ibOneExtendRightLoad1 ? "Y" : "N"); // 涓�浼稿彸渚ф帰璐�1
+ basCrnErrorLog.setIbOneExtendRightLoad2(ibOneExtendRightLoad2 ? "Y" : "N"); // 涓�浼稿彸渚ф帰璐�2
+ basCrnErrorLog.setIbTwoExtendLeftLoad1(ibTwoExtendLeftLoad1 ? "Y" : "N"); // 浜屼几宸︿晶鎺㈣揣1
+ basCrnErrorLog.setIbTwoExtendLeftLoad2(ibTwoExtendLeftLoad2 ? "Y" : "N"); // 浜屼几宸︿晶鎺㈣揣2
+ basCrnErrorLog.setIbTwoExtendRightLoad1(ibTwoExtendRightLoad1 ? "Y" : "N"); // 浜屼几鍙充晶鎺㈣揣1
+ basCrnErrorLog.setIbTwoExtendRightLoad2(ibTwoExtendRightLoad2 ? "Y" : "N"); // 浜屼几鍙充晶鎺㈣揣2
+ basCrnErrorLog.setIbSpeedSignal1(ibSpeedSignal1 ? "Y" : "N"); // 瓒呴�熶俊鍙�1
+ basCrnErrorLog.setIbSpeedSignal2(ibSpeedSignal2 ? "Y" : "N"); // 瓒呴�熶俊鍙�2
+ basCrnErrorLog.setIbOverweightSignal1(ibOverweightSignal1 ? "Y" : "N"); // 瓒呴噸淇″彿1
+ basCrnErrorLog.setIbOverweightSignal2(ibOverweightSignal2 ? "Y" : "N"); // 瓒呴噸淇″彿2
+ basCrnErrorLog.setIbRopeReleaseSignal1(ibRopeReleaseSignal1 ? "Y" : "N"); // 鏉剧怀淇″彿1
+ basCrnErrorLog.setIbRopeReleaseSignal2(ibRopeReleaseSignal2 ? "Y" : "N"); // 鏉剧怀淇″彿2
+ basCrnErrorLog.setIbSafetyClamp(ibSafetyClamp ? "Y" : "N"); // 瀹夊叏閽�
+ basCrnErrorLog.setIbTightener(ibTightener ? "Y" : "N"); // 寮犵揣鍣�
+ basCrnErrorLog.setIbSpeedLimiter(ibSpeedLimiter ? "Y" : "N"); // 闄愰�熷櫒
+ basCrnErrorLog.setIbSafetyDoorOpen(ibSafetyDoorOpen ? "Y" : "N"); // 瀹夊叏闂ㄦ墦寮�
+
+ return basCrnErrorLog;
+ }
+
+
+
+
+
+
public void setMode(Short mode) {
this.mode = mode;
@@ -343,81 +340,12 @@
this.status = CrnStatusType.get(type).id.shortValue();
}
- public void setFingerPos(Short type) {
- this.fingerPos = type;
- this.fingerPosType = CrnFingerPosType.get(type);
+ public Short getTemp1() {
+ return temp1;
}
- public void setError1(boolean[] error1){
- this.error1 = error1;
- this.crnError1 = new CrnError1();
- this.crnError1.remoteStop = error1[0];
- this.crnError1.mainStop = error1[1];
- this.crnError1.controlStop = error1[2];
- this.crnError1.xCoverErr = error1[3];
- this.crnError1.yCoverErr = error1[4];
- this.crnError1.zCoverErr = error1[5];
- this.crnError1.laserErr = error1[6];
- this.crnError1.barcodeErr = error1[7];
- this.crnError1.xFrontLimitErr = error1[8];
- this.crnError1.xBackLimitErr = error1[9];
- this.crnError1.yUpLimitErr = error1[10];
- this.crnError1.yDownLimitErr = error1[11];
- this.crnError1.zLeftLimitErr = error1[12];
- this.crnError1.zRightLimitErr = error1[13];
- this.crnError1.leftOverWidthErr1 = error1[14];
- this.crnError1.leftOverWidthErr2 = error1[15];
- }
-
- public void setError2(boolean[] error2){
- this.error2 = error2;
- this.crnError2 = new CrnError2();
- this.crnError2.leftOverLenErr1 = error2[0];
- this.crnError2.leftOverLenErr2 = error2[1];
- this.crnError2.leftOverHighErr = error2[2];
- this.crnError2.rightOverWidthErr1 = error2[3];
- this.crnError2.rightOverWidthErr2 = error2[4];
- this.crnError2.rightOverLenErr1 = error2[5];
- this.crnError2.rightOverLenErr2 = error2[6];
- this.crnError2.rightOverHighErr = error2[7];
- this.crnError2.leftLooseRopeErr = error2[8];
- this.crnError2.rightLooseRopeErr = error2[9];
- this.crnError2.frontDoorErr = error2[10];
- this.crnError2.backDoorErr = error2[11];
- this.crnError2.startupErr = error2[12];
- this.crnError2.xFrontLocaUpErr = error2[13];
- this.crnError2.xFrontLocaDownErr = error2[14];
- this.crnError2.xBackLocaUpErr = error2[15];
- }
-
- public void setError3(boolean[] error3) {
- this.error3 = error3;
- this.crnError3 = new CrnError3();
- this.crnError3.xBackLocaDownErr = error3[0];
- this.crnError3.yUpLocaUpErr = error3[1];
- this.crnError3.yUpLocaDownErr = error3[2];
- this.crnError3.yDownLocaUpErr = error3[3];
- this.crnError3.yDownLocaDownErr = error3[4];
- this.crnError3.zLeftLocaUpErr = error3[5];
- this.crnError3.zLeftLocaDownErr = error3[6];
- this.crnError3.zRightLocaUpErr = error3[7];
- this.crnError3.zRightLocaDownErr = error3[8];
- this.crnError3.leftTakeNoneErr = error3[9];
- this.crnError3.rightTakeNoneErr = error3[10];
- this.crnError3.leftTakeThenLoadErr = error3[11];
- this.crnError3.rightTakeThenLoadErr = error3[12];
- this.crnError3.leftPutAndLoadErr = error3[13];
- this.crnError3.rightPutAndLoadErr = error3[14];
- this.crnError3.leftPutThenNoneErr = error3[15];
- }
-
- public void setError4(boolean[] error4) {
- this.error4 = error4;
- this.crnError4 = new CrnError4();
- this.crnError4.rightPutThenNoneErr = error4[0];
- this.crnError4.xLooseBrakeTimeout = error4[1];
- this.crnError4.yLooseBrakeTimeout = error4[2];
- this.crnError4.zLooseBrakeTimeout = error4[3];
+ public void setTemp1(Short temp1) {
+ this.temp1 = temp1;
}
/**
@@ -429,8 +357,39 @@
public BasCrnp toSqlModel(BasCrnp basCrnp){
- basCrnp.setCrnErr(alarm1.longValue());
+ if (alarm!=null) {
+ basCrnp.setCrnErr(alarm.longValue());
+ }
basCrnp.setWrkNo(taskNo.intValue());
return basCrnp;
}
+
+ public void setxSpeed(float xSpeed) {
+ this.xSpeed = xSpeed;
+ }
+
+ public void setySpeed(float ySpeed) {
+ this.ySpeed = ySpeed;
+ }
+
+ public void setzSpeed(float zSpeed) {
+ this.zSpeed = zSpeed;
+ }
+
+ public void setxDistance(float xDistance) {
+ this.xDistance = xDistance;
+ }
+
+ public void setyDistance(float yDistance) {
+ this.yDistance = yDistance;
+ }
+
+ public void setxDuration(float xDuration) {
+ this.xDuration = xDuration;
+ }
+
+ public void setyDuration(float yDuration) {
+ this.yDuration = yDuration;
+ }
+
}
--
Gitblit v1.9.1