From 41d54f55168781798aff4f1137f696ab02c05e79 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 16 六月 2025 17:08:03 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 22 ++++++++++++++++------
1 files changed, 16 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 172a5a5..609ef66 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;
/**
* 鐘舵�佹灇涓�
@@ -62,7 +66,10 @@
/**
* RGV褰撳墠浣嶇疆
*/
- public Short RgvPos;
+ public Long RgvPos;
+ public int RgvPosInt = 0;
+ public Double instantaneousSpeed;// 鐬椂閫熷害 (m/min)
+ public Short endStaM;// 鐬椂閫熷害 (m/min) 婕父鐩殑鍦�
/**
* 璧拌鍦ㄥ畾浣�
@@ -101,6 +108,7 @@
* 寮傚父鐮�
*/
public Short alarm;
+ public List<Integer> alarmList = new ArrayList<>();
/**
* 蹇冭烦鎸囦护 1-2姣忕鍒囨崲涓�娆�
@@ -184,8 +192,7 @@
if (alarm!=null) {
basRgv.setRgvErr(alarm.longValue());
}
- basRgv.setWrkNo1(taskNo1.intValue());
- basRgv.setWrkNo2(taskNo2.intValue());
+ basRgv.setWrkNo1(taskNo1.longValue());
return basRgv;
}
@@ -202,9 +209,12 @@
}
public Integer getRgvPosI(){
+ return RgvPosInt;
+ }
+
+ public String getAlarm$(){
//闇�瑕佹牴鎹幇鍦烘敼閫� 鏍规嵁璇诲埌鐨勫�艰幏鍙栧搴旂珯鐐逛綅缃�
- if (RgvPos==null) return 0;
- return RgvPos.intValue();
+ return null;
}
}
--
Gitblit v1.9.1