[update] utc，海信信号机灯态接收，合并冲突

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

@@ -2,9 +2,7 @@ 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.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.rest.JsonViewObject;
@@ -59,6 +57,9 @@ public class SignalStatusTask {
 
     private static Map<String, List<LightsStatusVO>> lightStatusCache = new HashMap<>();
     private static final Map<String, Integer> runModeTimeMap = new ConcurrentHashMap<>();
+    @Qualifier("net.wanji.feign.service.UtcHisenseFeignClients")
+    @Autowired
+    private UtcHisenseFeignClients utcHisenseFeignClients;
 
     // 运行状态、告警，5分钟一次
     @Scheduled(fixedRate = 1 * 60 * 1000)
@@ -90,12 +91,14 @@ public class SignalStatusTask {
                         } 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 TypeReference<List<LightsStatusVO>>() {});
+                            lightsStatusVOS = mapper.convertValue(jsonViewObject.getContent(),
+                                    new com.fasterxml.jackson.core.type.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 TypeReference<List<LightsStatusVO>>() {});
+                            lightsStatusVOS = JSON.parseObject(content,
+                                    new com.alibaba.fastjson.TypeReference<List<LightsStatusVO>>() {});
                         }
                         long end = System.currentTimeMillis();
                         log.info("当前路口编号：{}，海康返回灯态时间：{}ms", crossId, (end - start));