From 3c01fbc988ff90ef1f195232beb98c7776d47277 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 23 十一月 2024 14:25:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/JarProtocol.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/JarProtocol.java b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
index 29966ae..2b391e3 100644
--- a/src/main/java/com/zy/core/model/protocol/JarProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
@@ -30,9 +30,15 @@
/**
IDLE(0, "绌洪棽"),
- MOVING(1, "浣滀笟涓�"),
- SOS(2, "鎶ヨ"),
- WAITING(3, "浠诲姟瀹屾垚绛夊緟WCS纭"),
+ MOVING(1, "鍏ユ枡涓�"),
+ SOS(2, "纭寲涓�"),
+ WAITING1(3, "鍑烘枡涓�"),
+ WAITING2(4, "鍋滄"),
+ WAITING3(5, "杩涙枡闂ㄦ墦寮�涓�"),
+ WAITING4(6, "鍑烘枡闂ㄦ墦寮�涓�"),
+ WAITING5(7, "杩涙枡闂ㄥ叧闂腑"),
+ OFF_LINE(8, "鍑烘枡闂ㄥ叧闂腑"),
+ OTHER(100, "鍏跺畠"),
*/
public Short status;
@@ -40,31 +46,37 @@
/*
* 宸﹂棬鐘舵��
+ * 杩涙枡闂�
* */
private boolean leftDoor;
/*
* 鍙抽棬鐘舵��
+ * 鍑烘枡闂�
* */
private boolean rightDoor;
/*
* 宸﹂棬鍙紑
+ * 杩涙枡闂�
* */
private boolean leftInEnable;
/*
* 宸﹂棬鍙叧
+ * 杩涙枡闂�
* */
private boolean leftOutEnable;
/*
* 鍙抽棬鍙紑
+ * 鍑烘枡闂�
* */
private boolean rightInEnable;
/*
* 鍙抽棬鍙叧
+ * 鍑烘枡闂�
* */
private boolean rightOutEnable;
@@ -75,23 +87,30 @@
/*
* open the left door
+ * 杩涙枡闂�
* */
public Integer leftDoorOpen;
/*
* close the left door
+ * 杩涙枡闂�
* */
public Integer leftDoorClose;
/*
* open the right door
+ * 鍑烘枡闂�
* */
public Integer rightDoorOpen;
/*
* close the right door
+ * 鍑烘枡闂�
* */
public Integer rightDoorClose;
+
+ public Float jarTemperature;
+ public Float jarPressure;
/**
@@ -132,6 +151,8 @@
basJar.setRightInEnable(rightInEnable?"Y":"N");
basJar.setRightOutEnable(rightOutEnable?"Y":"N");
basJar.setAutoing(autoing?"Y":"N");
+ basJar.setJarTemperature(jarTemperature);
+ basJar.setJarPressure(jarPressure);
return basJar;
}
--
Gitblit v1.9.1