From ca1971f52b62c18efa1af540431175b8e8ec7cd3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 17:06:50 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 1591bfc..955956d 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -1,9 +1,11 @@
package com.zy.core.model.protocol;
-import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasRgv;
import com.zy.core.enums.*;
import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* Created by vincent on 2020/8/7
@@ -29,6 +31,8 @@
* 2锛氭姤璀�
*/
public Short status;
+ public Short startSta;
+ public Short endSta;
/**
* 鐘舵�佹灇涓�
@@ -57,12 +61,14 @@
/**
* 宸ヤ綅1鏈夌墿
*/
- public Short loaded1;
+ public Short loaded1;//0 鏃犵墿锛�1 鏈夌墿
/**
* RGV褰撳墠浣嶇疆
*/
- public Short RgvPos;
+ public Long RgvPos;
+ public Double instantaneousSpeed;// 鐬椂閫熷害 (m/min)
+ public Short endStaM;// 鐬椂閫熷害 (m/min) 婕父鐩殑鍦�
/**
* 璧拌鍦ㄥ畾浣�
@@ -94,13 +100,19 @@
/**
* 宸ヤ綅2鏈夌墿
*/
- public Short loaded2;
+ public Short loaded2; //0 鏃犵墿锛�1 涓�灞傛棤鐗╀簩灞傛湁鐗╋紙鍙兘鎷嗗彔锛� 锛�2涓�灞傛湁鐗╀簩灞傛棤鐗� 锛堝彧鑳芥弧鏀撅級锛�3 1銆�2灞傞兘鏈夌墿 4锛氾紙锛夊彧鍏佽鎷嗙洏
///////////////////////////////////////////////////////////////////////////////////////
/**
* 寮傚父鐮�
*/
public Short alarm;
+ public List<Integer> alarmList = new ArrayList<>();
+
+ /**
+ * 蹇冭烦鎸囦护 1-2姣忕鍒囨崲涓�娆�
+ */
+ public Short heart;
private Short temp1;
@@ -109,6 +121,8 @@
private Short temp3;
private Short temp4;
+
+ private Short temp5;
/**
* X琛岃蛋琛岄�熷害m/min
@@ -177,8 +191,7 @@
if (alarm!=null) {
basRgv.setRgvErr(alarm.longValue());
}
- basRgv.setWrkNo1(taskNo1.intValue());
- basRgv.setWrkNo2(taskNo2.intValue());
+ basRgv.setWrkNo1(taskNo1.longValue());
return basRgv;
}
@@ -194,4 +207,15 @@
this.xDuration = Float.valueOf(xDuration);
}
+ public Integer getRgvPosI(){
+ //闇�瑕佹牴鎹幇鍦烘敼閫� 鏍规嵁璇诲埌鐨勫�艰幏鍙栧搴旂珯鐐逛綅缃�
+ if (RgvPos==null) return 0;
+ return RgvPos.intValue();
+ }
+
+ public String getAlarm$(){
+ //闇�瑕佹牴鎹幇鍦烘敼閫� 鏍规嵁璇诲埌鐨勫�艰幏鍙栧搴旂珯鐐逛綅缃�
+ return null;
+ }
+
}
--
Gitblit v1.9.1