#

Junjie

1 天以前 af2f9443ec9241de3aa2c8eed3d31eef382f89d0

 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;
            }