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/ShuttleProtocol.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index a4bf8e0..126af7d 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -6,6 +6,7 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.BasShuttleErrService;
import com.zy.asrs.service.LocMastService;
+import com.zy.common.model.NavigateNode;
import com.zy.common.utils.RedisUtil;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.ShuttleProtocolStatusType;
@@ -13,6 +14,7 @@
import lombok.extern.slf4j.Slf4j;
import java.util.HashMap;
+import java.util.List;
/**
* 鍥涘悜绌挎杞�
@@ -184,6 +186,11 @@
private Long lastOnlineTime = System.currentTimeMillis();
/**
+ * 灏忚溅绌洪棽鏃堕棿
+ */
+ private Long idleTime = System.currentTimeMillis();
+
+ /**
* 鎵╁睍瀛楁
*/
private Object extend;
@@ -192,6 +199,16 @@
* 绯荤粺娑堟伅
*/
private String systemMsg;
+
+ /**
+ * 浜ら�氱鍒�
+ */
+ private Boolean trafficControl = false;
+
+ /**
+ * 浜ら�氱鍒禢odes
+ */
+ private List<NavigateNode> trafficControlNodes = null;
public String getProtocolStatus$() {
if (this.protocolStatusType == null) {
@@ -228,17 +245,6 @@
}
}
return this.taskNo == null ? 0 : this.taskNo;
- }
-
- public synchronized void setSyncTaskNo(Integer taskNo) {
- RedisUtil redisUtil = null;
- try {
- redisUtil = SpringUtils.getBean(RedisUtil.class);
- }catch (Exception e) {}
- if (null != redisUtil) {
- redisUtil.set(RedisKeyType.SHUTTLE_FLAG.key + this.shuttleNo, taskNo);
- this.taskNo = taskNo;
- }
}
@Override
--
Gitblit v1.9.1