From f3de21a928fd73a1c9f66a7fe4d24afb1c9916af Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 10:25:48 +0800
Subject: [PATCH] #cs1
---
src/main/java/com/zy/core/model/protocol/JarProtocol.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 9fdd2cb..93bc569 100644
--- a/src/main/java/com/zy/core/model/protocol/JarProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
@@ -7,6 +7,8 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import java.util.Date;
+
/**
* Created by vincent on 2024/6/21
*/
@@ -110,6 +112,12 @@
public Integer rightDoorClose;
public Float jarTemperature;
+ public Float jarPressure;
+ public boolean holdingSign = false;
+ public boolean openDoorSign = false;
+ public boolean closeDoorSign = false;
+ public Short upStatus = 0;
+
/**
@@ -150,6 +158,20 @@
basJar.setRightInEnable(rightInEnable?"Y":"N");
basJar.setRightOutEnable(rightOutEnable?"Y":"N");
basJar.setAutoing(autoing?"Y":"N");
+ basJar.setJarTemperature(jarTemperature);
+ basJar.setJarPressure(jarPressure);
+ if (holdingSign){
+ basJar.setHoldingTime(new Date());
+ holdingSign = false;
+ }
+ if (openDoorSign){
+ basJar.setOpenTime(new Date());
+ openDoorSign = false;
+ }
+ if (closeDoorSign){
+ basJar.setCloseTime(new Date());
+ closeDoorSign = false;
+ }
return basJar;
}
--
Gitblit v1.9.1