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
8de71c55
Commit
8de71c55
authored
Mar 23, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 测试查找问题
parent
0d33a717
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
CommonEventWarnTask.java
...src/main/java/net/wanji/web/task/CommonEventWarnTask.java
+2
-1
SignalStatusTask.java
...ce/src/main/java/net/wanji/web/task/SignalStatusTask.java
+4
-1
No files found.
signal-control-service/src/main/java/net/wanji/web/task/CommonEventWarnTask.java
View file @
8de71c55
...
@@ -83,7 +83,7 @@ public class CommonEventWarnTask {
...
@@ -83,7 +83,7 @@ public class CommonEventWarnTask {
*/
*/
private
JsonViewObject
getSignalWarnData
()
{
private
JsonViewObject
getSignalWarnData
()
{
List
<
CommonEventAlarmOutVo
>
results
=
new
ArrayList
<>();
List
<
CommonEventAlarmOutVo
>
results
=
new
ArrayList
<>();
log
.
info
(
"=============信号机告警==============="
);
JsonViewObject
jsonViewObject
=
utcFeignClients
.
runningStatusAlarm
();
JsonViewObject
jsonViewObject
=
utcFeignClients
.
runningStatusAlarm
();
if
(
Objects
.
isNull
(
jsonViewObject
)
||
jsonViewObject
.
getCode
()
!=
200
)
{
if
(
Objects
.
isNull
(
jsonViewObject
)
||
jsonViewObject
.
getCode
()
!=
200
)
{
return
jsonViewObject
.
fail
(
"信号机告警UTC服务调用异常!"
);
return
jsonViewObject
.
fail
(
"信号机告警UTC服务调用异常!"
);
...
@@ -91,6 +91,7 @@ public class CommonEventWarnTask {
...
@@ -91,6 +91,7 @@ public class CommonEventWarnTask {
LocalDateTime
now
=
LocalDateTime
.
now
();
LocalDateTime
now
=
LocalDateTime
.
now
();
String
formatNow
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
).
format
(
now
);
String
formatNow
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
).
format
(
now
);
List
<
Map
<
String
,
Object
>>
content
=
(
List
<
Map
<
String
,
Object
>>)
jsonViewObject
.
getContent
();
List
<
Map
<
String
,
Object
>>
content
=
(
List
<
Map
<
String
,
Object
>>)
jsonViewObject
.
getContent
();
log
.
info
(
"=============信号机告警:{}"
,
content
);
content
.
forEach
(
map
->
{
content
.
forEach
(
map
->
{
Map
<
String
,
Object
>
result
=
map
;
Map
<
String
,
Object
>
result
=
map
;
String
signalId
=
(
String
)
result
.
get
(
"signalId"
);
String
signalId
=
(
String
)
result
.
get
(
"signalId"
);
...
...
signal-control-service/src/main/java/net/wanji/web/task/SignalStatusTask.java
View file @
8de71c55
...
@@ -36,7 +36,7 @@ public class SignalStatusTask {
...
@@ -36,7 +36,7 @@ public class SignalStatusTask {
private
final
ControlHistMapper
controlHistMapper
;
private
final
ControlHistMapper
controlHistMapper
;
private
final
TDeviceStatusLogMapper
tDeviceStatusLogMapper
;
private
final
TDeviceStatusLogMapper
tDeviceStatusLogMapper
;
@Scheduled
(
fixedRate
=
1
*
60
*
1000
)
@Scheduled
(
fixedRate
=
2
*
60
*
1000
)
@Transactional
@Transactional
public
void
syncSignalStatus
()
{
public
void
syncSignalStatus
()
{
try
{
try
{
...
@@ -47,6 +47,7 @@ public class SignalStatusTask {
...
@@ -47,6 +47,7 @@ public class SignalStatusTask {
}
}
List
<
Map
<
String
,
Object
>>
source
=
(
List
<
Map
<
String
,
Object
>>)
jsonViewObject
.
getContent
();
List
<
Map
<
String
,
Object
>>
source
=
(
List
<
Map
<
String
,
Object
>>)
jsonViewObject
.
getContent
();
List
<
SignalStatusVO
>
content
=
BeanMapUtils
.
mapsToObjects
(
source
,
SignalStatusVO
.
class
);
List
<
SignalStatusVO
>
content
=
BeanMapUtils
.
mapsToObjects
(
source
,
SignalStatusVO
.
class
);
log
.
info
(
"SignalStatusVOTOMap: {}"
,
content
);
content
.
forEach
(
signalStatusVO
->
{
content
.
forEach
(
signalStatusVO
->
{
String
signalId
=
signalStatusVO
.
getSignalId
();
String
signalId
=
signalStatusVO
.
getSignalId
();
String
crossId
=
signalStatusVO
.
getCrossId
();
String
crossId
=
signalStatusVO
.
getCrossId
();
...
@@ -58,6 +59,8 @@ public class SignalStatusTask {
...
@@ -58,6 +59,8 @@ public class SignalStatusTask {
if
(
StringUtils
.
isNotEmpty
(
crossId
))
{
if
(
StringUtils
.
isNotEmpty
(
crossId
))
{
lambdaQueryWrapper
.
eq
(
TDeviceStatusInfo:
:
getCode
,
crossId
);
lambdaQueryWrapper
.
eq
(
TDeviceStatusInfo:
:
getCode
,
crossId
);
TDeviceStatusInfo
tDeviceStatusInfo
=
tDeviceStatusMapper
.
selectOne
(
lambdaQueryWrapper
);
TDeviceStatusInfo
tDeviceStatusInfo
=
tDeviceStatusMapper
.
selectOne
(
lambdaQueryWrapper
);
log
.
info
(
"TDeviceStatusInfo::getCode: {}"
,
tDeviceStatusInfo
.
getCode
());
if
(
isExucuteUpdate
(
currentSignalStatus
,
currentFaultType
,
tDeviceStatusInfo
))
{
if
(
isExucuteUpdate
(
currentSignalStatus
,
currentFaultType
,
tDeviceStatusInfo
))
{
tDeviceStatusInfo
.
setStatus
(
currentSignalStatus
);
tDeviceStatusInfo
.
setStatus
(
currentSignalStatus
);
tDeviceStatusInfo
.
setFaultType
(
currentFaultType
);
tDeviceStatusInfo
.
setFaultType
(
currentFaultType
);
...
...
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