diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/cdz/CdzThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/cdz/CdzThread.java index 157addf..783d1e6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/cdz/CdzThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/cdz/CdzThread.java @@ -43,6 +43,13 @@ public class CdzThread implements Runnable { public void run() { init(); while (isRun) { + try { + dispatch(); + Thread.sleep(1500); + }catch (Exception e){ + log.error(e.getMessage(),e); + } + } } @@ -169,7 +176,6 @@ public class CdzThread implements Runnable { /** * 创建充电任务 * - * @param srgvList */ private void createChargingInJob(List srgvList) { srgvList.sort((o1, o2) -> o2.getBattery() - o1.getBattery()); @@ -187,7 +193,7 @@ public class CdzThread implements Runnable { DeviceCdz cdz = null; Optional min = cdzList.stream().filter(c -> c.getSzcs().equals(floor)).min((o1, o2) -> { Integer distance1 = Math.abs(o1.getSzcs()); - Integer distance2 = Math.abs(floor); + Integer distance2 = Math.abs(o2.getSzcs()); return distance1 - distance2; }); if (min.isPresent()) { @@ -221,7 +227,6 @@ public class CdzThread implements Runnable { /** * 创建充电任务 * - * @param deviceSrgv */ private void createChargingOutJob(DeviceSrgv deviceSrgv, DeviceCdz cdz) { SrgvChargingJob srgvChargingJobParam = new SrgvChargingJob();