Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/TrendServiceImpl.java

@@ -314,12 +314,14 @@ public class TrendServiceImpl implements TrendService {
             if (Objects.equals(realtimeStatus, CrossStatusEnum.SPILLOVER.getCode())) {
                 // 溢出只返回溢出方向的关联路口
                 String spilloverDirs = abnormalCrossListVO.getSpilloverDirs();
-                String[] split = spilloverDirs.split(",");
-                List<Integer> spilloverDirList = new ArrayList<>();
-                for (String s : split) {
-                    spilloverDirList.add(Integer.parseInt(s));
+                if (ObjectUtil.isNotNull(spilloverDirs)){
+                    String[] split = spilloverDirs.split(",");
+                    List<Integer> spilloverDirList = new ArrayList<>();
+                    for (String s : split) {
+                        spilloverDirList.add(Integer.parseInt(s));
+                    }
+                    buildRidData(abnormalCrossListVO, endCrossId, spilloverDirList);
                 }
-                buildRidData(abnormalCrossListVO, endCrossId, spilloverDirList);
             } else if (Objects.equals(realtimeStatus, CrossStatusEnum.CONGESTION.getCode())) {
                 // 拥堵返回所有方向关联路口
                 List<Integer> inDirs = baseCrossDirInfoMapper.selectInDirsByCrossId(endCrossId);