----

signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/GreenwaveInducesHistController.java

@@ -185,8 +185,8 @@ public class GreenwaveInducesHistController {
                 greenwaveInducesDTO.setStatus(x.getStatus());
                 AtomicReference<Integer> equipCount = new AtomicReference<>(0);
                 List<GreenwaveDirDTO> dirList = new ArrayList<>();
-//                greenwaveInducesList.stream().collect(Collectors.toMap(p -> p.getGreenId() + "_" + p.getDir(), p -> p)).values().stream().distinct().collect(Collectors.toList()).stream().forEach(p->{
-                greenwaveInducesHistList.stream().filter(o -> Objects.isNull(o.getGreenId()) && o.getGreenId().equals(x.getId()) && o.getDir().equals(p.getDir())).forEach(o -> {
+//                greenwaveInducesList.stream().collect(Collectors.toMap(p -> p.getGreenId() + "_" + p.getDir(), p -> p)).values().stream().distinct().collect(Collectors.toList()).stream().forEach(p->{ && o.getDir().equals(p.getDir())
+                greenwaveInducesHistList.stream().filter(o -> Objects.isNull(o.getGreenId()) && o.getGreenId().equals(x.getId())).forEach(o -> {
                     GreenwaveDirDTO greenwaveDirDTO = new GreenwaveDirDTO();
                     //这里从绿波表里获取基本信息
 //                    List<GreenwaveInfoPO> greenwaveInfoByGreenId = greenwaveInfoPOList.stream().filter(n -> n.getId().equals(o.getGreenId())).collect(Collectors.toList());// 过滤条件// 收集结果