Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Location.java

@@ -76,7 +76,7 @@ public class Location {
 	 * @return time in minutes
 	 */
 	public int getPathTimeTo(Location location) {
-		return distanceTimeMap.get(location).intValue();
+		return distanceTimeMap.get(location).intValue()/60;
 	}
 
     // ************************************************************************

project-dispatch/src/main/java/com/dituhui/pea/dispatch/scheduler/BatchScheduler.java

@@ -74,7 +74,7 @@ public class BatchScheduler {
 
                 LocalTime currentTime = LocalTime.now();
                 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);
                     DispatchBatch dispatchBatch = batchService.queryBatchInfoByDay(groupId, currDay);
                     if (null == dispatchBatch.getBatchNo()) {

project-dispatch/src/test/java/com/dituhui/pea/dispatch/SolveServiceTest.java

@@ -42,7 +42,6 @@ class SolveServiceTest {
     String groupId = "gsuzhou";
     String day = "2023-07-11";
 
-
     private SolverManager<DispatchSolution, UUID> solverManager;
     private Solver<DispatchSolution> solver;