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
989f83b6
Commit
989f83b6
authored
Nov 26, 2024
by
董国亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修订接口参数
parent
6febe144
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
GreenwaveInducesController.java
...nji/opt/controller/induce/GreenwaveInducesController.java
+4
-2
GreenwaveInducesHistController.java
...opt/controller/induce/GreenwaveInducesHistController.java
+4
-2
No files found.
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/GreenwaveInducesController.java
View file @
989f83b6
...
...
@@ -87,11 +87,12 @@ public class GreenwaveInducesController {
List
<
DeviceInduces
>
deviceInduces
=
deviceInducesList
.
stream
().
filter
(
x
->
Objects
.
nonNull
(
x
.
getEquipCode
())
&&
x
.
getEquipCode
().
equals
(
o
.
getEquipCode
())).
collect
(
Collectors
.
toList
());
// 过滤条件// 收集结果
if
(
Objects
.
nonNull
(
deviceInduces
)
&&
deviceInduces
.
size
()
>
0
)
{
induceDTO
.
setEquipName
(
deviceInduces
.
get
(
0
).
getEquipName
());
induceDTO
.
setRidDir
(
deviceInduces
.
get
(
0
).
getRid
Dir
());
induceDTO
.
setRidDir
(
o
.
get
Dir
());
induceDTO
.
setResolutionWidth
(
deviceInduces
.
get
(
0
).
getResolutionWidth
());
induceDTO
.
setResolutionHeight
(
deviceInduces
.
get
(
0
).
getResolutionHeight
());
induceDTO
.
setWkt
(
deviceInduces
.
get
(
0
).
getWkt
());
}
//获取上屏状态
induceDTO
.
setStatus
(
o
.
getStatus
());
//获取关联绿波信息
...
...
@@ -155,9 +156,10 @@ public class GreenwaveInducesController {
List
<
DeviceInduces
>
deviceInduces
=
deviceInducesList
.
stream
().
filter
(
x
->
Objects
.
nonNull
(
x
.
getEquipCode
())
&&
x
.
getEquipCode
().
equals
(
o
.
getEquipCode
())).
collect
(
Collectors
.
toList
());
// 过滤条件// 收集结果
if
(
Objects
.
nonNull
(
deviceInduces
)
&&
deviceInduces
.
size
()
>
0
)
{
induceDTO
.
setEquipName
(
deviceInduces
.
get
(
0
).
getEquipName
());
induceDTO
.
setRidDir
(
deviceInduces
.
get
(
0
).
getRid
Dir
());
induceDTO
.
setRidDir
(
o
.
get
Dir
());
induceDTO
.
setResolutionWidth
(
deviceInduces
.
get
(
0
).
getResolutionWidth
());
induceDTO
.
setResolutionHeight
(
deviceInduces
.
get
(
0
).
getResolutionHeight
());
induceDTO
.
setWkt
(
deviceInduces
.
get
(
0
).
getWkt
());
}
//获取上屏状态
induceDTO
.
setStatus
(
o
.
getStatus
());
...
...
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/GreenwaveInducesHistController.java
View file @
989f83b6
...
...
@@ -108,9 +108,10 @@ public class GreenwaveInducesHistController {
List
<
DeviceInduces
>
deviceInduces
=
deviceInducesList
.
stream
().
filter
(
m
->
Objects
.
nonNull
(
m
.
getEquipCode
())
&&
m
.
getEquipCode
().
equals
(
n
.
getEquipCode
())).
collect
(
Collectors
.
toList
());
// 过滤条件// 收集结果
if
(
Objects
.
nonNull
(
deviceInduces
)
&&
deviceInduces
.
size
()
>
0
)
{
induceDTO
.
setEquipName
(
deviceInduces
.
get
(
0
).
getEquipName
());
induceDTO
.
setRidDir
(
deviceInduces
.
get
(
0
).
getRid
Dir
());
//
induceDTO
.
setRidDir
(
n
.
get
Dir
());
//
induceDTO
.
setResolutionWidth
(
deviceInduces
.
get
(
0
).
getResolutionWidth
());
//
induceDTO
.
setResolutionHeight
(
deviceInduces
.
get
(
0
).
getResolutionHeight
());
//
induceDTO
.
setWkt
(
deviceInduces
.
get
(
0
).
getWkt
());
}
//关联模板信息
...
...
@@ -180,9 +181,10 @@ public class GreenwaveInducesHistController {
List
<
DeviceInduces
>
deviceInduces
=
deviceInducesList
.
stream
().
filter
(
m
->
Objects
.
nonNull
(
m
.
getEquipCode
())
&&
m
.
getEquipCode
().
equals
(
n
.
getEquipCode
())).
collect
(
Collectors
.
toList
());
// 过滤条件// 收集结果
if
(
Objects
.
nonNull
(
deviceInduces
)
&&
deviceInduces
.
size
()
>
0
)
{
induceDTO
.
setEquipName
(
deviceInduces
.
get
(
0
).
getEquipName
());
induceDTO
.
setRidDir
(
deviceInduces
.
get
(
0
).
getRid
Dir
());
//
induceDTO
.
setRidDir
(
n
.
get
Dir
());
//
induceDTO
.
setResolutionWidth
(
deviceInduces
.
get
(
0
).
getResolutionWidth
());
//
induceDTO
.
setResolutionHeight
(
deviceInduces
.
get
(
0
).
getResolutionHeight
());
//
induceDTO
.
setWkt
(
deviceInduces
.
get
(
0
).
getWkt
());
}
//关联模板信息
...
...
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