[update] 优化灯态

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

@@ -128,7 +128,6 @@ public class HkLightsStatusServiceImpl implements HkLightsStatusService {
                         int cycleCountDown = cycleLen - curRunTime;             // 周期剩余时长
                         infoVo.setCode(signalCode);
                         infoVo.setCrossId(crossId);
-//                infoVo.setManufacturerCode(""); // 应该不需要
                         infoVo.setCycleCountDown(cycleCountDown);
                         infoVo.setCycleLen(cycleLen);
                         // 循环相位列表
@@ -148,6 +147,13 @@ public class HkLightsStatusServiceImpl implements HkLightsStatusService {
                                 if (2 != vehicleStatus) { // 2红灯
                                     infoVo.setPhaseId(String.valueOf(phaseNo));
                                 }
+
+
+                                if (phaseInfoPO.getCountdown() <= phaseLength && !Objects.equals(phaseInfoPO.getRunTime(), phaseLength)) {
+                                    infoVo.setCyclePhaseCountDown(phaseInfoPO.getCountdown());
+                                    break;
+                                }
+
                             }
                         }
                         infoVo.setPhaseMap(phaseMap);

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

@@ -2,8 +2,8 @@ package net.wanji.utc.task;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dao.mapper.CrossInfoMapper;
@@ -90,15 +90,12 @@ public class SignalStatusTask {
                             lightsStatusVOS = hkLightsStatusService.getHkLightsStatus(crossId);
                         } else if (StringUtils.equals(BasicEnum.ManufacturerEnum.DT.getCode(), manufacturerInfoPO.getCode())){
                             JsonViewObject jsonViewObject = utcDTFeignClients.lightStatus(crossId);
-                            ObjectMapper mapper = new ObjectMapper();
-                            lightsStatusVOS = mapper.convertValue(jsonViewObject.getContent(),
-                                    new com.fasterxml.jackson.core.type.TypeReference<List<LightsStatusVO>>() {});
-                        } else if (StringUtils.equals(BasicEnum.ManufacturerEnum.HISENSE.getCode(),
-                                manufacturerInfoPO.getCode())){
+                            lightsStatusVOS = JSON.parseObject((String) jsonViewObject.getContent(), new com.alibaba.fastjson.TypeReference<List<LightsStatusVO>>() {});
+
+                        } else if (StringUtils.equals(BasicEnum.ManufacturerEnum.HISENSE.getCode(), manufacturerInfoPO.getCode())){
                             JsonViewObject jsonViewObject = utcHisenseFeignClients.lightStatus(crossId);
                             String content = (String) jsonViewObject.getContent();
-                            lightsStatusVOS = JSON.parseObject(content,
-                                    new com.alibaba.fastjson.TypeReference<List<LightsStatusVO>>() {});
+                            lightsStatusVOS = JSON.parseObject(content, new TypeReference<List<LightsStatusVO>>() {});
                         }
                         long end = System.currentTimeMillis();
                         log.info("当前路口编号：{}，海康返回灯态时间：{}ms", crossId, (end - start));