Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 32188e2e by 张晓
Options

解决合并冲突

2 parents afa28734 f36179c2
Expand all
Inline Side-by-side
Showing with 184 additions and 238 deletions
project-dispatch/src/main/java/com/dituhui/pea/dispatch/dao/DispatchOrderRepository.java
...@@ -10,13 +10,14 @@ import java.util.Optional; ...@@ -10,13 +10,14 @@ import java.util.Optional;
public interface DispatchOrderRepository extends CrudRepository<DispatchOrder, Long> { public interface DispatchOrderRepository extends CrudRepository<DispatchOrder, Long> {
// 查看未指派非confirm的，供算法计算
@Query("from DispatchOrder where groupId=?1 and batchNo=?2 and status !='CONFIRM' and (engineerCode is null or engineerCode='' ) ") @Query("from DispatchOrder where groupId=?1 and batchNo=?2 and status !='CONFIRM' and (engineerCode is null or engineerCode='' ) ")
List<DispatchOrder> findNotAssigned(String groupId, String batchNo); List<DispatchOrder> findNotAssigned(String groupId, String batchNo);
// 查看算法指派成功且非confirm状态的 // 查看算法指派成功且非confirm状态的
@Query("from DispatchOrder where groupId=?1 and batchNo=?2 and status !='CONFIRM' and engineerCode is not null and engineerCode!='' ") @Query("from DispatchOrder where groupId=?1 and batchNo=?2 and status !='CONFIRM' and ( engineerCode is not null and engineerCode!='') ")
List<DispatchOrder> findAssigned(String groupId, String batchNo); List<DispatchOrder> findAssigned(String groupId, String batchNo);
Optional<DispatchOrder> findByGroupIdAndBatchNoAndOrderId(String groupId, String batchNo, String orderId); Optional<DispatchOrder> findByGroupIdAndBatchNoAndOrderIdAndDt(String groupId, String batchNo, String orderId, String dt);
} }
\ No newline at end of file
project-dispatch/src/main/java/com/dituhui/pea/dispatch/dao/OrderAppointmentRepository.java deleted 100644 → 0
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/dao/OrderInfoRepository.java 0 → 100644
package com.dituhui.pea.dispatch.dao;
import com.dituhui.pea.dispatch.entity.OrderInfo;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import java.time.LocalDate;
import java.util.Optional;
public interface OrderInfoRepository extends CrudRepository<OrderInfo, Long> {
// @Query(value = "SELECT * FROM order_info WHERE order_id=:orderId ORDER BY dt DESC LIMIT 1",nativeQuery = true)
Optional<OrderInfo> findOrderInfoByOrderIdAndDt(String orderId, LocalDate dt);
}
project-dispatch/src/main/java/com/dituhui/pea/dispatch/dao/OrderRequestRepository.java deleted 100644 → 0
package com.dituhui.pea.dispatch.dao;
import com.dituhui.pea.dispatch.entity.OrderRequest;
import org.springframework.data.repository.CrudRepository;
import java.util.Optional;
public interface OrderRequestRepository extends CrudRepository<OrderRequest, Long> {
Optional<OrderRequest> findByOrderId(String orderId);
}
project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/DispatchOrder.java
...@@ -30,9 +30,15 @@ public class DispatchOrder implements Serializable { ...@@ -30,9 +30,15 @@ public class DispatchOrder implements Serializable {
@Column(name = "batch_no") @Column(name = "batch_no")
private String batchNo; private String batchNo;
@Column(name = "team_id")
private String teamId;
@Column(name = "order_id") @Column(name = "order_id")
private String orderId; private String orderId;
@Column(name = "dt")
private String dt;
@Column(name = "x") @Column(name = "x")
private String X; private String X;
...@@ -73,6 +79,14 @@ public class DispatchOrder implements Serializable { ...@@ -73,6 +79,14 @@ public class DispatchOrder implements Serializable {
@Column(name = "time_end") @Column(name = "time_end")
private LocalDateTime timeEnd; private LocalDateTime timeEnd;
//到达耗时（分钟）
@Column(name = "path_time")
private Integer pathTime;
//到达距离（米）
@Column(name = "path_distance")
private Integer pathDistance;
private String status; private String status;
private String ext; private String ext;
......
project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/EngineerInfo.java
...@@ -45,11 +45,6 @@ public class EngineerInfo implements Serializable { ...@@ -45,11 +45,6 @@ public class EngineerInfo implements Serializable {
private String credentials; private String credentials;
private Integer vehicle;
@Column(name = "vehicle_no")
private String vehicleNo;
@Column(name = "bean_status") @Column(name = "bean_status")
private Integer beanStatus; private Integer beanStatus;
......
project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/OrderAppointment.java deleted 100644 → 0
package com.dituhui.pea.dispatch.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@Entity
@Table(name = "order_appointment")
public class OrderAppointment implements Serializable {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
private Integer id;
@Column(name = "order_id")
private String orderId;
@Column(name = "suborder_id")
private String suborderId;
@Column(name = "main_sub")
private Integer mainSub;
@Column(name = "engineer_code")
private String engineerCode;
@Column(name = "engineer_name")
private String engineerName;
@Column(name = "engineer_phone")
private String engineerPhone;
@Column(name = "engineer_age")
private Integer engineerAge;
@Column(name = "is_workshop")
private Integer isWorkshop;
@JsonDeserialize(using = LocalDateDeserializer.class)
@JsonSerialize(using = LocalDateSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Column(name = "dt")
private LocalDate dt;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "expect_start_time")
private LocalDateTime expectStartTime;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "expect_end_time")
private LocalDateTime expectEndTime;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "actual_time")
private LocalDateTime actualTime;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "actual_start_time")
private LocalDateTime actualStartTime;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "actual_end_time")
private LocalDateTime actualEndTime;
@Column(name = "pre_status")
private String preStatus;
private String status;
private String memo;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "create_time")
private LocalDateTime createTime;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "update_time")
private LocalDateTime updateTime;
}
project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/OrderRequest.java → project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/OrderInfo.java
package com.dituhui.pea.dispatch.entity; package com.dituhui.pea.dispatch.entity;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
...@@ -17,20 +18,34 @@ import java.time.LocalDateTime; ...@@ -17,20 +18,34 @@ import java.time.LocalDateTime;
@Data @Data
@Entity @Entity
@Table(name = "order_request") @Table(name = "order_info")
public class OrderRequest implements Serializable { public class OrderInfo implements Serializable {
@Id @Id
@GeneratedValue(strategy=GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private String id; private Integer id;
@Column(name = "order_id") @Column(name = "order_id")
private String orderId; private String orderId;
@JsonDeserialize(using = LocalDateDeserializer.class)
@JsonSerialize(using = LocalDateSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate dt;
@Column(name = "sub_id")
private String subId;
private String name; private String name;
private String phone; private String phone;
private String province;
private String city;
private String county;
private String address; private String address;
@Column(name = "x") @Column(name = "x")
...@@ -39,11 +54,8 @@ public class OrderRequest implements Serializable { ...@@ -39,11 +54,8 @@ public class OrderRequest implements Serializable {
@Column(name = "y") @Column(name = "y")
private String Y; private String Y;
private String province; @Column(name = "bean_brand")
private String beanBrand;
private String city;
private String county;
private String brand; private String brand;
...@@ -51,19 +63,17 @@ public class OrderRequest implements Serializable { ...@@ -51,19 +63,17 @@ public class OrderRequest implements Serializable {
private String skill; private String skill;
@Column(name = "apply_note") @Column(name = "take_time")
private String applyNote; private Integer takeTime;
@Column(name = "is_workshop")
private Integer isWorkshop;
@Column(name = "fault_describe") @Column(name = "fault_describe")
private String faultDescribe; private String faultDescribe;
@Column(name = "apply_note")
@JsonDeserialize(using = LocalDateDeserializer.class) private String applyNote;
@JsonSerialize(using = LocalDateSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Column(name = "dt")
private LocalDate dt;
@JsonDeserialize(using = LocalDateTimeDeserializer.class) @JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class) @JsonSerialize(using = LocalDateTimeSerializer.class)
...@@ -82,53 +92,96 @@ public class OrderRequest implements Serializable { ...@@ -82,53 +92,96 @@ public class OrderRequest implements Serializable {
private String source; private String source;
@Column(name = "bean_priority")
private String beanPriority;
@Column(name = "bean_tags")
private String beanTags;
@Column(name = "bean_status")
private String beanStatus;
@Column(name = "bean_sub_status")
private String beanSubStatus;
@Column(name = "area_id") @Column(name = "area_id")
private String areaId; private String areaId;
@Column(name = "order_priority") @Column(name = "org_cluster_id")
private String orderPriority; private String orgClusterId;
@Column(name = "order_tags") @Column(name = "org_branch_id")
private String orderTags; private String orgBranchId;
@Column(name = "org_group_id")
private String orgGroupId;
@Column(name = "org_team_id")
private String orgTeamId;
private Integer priority; private Integer priority;
private String tags; private String tags;
private String status; @Column(name = "appointment_method")
private String appointmentMethod;
@Column(name = "appointment_status") @Column(name = "appointment_status")
private String appointmentStatus; private String appointmentStatus;
@Column(name = "appointment_method") @Column(name = "order_status")
private String appointmentMethod; private String orderStatus;
@Column(name = "org_cluster_id") @Column(name = "service_status")
private String orgClusterId; private String serviceStatus;
@Column(name = "org_cluster_name") @Column(name = "engineer_code")
private String orgClusterName; private String engineerCode;
@Column(name = "org_branch_id") @Column(name = "engineer_name")
private String orgBranchId; private String engineerName;
@Column(name = "org_branch_name") @Column(name = "engineer_phone")
private String orgBranchName; private String engineerPhone;
@Column(name = "org_group_id") @Column(name = "engineer_code_sub")
private String orgGroupId; private String engineerCodeSub;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "plan_start_time")
private LocalDateTime planStartTime;
@Column(name = "org_group_name") @JsonDeserialize(using = LocalDateTimeDeserializer.class)
private String orgGroupName; @JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "plan_end_time")
private LocalDateTime planEndTime;
@Column(name = "org_team_id") @Column(name = "arrive_elapsed")
private String orgTeamId; private Integer arriveElapsed;
@Column(name = "org_team_name") @Column(name = "arrive_distance")
private String orgTeamName; private Integer arriveDistance;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "actual_start_time")
private LocalDateTime actualStartTime;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "actual_end_time")
private LocalDateTime actualEndTime;
private String description; private String description;
@Column(name = "extra_info")
private String extraInfo;
@JsonDeserialize(using = LocalDateTimeDeserializer.class) @JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class) @JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
......
project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Customer.java
...@@ -21,6 +21,8 @@ public class Customer { ...@@ -21,6 +21,8 @@ public class Customer {
private long id; private long id;
private String code; private String code;
// orderid(code)+dt 确定唯一一条工单
private String dt;
@JsonIgnore @JsonIgnore
private Location location; private Location location;
// 时间窗 分钟 // 时间窗 分钟
...@@ -45,10 +47,11 @@ public class Customer { ...@@ -45,10 +47,11 @@ public class Customer {
public Customer() { public Customer() {
} }
public Customer(long id, String code, Location location, int startTime, int endTime, String requiredSkill, public Customer(long id, String code, String dt, Location location, int startTime, int endTime, String requiredSkill,
int serviceDuration) { int serviceDuration) {
this.id = id; this.id = id;
this.code = code; this.code = code;
this.dt = dt;
this.location = location; this.location = location;
this.startTime = startTime; this.startTime = startTime;
this.endTime = endTime; this.endTime = endTime;
...@@ -116,7 +119,7 @@ public class Customer { ...@@ -116,7 +119,7 @@ public class Customer {
} }
/** /**
* 与前一个订单或者出发地depot的距离 * 与前一个订单或者出发地depot的距离(米)
* *
* @return * @return
*/ */
...@@ -132,7 +135,7 @@ public class Customer { ...@@ -132,7 +135,7 @@ public class Customer {
} }
/** /**
* 与前一个订单或者出发地depot的路程时间 * 与前一个订单或者出发地depot的路程时间(分钟)
* *
* @return * @return
*/ */
...@@ -168,16 +171,17 @@ public class Customer { ...@@ -168,16 +171,17 @@ public class Customer {
return "Customer{" + return "Customer{" +
"id=" + id + "id=" + id +
", code='" + code + '\'' + ", code='" + code + '\'' +
", dt='" + dt + '\'' +
", location=" + location + ", location=" + location +
", startTime=" + startTime + ", startTime=" + startTime +
", endTime=" + endTime + ", endTime=" + endTime +
", serviceDuration=" + serviceDuration + ", serviceDuration=" + serviceDuration +
", requiredSkill='" + requiredSkill + '\'' + ", requiredSkill='" + requiredSkill + '\'' +
", technician=" + ((technician!=null) ? technician.getCode() : "null") + ", technician=" + ((technician != null) ? technician.getCode() : "null") +
", previousCustomer=" + ((previousCustomer != null) ? previousCustomer.getCode() : "null") + ", previousCustomer=" + ((previousCustomer != null) ? previousCustomer.getCode() : "null") +
", nextCustomer=" + ((nextCustomer != null) ? nextCustomer.getCode() : "null") + ", nextCustomer=" + ((nextCustomer != null) ? nextCustomer.getCode() : "null") +
", arrivalTime=" + arrivalTime + ", arrivalTime=" + arrivalTime +
", departureTime=" + ((getDepartureTime() != null )? getDepartureTime() : 0) + ", departureTime=" + ((getDepartureTime() != null) ? getDepartureTime() : 0) +
'}'; '}';
} }
} }
project-dispatch/src/main/java/com/dituhui/pea/dispatch/scheduler/BatchScheduler.java
...@@ -38,7 +38,7 @@ public class BatchScheduler { ...@@ -38,7 +38,7 @@ public class BatchScheduler {
@Value("${dispatch.cron.next-day-limit}") @Value("${dispatch.cron.next-day-limit}")
int nextDaysLimit = 3; int nextDaysLimit = 2;
@Autowired @Autowired
BatchService batchService; BatchService batchService;
...@@ -75,10 +75,11 @@ public class BatchScheduler { ...@@ -75,10 +75,11 @@ public class BatchScheduler {
log.info("dispatchRun begin----- group:{}, day:{}", groupId, currDay); log.info("dispatchRun begin----- group:{}, day:{}", groupId, currDay);
LocalTime currentTime = LocalTime.now(); LocalTime currentTime = LocalTime.now();
LocalTime cutoffTime = LocalTime.parse("16:00:00", DateTimeFormatter.ISO_LOCAL_TIME); LocalTime cutoffTime = LocalTime.parse("18:00:00", DateTimeFormatter.ISO_LOCAL_TIME);
// 明天单才有cutoff // 明天单才有cutoff
if (i == 1 && 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()) {
...@@ -97,6 +98,7 @@ public class BatchScheduler { ...@@ -97,6 +98,7 @@ public class BatchScheduler {
} }
continue; continue;
} }
*/
String batchNo = batchService.buildBatchData(groupId, currDay); String batchNo = batchService.buildBatchData(groupId, currDay);
UUID problemId = solveService.generateProblemId(groupId, batchNo); UUID problemId = solveService.generateProblemId(groupId, batchNo);
......
project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/ExtractService.java
...@@ -11,7 +11,7 @@ import java.sql.SQLException; ...@@ -11,7 +11,7 @@ import java.sql.SQLException;
* @author zhangx * @author zhangx
* <p> * <p>
* 排班算法数据准备 * 排班算法数据准备
* 排班结果解析到dispatch_order（更新补充技术员工号、上门时间） ,order_appointment、order_request * 排班结果解析到dispatch_order（更新补充技术员工号、上门时间） ,order_info
*/ */
public interface ExtractService { public interface ExtractService {
...@@ -19,9 +19,7 @@ public interface ExtractService { ...@@ -19,9 +19,7 @@ public interface ExtractService {
/* /*
* 将dispath_order 中的计算结果，回写到 order_request, order_appointment * 将dispath_order 中的计算结果，回写到 order_info
* order_appointment（新增、更新）
* order_request(主要更新状态)
* */ * */
void extractDispatchToOrder(String groupId, String batchNo, boolean isConfirm) ; void extractDispatchToOrder(String groupId, String batchNo, boolean isConfirm) ;
......
project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/BatchServiceImpl.java
...@@ -101,54 +101,39 @@ public class BatchServiceImpl implements BatchService { ...@@ -101,54 +101,39 @@ public class BatchServiceImpl implements BatchService {
" order by a.engineer_code asc"; " order by a.engineer_code asc";
int engCount = jdbcTemplate.update(sqlEngineer, batchNo, groupId); int engCount = jdbcTemplate.update(sqlEngineer, batchNo, groupId);
// 未派过的工单(虚拟指派不更改order_request.appointment_status,所以也包含在当前条件中) // 未派过的工单(已派过PRE状态还可以再次派)
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" + String sqlOrder = "INSERT INTO dispatch_order (group_id, batch_no, team_id, order_id , dt, x, y, \n" +
" select a.org_group_id, ? , a.order_id, a.x, a.y , \n" + " expect_time_begin, expect_time_end, tags, priority , skills , take_time, status )\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" + " select a.org_group_id, ?, a.org_team_id , a.order_id, a.dt, a.x, a.y , \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" + " a.expect_time_begin, a.expect_time_end, a.tags, a.priority , \n" +
" where a.org_group_id=? and a.status='OPEN' " + " concat(a.brand, '-', a.type, '-', a.skill) skills , a.take_time , a.appointment_status\n" +
" and a.dt = ? " + " from order_info a \n" +
" and a.appointment_status ='NOT_ASSIGNED' and a.appointment_method like 'AUTO%' \n" + " where a.org_group_id=? and a.dt = ? and bean_status='OPEN'\n" +
" and appointment_method like 'AUTO%' and a.appointment_status in ('INIT','VIRTUAL', 'PRE')\n" +
" and order_status ='NORMAL' and service_status='INIT'\n" +
" order by a.expect_time_begin asc "; " order by a.expect_time_begin asc ";
int orderCount = jdbcTemplate.update(sqlOrder, batchNo, groupId, batchDay); int orderCount = jdbcTemplate.update(sqlOrder, batchNo, groupId, batchDay);
// 已派过PRE状态还可以再次派 // confirm的要做预占用，所以也加入进来
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" + String sqlOrderConfirm = "INSERT INTO dispatch_order (group_id, batch_no, team_id, order_id , dt, x, y, \n" +
" select a.org_group_id, ?, a.order_id, a.x, a.y , \n" + " expect_time_begin, expect_time_end, tags, priority , skills , take_time, status, engineer_code, time_begin, time_end )\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" + " select a.org_group_id, ?, a.org_team_id , a.order_id, a.dt, a.x, a.y , \n" +
" from order_request a " + " a.expect_time_begin, a.expect_time_end, a.tags, a.priority , \n" +
" left join skill_info b on (a.brand=b.brand and a.type=b.type and a.skill=b.skill )\n" + " concat(a.brand, '-', a.type, '-', a.skill) skills , a.take_time, a.appointment_status, \n" +
" left join order_appointment o on (a.order_id =o.order_id)\n" + " a.engineer_code, a.plan_start_time, a.plan_end_time \n" +
" where a.org_group_id=? and a.status='OPEN' \n" + " from order_info a \n" +
" and a.dt = ? " + " where a.org_group_id=? and a.dt = ? and bean_status='OPEN'\n" +
" and a.appointment_status = 'ASSIGNED' and a.appointment_method like 'AUTO%' \n" + " and appointment_method like 'AUTO%' and a.appointment_status in ('CONFIRM')\n" +
" and o.pre_status in ('PRE') \n" + " and order_status ='NORMAL' and service_status='INIT'\n" +
" order by a.expect_time_begin asc "; " order by a.expect_time_begin asc ";
int orderCountPre = jdbcTemplate.update(sqlOrderPre, batchNo, groupId, batchDay); int orderConfirmCount = jdbcTemplate.update(sqlOrderConfirm, batchNo, groupId, batchDay);
// CONFIRM的订单再次入表（1占用时间窗 2，可视化需要展示）
String sqlOrderConfirm = "INSERT INTO dispatch_order (group_id, batch_no, order_id , x, y, expect_time_begin, expect_time_end, tags, priority , skills , take_time, " +
" engineer_code, seq, time_begin, time_end, status )\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" +
" o.engineer_code, -1, o.expect_start_time, o.expect_end_time, o.pre_status " +
" 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" +
" 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 = ? " +
" and o.pre_status in ('CONFIRM') \n" +
" order by a.expect_time_begin asc ";
// int orderCountConfirm = jdbcTemplate.update(sqlOrderConfirm, batchNo, groupId, batchDay);
log.info("准备批次数据 orderCount :{}", orderCount); log.info("准备批次数据 orderCount:{}, orderConfirmCount:{}", orderCount, orderConfirmCount);
log.info("准备批次数据 orderCountPre :{}", orderCountPre);
// log.info("准备批次数据 orderCountConfirm :{}", orderCountConfirm);
if (orderCount + orderCountPre > 0) { if (orderCount + orderConfirmCount > 0) {
jdbcTemplate.update("update dispatch_batch set engineer_num=? , order_num=?, start_time=?, end_time=null, status='RUNNING' where group_id=? and batch_no=?", jdbcTemplate.update("update dispatch_batch set engineer_num=? , order_num=?, start_time=?, end_time=null, status='RUNNING' where group_id=? and batch_no=?",
engCount, orderCount + orderCountPre , LocalDateTime.now(), groupId, batchNo); engCount, orderCount + orderConfirmCount, LocalDateTime.now(), groupId, batchNo);
} else { } else {
jdbcTemplate.update("update dispatch_batch set engineer_num=? , order_num=?, start_time=?, end_time=?, status='DONE' where group_id=? and batch_no=?", jdbcTemplate.update("update dispatch_batch set engineer_num=? , order_num=?, start_time=?, end_time=?, status='DONE' where group_id=? and batch_no=?",
engCount, 0, LocalDateTime.now(), LocalDateTime.now(), groupId, batchNo); engCount, 0, LocalDateTime.now(), LocalDateTime.now(), groupId, batchNo);
......
project-dispatch/src/main/java/com/dituhui/pea/dispatch/utils/DataUtils.java
...@@ -264,7 +264,7 @@ public class DataUtils { ...@@ -264,7 +264,7 @@ public class DataUtils {
// 初始化订单+技能服务时间 // 初始化订单+技能服务时间
List<Customer> customerList = new ArrayList<>(); List<Customer> customerList = new ArrayList<>();
for (int i = 0; i < customerIndexMap.keySet().size(); i++) { for (int i = 0; i < customerIndexMap.keySet().size(); i++) {
customerList.add(new Customer(i + 1, customerIndexMap.get(i + 1), locationIndex.get(i + 2), customerList.add(new Customer(i + 1, customerIndexMap.get(i + 1), "2000-01-01", locationIndex.get(i + 2),
customerStartMap.get(i + 1), customerEndMap.get(i + 1), customerSkillMap.get(i + 1), customerStartMap.get(i + 1), customerEndMap.get(i + 1), customerSkillMap.get(i + 1),
// 初始化技能服务时间 // 初始化技能服务时间
customerCodeServiceTimeMap.get(customerIndexMap.get(i + 1)))); customerCodeServiceTimeMap.get(customerIndexMap.get(i + 1))));
......
project-dispatch/src/test/java/com/dituhui/pea/dispatch/SolveServiceTest.java
...@@ -44,6 +44,7 @@ class SolveServiceTest { ...@@ -44,6 +44,7 @@ class SolveServiceTest {
String groupId = "gsuzhou"; String groupId = "gsuzhou";
String day = "2023-07-25"; String day = "2023-07-25";
private SolverManager<DispatchSolution, UUID> solverManager; private SolverManager<DispatchSolution, UUID> solverManager;
private SolverFactory<DispatchSolution> solverFactory; private SolverFactory<DispatchSolution> solverFactory;
private Solver<DispatchSolution> solver; private Solver<DispatchSolution> solver;
...@@ -55,6 +56,7 @@ class SolveServiceTest { ...@@ -55,6 +56,7 @@ class SolveServiceTest {
solverConfig.withConstraintProviderClass(DispatchConstraintProvider.class); solverConfig.withConstraintProviderClass(DispatchConstraintProvider.class);
solverConfig.withTerminationSpentLimit(Duration.ofSeconds(20)); solverConfig.withTerminationSpentLimit(Duration.ofSeconds(20));
solverFactory = SolverFactory.create(solverConfig); solverFactory = SolverFactory.create(solverConfig);
solver = solverFactory.buildSolver(); solver = solverFactory.buildSolver();
solverManager = SolverManager.create(solverConfig, new SolverManagerConfig()); solverManager = SolverManager.create(solverConfig, new SolverManagerConfig());
...@@ -81,7 +83,17 @@ class SolveServiceTest { ...@@ -81,7 +83,17 @@ class SolveServiceTest {
solveService.saveSolutionWrp(solution); solveService.saveSolutionWrp(solution);
extractService.extractDispatchToOrder(groupId, batchNo, false); extractService.extractDispatchToOrder(groupId, batchNo, false);
log.info("testAsync done"); log.info("testAsync done");
} }
@Test
public void testExtraceToOrder() throws InterruptedException {
log.info("testExtraceToOrder init");
String batchNo = "20230723-0810";
extractService.extractDispatchToOrder(groupId, batchNo, false);
log.info("testExtraceToOrder done");
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!