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
9a62f7df
Commit
9a62f7df
authored
Feb 27, 2025
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[add] 灯态控制模式缓存优化
parent
ef35556f
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
18 deletions
+13
-18
ControlCommandStrategyServiceImpl.java
...rvice/control/impl/ControlCommandStrategyServiceImpl.java
+12
-17
SignalCommandSyncTask.java
...c/main/java/net/wanji/utc/task/SignalCommandSyncTask.java
+1
-1
No files found.
signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/ControlCommandStrategyServiceImpl.java
View file @
9a62f7df
...
...
@@ -47,7 +47,6 @@ import java.util.Date;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.stream.Collectors
;
/**
* @author duanruiming
...
...
@@ -259,7 +258,7 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
}
else
{
jsonViewObject
=
wanJiControlCommandService
.
lockControl
(
commandVO
);
}
}
else
{
}
else
{
jsonViewObject
=
viewObject
;
}
}
catch
(
Exception
e
)
{
...
...
@@ -315,20 +314,16 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
**/
private
JsonViewObject
checkControlStatus
(
String
crossId
)
{
JsonViewObject
jsonViewObject
=
null
;
List
<
SignalCommandPO
>
signalCommandPOS
=
SignalCommandSyncTask
.
signalStatusRunModelList
;
if
(
ObjectUtil
.
isNotEmpty
(
signalCommandPOS
))
{
List
<
SignalCommandPO
>
collect
=
signalCommandPOS
.
stream
().
filter
(
x
->
x
.
getCrossId
().
equals
(
crossId
)).
collect
(
Collectors
.
toList
());
if
(
ObjectUtil
.
isNotEmpty
(
collect
))
{
SignalCommandPO
signalCommandPO
=
collect
.
get
(
0
);
Integer
status
=
signalCommandPO
.
getStatus
();
String
runMode
=
signalCommandPO
.
getRunMode
();
if
(
status
==
0
)
{
jsonViewObject
=
JsonViewObject
.
newInstance
().
fail
(
"该路口处于离线状态,禁止执行指令"
);
jsonViewObject
.
setCode
(
HttpCode
.
NOT_IMPLEMENTED
.
value
());
}
else
if
(
"31"
.
equals
(
runMode
))
{
jsonViewObject
=
JsonViewObject
.
newInstance
().
fail
(
"该路口控制模式为手动控制,禁止执行指令"
);
jsonViewObject
.
setCode
(
HttpCode
.
NOT_EXTENDED
.
value
());
}
SignalCommandPO
signalCommandPO
=
SignalCommandSyncTask
.
signalStatusRunModelMap
.
get
(
crossId
);
if
(
ObjectUtil
.
isNotEmpty
(
signalCommandPO
))
{
Integer
status
=
signalCommandPO
.
getStatus
();
String
runMode
=
signalCommandPO
.
getRunMode
();
if
(
status
==
0
)
{
jsonViewObject
=
JsonViewObject
.
newInstance
().
fail
(
"该路口处于离线状态,禁止执行指令"
);
jsonViewObject
.
setCode
(
HttpCode
.
NOT_IMPLEMENTED
.
value
());
}
else
if
(
"31"
.
equals
(
runMode
))
{
jsonViewObject
=
JsonViewObject
.
newInstance
().
fail
(
"该路口控制模式为手动控制,禁止执行指令"
);
jsonViewObject
.
setCode
(
HttpCode
.
NOT_EXTENDED
.
value
());
}
}
return
jsonViewObject
;
...
...
@@ -561,7 +556,7 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
}
else
{
jsonViewObject
=
wanJiControlCommandService
.
tempSchemeDetail
(
tempSchemeSendVO
);
}
}
else
{
}
else
{
jsonViewObject
=
viewObject
;
}
}
catch
(
Exception
e
)
{
...
...
signal-utc-service/src/main/java/net/wanji/utc/task/SignalCommandSyncTask.java
View file @
9a62f7df
This diff is collapsed.
Click to expand it.
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