[add] 绿波事件过滤畅通

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/TrendControllerV2.java

@@ -160,7 +160,9 @@ public class TrendControllerV2 {
             log.error("态势监测-事件告警-实时列表：", e);
             JsonViewObject.newInstance().success(list);
         }
-        List<OptMonitoringVO> collect = list.stream().filter(vo -> !StringUtils.equalsIgnoreCase("700", vo.getType())).collect(Collectors.toList());
+        List<OptMonitoringVO> collect = list.stream().
+                filter(vo -> !StringUtils.equalsIgnoreCase("700", vo.getType())
+                && !StringUtils.equalsIgnoreCase("708", vo.getType())).collect(Collectors.toList());
         return JsonViewObject.newInstance().success(collect);
     }
 

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/implv2/TrendServiceV2Impl.java

@@ -361,15 +361,19 @@ public class TrendServiceV2Impl implements TrendServiceV2 {
     private String getOptGreenResult(String id, StringBuilder sb) {
         String result = "";
         List<GreenLastOptResultDTO> greenLastOptResultDTOS = strategyGreenOptHistMapper.selectLastGreenOptResultList();
-        for (GreenLastOptResultDTO dto : greenLastOptResultDTOS) {
-            if (StringUtils.endsWithIgnoreCase(id, String.valueOf(dto.getGreenId()))) {
-                Integer controlMethod = dto.getControlMethod();
-                if (0 >= controlMethod) {
-                    sb.append("动态绿波").append("-").append("均衡调控").append("-").append("神思策略");
-                } else {
-                    sb.append("均衡调控").append("-").append("专家方案");
+        if (!CollectionUtils.isEmpty(greenLastOptResultDTOS)) {
+            for (GreenLastOptResultDTO dto : greenLastOptResultDTOS) {
+                if (StringUtils.endsWithIgnoreCase(id, String.valueOf(dto.getGreenId()))) {
+                    Integer controlMethod = dto.getControlMethod();
+                    if (controlMethod >= 0) {
+                        sb.append("动态绿波").append("-").append("均衡调控").append("-").append("神思策略");
+                    } else {
+                        sb.append("均衡调控").append("-").append("专家方案");
+                    }
                 }
             }
+        } else {
+            sb.append("动态绿波-专家方案");
         }
         result = sb.toString();
         return result;