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
9ee0946b
Commit
9ee0946b
authored
Jul 03, 2023
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 信号优化-态势监测,绿波详情异常返回
parent
10c4b262
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
TrendServiceImpl.java
...ain/java/net/wanji/opt/service/impl/TrendServiceImpl.java
+8
-2
No files found.
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/TrendServiceImpl.java
View file @
9ee0946b
...
@@ -400,7 +400,7 @@ public class TrendServiceImpl implements TrendService {
...
@@ -400,7 +400,7 @@ public class TrendServiceImpl implements TrendService {
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
res
.
setStrategySelected
(
collect
);
res
.
setStrategySelected
(
collect
);
// 绿波路口信息
// 绿波路口信息
List
<
GreenwaveDetailVO
.
GreenwaveCross
>
greenwaveCrossList
=
buildGreenwaveCrossList
(
greenwaveId
,
dir
);
List
<
GreenwaveDetailVO
.
GreenwaveCross
>
greenwaveCrossList
=
buildGreenwaveCrossList
(
greenwaveId
);
res
.
setGreenwaveCrossList
(
greenwaveCrossList
);
res
.
setGreenwaveCrossList
(
greenwaveCrossList
);
// 绿波带
// 绿波带
if
(
dir
==
0
)
{
// 正向
if
(
dir
==
0
)
{
// 正向
...
@@ -565,7 +565,7 @@ public class TrendServiceImpl implements TrendService {
...
@@ -565,7 +565,7 @@ public class TrendServiceImpl implements TrendService {
return
greenwavePoint
;
return
greenwavePoint
;
}
}
private
List
<
GreenwaveDetailVO
.
GreenwaveCross
>
buildGreenwaveCrossList
(
Integer
greenwaveId
,
Integer
dir
)
{
private
List
<
GreenwaveDetailVO
.
GreenwaveCross
>
buildGreenwaveCrossList
(
Integer
greenwaveId
)
{
List
<
GreenwaveDetailVO
.
GreenwaveCross
>
res
=
new
ArrayList
<>();
List
<
GreenwaveDetailVO
.
GreenwaveCross
>
res
=
new
ArrayList
<>();
List
<
GreenwaveCrossPO
>
greenwaveCrossList
=
greenwaveCrossMapper
.
selectByGreenwaveId
(
greenwaveId
);
List
<
GreenwaveCrossPO
>
greenwaveCrossList
=
greenwaveCrossMapper
.
selectByGreenwaveId
(
greenwaveId
);
// 相对相位差列表
// 相对相位差列表
...
@@ -582,6 +582,9 @@ public class TrendServiceImpl implements TrendService {
...
@@ -582,6 +582,9 @@ public class TrendServiceImpl implements TrendService {
String
crossId
=
greenwaveCrossPO
.
getCrossId
();
String
crossId
=
greenwaveCrossPO
.
getCrossId
();
greenwaveCross
.
setCrossId
(
crossId
);
greenwaveCross
.
setCrossId
(
crossId
);
BaseCrossInfoPO
baseCrossInfoPO
=
baseCrossInfoMapper
.
selectById
(
crossId
);
BaseCrossInfoPO
baseCrossInfoPO
=
baseCrossInfoMapper
.
selectById
(
crossId
);
if
(
baseCrossInfoPO
==
null
)
{
throw
new
RuntimeException
(
"无此路口基础信息"
);
}
greenwaveCross
.
setCrossName
(
baseCrossInfoPO
.
getName
());
greenwaveCross
.
setCrossName
(
baseCrossInfoPO
.
getName
());
greenwaveCross
.
setIsKeyRoute
(
greenwaveCrossPO
.
getIsKeyRoute
());
greenwaveCross
.
setIsKeyRoute
(
greenwaveCrossPO
.
getIsKeyRoute
());
greenwaveCross
.
setSort
(
greenwaveCrossPO
.
getSort
());
greenwaveCross
.
setSort
(
greenwaveCrossPO
.
getSort
());
...
@@ -598,6 +601,9 @@ public class TrendServiceImpl implements TrendService {
...
@@ -598,6 +601,9 @@ public class TrendServiceImpl implements TrendService {
// 获取当前方案
// 获取当前方案
Integer
sectionId
=
greenwaveCrossPO
.
getSectionId
();
Integer
sectionId
=
greenwaveCrossPO
.
getSectionId
();
CrossSectionPO
crossSectionPO
=
baseCrossSectionMapper
.
selectById
(
sectionId
);
CrossSectionPO
crossSectionPO
=
baseCrossSectionMapper
.
selectById
(
sectionId
);
if
(
crossSectionPO
==
null
)
{
throw
new
RuntimeException
(
"无当前时段方案信息"
);
}
Integer
currentSchemeId
=
crossSectionPO
.
getSchemeId
();
Integer
currentSchemeId
=
crossSectionPO
.
getSchemeId
();
BaseCrossSchemePO
baseCrossSchemePO
=
baseCrossSchemeMapper
.
selectById
(
currentSchemeId
);
BaseCrossSchemePO
baseCrossSchemePO
=
baseCrossSchemeMapper
.
selectById
(
currentSchemeId
);
greenwaveCross
.
setOffset
(
baseCrossSchemePO
.
getOffset
());
greenwaveCross
.
setOffset
(
baseCrossSchemePO
.
getOffset
());
...
...
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