Merge branch 'feature-dispatch-zx' into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/SolveServiceImpl.java

@@ -66,7 +66,6 @@ public class SolveServiceImpl implements SolveService {
     private EntityManager entityManager;
 
 
-
     @Autowired
     ExtractService extractService;
 
@@ -157,11 +156,8 @@ public class SolveServiceImpl implements SolveService {
             Depot depot = new Depot(engineer.getId(), engineer.getEngineerCode(), location, 60 * 8, 60 * 18);
             depotList.add(depot);
 
-//            log.debug("组织问题对象, technicianList groupId:{}, batchNo:{}, engineer-code:{}", groupId, batchNo, engineer.getEngineerCode());
             List<String> skillList = queryEngineerSkills(engineer.getEngineerCode());
 
-//            log.debug("组织问题对象, technicianList groupId:{}, batchNo:{}, engineer-code:{} , skills:{}", groupId, batchNo, engineer.getEngineerCode(), String.join(";", skillList));
-
             // 距离偏好map
             Map<String, Long> preferedLoctionDistanceMap = new HashMap<String, Long>();
             customerList.forEach(customer -> {
@@ -180,9 +176,9 @@ public class SolveServiceImpl implements SolveService {
 
         //locationlist
         List<Location> locationList = Stream.concat(depotList.stream().map(Depot::getLocation), customerList.stream().map(Customer::getLocation)).collect(Collectors.toList());
+        distanceCalculator.initDistanceMaps(locationList);
 
         DispatchSolution solution = new DispatchSolution(groupId, batchNo, locationList, oneDepot, technicianList, customerList);
-        distanceCalculator.initDistanceMaps(locationList);
 
         log.info("组织问题对象 done, groupId:{}, batchNo:{}, technician-size:{}, customer-size:{}, location-size:{}",
                 groupId, batchNo, technicianList.size(), customerList.size(), locationList.size());

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

@@ -50,7 +50,7 @@ class SolveServiceTest {
         SolverConfig solverConfig = new SolverConfig().withSolutionClass(DispatchSolution.class);
         solverConfig.withEntityClassList(Arrays.asList(Technician.class, Customer.class));// 这里不能漏掉，否则约束不生效
         solverConfig.withConstraintProviderClass(DispatchConstraintProvider.class);
-        solverConfig.withTerminationSpentLimit(Duration.ofSeconds(10));
+        solverConfig.withTerminationSpentLimit(Duration.ofSeconds(20));
 
         SolverFactory<DispatchSolution> solverFactory = SolverFactory.create(solverConfig);
         solver = solverFactory.buildSolver();