Merge remote-tracking branch 'origin/develop' into develop

.gitignore

@@ -9,3 +9,4 @@
 /*/.project
 /*/logs/
 /*/.gitignore
+dispatchSolution-*.json
\ No newline at end of file

project-dispatch/src/main/java/com/dituhui/pea/dispatch/dao/DispatchBatchRepository.java

@@ -20,7 +20,7 @@ public interface DispatchBatchRepository extends CrudRepository<DispatchBatch, L
     Optional<DispatchBatch> findByGroupIdAndBatchDate(String groupId, String batchDay);
 
     @Query(value = "from DispatchBatch  where groupId = ?1 and batchNo=?2 ")
-    List<DispatchBatch> findLatestGroup(String groupId, String batchNo);
+    Optional<DispatchBatch> findByGroupIdAndBatchNo(String groupId, String batchNo);
 
 
 }
\ No newline at end of file

project-dispatch/src/main/java/com/dituhui/pea/dispatch/dao/OrderAppointmentRepository.java

 package com.dituhui.pea.dispatch.dao;
 
 import com.dituhui.pea.dispatch.entity.OrderAppointment;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
 import java.util.Optional;
 
 public interface OrderAppointmentRepository extends CrudRepository<OrderAppointment, Long> {
 
+    @Query(value = "SELECT * FROM order_appointment  WHERE order_id=:orderId ORDER BY id DESC LIMIT 1", nativeQuery = true)
     Optional<OrderAppointment> findByOrderId(String orderId);
 }

project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/DispatchBatch.java

@@ -72,6 +72,12 @@ public class DispatchBatch implements Serializable {
     @Column(name = "status")
     private String status;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "cutoffed_time")
+    private LocalDateTime cutoffedTime;
+
     @Column(name = "memo")
     private String memo;
 

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

 package com.dituhui.pea.dispatch.scheduler;
 
 import com.dituhui.pea.dispatch.constraint.DispatchConstraintProvider;
+import com.dituhui.pea.dispatch.entity.DispatchBatch;
 import com.dituhui.pea.dispatch.pojo.Customer;
 import com.dituhui.pea.dispatch.pojo.DispatchSolution;
 import com.dituhui.pea.dispatch.pojo.Technician;
@@ -21,6 +22,8 @@ import java.io.File;
 import java.sql.SQLException;
 import java.time.Duration;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.UUID;
@@ -69,6 +72,32 @@ public class BatchScheduler {
                 String currDay = LocalDate.now().plusDays(i).format(DateTimeFormatter.ISO_LOCAL_DATE);
                 log.info("dispatchRun begin----- group:{}, day:{}", groupId, currDay);
 
+                LocalTime currentTime = LocalTime.now();
+                LocalTime cutoffTime = LocalTime.parse("16:00:00", DateTimeFormatter.ISO_LOCAL_TIME);
+                if (currentTime.isAfter(cutoffTime)) {
+                    log.info("dispatchRun 已过cutoff时间,更新pre状态为confirm----- group:{}, day:{}", groupId, currDay);
+                    DispatchBatch dispatchBatch = batchService.queryBatchInfoByDay(groupId, currDay);
+                    if (null == dispatchBatch.getBatchNo()) {
+                        log.info("dispatchRun 未查询到批次信息跳过----- group:{}, day:{}", groupId, currDay);
+                        continue;
+                    }
+                    if (null == dispatchBatch.getCutoffedTime()) {
+                        log.info("dispatchRun 已过cutoff时间,更新pre状态为confirm, 执行首次confirm----- group:{}, day:{}", groupId, currDay);
+                        try {
+                            this.extractService.extractDispatchToOrder(groupId, dispatchBatch.getBatchNo(), true);
+                            dispatchBatch.setCutoffedTime(LocalDateTime.now());
+                            batchService.saveDispatchBatch(dispatchBatch);
+                        } catch (SQLException e) {
+                            log.error("dispatchRun 已过cutoff时间,更新pre状态为confirm 异常 %s", e);
+                            throw new RuntimeException(e);
+                        }
+
+                    } else {
+                        log.info("dispatchRun 已过cutoff时间,更新pre状态为confirm, 已经执行confirm,跳过当次计算 ----- group:{}, day:{}", groupId, currDay);
+                    }
+                    continue;
+                }
+
                 String batchNo = batchService.buildBatchData(groupId, currDay);
                 UUID problemId = solveService.generateProblemId(groupId, batchNo);
                 log.info("dispatchRun group:{}, day:{}, batch:{}, problemId:{}", groupId, currDay, batchNo, problemId);
@@ -81,13 +110,11 @@ public class BatchScheduler {
                 }
                 log.info("dispatchRun prepare done, group:{}, day:{}, batch:{}, problemId:{}", groupId, currDay, batchNo, problemId);
                 DispatchSolution solution = solver.solve(problem);
-                log.info("dispatchRun run done, group:{}, day:{}, batch:{}, problemId:{}, score:{}",
-                        groupId, currDay, batchNo, problemId, solution.getScore().toShortString());
+                log.info("dispatchRun run done, group:{}, day:{}, batch:{}, problemId:{}, score:{}", groupId, currDay, batchNo, problemId, solution.getScore().toShortString());
                 this.extractService.saveAndExtractSolution(solution);
                 log.info("dispatchRun done ------ group:{}, day:{}", groupId, currDay);
 
-                JacksonSolutionFileIO<DispatchSolution> exporter = new JacksonSolutionFileIO<DispatchSolution>(
-                        DispatchSolution.class);
+                JacksonSolutionFileIO<DispatchSolution> exporter = new JacksonSolutionFileIO<DispatchSolution>(DispatchSolution.class);
                 // Set the output file.
 
 
@@ -98,11 +125,10 @@ public class BatchScheduler {
 
             }
 
-
-        } catch (SQLException e) {
+        } catch (InterruptedException e) {
             log.info("error %s", e);
             throw new RuntimeException(e);
-        } catch (InterruptedException e) {
+        } catch (SQLException e) {
             log.info("error %s", e);
             throw new RuntimeException(e);
         }

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

@@ -23,4 +23,6 @@ public interface BatchService {
 
     String queryBatchNoByDay(String groupId, String day);
 
+    void saveDispatchBatch(DispatchBatch batchInfo);
+
 }

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

@@ -2,6 +2,7 @@ package com.dituhui.pea.dispatch.service;
 
 
 import com.dituhui.pea.dispatch.pojo.DispatchSolution;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.SQLException;
 
@@ -18,12 +19,14 @@ public interface ExtractService {
      * 将计算结果回写到dispatch2个表、以及order两个表
      * 是下面两个方法的包装
      * */
