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
c45a7a7a
Commit
c45a7a7a
authored
Jul 16, 2024
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] review-阻塞list判断优化
parent
f27b9666
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
DiagnoServiceImpl.java
...in/java/net/wanji/opt/service/impl/DiagnoServiceImpl.java
+4
-4
No files found.
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/DiagnoServiceImpl.java
View file @
c45a7a7a
...
@@ -175,7 +175,7 @@ public class DiagnoServiceImpl implements DiagnoService {
...
@@ -175,7 +175,7 @@ public class DiagnoServiceImpl implements DiagnoService {
schemeOptVO
.
setSchemeId
(
schemeId
);
schemeOptVO
.
setSchemeId
(
schemeId
);
// 选择数据批次时间最大的记录
// 选择数据批次时间最大的记录
List
<
CrossSchemeOptLogPO
>
maxList
=
crossSchemeOptLogMapper
.
selectMaxByCrossIdAndSchemeId
(
crossId
,
schemeId
);
List
<
CrossSchemeOptLogPO
>
maxList
=
crossSchemeOptLogMapper
.
selectMaxByCrossIdAndSchemeId
(
crossId
,
schemeId
);
if
(
CollectionUtil
.
isNot
Empty
(
maxList
))
{
if
(
!
CollectionUtils
.
is
Empty
(
maxList
))
{
// 根据相位去重
// 根据相位去重
TreeSet
<
CrossSchemeOptLogPO
>
collect
=
maxList
.
stream
()
TreeSet
<
CrossSchemeOptLogPO
>
collect
=
maxList
.
stream
()
.
collect
(
Collectors
.
toCollection
(
.
collect
(
Collectors
.
toCollection
(
...
@@ -261,7 +261,7 @@ public class DiagnoServiceImpl implements DiagnoService {
...
@@ -261,7 +261,7 @@ public class DiagnoServiceImpl implements DiagnoService {
String
crossId
=
sendManualDTO
.
getSendCrossId
();
String
crossId
=
sendManualDTO
.
getSendCrossId
();
// 选择数据批次时间最大的记录
// 选择数据批次时间最大的记录
List
<
CrossSchemeOptLogPO
>
maxList
=
crossSchemeOptLogMapper
.
selectMaxByCrossId
(
crossId
);
List
<
CrossSchemeOptLogPO
>
maxList
=
crossSchemeOptLogMapper
.
selectMaxByCrossId
(
crossId
);
if
(
CollectionUtil
.
isNot
Empty
(
maxList
))
{
if
(
!
CollectionUtils
.
is
Empty
(
maxList
))
{
CrossSchemeOptLogPO
crossSchemeOptLogPO
=
maxList
.
get
(
0
);
CrossSchemeOptLogPO
crossSchemeOptLogPO
=
maxList
.
get
(
0
);
String
dataExtend
=
crossSchemeOptLogPO
.
getDataExtend
();
String
dataExtend
=
crossSchemeOptLogPO
.
getDataExtend
();
OptDataExtend
optDataExtendOld
=
gson
.
fromJson
(
dataExtend
,
OptDataExtend
.
class
);
OptDataExtend
optDataExtendOld
=
gson
.
fromJson
(
dataExtend
,
OptDataExtend
.
class
);
...
@@ -387,7 +387,7 @@ public class DiagnoServiceImpl implements DiagnoService {
...
@@ -387,7 +387,7 @@ public class DiagnoServiceImpl implements DiagnoService {
// 获取路口历史数据
// 获取路口历史数据
List
<
CrossDataHistPO
>
crossDataHistPOList
=
List
<
CrossDataHistPO
>
crossDataHistPOList
=
crossDataHistMapper
.
selectByCrossIdAndTimestamp
(
crossId
,
preSeconds
);
crossDataHistMapper
.
selectByCrossIdAndTimestamp
(
crossId
,
preSeconds
);
if
(
CollectionUtil
.
isNot
Empty
(
crossDataHistPOList
))
{
if
(
!
CollectionUtils
.
is
Empty
(
crossDataHistPOList
))
{
List
<
OptEffectVO
.
IndexDelay
>
indexDelayList
=
buildIndexDelayList
(
crossDataHistPOList
);
List
<
OptEffectVO
.
IndexDelay
>
indexDelayList
=
buildIndexDelayList
(
crossDataHistPOList
);
optEffectVO
.
setIndexDelayList
(
indexDelayList
);
optEffectVO
.
setIndexDelayList
(
indexDelayList
);
List
<
OptEffectVO
.
QueueStop
>
queueStopList
=
buildQueueStopList
(
crossDataHistPOList
);
List
<
OptEffectVO
.
QueueStop
>
queueStopList
=
buildQueueStopList
(
crossDataHistPOList
);
...
@@ -397,7 +397,7 @@ public class DiagnoServiceImpl implements DiagnoService {
...
@@ -397,7 +397,7 @@ public class DiagnoServiceImpl implements DiagnoService {
// 获取路口方向历史数据
// 获取路口方向历史数据
List
<
CrossDirDataHistPO
>
crossDirDataHistPOList
=
List
<
CrossDirDataHistPO
>
crossDirDataHistPOList
=
crossDirDataHistMapper
.
selectByCrossIdDirAndTimestamp
(
crossId
,
dir
,
preSeconds
);
crossDirDataHistMapper
.
selectByCrossIdDirAndTimestamp
(
crossId
,
dir
,
preSeconds
);
if
(
CollectionUtil
.
isNot
Empty
(
crossDirDataHistPOList
))
{
if
(
!
CollectionUtils
.
is
Empty
(
crossDirDataHistPOList
))
{
List
<
OptEffectVO
.
IndexDelay
>
indexDelayList
=
buildIndexDelayListDir
(
crossDirDataHistPOList
);
List
<
OptEffectVO
.
IndexDelay
>
indexDelayList
=
buildIndexDelayListDir
(
crossDirDataHistPOList
);
optEffectVO
.
setIndexDelayList
(
indexDelayList
);
optEffectVO
.
setIndexDelayList
(
indexDelayList
);
List
<
OptEffectVO
.
QueueStop
>
queueStopList
=
buildQueueStopListDir
(
crossDirDataHistPOList
);
List
<
OptEffectVO
.
QueueStop
>
queueStopList
=
buildQueueStopListDir
(
crossDirDataHistPOList
);
...
...
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