Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/constraint/DispatchConstraintProvider.java

@@ -76,6 +76,9 @@ public class DispatchConstraintProvider implements ConstraintProvider {
                                         if (!in) {
                                             // 到达时间在日历窗口外，惩罚得分
                                             ret = true;
+                                            customer.setInTechnicianTimeWindows(false);
+                                        } else {
+                                            customer.setInTechnicianTimeWindows(true);
                                         }
                                     }
                                 }
@@ -93,18 +96,18 @@ public class DispatchConstraintProvider implements ConstraintProvider {
                 .asConstraint(ConstraintNameEnum.technicianCapacityMatch.name());
     }
 
-	protected Constraint dispatchedMatch(ConstraintFactory factory) {
-		return factory.forEach(Customer.class).filter(customer ->
-		// 已分配但是分给了别人
-		(customer.getDispatchedTechnicianCode() != null && customer.getTechnician() != null
-				&& !StringUtils.equals(customer.getDispatchedTechnicianCode(), customer.getTechnician().getCode())) ||
-		// 已排除但是分给了这个人
-				(customer.getExclusiveTechnicianCode() != null && customer.getTechnician() != null
-						&& StringUtils.equals(customer.getExclusiveTechnicianCode(),
-								customer.getTechnician().getCode())))
-				.penalizeLong(HardSoftLongScore.ONE_HARD, customer -> 50)
-				.asConstraint(ConstraintNameEnum.dispatchedMatch.name());
-	}
+    protected Constraint dispatchedMatch(ConstraintFactory factory) {
+        return factory.forEach(Customer.class).filter(customer ->
+                        // 已分配但是分给了别人
+                        (customer.getDispatchedTechnicianCode() != null && customer.getTechnician() != null
+                                && !StringUtils.equals(customer.getDispatchedTechnicianCode(), customer.getTechnician().getCode())) ||
+                                // 已排除但是分给了这个人
+                                (customer.getExclusiveTechnicianCode() != null && customer.getTechnician() != null
+                                        && StringUtils.equals(customer.getExclusiveTechnicianCode(),
+                                        customer.getTechnician().getCode())))
+                .penalizeLong(HardSoftLongScore.ONE_HARD, customer -> 50)
+                .asConstraint(ConstraintNameEnum.dispatchedMatch.name());
+    }
 
 //	protected Constraint customerTimeWindowsMatch1(ConstraintFactory factory) {
 //		return factory.forEach(Customer.class).filter(

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

