[update] UTC模拟灯态优化

signal-utc-service/src/main/java/net/wanji/utc/common/typeenum/BasicEnum.java

@@ -9,7 +9,8 @@ public class BasicEnum {
     public enum ManufacturerEnum {
         HK("海康", "HK"),
         DT("东土", "DT"),
-        HISENSE("海信", "HISENSE");
+        HISENSE("海信", "HISENSE"),
+        STATIC("静态方案灯态", "STATIC");
 
         private String nick;
         private String code;

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.utils.tool.JacksonUtils;
 import net.wanji.databus.dao.entity.CrossLightsStatusHistPO;
 import net.wanji.databus.dao.mapper.CrossInfoMapper;
@@ -37,6 +38,7 @@ import java.util.stream.Collectors;
  */
 @RequiredArgsConstructor
 @Service
+@Slf4j
 public class SignalStatusServiceImpl implements SignalStatusService {
     private final ManufacturerInfoMapper manufacturerInfoMapper;
     private final CrossInfoMapper crossInfoMapper;
@@ -51,6 +53,7 @@ public class SignalStatusServiceImpl implements SignalStatusService {
     @Transactional
     public List<SignalStatusLogPO> runningStatusAlarm() throws Exception {
         List<SignalStatusLogPO> resList = new ArrayList<>();
+        try {
             BasicEnum.ManufacturerEnum[] manufacturerEnums = BasicEnum.ManufacturerEnum.values();
             for (BasicEnum.ManufacturerEnum manufacturerEnum : manufacturerEnums) {
                 List<BaseCrossInfo> baseCrossInfoList = getBaseCrossInfoList(manufacturerEnum);
@@ -82,6 +85,10 @@ public class SignalStatusServiceImpl implements SignalStatusService {
                     }
                 }
             }
+        } catch (Exception e) {
+            log.error("运行状态、告警服务异常", e);
+            throw new Exception(e);
+        }
         return resList;
     }
 

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

@@ -12,6 +12,7 @@ import net.wanji.utc.cache.CrossInfoCache;
 import net.wanji.utc.cache.UtcFeignClientCache;
 import net.wanji.utc.service.runninginfo.WanJiCommonRunningStatusService;
 import net.wanji.utc.util.HttpRestUtil;
+import net.wanji.utc.util.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -37,6 +38,9 @@ public class WanJiCommonRunningStatusServiceImpl implements WanJiCommonRunningSt
         List<SignalStatusLogPO> result = new ArrayList<>();
         for (String crossId : crossIdList) {
             String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
+            if (StringUtils.isEmpty(manufacturerIdCode)) {
+                continue;
+            }
             JsonViewObject jsonViewObject = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode).runningStatusAlarm(crossId);
             if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
                 throw new Exception("获取运行状态、告警数据远程服务调用异常，异常信息" + jsonViewObject.getMessage());

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

@@ -105,6 +105,10 @@ public class SignalStatus4StaticSchemeTask {
                     if (Objects.nonNull(crossSchemePO)) {
                         String schemeNo = crossSchemePO.getSchemeNo();
                         if (StringUtils.isNotBlank(schemeNo)) {
+
+                            if (isNotNextSchemeNo(crossSchemePO)) {
+                                continue;
+                            }
                             List<CrossSchemePhaseCountDownDTO> crossSchemePhaseCountDownList = CrossSchemePhaseTimeCountCache.crossSchemePhaseCountDownList;
                             for (CrossSchemePhaseCountDownDTO crossSchemePhaseCountDownDTO : crossSchemePhaseCountDownList) {
                                 if (StringUtils.equalsIgnoreCase(schemeNo, crossSchemePhaseCountDownDTO.getSchemeNo()) &&
@@ -133,6 +137,21 @@ public class SignalStatus4StaticSchemeTask {
         }
     }
 
+    private boolean isNotNextSchemeNo(CrossSchemePO crossSchemePO) {
+        if (Objects.nonNull(crossSchemePO)) {
+            String schemeNo = crossSchemePO.getSchemeNo();
+            String crossId = crossSchemePO.getCrossId();
+            LightsStatusVO lightsStatusVO = currentCrossLightStatusCache.get(crossId);
+            if (Objects.nonNull(lightsStatusVO)) {
+                String currentSchemeNo = lightsStatusVO.getSchemeId();
+                if (StringUtils.equalsIgnoreCase(schemeNo, currentSchemeNo)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     private static Integer getCurrentSchemeId(List<CrossSectionPO> crossSectionPOS, LocalTime currentTime, Integer currentPlanId) {
         if (!CollectionUtils.isEmpty(crossSectionPOS)) {
             List<CrossSectionPO> currentPlanIdSectionList = crossSectionPOS.stream().filter(po -> Objects.equals(currentPlanId, po.getPlanId())).collect(Collectors.toList());
@@ -178,7 +197,7 @@ public class SignalStatus4StaticSchemeTask {
     }
 
 
-    private static void getRedCountDown(String crossId, LightsStatusVO lightsStatusVO, String schemeId) {
+    private static void getRedCountDown(String crossId, LightsStatusVO lightsStatusVO, String schemeId) throws Exception {
         Map<String, Object> phaseMap = new HashMap<>();
         List<CrossPhaseDirTurnPojo> crossPhaseDirTurnCache = CrossPhaseDirTurnCache.getCrossPhaseDirTurnCache(crossId);
         List<PhaseCountDownDTO> phaseCountDownList = getPhaseCountDownList(crossId, schemeId);
@@ -351,7 +370,11 @@ public class SignalStatus4StaticSchemeTask {
         } else {
             lightsStatusVO.setCyclePhaseCountDown(lightsStatusVO.getCyclePhaseCountDown() - 1);
             Integer cycleCountDown = lightsStatusVO.getCycleCountDown();
+            if (cycleCountDown >= 2) {
                 lightsStatusVO.setCycleCountDown(--cycleCountDown);
+            } else {
+                lightsStatusVO.setCycleCountDown(lightsStatusVO.getCycleLen());
+            }
         }
     }
 

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

@@ -97,22 +97,25 @@ public class SignalStatusTask {
                     try {
                         if (StringUtils.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerInfoPO.getCode())) {
                             lightsStatusVOS = hkLightsStatusService.getHkLightsStatus(crossId);
-                            } else if (StringUtils.equals(BasicEnum.ManufacturerEnum.DT.getCode(), manufacturerInfoPO.getCode())){
+                        } else if (StringUtils.equals(BasicEnum.ManufacturerEnum.DT.getCode(), manufacturerInfoPO.getCode())) {
                             JsonViewObject jsonViewObject = utcDTFeignClients.lightStatus(crossId);
-                                lightsStatusVOS = mapper.convertValue(jsonViewObject.getContent(), new TypeReference<List<LightsStatusVO>>() {});
-                            } else if (StringUtils.endsWithIgnoreCase(BasicEnum.ManufacturerEnum.HISENSE.getCode(), manufacturerInfoPO.getCode())){
+                            lightsStatusVOS = mapper.convertValue(jsonViewObject.getContent(), new TypeReference<List<LightsStatusVO>>() {
+                            });
+                        } else if (StringUtils.endsWithIgnoreCase(BasicEnum.ManufacturerEnum.HISENSE.getCode(), manufacturerInfoPO.getCode())) {
                             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())) {
+                            LightsStatusVO lightsStatusVO = SignalStatus4StaticSchemeTask.currentCrossLightStatusCache.get(crossId);
+                            if (Objects.nonNull(lightsStatusVO)) {
+                                lightsStatusVOS = new ArrayList<>();
+                                lightsStatusVOS.add(lightsStatusVO);
+                            }
                         }
                     } catch (Exception e) {
-                            log.error("灯态异常");
-                            //throw new Exception(e);
-                            //lightsStatusVOS = new ArrayList<>();
-                            //LightsStatusVO lightsStatusVO = SignalStatus4StaticSchemeTask.currentCrossLightStatusCache.get(crossId);
-                            //lightsStatusVOS.add(lightsStatusVO);
+                        log.error("获取厂商灯态异常", e);
                     }
 
-
                     List<Map.Entry<String, RealTimeDataWebSocket>> value = entry.getValue();
                     if (!CollectionUtils.isEmpty(lightsStatusVOS)) {
                         for (LightsStatusVO lightsStatusVO : lightsStatusVOS) {
@@ -157,6 +160,7 @@ public class SignalStatusTask {
 
     /**
      * 计算控制倒计时
+     *
      * @param crossId
      * @param lightsStatusVO
      */
@@ -200,6 +204,7 @@ public class SignalStatusTask {
 
     /**
      * 插入路口灯态历史表
+     *
      * @param crossId 路口ID
      * @param json    灯态JSON字符串
      * @throws Exception 异常处理