+//    @Transactional
     void saveAndExtractSolution(DispatchSolution solution) throws RuntimeException;
 
 
     /*
      * 将计算结果回写到dispatch_order表（更新补充技术员工号、上门时间）
      * */
+//    @Transactional
     void saveSolutionToDispatch(String groupId, String batchNo, DispatchSolution solution) throws RuntimeException;
 
     /*
@@ -31,7 +34,8 @@ public interface ExtractService {
      *   order_appointment（新增、更新）
      *   order_request(主要更新状态)
      * */
-    void extractDispatchToOrder(String groupId, String batchNo) throws SQLException;
+//    @Transactional
+    void extractDispatchToOrder(String groupId, String batchNo, boolean isConfirm) throws SQLException;
 
 
 }

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

@@ -80,6 +80,7 @@ public class BatchServiceImpl implements BatchService {
 //        int engCount = queryEnginerCount(groupId);
 //        int orderCount = queryOrderCount(groupId, batchDay);
 
+
         log.info("清理原批次数据, groupId:{}, day:{}, batchNo:{}", groupId, batchDay, batchNo);
         jdbcTemplate.update("delete from dispatch_engineer where group_id=? and batch_no=?", groupId, batchNo);
         jdbcTemplate.update("delete from dispatch_order where group_id=? and batch_no=?", groupId, batchNo);
@@ -94,23 +95,23 @@ public class BatchServiceImpl implements BatchService {
                 " order by a.engineer_code asc";
         int engCount = jdbcTemplate.update(sqlEngineer, batchNo, groupId);
 
-        // 未派过的工单
+        // 未派过的工单(虚拟指派不更改order_request.appointment_status,所以也包含在当前条件中)
         String sqlOrder = "INSERT INTO dispatch_order (group_id,  batch_no, order_id ,  x, y,  expect_time_begin, expect_time_end, tags, priority , skills , take_time )\n" +
                 " select a.org_group_id, ? ,  a.order_id, a.x, a.y , \n" +
-                " a.expect_time_begin, a.expect_time_end, a.tags, a.priority , concat(a.brand, a.type, a.skill) skills ,  b.take_time  \n" +
-                "          from order_request a left join product_category b on (a.brand=b.brand and a.type=b.type and a.skill=b.skill )\n" +
+                " a.expect_time_begin, a.expect_time_end, a.tags, a.priority , concat(a.brand, '-', a.type, '-', a.skill) skills ,  b.take_time  \n" +
+                "          from order_request a left join skill_info b on (a.brand=b.brand and a.type=b.type and a.skill=b.skill )\n" +
                 "          where  a.org_group_id=?  and a.status='OPEN' " +
                 "                 and a.dt = ? " +
-                "                 and appointment_status ='NOT_ASSIGNED' and appointment_method like 'AUTO%' \n" +
+                "                 and a.appointment_status ='NOT_ASSIGNED' and appointment_method like 'AUTO%' \n" +
                 "          order by a.expect_time_begin asc  ";
         int orderCount = jdbcTemplate.update(sqlOrder, batchNo, groupId, batchDay);
 
         // 已派过PRE状态还可以再次派
         String sqlOrderPre = "INSERT INTO dispatch_order (group_id,  batch_no, order_id ,  x, y,  expect_time_begin, expect_time_end, tags, priority , skills , take_time )\n" +
                 " select a.org_group_id, ?,  a.order_id, a.x, a.y , \n" +
-                "      a.expect_time_begin, a.expect_time_end, a.tags, a.priority , concat(a.brand, a.type, a.skill) skills ,  b.take_time  \n" +
+                "      a.expect_time_begin, a.expect_time_end, a.tags, a.priority , concat(a.brand,'-', a.type, '-', a.skill) skills ,  b.take_time  \n" +
                 "      from order_request a " +
-                "      left join product_category b on (a.brand=b.brand and a.type=b.type and a.skill=b.skill  )\n" +
+                "      left join skill_info b on (a.brand=b.brand and a.type=b.type and a.skill=b.skill  )\n" +
                 "      left join order_appointment o on (a.order_id =o.order_id)\n" +
                 "                  where a.org_group_id=?  and a.status='OPEN' \n" +
                 "                  and a.dt = ?  " +
@@ -119,8 +120,9 @@ public class BatchServiceImpl implements BatchService {
                 "    order by a.expect_time_begin asc  ";
         int orderCountPre = jdbcTemplate.update(sqlOrderPre, batchNo, groupId, batchDay);
 
-        log.info("准备批次数据 order1 :{}", orderCount);
-        log.info("准备批次数据 order2 :{}", orderCountPre);
+
+        log.info("准备批次数据 orderCount :{}", orderCount);
+        log.info("准备批次数据 orderCountPre :{}", orderCountPre);
 
 
         jdbcTemplate.update("update dispatch_batch set engineer_num=? , order_num=?, start_time=?, end_time=null, status='RUNNING' where group_id=? and batch_no=?",
@@ -148,5 +150,9 @@ public class BatchServiceImpl implements BatchService {
         return optional.orElseGet(DispatchBatch::new);
     }
 
+    @Override
+    public void saveDispatchBatch(DispatchBatch batchInfo) {
+        batchRepository.save(batchInfo);
+    }
 
 }

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

@@ -58,8 +58,8 @@ public class SolveServiceImpl implements SolveService {
     // 查询技术员所有技能集
     private List<String> queryEngineerSkills(String engineerCode) {
         List<String> result = new ArrayList<>();
-        String sql = "select concat( b.brand, b.type, b.skill) as skill   from engineer_skill a left join product_category b \n"
-                + "\t on a.category_id= b.product_category_id  where a.engineer_code=? and a.status=1 " +
+        String sql = "select concat( b.brand, '-', b.type, '-', b.skill) as skill   from engineer_skill_group a left join skill_info b \n" +
+                "                 on a.skill_group_code= b.skill_group_code  where a.engineer_code=? and a.status=1 \n" +
                 "                 and b.brand is not null ";
         Object[] param = {engineerCode};
         result = jdbcTemplate.queryForList(sql, param, String.class);
@@ -184,7 +184,7 @@ public class SolveServiceImpl implements SolveService {
         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);
 
         // Solve the problem

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

@@ -3,8 +3,8 @@ server:
 
 dispatch:
   cron:
-    expr: 0 36 8-18 * * ?
-    next-day-limit: 3
+    expr: 0 43 8-18 * * ?
+    next-day-limit: 2
 #    expr: 0 */10 8-18 * * ?
 
 spring:

project-order/src/main/java/com/dituhui/pea/order/dto/DispatchOrderListReq.java

@@ -22,6 +22,7 @@ public class DispatchOrderListReq {
 	private List<Integer> priorities;
 	private List<String> typeCategory;
 	private List<String> skillCategory;
+	private List<Integer> groupCategory;
 	private String phone;
 	private String orderId;
 	private List<String> appointmentStatus;

project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceListReq.java

@@ -28,6 +28,7 @@ public class OrderServiceListReq {
 	private List<Integer> priorities;
 	private List<String> typeCategory;
 	private List<String> skillCategory;
+	private List<Integer> groupCategory;
 	private String phone;
 	private String orderId;
 	private List<String> appointmentStatus;

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

@@ -307,6 +307,11 @@ public class DispatchServiceImpl implements DispatchService {
 			String sql = String.format("select 1 from order_appointment oa where oa.order_id = order_request.order_id and oa.dt = order_request.dt and oa.engineer_code in (%s)", engineerCodes);
 			lqw.exists(sql);
 		}
+		if (ListUtils.isNotEmpty(reqDTO.getGroupCategory())) {
+			String groupCategory = reqDTO.getGroupCategory().stream().map(Object::toString).collect(Collectors.joining(","));
+			String sql = String.format("select 1 from org_group g where g.group_id = order_request.org_group_id and g.category in (%s)", groupCategory);
+			lqw.exists(sql);
+		}
 
 		return orderRequestMPDao.selectList(lqw);
 	}

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

@@ -78,6 +78,12 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 			lqw.exists(sql);
 		}
 
+		if (ListUtils.isNotEmpty(reqDTO.getGroupCategory())) {
+			String groupCategory = reqDTO.getGroupCategory().stream().map(Object::toString).collect(Collectors.joining(","));
+			String sql = String.format("select 1 from org_group g where g.group_id = order_request.org_group_id and g.category in (%s)", groupCategory);
+			lqw.exists(sql);
+		}
+
 		// 查询工单表列表
 		orderRequestMPDao.selectPage(pg, lqw);