@@ -21,12 +21,12 @@ public class Customer {
 
     private long id;
     private String code;
-    
+
     // 已分配
     private String dispatchedTechnicianCode;
     // 已排除
     private String exclusiveTechnicianCode;
-    
+
     // orderid(code)+dt 确定唯一一条工单
     private String dt;
     @JsonIgnore
@@ -50,6 +50,8 @@ public class Customer {
     // 离开时间
     // private Integer departureTime;
 
+    private boolean isInTechnicianTimeWindows = true;
+
     public Customer() {
     }
 
@@ -135,9 +137,9 @@ public class Customer {
 //            throw new IllegalStateException("This method must not be called when the shadow variables are not initialized yet.");
         }
         if (previousCustomer == null) {
-            return technician.getDepot().getLocation().getDistanceTo(technician.getVehicleType(),location);
+            return technician.getDepot().getLocation().getDistanceTo(technician.getVehicleType(), location);
         }
-        return previousCustomer.getLocation().getDistanceTo(technician.getVehicleType(),location);
+        return previousCustomer.getLocation().getDistanceTo(technician.getVehicleType(), location);
     }
 
     /**
@@ -151,9 +153,9 @@ public class Customer {
 //            throw new IllegalStateException("This method must not be called when the shadow variables are not initialized yet.");
         }
         if (previousCustomer == null) {
-            return technician.getDepot().getLocation().getPathTimeTo(technician.getVehicleType(),location);
+            return technician.getDepot().getLocation().getPathTimeTo(technician.getVehicleType(), location);
         }
-        return previousCustomer.getLocation().getPathTimeTo(technician.getVehicleType(),location);
+        return previousCustomer.getLocation().getPathTimeTo(technician.getVehicleType(), location);
     }
 
     @Override

project-dispatch/src/main/java/com/dituhui/pea/dispatch/quartz/dispatch/AutoDispatchJob.java

 package com.dituhui.pea.dispatch.quartz.dispatch;
 
+import com.dituhui.pea.dispatch.common.RedissonUtil;
 import com.dituhui.pea.dispatch.service.SchedulerService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.DisallowConcurrentExecution;
@@ -23,7 +24,7 @@ import javax.annotation.Resource;
 @DisallowConcurrentExecution
 public class AutoDispatchJob extends QuartzJobBean {
 
-    public static final String TEAM_JOB_PREFIX="BOXI_TEAM_";
+    public static final String TEAM_JOB_PREFIX = "BOXI_TEAM_";
 
     @Resource
     private SchedulerService schedulerService;
@@ -36,6 +37,9 @@ public class AutoDispatchJob extends QuartzJobBean {
             String teamId = name.substring(TEAM_JOB_PREFIX.length());
             long start = System.currentTimeMillis();
             log.info(">>> 自动派工(teamId:{}) 自动任务开始", teamId);
+            /*RedissonUtil.lockOperation(AutoDispatchJob.TEAM_JOB_PREFIX + teamId, 60, () -> {
+                schedulerService.dispatchRun2(teamId);
+            });*/
             schedulerService.dispatchRun2(teamId);
             long end = System.currentTimeMillis();
             log.info(">>> 自动派工(teamId:{}) 自动任务结束，耗时：{}", teamId, end - start);

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

@@ -113,52 +113,45 @@ public class SchedulerServiceImpl implements SchedulerService {
 
         for (int i = 1; i <= nextDaysLimit; i++) {
             String currDay = LocalDate.now().plusDays(i).format(DateTimeFormatter.ISO_LOCAL_DATE);
-            boolean finalCutOff = cutOff;
-            RedissonUtil.lockOperation(AutoDispatchJob.TEAM_JOB_PREFIX + teamId, 60, () -> {
-                dispatchRun2OneDay(teamId, currDay, today, finalCutOff);
-            });
-        }
-    }
-
-    private void dispatchRun2OneDay(String teamId, String currDay, String today, boolean cutOff) {
-        Optional<DispatchBatch> optional = dispatchBatchRepository.findByTeamIdAndBatchDate(teamId, currDay);
-        if (optional.isPresent()
-                && Objects.nonNull(optional.get().getCutoffedTime())
-                && DateUtil.format(optional.get().getCutoffedTime(), "yyyy-MM-dd").equals(today)) {
-            //自动任务截止
-            log.error(">>> teamId:{}, day:{} 自动任务已截止", teamId, currDay);
-            return;
-        }
-
-        try {
-            log.info("dispatchRun begin----- teamId:{}, day:{}", teamId, currDay);
-
-            String batchNo = batchService.buildBatchData2(teamId, currDay, cutOff);
-            UUID problemId = solveService.generateProblemId(teamId, batchNo);
-            log.info("dispatchRun teamId:{}, day:{}, batch:{}, problemId:{}", teamId, currDay, batchNo, problemId);
-
-            DispatchSolution problem = solveService.prepareSolution2(teamId, batchNo, currDay);
-
-            if (problem.getCustomerList().size() <= 0) {
-                log.info("dispatchRun 当前批次没有待指派工单 , teamId:{}, day:{}, batch:{}, problemId:{}, order-size:{}", teamId, currDay, batchNo, problemId, problem.getCustomerList().size());
+            Optional<DispatchBatch> optional = dispatchBatchRepository.findByTeamIdAndBatchDate(teamId, currDay);
+            if (optional.isPresent()
+                    && Objects.nonNull(optional.get().getCutoffedTime())
+                    && DateUtil.format(optional.get().getCutoffedTime(), "yyyy-MM-dd").equals(today)) {
+                //自动任务截止
+                log.error(">>> teamId:{}, day:{} 自动任务已截止", teamId, currDay);
                 return;
             }
-            log.info("dispatchRun prepare done, teamId:{}, day:{}, batch:{}, problemId:{}", teamId, currDay, batchNo, problemId);
-            Solver<DispatchSolution> solver = solverFactory.buildSolver();
-            DispatchSolution solution = solver.solve(problem);
-            DispatchSolutionUtils.removeHardConstraintCustomer(solution, solverFactory);
-            log.info("dispatchRun solve done, teamId:{}, day:{}, batch:{}, problemId:{}, score:{}", teamId, currDay, batchNo, problemId, solution.getScore().toShortString());
-            this.solveService.saveSolutionWrp2(solution);
-            this.extractService.extractDispatchToOrder2(teamId, batchNo, cutOff);
-            log.info("dispatchRun done ------ teamId:{}, day:{}", teamId, currDay);
-
-            JacksonSolutionFileIO<DispatchSolution> exporter = new JacksonSolutionFileIO<DispatchSolution>(DispatchSolution.class);
-            exporter.write(solution, new File(String.format("dispatchSolution_%s_%s.json", teamId, currDay)));
-
-            //log.info("dispatchRun group:{}, team:{} done", groupId, teamId);
-        } catch (Exception e) {
-            log.error(">>> (teamId:{}, day:{})自动排班失败：{}", teamId, currDay, e.getMessage(), e);
-            //throw e;
+
+            try {
+                log.info("dispatchRun begin----- teamId:{}, day:{}", teamId, currDay);
+
+                String batchNo = batchService.buildBatchData2(teamId, currDay, cutOff);
+                UUID problemId = solveService.generateProblemId(teamId, batchNo);
+                log.info("dispatchRun teamId:{}, day:{}, batch:{}, problemId:{}", teamId, currDay, batchNo, problemId);
+
+                DispatchSolution problem = solveService.prepareSolution2(teamId, batchNo, currDay);
+
+                if (problem.getCustomerList().size() <= 0) {
+                    log.info("dispatchRun 当前批次没有待指派工单 , teamId:{}, day:{}, batch:{}, problemId:{}, order-size:{}", teamId, currDay, batchNo, problemId, problem.getCustomerList().size());
+                    return;
+                }
+                log.info("dispatchRun prepare done, teamId:{}, day:{}, batch:{}, problemId:{}", teamId, currDay, batchNo, problemId);
+                Solver<DispatchSolution> solver = solverFactory.buildSolver();
+                DispatchSolution solution = solver.solve(problem);
+                DispatchSolutionUtils.removeHardConstraintCustomer(solution, solverFactory);
+                log.info("dispatchRun solve done, teamId:{}, day:{}, batch:{}, problemId:{}, score:{}", teamId, currDay, batchNo, problemId, solution.getScore().toShortString());
+                this.solveService.saveSolutionWrp2(solution);
+                this.extractService.extractDispatchToOrder2(teamId, batchNo, cutOff);
+                log.info("dispatchRun done ------ teamId:{}, day:{}", teamId, currDay);
+
+                JacksonSolutionFileIO<DispatchSolution> exporter = new JacksonSolutionFileIO<DispatchSolution>(DispatchSolution.class);
+                exporter.write(solution, new File(String.format("dispatchSolution_%s_%s.json", teamId, currDay)));
+
+                //log.info("dispatchRun group:{}, team:{} done", groupId, teamId);
+            } catch (Exception e) {
+                log.error(">>> (teamId:{}, day:{})自动排班失败：{}", teamId, currDay, e.getMessage(), e);
+                //throw e;
+            }
         }
     }
 }
\ No newline at end of file

project-dispatch/src/main/resources/application-dev.yaml

@@ -3,8 +3,8 @@ server:
 
 dispatch:
   cron:
-    expr: 0 */3 8-23 * * ?
-    next-day-limit: 20
+    expr: 0 10 8-23 * * ?
+    next-day-limit: 2
 
 scheduler:
   init-engineer-capacity:

project-interface/src/main/java/com/dituhui/pea/enums/StatusCodeEnum.java

@@ -147,6 +147,8 @@ public enum StatusCodeEnum {
     ORDER_FINISHED("030", "订单已结束,请勿操作", false),
 
     FENDAN_IS_TRANSCEND_AND_SPECIAL("031", "分单超派和特殊时间", false),
+
+    ENGINEER_IS_LEAVE_TIME("032", "工单（%s）指派失败！%s的工作日历在该时间段已有日程安排", false),
     ;
 
     /**

project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java

@@ -357,7 +357,7 @@ public class DispatchServiceImpl implements DispatchService {
             Result<OrderInfoEntity> entityResult = orderInfoService.insterEngineerOrders(engineerOrders, entity, skill, byTeamId, engineer);
             if (!entityResult.getCode().equals(ResultEnum.SUCCESS.getCode())) {
                 // return Result.failed("当前工程师无法预约合适时间");
-                errorList.add(entity.getOrderId());
+                errorList.add("单号:" + entity.getOrderId());
                 continue;
             }
             entity = entityResult.getResult();
@@ -378,11 +378,9 @@ public class DispatchServiceImpl implements DispatchService {
             successList.add(entity.getOrderId());
         }
         List<String> resultList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(successList)) {
-            resultList.add(String.format("%s订单指派(改派)成功", String.join(",", successList)));
-        }
         if (CollectionUtils.isNotEmpty(errorList)) {
-            resultList.add(String.format("%s订单指派(改派)失败,当前工程师无法预约合适时间", String.join(",", errorList)));
+            String msg = errorList.size() > 3 ? String.join(",", errorList.subList(0, 3)) + "..." : String.join(",", errorList);
+            resultList.add(String.format(StatusCodeEnum.ENGINEER_IS_LEAVE_TIME.getDesc(), msg, engineer.getName()));
         }
         return Result.success(CollectionUtils.isNotEmpty(resultList) ? String.join(",", resultList) : null);
     }

project-order/src/main/java/com/dituhui/pea/order/service/impl/FendanServiceImpl.java

@@ -290,7 +290,7 @@ public class FendanServiceImpl implements FendanService {
                 }
                 //最后处理全技能数据
                 if (i == mapBlockInfoList.size() - 1 && null != allLayer) {
-                    OrgTeamInfo orgTeamInfoAll = BeanUtil.copyProperties(orgTeamEntity, OrgTeamInfo.class);
+                    OrgTeamInfo orgTeamInfoAll = BeanUtil.copyProperties(teamMap.get(allLayer.getTeamId()), OrgTeamInfo.class);
                     orgGroup.setTeamInfos(Arrays.asList(orgTeamInfoAll));
                     allLayer = null;
                 }