From 190201789934d7b2b4344e0eba6b4a0c2e38f54e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 27 八月 2025 14:34:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
index 2c5ffd1..08041ee 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -39,12 +39,22 @@
/**
* 浠诲姟鐘舵��
*/
- private Integer protocolStatus = LiftProtocolStatusType.NONE.id;
+ private Integer protocolStatus = LiftProtocolStatusType.IDLE.id;
/**
* 浠诲姟鐘舵�佹灇涓�
*/
- private LiftProtocolStatusType protocolStatusType = LiftProtocolStatusType.NONE;
+ private LiftProtocolStatusType protocolStatusType = LiftProtocolStatusType.IDLE;
+
+ /**
+ * 璁惧鐘舵��
+ */
+ private Integer deviceStatus = LiftDeviceStatusType.NONE.id;
+
+ /**
+ * 璁惧鐘舵�佹灇涓�
+ */
+ private LiftDeviceStatusType deviceStatusType = LiftDeviceStatusType.NONE;
/**
* 浠诲姟妯″紡
@@ -190,14 +200,6 @@
return this.taskNo == null ? 0 : this.taskNo;
}
- public synchronized void setSyncTaskNo(Integer taskNo) {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- if (null != redisUtil) {
- redisUtil.set(RedisKeyType.LIFT_FLAG.key + this.liftNo, taskNo);
- this.taskNo = taskNo;
- }
- }
-
public String getModel$() {
if (this.model == null) {
return "";
@@ -222,6 +224,14 @@
return LiftProtocolStatusType.get(this.protocolStatus).desc;
}
+ public String getDeviceStatus$() {
+ if (this.deviceStatus == null) {
+ return "";
+ }
+
+ return LiftDeviceStatusType.get(this.deviceStatus).desc;
+ }
+
public String getTaskMode$() {
if (this.taskMode == null) {
return "";
--
Gitblit v1.9.1