From d36e5e64c363af15a27547b47d0fd2f5b7391346 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 17 五月 2024 18:08:49 +0800
Subject: [PATCH] #二楼
---
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 255 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 184 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index 13c11bf..32f1deb 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -1,98 +1,195 @@
package com.zy.core.model.protocol;
+import com.zy.asrs.entity.BasRgv;
import com.zy.core.enums.RgvModeType;
import com.zy.core.enums.RgvStatusType;
import com.zy.core.enums.RgvWalkPosType;
import lombok.Data;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
@Data
-public class RgvProtocol {
+public class RgvProtocol implements Cloneable{
- //RGV缂栧彿
- private Integer rgvNo;
+ private Integer RgvNo;
- //妯″紡
- private Short mode;
+ /**
+ * 1 = 鎵嬪姩妯″紡
+ * 2 = 鑷姩妯″紡
+ * 3 = 鐢佃剳妯″紡
+ */
+ public Short mode;
- //RGV妯″紡鏋氫妇
- private RgvModeType modeType;
+ public RgvModeType modeType;
- //RGV鐘舵��
- private Short status;
+ /**
+ * 宸ヤ綅1浠诲姟鍙�
+ */
+ public Integer taskNo1 = 0;
+ /**
+ * 宸ヤ綅2浠诲姟鍙�
+ */
+ public Integer taskNo2 = 0;
- //RGV鐘舵�佹灇涓�
- private RgvStatusType statusType;
+ /**
+ * RGV褰撳墠鐘舵��
+ * 0锛氱┖闂诧紝鏃犱换鍔�
+ * 1锛氫綔涓氫腑
+ * 2锛氭姤璀�
+ */
+ public Short status;
- //宸ヤ綅1宸ヤ綔鍙�
- private Integer taskNo1;
+ /**
+ * 鐘舵�佹灇涓�
+ */
+ public RgvStatusType statusType;
+ /**
+ * 褰撳墠鍒楀彿
+ */
+ public Short columnNumber;
- //宸ヤ綅1鏈夌墿淇″彿
- private Short loaded1;
+ /**
+ * RGV褰撳墠浣嶇疆
+ */
+ public Integer RgvPos;
- //RGV褰撳墠浣嶇疆
- private Short rgvPos;
+ /**
+ * 宸ヤ綅1鏈夌墿
+ */
+ public Short loaded1;
- //璧拌鍦ㄥ畾浣� 0锛氬湪瀹氫綅锛�1锛氫笉鍦ㄥ畾浣�
- private Short walkPos;
- //RGV璧拌鏋氫妇
- private RgvWalkPosType walkPosType;
+ /**
+ * 寮傚父鐮�
+ */
+ public Short alarm;
- //宸ヤ綅2宸ヤ綔鍙�
- private Short taskNo2;
+ /**
+ * X琛岃蛋琛岄�熷害m/min
+ */
+ private Float xSpeed;
- //宸ヤ綅2鏈夌墿淇″彿
- private Short loaded2;
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
+ */
+ public Float xDistance;
- //宸ヤ綅1浠诲姟瀹屾垚淇″彿
- private Short taskFinish1;
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
+ */
+ public Float xDuration;
- //宸ヤ綅2浠诲姟瀹屾垚淇″彿
- private Short taskFinish2;
- //寮傚父鐮�
- private Short alarm;
- //蹇冭烦
- private Short heart;
- //澶囩敤1
- private Integer temp1;
- //澶囩敤2
+ /**
+ * RGV宸ヤ綅1褰撳墠鐘舵��
+ * 0锛氱┖闂诧紝鏃犱换鍔�
+ * 11锛氬彇璐т腑
+ * 12锛氭斁璐т腑
+ * 10锛氫换鍔″畬鎴愮瓑寰匴CS纭
+ */
+ public Short status1;
+
+ /**
+ * 鐘舵�佹灇涓�
+ */
+ public RgvStatusType statusType1;
+
+
+
+
+
+ /**
+ * 璧拌鍦ㄥ畾浣�
+ * 0 = 鍦ㄥ畾浣�
+ * 1 = 涓嶅湪瀹氫綅
+ */
+ public Short walkPos;
+
+
+
+
+ /**
+ * RGV宸ヤ綅2褰撳墠鐘舵��
+ * 0锛氱┖闂诧紝鏃犱换鍔�
+ * 11锛氬彇璐т腑
+ * 12锛氭斁璐т腑
+ * 10锛氫换鍔″畬鎴愮瓑寰匴CS纭
+ */
+ public Short status2;
+
+ /**
+ * 鐘舵�佹灇涓�
+ */
+ public RgvStatusType statusType2;
+
+ /**
+ * 宸ヤ綅2鏈夌墿
+ */
+ public Short loaded2;
+
+
+
+ /**
+ * 蹇冭烦鎸囦护 1-2姣忕鍒囨崲涓�娆�
+ */
+ public Short heart;
+
+ private Short temp1;
+
private Short temp2;
- //澶囩敤3
private Short temp3;
- //澶囩敤4
private Short temp4;
- //澶囩敤5
private Short temp5;
- //宸ヤ綅1浠诲姟妯″紡
- private Short taskMode1;
- //宸ヤ綅1婧愮珯
- private Short sourceStn1;
- //宸ヤ綅1鐩爣绔�
- private Short destinationPos1;
+ public void setMode(Short mode) {
+ this.mode = mode;
+ this.modeType = RgvModeType.get(mode);
+ }
- //宸ヤ綅2浠诲姟妯″紡
- private Short taskMode2;
+ public void setMode(RgvModeType type) {
+ this.modeType = type;
+ this.mode = RgvModeType.get(type).id.shortValue();
+ }
- //宸ヤ綅2婧愮珯
- private Short sourceStn2;
+ public void setStatus(Short status){
+ this.status = status;
+ this.statusType = RgvStatusType.get(status);
+ }
- //宸ヤ綅2鐩爣绔�
- private Short destinationPos2;
+ public void setStatus(RgvStatusType type){
+ this.statusType = type;
+ this.status = RgvStatusType.get(type).id.shortValue();
+ }
- //宸ヤ綅1涓嬪彂鏃堕棿
- private Long task1SendTime;
+ public void setStatus1(Short status1){
+ this.status1 = status1;
+ this.statusType1 = RgvStatusType.get(status1);
+ }
+
+ public void setStatus1(RgvStatusType type1){
+ this.statusType1 = type1;
+ this.status1 = RgvStatusType.get(type1).id.shortValue();
+ }
+
+ public void setStatus2(Short status2){
+ this.status2 = status2;
+ this.statusType2 = RgvStatusType.get(status2);
+ }
+
+ public void setStatus2(RgvStatusType type2){
+ this.statusType2 = type2;
+ this.status2 = RgvStatusType.get(type2).id.shortValue();
+ }
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
@@ -101,34 +198,50 @@
*/
private String lastIo = "I";
- public void setMode(Short mode) {
- this.mode = mode;
- this.modeType = RgvModeType.get(mode);
+
+ public BasRgv toSqlModel(BasRgv basRgv){
+ if (alarm!=null) {
+ basRgv.setRgvErr(alarm.longValue());
+ }
+ basRgv.setWrkNo1(taskNo1.intValue());
+// basRgv.setWrkNo2(taskNo2.intValue());
+ return basRgv;
}
- public void setMode(RgvModeType type) {
- this.mode = type.id;
- this.modeType = type;
+ public void setxSpeed(float xSpeed) {
+ this.xSpeed = xSpeed;
}
- public void setStatus(Short status) {
- this.status = status;
- this.statusType = RgvStatusType.get(status);
+ public void setxDistance(float xDistance) {
+ this.xDistance = xDistance;
}
- public void setStatus(RgvStatusType type) {
- this.status = type.id;
- this.statusType = type;
+ public void setxDuration(float xDuration) {
+ this.xDuration = xDuration;
}
- public void setWalkPos(Short walkPos) {
- this.walkPos = walkPos;
- this.walkPosType = RgvWalkPosType.get(walkPos);
+ public Integer getRgvPosI(){
+ //闇�瑕佹牴鎹幇鍦烘敼閫� 鏍规嵁璇诲埌鐨勫�艰幏鍙栧搴旂珯鐐逛綅缃�
+ Map<Short,Integer> map = new HashMap<>();
+ map.put((short) 1,100);map.put((short) 2,101);
+ map.put((short) 3,106);map.put((short) 4,107);
+ map.put((short) 5,112);map.put((short) 6,113);
+ map.put((short) 7,119);map.put((short) 8,124);
+ map.put((short) 9,149);map.put((short) 10,153);
+ map.put((short) 11,157);map.put((short) 12,161);
+ if (RgvPos==null) return 0;
+
+ return map.get(RgvPos);
}
- public void setWalkPos(RgvWalkPosType type) {
- this.walkPos = type.id;
- this.walkPosType = type;
+ @Override
+ public RgvProtocol clone() {
+ try {
+ return (RgvProtocol) super.clone();
+ } catch (CloneNotSupportedException e) {
+ e.printStackTrace();
+ }
+ return null;
}
}
--
Gitblit v1.9.1