Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
traffic-signal-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
signal
traffic-signal-platform
Commits
0a9a273f
Commit
0a9a273f
authored
Oct 16, 2023
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 干线评价-修改工作日绿波时段
parent
0ee22d84
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
MainlineEvaluateServiceImpl.java
...t/wanji/opt/service/impl/MainlineEvaluateServiceImpl.java
+3
-3
No files found.
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/MainlineEvaluateServiceImpl.java
View file @
0a9a273f
...
@@ -640,7 +640,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
...
@@ -640,7 +640,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
private
void
mergeLineSchemeBuffer
(
Map
<
String
,
LineSchemeDTO
>
lineSchemeBuffer
,
String
mainlineName
)
{
private
void
mergeLineSchemeBuffer
(
Map
<
String
,
LineSchemeDTO
>
lineSchemeBuffer
,
String
mainlineName
)
{
if
(
mainlineName
.
contains
(
"转山西路至霞景路"
))
{
if
(
mainlineName
.
contains
(
"转山西路至霞景路"
))
{
// 工作日合并 07:00-09:
00,09:00-16:0
0,21:30-23:59
// 工作日合并 07:00-09:
30,09:30-16:3
0,21:30-23:59
// 周末和节假日合并 13:30-20:00,21:30-23:59
// 周末和节假日合并 13:30-20:00,21:30-23:59
Map
<
String
,
LineSchemeDTO
>
mergedRecords
=
new
HashMap
<>();
Map
<
String
,
LineSchemeDTO
>
mergedRecords
=
new
HashMap
<>();
...
@@ -685,8 +685,8 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
...
@@ -685,8 +685,8 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
private
List
<
int
[]>
getMergingPeriods
(
boolean
isWeekday
)
{
private
List
<
int
[]>
getMergingPeriods
(
boolean
isWeekday
)
{
if
(
isWeekday
)
{
if
(
isWeekday
)
{
return
Arrays
.
asList
(
return
Arrays
.
asList
(
new
int
[]
{
timeToInt
(
"07:00"
),
timeToInt
(
"09:
0
0"
)},
new
int
[]
{
timeToInt
(
"07:00"
),
timeToInt
(
"09:
3
0"
)},
new
int
[]
{
timeToInt
(
"09:
00"
),
timeToInt
(
"16:0
0"
)},
new
int
[]
{
timeToInt
(
"09:
30"
),
timeToInt
(
"16:3
0"
)},
new
int
[]
{
timeToInt
(
"21:30"
),
timeToInt
(
"23:59"
)}
new
int
[]
{
timeToInt
(
"21:30"
),
timeToInt
(
"23:59"
)}
);
);
}
else
{
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment