From 716f7e3dec477b1dffe2ff33182116f558be60b0 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 01 一月 2025 15:22:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/JarProtocol.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 41b0859..cfa29a4 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
*/
@@ -109,7 +111,13 @@
* */
public Integer rightDoorClose;
- public Integer jarTemperature;
+ 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,24 @@
basJar.setRightInEnable(rightInEnable?"Y":"N");
basJar.setRightOutEnable(rightOutEnable?"Y":"N");
basJar.setAutoing(autoing?"Y":"N");
+ basJar.setJarTemperature(jarTemperature);
+ basJar.setJarPressure(jarPressure);
+ basJar.setLeftDoorOpen(leftDoorOpen);
+ basJar.setLeftDoorClose(leftDoorClose);
+ basJar.setRightDoorOpen(rightDoorOpen);
+ basJar.setRightDoorClose(rightDoorClose);
+ 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