[update] 优化运行状态

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

@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @date 2022/11/21 9:11
@@ -51,15 +52,15 @@ public class SignalStatusServiceImpl implements SignalStatusService {
             if (baseCrossInfoList == null) {
                 continue;
             }
-            List<SignalStatusLogPO> signalStatusLogPOList = null;
+            List<SignalStatusLogPO> signalStatusLogPOList = new ArrayList<>();
             if (manufacturerEnum.getCode().equals(BasicEnum.ManufacturerEnum.HK.getCode())) {
                 // 海康
                 // 3.2.5信号机运行状态和告警信息
-                signalStatusLogPOList = hkRunningStatusService.getHkRunningStatus(baseCrossInfoList);
-            } else {
+                resList.addAll(hkRunningStatusService.getHkRunningStatus(baseCrossInfoList));
+            } else if (manufacturerEnum.getCode().equals(BasicEnum.ManufacturerEnum.DT.getCode())) {
                 // todo 其他厂商
-//                List<String> crossIdList = baseCrossInfoList.stream().map(BaseCrossInfo::getCrossId).collect(Collectors.toList());
-//                signalStatusLogPOList = wanJiRunningStatusService.runningStatus(crossIdList);
+                List<String> crossIdList = baseCrossInfoList.stream().map(BaseCrossInfo::getCrossId).collect(Collectors.toList());
+                resList.addAll(wanJiRunningStatusService.runningStatus(crossIdList));
             }
             // 更新Redis
             if (null != signalStatusLogPOList) {
@@ -128,8 +129,8 @@ public class SignalStatusServiceImpl implements SignalStatusService {
                 lightsStatusVOList = hkLightsStatusService.getHkLightsStatus(baseCrossInfoList);
             } else {
                 // todo 其他厂商
-//                List<String> crossIdList = baseCrossInfoList.stream().map(BaseCrossInfo::getCrossId).collect(Collectors.toList());
-//                lightsStatusVOList = wanJiRunningStatusService.lightsStatus(crossIdList);
+                List<String> crossIdList = baseCrossInfoList.stream().map(BaseCrossInfo::getCrossId).collect(Collectors.toList());
+                lightsStatusVOList = wanJiRunningStatusService.lightsStatus(crossIdList);
             }
             // 更新Redis
             if (lightsStatusVOList != null) {

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

@@ -33,19 +33,17 @@ public class WanJiCommonRunningStatusServiceImpl implements WanJiCommonRunningSt
 
     @Override
     public List<SignalStatusLogPO> runningStatus(List<String> crossIdList) throws Exception {
-        Set<String> set = new HashSet<>();
+        List<SignalStatusLogPO> result = new ArrayList<>();
         for (String crossId : crossIdList) {
             String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
-            set.add(manufacturerIdCode);
-        }
-        List<SignalStatusLogPO> result = new ArrayList<>();
-        for (String manufacturerIdCode : set) {
-            JsonViewObject jsonViewObject = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode).runningStatusAlarm();
+            JsonViewObject jsonViewObject = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode).runningStatusAlarm(crossId);
             if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
                 throw new Exception("获取运行状态、告警数据远程服务调用异常，异常信息" + jsonViewObject.getMessage());
             }
-            result = (List<SignalStatusLogPO>) jsonViewObject.getContent();
+            ObjectMapper mapper = new ObjectMapper();
+            result.addAll(mapper.convertValue(jsonViewObject.getContent(), new TypeReference<List<SignalStatusLogPO>>() {}));
         }
+
         return result;
     }