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
bd6cf17b
Commit
bd6cf17b
authored
Mar 23, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 封闭开发bug修复
parent
a73368ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
SituationDetectionController.java
...et/wanji/web/controller/SituationDetectionController.java
+1
-4
SituationDetectionServiceImpl.java
...wanji/web/service/impl/SituationDetectionServiceImpl.java
+2
-2
No files found.
signal-control-service/src/main/java/net/wanji/web/controller/SituationDetectionController.java
View file @
bd6cf17b
...
...
@@ -167,10 +167,7 @@ public class SituationDetectionController extends BaseController {
for
(
CrossDeviceStatusInfoOutVO
item
:
list
)
{
int
fualType
=
item
.
getFaultType
();
int
status
=
item
.
getStatus
();
if
(
status
==
0
)
{
status
=
2
;
}
if
(
fualType
!=
0
)
{
if
(
status
==
1
&&
fualType
!=
0
)
{
status
=
3
;
}
item
.
setStatus
(
status
);
...
...
signal-control-service/src/main/java/net/wanji/web/service/impl/SituationDetectionServiceImpl.java
View file @
bd6cf17b
...
...
@@ -663,8 +663,8 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
}
}
return
s
ignalOperationModeVOS
;
List
<
SignalOperationModeVO
>
sort
=
signalOperationModeVOS
.
stream
().
sorted
(
Comparator
.
comparing
(
SignalOperationModeVO:
:
getStartTime
).
reversed
()).
collect
(
Collectors
.
toList
());
return
s
ort
;
}
@Override
...
...
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