#

Junjie

1 天以前 53332ecb0edc651bae91f1e7a74a795d76d87cb2

#

 src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java

@@ -54,6 +54,8 @@
    private CommonService commonService;
    @Autowired
    private NotifyUtils notifyUtils;
    @Autowired
    private StationOperateProcessUtils stationOperateProcessUtils;

    public synchronized void crnIoExecute() {
        Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
@@ -258,6 +260,21 @@
            return false;
        }

        int stationMaxTaskCount = 30;
        Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
        if (systemConfigMapObj != null) {
            try {
                HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
                stationMaxTaskCount = Integer.parseInt(systemConfigMap.getOrDefault("stationMaxTaskCountLimit", "30"));
            } catch (Exception ignore) {}
        }

        int currentStationTaskCount = stationOperateProcessUtils.getCurrentStationTaskCount();
        if (stationMaxTaskCount > 0 && currentStationTaskCount >= stationMaxTaskCount) {
            News.warn("输送站点任务数量达到上限，已停止任务下发。当前任务数={}，上限={}", currentStationTaskCount, stationMaxTaskCount);
            return false;
        }

        Integer crnNo = basCrnp.getCrnNo();

        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()

 src/main/java/com/zy/core/utils/StationOperateProcessUtils.java

@@ -808,11 +808,6 @@
                }
            }
        }

        if (config.stationMaxTaskCount > 0 && currentStationTaskCount >= config.stationMaxTaskCount) {
            News.warn("输送站点任务数量达到上限，已停止站点任务下发。当前任务数={}，上限={}", currentStationTaskCount, config.stationMaxTaskCount);
            return true;
        }
        return false;
    }

@@ -939,15 +934,6 @@
        }
        config.loopModeEnable = parseBoolean(loopModeValue, config.loopModeEnable);

        String stationMaxTaskCountValue = getConfigValue(systemConfigMap, "stationMaxTaskCountLimit");
        if (isBlank(stationMaxTaskCountValue)) {
            stationMaxTaskCountValue = getConfigValue(systemConfigMap, "stationMaxTaskCount");
        }
        if (isBlank(stationMaxTaskCountValue)) {
            stationMaxTaskCountValue = getConfigValue(systemConfigMap, "conveyorStationTaskLimit");
        }
        config.stationMaxTaskCount = parseInt(stationMaxTaskCountValue, config.stationMaxTaskCount);

        return config;
    }

@@ -1022,8 +1008,6 @@
        private double circleMaxLoadLimit = 0.8d;
        // 是否启用绕圈模式（仅启用时才生效承载限制）
        private boolean loopModeEnable = false;
        // 站点最大任务数量上限，0表示不限制
        private int stationMaxTaskCount = 30;
    }

    private static class LoadGuardState {