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
dd30f23b
Commit
dd30f23b
authored
Jun 01, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 控制模式表更新逻辑优化
parent
0783e5a6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
SignalStatusTask.java
...ce/src/main/java/net/wanji/web/task/SignalStatusTask.java
+2
-2
No files found.
signal-control-service/src/main/java/net/wanji/web/task/SignalStatusTask.java
View file @
dd30f23b
...
@@ -74,7 +74,6 @@ public class SignalStatusTask {
...
@@ -74,7 +74,6 @@ public class SignalStatusTask {
}
}
// 更新数据库状态
// 更新数据库状态
updateSignalStatus
(
signalStatusVO
,
crossId
,
name
,
currentSignalStatus
,
currentFaultType
,
results
);
updateSignalStatus
(
signalStatusVO
,
crossId
,
name
,
currentSignalStatus
,
currentFaultType
,
results
);
insertControlHist
(
signalStatusVO
);
log
.
info
(
"更新信号机状态成功,{}"
,
currentSignalStatus
);
log
.
info
(
"更新信号机状态成功,{}"
,
currentSignalStatus
);
});
});
long
end
=
LocalDateTime
.
now
().
toEpochSecond
(
ZoneOffset
.
of
(
"+8"
));
long
end
=
LocalDateTime
.
now
().
toEpochSecond
(
ZoneOffset
.
of
(
"+8"
));
...
@@ -127,6 +126,7 @@ public class SignalStatusTask {
...
@@ -127,6 +126,7 @@ public class SignalStatusTask {
insertDeviceStatusLog
(
signalStatusVO
,
crossId
,
currentSignalStatus
,
currentFaultType
,
name
);
insertDeviceStatusLog
(
signalStatusVO
,
crossId
,
currentSignalStatus
,
currentFaultType
,
name
);
// 信号机状态发生改变,进行告警通知
// 信号机状态发生改变,进行告警通知
buildSignalWarnData
(
results
,
crossId
,
currentSignalStatus
,
currentFaultType
,
name
);
buildSignalWarnData
(
results
,
crossId
,
currentSignalStatus
,
currentFaultType
,
name
);
insertControlHist
(
signalStatusVO
);
}
}
}
else
{
}
else
{
TDeviceStatusInfo
deviceStatusInfo
=
new
TDeviceStatusInfo
();
TDeviceStatusInfo
deviceStatusInfo
=
new
TDeviceStatusInfo
();
...
@@ -150,7 +150,7 @@ public class SignalStatusTask {
...
@@ -150,7 +150,7 @@ public class SignalStatusTask {
private
void
insertControlHist
(
SignalStatusVO
signalStatusVO
)
{
private
void
insertControlHist
(
SignalStatusVO
signalStatusVO
)
{
// 手动控制控制历史表
// 手动控制控制历史表
Map
<
String
,
Boolean
>
centerControlMap
=
ControlModeConst
.
centerControlMap
;
Map
<
String
,
Boolean
>
centerControlMap
=
ControlModeConst
.
centerControlMap
;
if
(
!
centerControlMap
.
isEmpty
()
&&
!
centerControlMap
.
get
(
signalStatusVO
.
getCrossId
(
)))
{
if
(
centerControlMap
.
isEmpty
()
||
(!
centerControlMap
.
isEmpty
()
&&
!
centerControlMap
.
get
(
signalStatusVO
.
getCrossId
()
)))
{
String
crossId
=
signalStatusVO
.
getCrossId
();
String
crossId
=
signalStatusVO
.
getCrossId
();
Integer
controlType
=
signalStatusVO
.
getControlType
();
Integer
controlType
=
signalStatusVO
.
getControlType
();
TCrossControlHist
tCrossControlHist
=
controlHistMapper
.
selectRecentOne
(
crossId
);
TCrossControlHist
tCrossControlHist
=
controlHistMapper
.
selectRecentOne
(
crossId
);
...
...
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