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 1b927755
authored
Jul 05, 2023
by
张晓
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
算法读取批次部分合并
1 parent
998c16f9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
3 deletions
project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Location.java
project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Technician.java
project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/DispatchServiceImpl.java
project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Location.java
View file @
1b92775
...
@@ -69,12 +69,12 @@ public class Location {
...
@@ -69,12 +69,12 @@ public class Location {
/**
/**
* time to the given location in minutes.
* time to the given location in minutes.
* FIXME 这里简化处理没有用时间矩阵 时间=距离/100
*
* @param location other location
* @param location other location
* @return time in minutes
* @return time in minutes
*/
*/
public
int
getPathTimeTo
(
Location
location
)
{
public
int
getPathTimeTo
(
Location
location
)
{
return
(
int
)(
distanceMap
.
get
(
location
)/
100
);
return
distanceTimeMap
.
get
(
location
).
intValue
(
);
}
}
// ************************************************************************
// ************************************************************************
...
@@ -97,4 +97,5 @@ public class Location {
...
@@ -97,4 +97,5 @@ public class Location {
return
this
.
id
==
((
Location
)
obj
).
getId
();
return
this
.
id
==
((
Location
)
obj
).
getId
();
}
}
}
}
project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Technician.java
View file @
1b92775
...
@@ -195,5 +195,18 @@ public class Technician {
...
@@ -195,5 +195,18 @@ public class Technician {
return
this
.
id
==
((
Technician
)
obj
).
getId
();
return
this
.
id
==
((
Technician
)
obj
).
getId
();
}
}
@Override
public
String
toString
()
{
return
"Technician{"
+
"id="
+
id
+
", code='"
+
code
+
'\''
+
", depot="
+
depot
+
", startTime="
+
startTime
+
", endTime="
+
endTime
+
", skills="
+
skills
+
", maxCount="
+
maxCount
+
", maxMinute="
+
maxMinute
+
", maxDistanceMeter="
+
maxDistanceMeter
+
'}'
;
}
}
}
project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/DispatchServiceImpl.java
View file @
1b92775
This diff is collapsed.
Click to expand it.
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