[update] 优化灯态异常校验

signal-utc-service/src/main/java/net/wanji/utc/service/runninginfo/impl/SignalStatusServiceImpl.java

@@ -160,10 +160,12 @@ public class SignalStatusServiceImpl implements SignalStatusService {
             // 更新Redis
             if (lightsStatusVOList != null) {
                 for (LightsStatusVO lightsStatusVO : lightsStatusVOList) {
-                    String field = manufacturerEnum.getCode() + Constants.SEPARATOR_UNDER_LINE +
-                            lightsStatusVO.getCode();
-                    redisUtil.setHash(RedisKeyConst.KEY_PREFIX + RedisKeyConst.LIGHTS_STATUS, field,
-                            JSON.toJSONString(lightsStatusVO));
+                    if (Objects.nonNull(lightsStatusVO)) {
+                        String field = manufacturerEnum.getCode() + Constants.SEPARATOR_UNDER_LINE +
+                                lightsStatusVO.getCode();
+                        redisUtil.setHash(RedisKeyConst.KEY_PREFIX + RedisKeyConst.LIGHTS_STATUS, field,
+                                JSON.toJSONString(lightsStatusVO));
+                    }
                 }
                 resList.addAll(lightsStatusVOList);
             }

signal-utc-service/src/main/java/net/wanji/utc/task/SignalStatusTask.java

@@ -121,13 +121,12 @@ public class SignalStatusTask {
                     List<Map.Entry<String, RealTimeDataWebSocket>> value = entry.getValue();
                     if (!CollectionUtils.isEmpty(lightsStatusVOS)) {
                         for (LightsStatusVO lightsStatusVO : lightsStatusVOS) {
-                            if (Objects.equals(lightsStatusVO.getCrossId(), crossId)) {
+                            if (Objects.nonNull(lightsStatusVO) && Objects.equals(lightsStatusVO.getCrossId(), crossId)) {
                                 calculateContolCountDown(crossId, lightsStatusVO);
                                 try { // 相同路口不同websocket统一发送灯态
-                                    // 切换socket
-                                    List<LightsStatusVO2> listResult = lightsStatusVOCopy(lightsStatusVOS);
-
-                                    String json = mapper.writeValueAsString(listResult);
+                                    // 新版本，测试，未更新
+                                    //List<LightsStatusVO2> listResult = lightsStatusVOCopy(lightsStatusVOS);
+                                    String json = mapper.writeValueAsString(lightsStatusVOS);
                                     for (Map.Entry<String, RealTimeDataWebSocket> socketEntry : value) {
                                         String crossIdStr = socketEntry.getKey();
                                         RealTimeDataWebSocket webSocket = socketEntry.getValue();