From d56b8093dc9e3e75f8efe1a0f1aa6d821c9c3dfb Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 15 四月 2025 13:30:35 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java |  303 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 213 insertions(+), 90 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
index 581fa09..f8964a1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
@@ -1,7 +1,6 @@
 package com.zy.asrs.wcs.core.utils;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zy.asrs.framework.common.Cools;
 import com.zy.asrs.framework.common.SnowflakeIdWorker;
@@ -24,6 +23,7 @@
 import com.zy.asrs.wcs.system.service.DictService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -59,6 +59,73 @@
     @Autowired
     private NavigateUtils navigateUtils;
 
+    /**
+     * 璋冨害杞﹁締
+     */
+    public Device dispatchShuttle(Task task, String locNo) {
+        ArrayList<ShuttleThread> sameLev = new ArrayList<>();//鐩稿悓妤煎眰鐨勭┛姊溅
+        ArrayList<ShuttleThread> diffLev = new ArrayList<>();//涓嶅悓妤煎眰鐨勭┛姊溅
+
+        ShuttleThread resThread = null;
+        int lev = Utils.getLev(locNo);
+        List<Device> list = deviceService.list(new LambdaQueryWrapper<Device>()
+                .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
+                .eq(Device::getHostId, task.getHostId())
+                .eq(Device::getStatus, 1));
+        //鑾峰彇鍚屽眰灏忚溅
+        List<Device> currentLevDevices = new ArrayList<>();
+        //鑾峰彇璺ㄥ眰灏忚溅
+        HashMap<Integer, List<Device>> diffLevDeviceMap = new HashMap<>();
+        for (Device device : list) {
+            //鑾峰彇鍥涘悜绌挎杞︾嚎绋�
+            ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
+            ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+            if (shuttleProtocol == null || shuttleProtocol.getShuttleNo() == null) {
+                continue;
+            }
+
+            if (shuttleProtocol.getCurrentLocNo() == null) {
+                continue;
+            }
+
+            int shuttleLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());
+            if (shuttleLev == lev) {
+                currentLevDevices.add(device);
+            } else {
+                List<Device> devices = null;
+                if (diffLevDeviceMap.containsKey(shuttleLev)) {
+                    devices = diffLevDeviceMap.get(shuttleLev);
+                } else {
+                    devices = new ArrayList<>();
+                }
+                devices.add(device);
+                diffLevDeviceMap.put(shuttleLev, devices);
+            }
+        }
+
+        //鎼滅储鍚屽眰
+        resThread = this.searchCurrentLevShuttle(currentLevDevices, locNo);
+
+        //鍚屽眰娌℃湁鎼滅储鍒板悎閫傚皬杞︼紝璺ㄦゼ灞傛悳绱�
+        if (resThread == null) {
+            resThread = this.searchDiffLevShuttle(diffLevDeviceMap, locNo, task);
+        }
+
+        if (resThread != null) {
+            if (resThread.getStatus().getCurrentLocNo().equals(locNo)) {
+                return resThread.getDevice();
+            }
+
+            Task result = generateMoveTask(resThread.getDevice(), locNo);
+            if (result != null) {
+                return resThread.getDevice();
+            }
+        }
+
+        News.info("{}鐩爣搴撲綅娌℃湁鎼滅储鍒板彲鐢ㄧ┛姊溅", locNo);
+        return null;
+    }
+
     public synchronized ShuttleThread searchIdleShuttle(Task task) {
         String locNo = taskService.judgeInbound(task) ? task.getDestLoc() : task.getOriginLoc();
         ShuttleThread resThread = null;
@@ -70,7 +137,7 @@
         //鑾峰彇鍚屽眰灏忚溅
         List<Device> currentLevDevices = new ArrayList<>();
         //鑾峰彇璺ㄥ眰灏忚溅
-        List<Device> diffLevDevices = new ArrayList<>();
+        HashMap<Integer,List<Device>> diffLevDeviceMap = new HashMap<>();
         for (Device device : list) {
             //鑾峰彇鍥涘悜绌挎杞︾嚎绋�
             ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
@@ -79,10 +146,22 @@
                 continue;
             }
 
-            if (Utils.getLev(shuttleProtocol.getCurrentLocNo()) == lev) {
+            if (shuttleProtocol.getCurrentLocNo() == null) {
+                continue;
+            }
+
+            int shuttleLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());
+            if (shuttleLev == lev) {
                 currentLevDevices.add(device);
             }else {
-                diffLevDevices.add(device);
+                List<Device> devices = null;
+                if(diffLevDeviceMap.containsKey(shuttleLev)) {
+                    devices = diffLevDeviceMap.get(shuttleLev);
+                }else {
+                    devices = new ArrayList<>();
+                }
+                devices.add(device);
+                diffLevDeviceMap.put(shuttleLev, devices);
             }
         }
         //鎼滅储鍚屽眰
