From efa3e3042d30506b8eb3ce662d39c4dd954ae945 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 25 七月 2025 13:35:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 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 4cb41ef..c4db647 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,9 +186,29 @@
private Long lastOnlineTime = System.currentTimeMillis();
/**
+ * 灏忚溅绌洪棽鏃堕棿
+ */
+ private Long idleTime = System.currentTimeMillis();
+
+ /**
* 鎵╁睍瀛楁
*/
private Object extend;
+
+ /**
+ * 绯荤粺娑堟伅
+ */
+ private String systemMsg;
+
+ /**
+ * 浜ら�氱鍒�
+ */
+ private Boolean trafficControl = false;
+
+ /**
+ * 浜ら�氱鍒禢odes
+ */
+ private List<NavigateNode> trafficControlNodes = null;
public String getProtocolStatus$() {
if (this.protocolStatusType == null) {
@@ -212,7 +234,10 @@
}
public Integer getTaskNo() {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ RedisUtil redisUtil = null;
+ try {
+ redisUtil = SpringUtils.getBean(RedisUtil.class);
+ }catch (Exception e) {}
if (null != redisUtil) {
Object o = redisUtil.get(RedisKeyType.SHUTTLE_FLAG.key + this.shuttleNo);
if (!Cools.isEmpty(o)) {
@@ -223,7 +248,10 @@
}
public synchronized void setSyncTaskNo(Integer taskNo) {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ 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;
@@ -242,7 +270,10 @@
//閫氳繃褰撳墠浜岀淮鐮佽幏鍙栧綋鍓嶅簱浣嶅彿
public String getCurrentLocNo() {
- LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ LocMastService locMastService = null;
+ try {
+ locMastService = SpringUtils.getBean(LocMastService.class);
+ }catch (Exception e) {}
if (locMastService == null) {
return null;
}
@@ -255,7 +286,13 @@
}
public String getStatusErrorCode$() {
- BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
+ BasShuttleErrService basShuttleErrService = null;
+ try {
+ basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
+ }catch (Exception e) {}
+ if (basShuttleErrService == null) {
+ return "";
+ }
if (this.errorCode == null) {
return "";
}
@@ -334,12 +371,15 @@
public HashMap<String, Object> getPoint() {
HashMap<String, Object> map = new HashMap<>();
- if (this.currentCode == null) {
+ LocMastService locMastService = null;
+ try {
+ locMastService = SpringUtils.getBean(LocMastService.class);
+ }catch (Exception e) {}
+ if (locMastService == null) {
return map;
}
- LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
- if (locMastService == null) {
+ if (this.currentCode == null) {
return map;
}
--
Gitblit v1.9.1