From e156048b1ea844434ca7675af45e37a2dfad6e8c Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 16 六月 2025 14:18:55 +0800
Subject: [PATCH] rgv调度优化

---
 src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java |   98 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java b/src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java
index 77a1873..d061c3f 100644
--- a/src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java
+++ b/src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java
@@ -2,9 +2,11 @@
 
 import com.zy.asrs.entity.BasDevpPosition;
 import com.zy.asrs.entity.WrkMast;
-import com.zy.core.enums.RouteCollectCountType;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class SortTheExecutionOfTheCarUtil {
     //鎺掑簭
@@ -91,14 +93,14 @@
         Integer integer = LatelyAndLessThan(devpPosition, nowPosition,perimeter);
         for (BasDevpPosition basDevpPosition:devpPosition){
             if (basDevpPosition.getDevNo().equals(integer)){
-                if (basDevpPosition.getDevNo() == 133){
+                if (basDevpPosition.getDevNo() == 134){
                     result = 101;
                 }
                 break;
             }
             result = basDevpPosition.getDevNo();
         }
-        return result;
+        return result == -1? 101 : result;
     }
 //    //鑾峰彇鏈�杩戝苟鍦ㄥ綋鍓嶄綅缃墠杈圭殑浣嶇疆
 //    public static Long LatelyAndLessThan(long[] devpPosition,long nowPosition){
@@ -462,16 +464,96 @@
     public static Double LatelyAndLessThan(long devPosition,long rgvPosition,long perimeter){
         long Difference = perimeter;
         if (devPosition >= rgvPosition){
-            if ((devPosition-rgvPosition) < Difference){
+//            if ((devPosition-rgvPosition) < Difference){
                 Difference = devPosition-rgvPosition;
-            }
+//            }
         } else {
-            if (perimeter - (rgvPosition - devPosition) < Difference){
+//            if (perimeter - (rgvPosition - devPosition) < Difference){
                 Difference = perimeter - (rgvPosition - devPosition);
-            }
+//            }
         }
         return Double.valueOf(Difference);
     }
 
+    public static int calculateShortestDistanceDistance(List<Integer> data, int a, int b) {
+        Result result = calculateShortestDistance(data, a, b);
+        return result.distance;
+    }
+
+    public static List<Integer> calculateShortestDistancePassedData(List<Integer> data, int a, int b) {
+        Result result = calculateShortestDistance(data, a, b);
+        return result.passedData;
+    }
+
+//    public static String calculateShortestDistanceDirection(List<Integer> data, int a, int b) {
+//        Result result = calculateShortestDistance(data, a, b);
+//        return result.direction;
+//    }
+
+    public static boolean calculateShortestDistanceDirection(List<Integer> data, int a, int b) {
+        Result result = calculateShortestDistance(data, a, b);
+        return result.direction.equals("鍚戝墠璧帮紙椤烘椂閽堬級");
+    }
+
+
+    public static void main(String[] args) {
+        List<Integer> data = new ArrayList<>();
+        // 鐢� List<Integer> 鍒濆鍖栨暟鎹�
+        for (int i = 1; i <= 9; i++) {
+            data.add(i);
+        }
+
+        int a = 3; // 璧风偣
+        int b = 3; // 缁堢偣
+
+        Result result = calculateShortestDistance(data, a, b);
+        System.out.println("鏈�杩戠殑璺濈鏄�: " + result.distance);
+        System.out.println("缁忚繃鐨勬暟鎹�: " + result.passedData);
+        System.out.println("鏂瑰悜: " + result.direction);
+    }
+
+    public static Result calculateShortestDistance(List<Integer> data, int a, int b) {
+        int length = data.size();
+        int indexA = data.indexOf(a);
+        int indexB = data.indexOf(b);
+
+        if (indexA == -1 || indexB == -1) {
+            throw new IllegalArgumentException("鍒楄〃涓湭鎵惧埌鎸囧畾鐨勫厓绱�");
+        }
+
+        // 椤烘椂閽堟柟鍚戠殑璺濈鍙婄粡杩囩殑鏁版嵁
+        List<Integer> clockwiseData = new ArrayList<>();
+        int clockwiseDistance = (indexB - indexA + length) % length;
+        for (int i = 0; i <= clockwiseDistance; i++) {
+            clockwiseData.add(data.get((indexA + i) % length));
+        }
+
+        // 閫嗘椂閽堟柟鍚戠殑璺濈鍙婄粡杩囩殑鏁版嵁
+        List<Integer> counterClockwiseData = new ArrayList<>();
+        int counterClockwiseDistance = (indexA - indexB + length) % length;
+        for (int i = 0; i <= counterClockwiseDistance; i++) {
+            counterClockwiseData.add(data.get((indexA - i + length) % length));
+        }
+
+        // 姣旇緝璺濈骞惰繑鍥炵粨鏋�
+        if (clockwiseDistance <= counterClockwiseDistance) {
+            return new Result(clockwiseDistance, clockwiseData, "鍚戝墠璧帮紙椤烘椂閽堬級");
+        } else {
+            return new Result(counterClockwiseDistance, counterClockwiseData, "鍚戝悗璧帮紙閫嗘椂閽堬級");
+        }
+    }
+
+    // 鐢ㄤ簬杩斿洖缁撴灉鐨勭被
+    static class Result {
+        public int distance;
+        public List<Integer> passedData;
+        public String direction;
+
+        public Result(int distance, List<Integer> passedData, String direction) {
+            this.distance = distance;
+            this.passedData = passedData;
+            this.direction = direction;
+        }
+    }
 
 }

--
Gitblit v1.9.1