@@ -90,7 +169,7 @@
 
         //鍚屽眰娌℃湁鎼滅储鍒板悎閫傚皬杞︼紝璺ㄦゼ灞傛悳绱�
         if(resThread == null) {
-            resThread = this.searchDiffLevShuttle(diffLevDevices, locNo, task);
+            resThread = this.searchDiffLevShuttle(diffLevDeviceMap, locNo, task);
         }
 
         return resThread;
@@ -136,6 +215,12 @@
             }
 
             // 鏈夋病鏈夎鍏朵粬浠诲姟璋冨害
+            List<Task> taskList = taskService.selectWorkingByShuttle(Integer.valueOf(device.getDeviceNo()), null);
+            if (!taskList.isEmpty()) {
+                continue;
+            }
+
+
             int currentLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());//灏忚溅褰撳墠灞傞珮
             String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅褰撳墠搴撲綅鍙�
 
@@ -146,10 +231,10 @@
 
             // 鍚屾ゼ灞傜洿鎺ヨ绠楀埌鐩爣搴撲綅
             //褰撳墠绌挎杞︾嚎绋嬪埌褰撳墠杞﹀瓙鎵�鍦ㄦゼ灞傜殑鐩爣搴撲綅璺濈
-            List<NavigateNode> currentShuttlePath = navigateUtils.calc(
+            List<NavigateNode> currentShuttlePath = navigateUtils.calcWhiteList(
                     currentLocNo
                     , locNo
-                    , NavigationMapType.NORMAL.id
+                    , NavigationMapType.DFX.id
                     , Utils.getShuttlePoints(Integer.parseInt(shuttleThread.getDevice().getDeviceNo()), currentLev)
             );//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝e父閫氶亾鍦板浘
             if (currentShuttlePath == null) {
@@ -173,102 +258,114 @@
         return resThread;
     }
 
-    private synchronized ShuttleThread searchDiffLevShuttle(List<Device> devices, String locNo, Task task) {
+    private synchronized ShuttleThread searchDiffLevShuttle(HashMap<Integer,List<Device>> devicesMap, String locNo, Task task) {
         ShuttleThread resThread = null;
         Integer finalDistance = ShuttleDispatcher.INF;
 
         //妫�娴嬬洰鏍囨ゼ灞傝溅鏁伴噺鏄惁灏忎簬鍏佽鐨勬渶澶ф暟閲�
         boolean checkDispatchMaxNum = checkDispatchMaxNum(Utils.getLev(locNo), task.getHostId());
 
-        for (Device device : devices) {
-            if (taskService.hasBusyOutboundByShuttle(Integer.parseInt(device.getDeviceNo()))) {
-                continue;
-            }
-            //鑾峰彇鍥涘悜绌挎杞︾嚎绋�
-            ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
-            ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
-            if (shuttleProtocol == null || shuttleProtocol.getShuttleNo() == null) {
-                continue;
-            }
+        for (Map.Entry<Integer, List<Device>> entry : devicesMap.entrySet()) {
+            Integer lev = entry.getKey();
+            List<Device> devices = entry.getValue();
+            for (Device device : devices) {
+                if (taskService.hasBusyOutboundByShuttle(Integer.parseInt(device.getDeviceNo()))) {
+                    continue;
+                }
+                //鑾峰彇鍥涘悜绌挎杞︾嚎绋�
+                ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
+                ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+                if (shuttleProtocol == null || shuttleProtocol.getShuttleNo() == null) {
+                    continue;
+                }
 
-            if (!shuttleThread.isIdle()) {
-                continue;
-            }
+                if (!shuttleThread.isIdle()) {
+                    continue;
+                }
 
-            BasShuttle basShuttle = basShuttleService.getOne(new LambdaQueryWrapper<BasShuttle>()
-                    .eq(BasShuttle::getShuttleNo, device.getDeviceNo())
-                    .eq(BasShuttle::getHostId, device.getHostId()));
-            if (basShuttle == null) {
-                continue;//灏忚溅鍩虹鏁版嵁涓嶅瓨鍦�
-            }
+                BasShuttle basShuttle = basShuttleService.getOne(new LambdaQueryWrapper<BasShuttle>()
+                        .eq(BasShuttle::getShuttleNo, device.getDeviceNo())
+                        .eq(BasShuttle::getHostId, device.getHostId()));
+                if (basShuttle == null) {
+                    continue;//灏忚溅鍩虹鏁版嵁涓嶅瓨鍦�
+                }
 
-            if (!Cools.isEmpty(basShuttle.getDisableLev())) {
-                List<Integer> disableLev = JSON.parseArray(basShuttle.getDisableLev(), Integer.class);
-                //妫�鏌ュ皬杞︽槸鍚︾鐢ㄨ妤煎眰
-                if (disableLev.contains(Utils.getLev(locNo))) {
-                    continue;//灏忚溅绂佺敤璇ユゼ灞傝烦杩囪杞�
+                if (!Cools.isEmpty(basShuttle.getDisableLev())) {
+                    List<Integer> disableLev = JSON.parseArray(basShuttle.getDisableLev(), Integer.class);
+                    //妫�鏌ュ皬杞︽槸鍚︾鐢ㄨ妤煎眰
+                    if (disableLev.contains(Utils.getLev(locNo))) {
+                        continue;//灏忚溅绂佺敤璇ユゼ灞傝烦杩囪杞�
+                    }
+                }
+
+                //妫�娴嬫槸鍚﹀瓨鍦ㄥ厖鐢典换鍔�
+                Task taskCharge = taskService.selectChargeWorking(Integer.valueOf(device.getDeviceNo()));
+                if (taskCharge != null) {
+                    continue;
+                }
+
+                // 鏈夋病鏈夎鍏朵粬浠诲姟璋冨害
+                List<Task> taskList = taskService.selectWorkingByShuttle(Integer.valueOf(device.getDeviceNo()), null);
+                if (!taskList.isEmpty()) {
+                    continue;
+                }
+
+                int currentLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());//灏忚溅褰撳墠灞傞珮
+                String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅褰撳墠搴撲綅鍙�
+
+                if (!checkDispatchMaxNum) {
+                    News.info("{}浠诲姟锛寋}灞傦紝宸茬粡杈惧埌褰撳墠妤煎眰璋冨害杞﹁締鏈�澶у��", task.getTaskNo(), Utils.getLev(locNo));
+                    continue;
+                }
+
+                //鑾峰彇璺濈灏忚溅浣嶇疆鏈�杩戠殑绌洪棽鍙崲灞傛彁鍗囨満
+                LiftThread liftThread = liftDispatcher.searchIdleLift(currentLocNo, task.getHostId(), true);
+                if (liftThread == null) {
+                    continue;
+                }
+                Device recentTransferLift = liftThread.getDevice();
+
+                //鑾峰彇灏忚溅妤煎眰鎻愬崌鏈哄緟鏈轰綅
+                ShuttleStandby shuttleStandby = shuttleStandbyService.getOne(new LambdaQueryWrapper<ShuttleStandby>()
+                        .eq(ShuttleStandby::getDeviceId, recentTransferLift.getId())
+                        .eq(ShuttleStandby::getDeviceLev, currentLev)
+                        .eq(ShuttleStandby::getStatus, 1));
+                String targetLocNo = shuttleStandby.getDeviceLoc();
+
+                //褰撳墠绌挎杞︾嚎绋嬪埌褰撳墠杞﹀瓙鎵�鍦ㄦゼ灞傜殑鎻愬崌鏈哄緟鏈轰綅璺濈
+                List<NavigateNode> currentShuttlePath = navigateUtils.calc(
+                        currentLocNo
+                        , targetLocNo
+                        , NavigationMapType.DFX.id
+                        , Utils.getShuttlePoints(Integer.parseInt(shuttleThread.getDevice().getDeviceNo()), currentLev)
+                );//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝e父閫氶亾鍦板浘
+                if (currentShuttlePath == null) {
+                    continue;
+                }
+
+                Integer currDistance = navigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁$畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+
+                // 涓嶅悓妤煎眰鏉冮噸
+                if (currentLev != Utils.getLev(locNo)) {
+                    currDistance += WEIGHT;
+                }
+
+                // 鎸傝浇浠诲姟鏉冮噸
+                List<Task> tasks = taskService.selectWorkingByShuttle(Integer.valueOf(device.getDeviceNo()), null);
+                if (!Cools.isEmpty(tasks)) {
+                    currDistance += tasks.size() * WEIGHT;
+                }
+
+                if (currDistance < finalDistance) {
+                    finalDistance = currDistance;
+                    resThread = shuttleThread;
                 }
             }
 
-            //妫�娴嬫槸鍚﹀瓨鍦ㄥ厖鐢典换鍔�
-            Task taskCharge = taskService.selectChargeWorking(Integer.valueOf(device.getDeviceNo()));
-            if (taskCharge != null) {
-                continue;
-            }
-
-            // 鏈夋病鏈夎鍏朵粬浠诲姟璋冨害
-            int currentLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());//灏忚溅褰撳墠灞傞珮
-            String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅褰撳墠搴撲綅鍙�
-
-            if (!checkDispatchMaxNum) {
-                News.info("{}浠诲姟锛寋}灞傦紝宸茬粡杈惧埌褰撳墠妤煎眰璋冨害杞﹁締鏈�澶у��", task.getTaskNo(), Utils.getLev(locNo));
-                continue;
-            }
-
-            //鑾峰彇璺濈灏忚溅浣嶇疆鏈�杩戠殑绌洪棽鍙崲灞傛彁鍗囨満
-            LiftThread liftThread = liftDispatcher.searchIdleLift(currentLocNo, task.getHostId(), true);
-            if (liftThread == null) {
-                continue;
-            }
-            Device recentTransferLift = liftThread.getDevice();
-
-            //鑾峰彇灏忚溅妤煎眰鎻愬崌鏈哄緟鏈轰綅
-            ShuttleStandby shuttleStandby = shuttleStandbyService.getOne(new LambdaQueryWrapper<ShuttleStandby>()
-                    .eq(ShuttleStandby::getDeviceId, recentTransferLift.getId())
-                    .eq(ShuttleStandby::getDeviceLev, currentLev)
-                    .eq(ShuttleStandby::getStatus, 1));
-            String targetLocNo = shuttleStandby.getDeviceLoc();
-
-            //褰撳墠绌挎杞︾嚎绋嬪埌褰撳墠杞﹀瓙鎵�鍦ㄦゼ灞傜殑鎻愬崌鏈哄緟鏈轰綅璺濈
-            List<NavigateNode> currentShuttlePath = navigateUtils.calc(
-                    currentLocNo
-                    , targetLocNo
-                    , NavigationMapType.NORMAL.id
-                    , Utils.getShuttlePoints(Integer.parseInt(shuttleThread.getDevice().getDeviceNo()), currentLev)
-            );//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝e父閫氶亾鍦板浘
-            if (currentShuttlePath == null) {
-                continue;
-            }
-
-            Integer currDistance = navigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁$畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
-
-            // 涓嶅悓妤煎眰鏉冮噸
-            if (currentLev != Utils.getLev(locNo)) {
-                currDistance += WEIGHT;
-            }
-
-            // 鎸傝浇浠诲姟鏉冮噸
-            List<Task> tasks = taskService.selectWorkingByShuttle(Integer.valueOf(device.getDeviceNo()), null);
-            if (!Cools.isEmpty(tasks)) {
-                currDistance += tasks.size() * WEIGHT;
-            }
-
-            if (currDistance < finalDistance) {
-                finalDistance = currDistance;
-                resThread = shuttleThread;
+            if (resThread != null) {
+                break;
             }
         }
-
         return resThread;
     }
 
@@ -292,6 +389,11 @@
             return null;
         }
 
+        ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+        if (shuttleProtocol == null) {
+            return null;
+        }
+
         Task task = new Task();
         task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
         task.setTaskNo(String.valueOf(Utils.getTaskNo("MOVE")));
@@ -299,7 +401,7 @@
         task.setTaskCtg(taskCtg.getId());
         task.setPriority(10);
         task.setOriginSite(null);
-        task.setOriginLoc(null);
+        task.setOriginLoc(shuttleProtocol.getCurrentLocNo());
         task.setDestSite(null);
         task.setDestLoc(locNo); // 杩佺Щ浣嶇疆
         task.setIoTime(new Date());
@@ -541,5 +643,26 @@
         return lastPathStartLoc;
     }
 
+    //鑾峰彇灏忚溅鍧愭爣
+    public String findShuttleLocNo(Integer shuttleNo, Long hostId) {
+        Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
+                .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
+                .eq(Device::getDeviceNo, shuttleNo)
+                .eq(Device::getHostId, hostId)
+                .eq(Device::getStatus, 1));
+        if(device == null) {
+            return null;
+        }
+
+        //鑾峰彇鍥涘悜绌挎杞︾嚎绋�
+        ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
+        ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+        if (shuttleProtocol == null || shuttleProtocol.getShuttleNo() == null) {
+            return null;
+        }
+
+        return shuttleProtocol.getCurrentLocNo();
+    }
+
 
 }

--
Gitblit v1.9.1