From 5817004ce9f72d75016be7a95bf7f5057af081ec Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 26 九月 2025 13:34:32 +0800 Subject: [PATCH] 跑库功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java index 8b3ec26..ab87338 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java @@ -168,27 +168,35 @@ if (Cools.isEmpty(autoRunArea)) { return; } + List<Integer> array = new ArrayList<>(); + List<String> list = new ArrayList<>(); for (char c : autoRunArea.toCharArray()) { switch (c) { case '1': - this.autoRun(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST, StaGroupConstant.FAR_RIGHT_STA_ROW_LIST); + array.addAll(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST); + list.addAll(StaGroupConstant.FAR_RIGHT_STA_ROW_LIST); break; case '2': - this.autoRun(LocGroupConstant.RIGHT_LOC_ROW_LIST, StaGroupConstant.RIGHT_STA_ROW_LIST); + array.addAll(LocGroupConstant.RIGHT_LOC_ROW_LIST); + list.addAll(StaGroupConstant.RIGHT_STA_ROW_LIST); break; case '3': - this.autoRun(LocGroupConstant.MIDDLE_LOC_ROW_LIST, StaGroupConstant.MIDDLE_STA_ROW_LIST); + array.addAll(LocGroupConstant.MIDDLE_LOC_ROW_LIST); + list.addAll(StaGroupConstant.MIDDLE_STA_ROW_LIST); break; case '4': - this.autoRun(LocGroupConstant.LEFT_LOC_ROW_LIST, StaGroupConstant.LEFT_STA_ROW_LIST); + array.addAll(LocGroupConstant.LEFT_LOC_ROW_LIST); + list.addAll(StaGroupConstant.LEFT_STA_ROW_LIST); break; case '5': - this.autoRun(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST); + array.addAll(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST); + list.addAll(StaGroupConstant.FAR_LEFT_STA_ROW_LIST); break; default: break; } } + this.autoRun(array, list); } private void autoRun(List<Integer> locGroupList, List<String> staGroupList) { @@ -290,31 +298,37 @@ if (Cools.isEmpty(autoRunArea)) { return; } + List<Integer> array = new ArrayList<>(); + List<String> list = new ArrayList<>(); for (char c : autoRunArea.toCharArray()) { switch (c) { case '1': - xx(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST); + array.addAll(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST); + list.addAll(StaGroupConstant.FAR_RIGHT_STA_ROW_LIST); break; case '2': - xx(LocGroupConstant.RIGHT_LOC_ROW_LIST); + array.addAll(LocGroupConstant.RIGHT_LOC_ROW_LIST); + list.addAll(StaGroupConstant.RIGHT_STA_ROW_LIST); break; case '3': - xx(LocGroupConstant.MIDDLE_LOC_ROW_LIST); + array.addAll(LocGroupConstant.MIDDLE_LOC_ROW_LIST); + list.addAll(StaGroupConstant.MIDDLE_STA_ROW_LIST); break; case '4': - xx(LocGroupConstant.LEFT_LOC_ROW_LIST); + array.addAll(LocGroupConstant.LEFT_LOC_ROW_LIST); + list.addAll(StaGroupConstant.LEFT_STA_ROW_LIST); break; case '5': - xx(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST); + array.addAll(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST); + list.addAll(StaGroupConstant.FAR_LEFT_STA_ROW_LIST); break; default: break; } } - + xx(array); } - private void xx(List<Integer> locGroupList) { Integer startRow = Collections.min(locGroupList); @@ -322,8 +336,7 @@ String memo = "DEMO_LOC_" + startRow + "-" + endRow; - - Integer maxThread = 40; + Integer maxThread = 30; Config confNum = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_MOVE_THEAD_MAX)); if (!Objects.isNull(confNum)) { maxThread = Integer.valueOf(confNum.getVal()); -- Gitblit v1.9.1