Commit f5cafcdf by 张晓

Merge branch 'feature-dispatch-zx' into develop

2 parents 2484e2b3 dc93d5cc
...@@ -76,7 +76,7 @@ public class Location { ...@@ -76,7 +76,7 @@ public class Location {
* @return time in minutes * @return time in minutes
*/ */
public int getPathTimeTo(Location location) { public int getPathTimeTo(Location location) {
return distanceTimeMap.get(location).intValue(); return distanceTimeMap.get(location).intValue()/60;
} }
// ************************************************************************ // ************************************************************************
......
...@@ -74,7 +74,7 @@ public class BatchScheduler { ...@@ -74,7 +74,7 @@ public class BatchScheduler {
LocalTime currentTime = LocalTime.now(); LocalTime currentTime = LocalTime.now();
LocalTime cutoffTime = LocalTime.parse("16:00:00", DateTimeFormatter.ISO_LOCAL_TIME); LocalTime cutoffTime = LocalTime.parse("16:00:00", DateTimeFormatter.ISO_LOCAL_TIME);
if (currentTime.isAfter(cutoffTime)) { if (i==1 && currentTime.isAfter(cutoffTime)) {
log.info("dispatchRun 已过cutoff时间,更新pre状态为confirm----- group:{}, day:{}", groupId, currDay); log.info("dispatchRun 已过cutoff时间,更新pre状态为confirm----- group:{}, day:{}", groupId, currDay);
DispatchBatch dispatchBatch = batchService.queryBatchInfoByDay(groupId, currDay); DispatchBatch dispatchBatch = batchService.queryBatchInfoByDay(groupId, currDay);
if (null == dispatchBatch.getBatchNo()) { if (null == dispatchBatch.getBatchNo()) {
......
...@@ -42,7 +42,6 @@ class SolveServiceTest { ...@@ -42,7 +42,6 @@ class SolveServiceTest {
String groupId = "gsuzhou"; String groupId = "gsuzhou";
String day = "2023-07-11"; String day = "2023-07-11";
private SolverManager<DispatchSolution, UUID> solverManager; private SolverManager<DispatchSolution, UUID> solverManager;
private Solver<DispatchSolution> solver; private Solver<DispatchSolution> solver;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!