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
a75e5172
Commit
a75e5172
authored
Sep 18, 2023
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[add] 新信号评价-运行评价-异常事件详情,添加时间线
parent
bb66610a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
0 deletions
+28
-0
SceneEvaluateServiceImpl.java
.../net/wanji/opt/service/impl/SceneEvaluateServiceImpl.java
+25
-0
SceneEvaluateAbnormalDetailVO.java
.../java/net/wanji/opt/vo/SceneEvaluateAbnormalDetailVO.java
+3
-0
No files found.
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/SceneEvaluateServiceImpl.java
View file @
a75e5172
...
...
@@ -186,6 +186,7 @@ public class SceneEvaluateServiceImpl implements SceneEvaluateService {
List
<
CrossDataHistPO
>
sceneCrossDataHistPOList
=
getCrossDataHistPOList
(
startTime
,
newEndTime
,
crossId
);
vo
.
setStartTime
(
startTime
);
vo
.
setTimeline
(
getTimeline
(
startTime
,
newEndTime
));
// todo 暂时只有拥堵,后期扩展考虑增加字段
if
(
Objects
.
equals
(
status
,
CrossStatusEnum
.
CONGESTION
.
getCode
()))
{
Integer
delayTime
=
calcCrossDelayTime
(
sceneCrossDataHistPOList
);
...
...
@@ -242,6 +243,30 @@ public class SceneEvaluateServiceImpl implements SceneEvaluateService {
return
vo
;
}
private
List
<
String
>
getTimeline
(
Date
startTime
,
Date
newEndTime
)
{
List
<
String
>
res
=
new
ArrayList
<>();
Calendar
startCal
=
Calendar
.
getInstance
();
startCal
.
setTime
(
startTime
);
int
minute
=
startCal
.
get
(
Calendar
.
MINUTE
);
int
remainder
=
minute
%
5
;
startCal
.
add
(
Calendar
.
MINUTE
,
-
remainder
);
Calendar
endCal
=
Calendar
.
getInstance
();
endCal
.
setTime
(
newEndTime
);
minute
=
endCal
.
get
(
Calendar
.
MINUTE
);
remainder
=
(
5
-
(
minute
%
5
))
%
5
;
endCal
.
add
(
Calendar
.
MINUTE
,
remainder
);
for
(
Calendar
cal
=
(
Calendar
)
startCal
.
clone
();
cal
.
before
(
endCal
)
||
cal
.
equals
(
endCal
);
cal
.
add
(
Calendar
.
MINUTE
,
5
))
{
res
.
add
(
HOUR_SDF
.
format
(
cal
.
getTime
()));
}
return
res
;
}
private
List
<
SchemeEvaluateSchemeDetailOverallVO
.
OverallMetrics
>
buildCrossSpilloverMetrics
(
List
<
CrossDataHistPO
>
sceneCrossDataHistPOList
)
{
List
<
SchemeEvaluateSchemeDetailOverallVO
.
OverallMetrics
>
res
=
new
ArrayList
<>();
...
...
signal-optimize-service/src/main/java/net/wanji/opt/vo/SceneEvaluateAbnormalDetailVO.java
View file @
a75e5172
...
...
@@ -46,6 +46,9 @@ public class SceneEvaluateAbnormalDetailVO {
@ApiModelProperty
(
value
=
"指标数据"
)
List
<
SchemeEvaluateSchemeDetailOverallVO
.
OverallMetrics
>
overallMetricsList
;
@ApiModelProperty
(
value
=
"时间轴"
)
List
<
String
>
timeline
;
@NoArgsConstructor
@Data
public
static
class
OverallMetrics
{
...
...
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