From a0031ed8c187dacc30b4bb2709d3a1dc477a17cf Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期四, 17 十月 2024 15:34:14 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 ++ src/main/java/com/zy/core/MainProcess.java | 4 + src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java | 59 +++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index a03ebb5..3e6f610 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -47,7 +47,12 @@ private BasDevpService basDevpService; @Autowired private BasRgvServiceImpl basRgvService; + /** + * 绔欑偣浠诲姟妫�娴� 涓嬪彂灏忚溅鍙栨斁浠诲姟 + */ + public synchronized void updateStePosition() { + } /** * 绔欑偣浠诲姟妫�娴� 涓嬪彂灏忚溅鍙栨斁浠诲姟 */ diff --git a/src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java b/src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java new file mode 100644 index 0000000..8ad735b --- /dev/null +++ b/src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java @@ -0,0 +1,59 @@ +package com.zy.asrs.utils; + +import com.zy.core.enums.RouteCollectCountType; + +import java.util.Arrays; +import java.util.List; + +public class SortTheExecutionOfTheCarUtil { + //鎺掑簭 + public static int[][] ReorderSteId(int[][] steList,int steNoStart){ + int[][] ints = new int[steList.length][2]; + int Difference = 0; + for (int[] steNo : steList){ + if (steNo[0] == steNoStart){ + Difference = steNo[1] - 1; + break; + } + } + for (int[] steNo : steList){ + int i = steNo[1]; + if (i > Difference){ + steNo[1] = i - Difference; + } else { + steNo[1] = steList.length + i-Difference; + } + ints[steNo[0]-1] = steNo; + } + return ints; + } + //鎺掑簭 + public static int ReorderSteId2(int[][] steList,int steNoStart){ + int[][] ints = new int[steList.length][2]; + int Difference = 0; + for (int[] steNo : steList){ + if (steNo[0] == steNoStart){ + Difference = steNo[1] - 1; + break; + } + } + for (int[] steNo : steList){ + int i = steNo[1]; + if (i > Difference){ + steNo[1] = i - Difference; + } else { + steNo[1] = steList.length + i-Difference; + } + ints[steNo[0]-1] = steNo; + } + return 0; + } + public static void main(String[] args) { + int[][] ints = new int[][]{{1,1},{2,2},{3,3},{4,4},{5,5},{6,6},{7,7},{8,8},{9,9},{10,10}}; + + int[][] reorderSteId = ReorderSteId(ints, 2); + for (int[] ste : reorderSteId){ + System.out.println(Arrays.toString(ste)); + } + } +} diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java index 8e9246c..763721a 100644 --- a/src/main/java/com/zy/core/MainProcess.java +++ b/src/main/java/com/zy/core/MainProcess.java @@ -54,8 +54,10 @@ if (!SystemProperties.WCS_RUNNING_STATUS.get()) { continue; } + //鏇存柊浣嶇疆淇℃伅 + mainService.updateStePosition(); - // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢� + // 浠诲姟涓嬪彂 mainService.loopSteCharge(); -- Gitblit v1.9.1