Skip to content

T
traffic-signal-platform
Commit 989f83b6 authored by 董国亮's avatar 董国亮
Browse files
Options

修订接口参数

parent 6febe144
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/GreenwaveInducesController.java
View file @ 989f83b6
...@@ -87,11 +87,12 @@ public class GreenwaveInducesController { ...@@ -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());// 过滤条件// 收集结果 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) { if (Objects.nonNull(deviceInduces) && deviceInduces.size() > 0) {
induceDTO.setEquipName(deviceInduces.get(0).getEquipName()); induceDTO.setEquipName(deviceInduces.get(0).getEquipName());
induceDTO.setRidDir(deviceInduces.get(0).getRidDir()); induceDTO.setRidDir(o.getDir());
induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth()); induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth());
induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight()); induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight());
induceDTO.setWkt(deviceInduces.get(0).getWkt()); induceDTO.setWkt(deviceInduces.get(0).getWkt());
} }
//获取上屏状态 //获取上屏状态
induceDTO.setStatus(o.getStatus()); induceDTO.setStatus(o.getStatus());
//获取关联绿波信息 //获取关联绿波信息
...@@ -155,9 +156,10 @@ public class GreenwaveInducesController { ...@@ -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());// 过滤条件// 收集结果 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) { if (Objects.nonNull(deviceInduces) && deviceInduces.size() > 0) {
induceDTO.setEquipName(deviceInduces.get(0).getEquipName()); induceDTO.setEquipName(deviceInduces.get(0).getEquipName());
induceDTO.setRidDir(deviceInduces.get(0).getRidDir()); induceDTO.setRidDir(o.getDir());
induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth()); induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth());
induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight()); induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight());
induceDTO.setWkt(deviceInduces.get(0).getWkt());
} }
//获取上屏状态 //获取上屏状态
induceDTO.setStatus(o.getStatus()); 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 { ...@@ -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());// 过滤条件// 收集结果 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) { if (Objects.nonNull(deviceInduces) && deviceInduces.size() > 0) {
induceDTO.setEquipName(deviceInduces.get(0).getEquipName()); induceDTO.setEquipName(deviceInduces.get(0).getEquipName());
induceDTO.setRidDir(deviceInduces.get(0).getRidDir());// induceDTO.setRidDir(n.getDir());//
induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth());// induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth());//
induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight());// induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight());//
induceDTO.setWkt(deviceInduces.get(0).getWkt());
} }
//关联模板信息 //关联模板信息
...@@ -180,9 +181,10 @@ public class GreenwaveInducesHistController { ...@@ -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());// 过滤条件// 收集结果 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) { if (Objects.nonNull(deviceInduces) && deviceInduces.size() > 0) {
induceDTO.setEquipName(deviceInduces.get(0).getEquipName()); induceDTO.setEquipName(deviceInduces.get(0).getEquipName());
induceDTO.setRidDir(deviceInduces.get(0).getRidDir());// induceDTO.setRidDir(n.getDir());//
induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth());// induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth());//
induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight());// induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight());//
induceDTO.setWkt(deviceInduces.get(0).getWkt());
} }
//关联模板信息 //关联模板信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment