Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit b6ff7777
authored
Jun 25, 2023
by
chamberone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 排班输出json格式调整
1 parent
48d47dd5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Customer.java
project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Technician.java
project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Customer.java
View file @
b6ff777
...
...
@@ -3,6 +3,8 @@ package com.dituhui.pea.dispatch.pojo;
import
org.optaplanner.core.api.domain.entity.PlanningEntity
;
import
org.optaplanner.core.api.domain.variable.ShadowVariable
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
lombok.Data
;
import
org.optaplanner.core.api.domain.variable.InverseRelationShadowVariable
;
...
...
@@ -18,6 +20,7 @@ public class Customer {
private
long
id
;
private
String
code
;
@JsonIgnore
private
Location
location
;
// 时间窗 分钟
private
int
startTime
;
...
...
@@ -27,8 +30,11 @@ public class Customer {
private
String
requiredSkill
;
// Shadow variables
@JsonIgnore
private
Technician
technician
;
@JsonIgnore
private
Customer
previousCustomer
;
@JsonIgnore
private
Customer
nextCustomer
;
// 到达时间
private
Integer
arrivalTime
;
...
...
@@ -139,8 +145,4 @@ public class Customer {
return
previousCustomer
.
getLocation
().
getPathTimeTo
(
location
);
}
// @Override
// public String toString() {
// return "Customer{" + "id=" + id + '}';
// }
}
project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Technician.java
View file @
b6ff777
...
...
@@ -11,6 +11,8 @@ import org.optaplanner.core.api.domain.entity.PlanningEntity;
import
org.optaplanner.core.api.domain.lookup.PlanningId
;
import
org.optaplanner.core.api.domain.variable.PlanningListVariable
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
lombok.Data
;
@Data
...
...
@@ -20,6 +22,7 @@ public class Technician {
@PlanningId
private
long
id
;
private
String
code
;
@JsonIgnore
private
Depot
depot
;
// 上班时间窗 分钟480-1080 8-18点
...
...
@@ -31,6 +34,7 @@ public class Technician {
// 偏好坐标
// private Location preferredlocation;
// teck code : customer code , distance
@JsonIgnore
private
Map
<
String
,
Long
>
preferredlocationDistanceMap
=
new
HashMap
<
String
,
Long
>();
@PlanningListVariable
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment