From aaf4a5039c86db159587e1299d5c3925adb70489 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 18 十二月 2025 16:16:39 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java b/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
index 0aea24a..524807a 100644
--- a/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
+++ b/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
@@ -14,6 +14,7 @@
 import com.zy.core.network.api.ZyStationConnectApi;
 import com.zy.core.network.entity.ZyStationStatusEntity;
 
+import java.util.HashMap;
 import java.util.List;
 
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -293,7 +294,16 @@
             }
 
             if (!checkTaskNoInArea(taskNo)) {
-                if (System.currentTimeMillis() - executeTime > 1000 * 10) {
+                boolean fakeAllowCheckBlock = true;
+                Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
+                if (systemConfigMapObj != null) {
+                    HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
+                    if (!systemConfigMap.get("fakeAllowCheckBlock").equals("Y")) {
+                        fakeAllowCheckBlock = false;
+                    }
+                }
+
+                if (fakeAllowCheckBlock && System.currentTimeMillis() - executeTime > 1000 * 10) {
                     //璁ゅ畾鍫靛
                     boolean result = runBlockStation(taskNo, currentStationId, taskNo, currentStationId);
                     if(!result) {
@@ -478,7 +488,7 @@
                 return false;
             }
 
-            boolean result2 = updateStationData(lockTaskNo, currentStationId, 0, 0, false, null, false);
+            boolean result2 = updateStationData(lockTaskNo, currentStationId, 0, 0, false, "", false);
             if (!result2) {
                 return false;
             }

--
Gitblit v1.9.1