From b6428016edf3de843020bc95fd1708d3bb1961e5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 07 七月 2025 16:41:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 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 b785a03..a4bf8e0 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -217,7 +217,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)) {
@@ -228,7 +231,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;
@@ -247,7 +253,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;
         }
@@ -260,7 +269,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 "";
         }
@@ -339,12 +354,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