Commit c98cd06f authored by duanruiming's avatar duanruiming

[update] UTC模拟灯态优化,删除厂商,解决调用报错

parent f217bd71
...@@ -9,8 +9,7 @@ public class BasicEnum { ...@@ -9,8 +9,7 @@ public class BasicEnum {
public enum ManufacturerEnum { public enum ManufacturerEnum {
HK("海康", "HK"), HK("海康", "HK"),
DT("东土", "DT"), DT("东土", "DT"),
HISENSE("海信", "HISENSE"), HISENSE("海信", "HISENSE");
STATIC("静态方案灯态", "STATIC");
private String nick; private String nick;
private String code; private String code;
......
...@@ -105,7 +105,7 @@ public class SignalStatusTask { ...@@ -105,7 +105,7 @@ public class SignalStatusTask {
JsonViewObject jsonViewObject = utcHisenseFeignClients.lightStatus(crossId); JsonViewObject jsonViewObject = utcHisenseFeignClients.lightStatus(crossId);
lightsStatusVOS = mapper.convertValue(jsonViewObject.getContent(), new TypeReference<List<LightsStatusVO>>() { lightsStatusVOS = mapper.convertValue(jsonViewObject.getContent(), new TypeReference<List<LightsStatusVO>>() {
}); });
} else if (StringUtils.endsWithIgnoreCase(BasicEnum.ManufacturerEnum.STATIC.getCode(), manufacturerInfoPO.getCode())) { } else if (StringUtils.endsWithIgnoreCase("STATIC", manufacturerInfoPO.getCode())) {
LightsStatusVO lightsStatusVO = SignalStatus4StaticSchemeTask.currentCrossLightStatusCache.get(crossId); LightsStatusVO lightsStatusVO = SignalStatus4StaticSchemeTask.currentCrossLightStatusCache.get(crossId);
if (Objects.nonNull(lightsStatusVO)) { if (Objects.nonNull(lightsStatusVO)) {
lightsStatusVOS = new ArrayList<>(); lightsStatusVOS = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment