[update] 诊断优化，处理缺少数据异常

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/DiagnoServiceImpl.java

@@ -162,24 +162,25 @@ public class DiagnoServiceImpl implements DiagnoService {
         schemeOptVO.setCrossId(crossId);
         // 选择数据批次时间最大的记录
         List<CrossSchemeOptLogPO> maxList = crossSchemeOptLogMapper.selectMaxByCrossId(crossId);
-        if (CollectionUtil.isEmpty(maxList)) {
-            throw new RuntimeException("没有该路口优化日志数据");
+        if (CollectionUtil.isNotEmpty(maxList)) {
+            // 根据相位去重
+            TreeSet<CrossSchemeOptLogPO> collect = maxList.stream()
+                    .collect(Collectors.toCollection(
+                            () -> new TreeSet<>(Comparator.comparing(CrossSchemeOptLogPO::getPhaseNo))));
+            CrossSchemeOptLogPO crossSchemeOptLogPO = maxList.get(0);
+            String optType = crossSchemeOptLogPO.getOptType();
+            schemeOptVO.setOptType(Integer.parseInt(optType));
+            Integer schemeId = crossSchemeOptLogPO.getSchemeId();
+            CrossSchemePO crossSchemePO = crossSchemeMapper.selectById(schemeId);
+            if (crossSchemePO != null) {
+                schemeOptVO.setCycle(crossSchemePO.getCycle());
+                schemeOptVO.setSchemeId(crossSchemePO.getId());
+                schemeOptVO.setOffset(crossSchemeOptLogPO.getOffset());
+            }
+            // 构造调整时间列表
+            List<SchemeOptVO.PhaseOptTime> phaseOptTimeList = buildPhaseOptTimeList(collect, schemeId);
+            schemeOptVO.setPhaseOptTimeList(phaseOptTimeList);
         }
-        // 根据相位去重
-        TreeSet<CrossSchemeOptLogPO> collect = maxList.stream()
-                .collect(Collectors.toCollection(
-                        () -> new TreeSet<>(Comparator.comparing(CrossSchemeOptLogPO::getPhaseNo))));
-        CrossSchemeOptLogPO crossSchemeOptLogPO = maxList.get(0);
-        String optType = crossSchemeOptLogPO.getOptType();
-        schemeOptVO.setOptType(Integer.parseInt(optType));
-        Integer schemeId = crossSchemeOptLogPO.getSchemeId();
-        CrossSchemePO crossSchemePO = crossSchemeMapper.selectById(schemeId);
-        schemeOptVO.setCycle(crossSchemePO.getCycle());
-        schemeOptVO.setSchemeId(crossSchemePO.getId());
-        schemeOptVO.setOffset(crossSchemeOptLogPO.getOffset());
-        // 构造调整时间列表
-        List<SchemeOptVO.PhaseOptTime> phaseOptTimeList = buildPhaseOptTimeList(collect, schemeId);
-        schemeOptVO.setPhaseOptTimeList(phaseOptTimeList);
         return schemeOptVO;
     }
 
@@ -245,18 +246,18 @@ public class DiagnoServiceImpl implements DiagnoService {
         String crossId = sendManualDTO.getSendCrossId();
         // 选择数据批次时间最大的记录
         List<CrossSchemeOptLogPO> maxList = crossSchemeOptLogMapper.selectMaxByCrossId(crossId);
-        if (CollectionUtil.isEmpty(maxList)) {
-            throw new RuntimeException("没有该路口优化日志数据");
+        if (CollectionUtil.isNotEmpty(maxList)) {
+            CrossSchemeOptLogPO crossSchemeOptLogPO = maxList.get(0);
+            String dataExtend = crossSchemeOptLogPO.getDataExtend();
+            OptDataExtend optDataExtendOld = gson.fromJson(dataExtend, OptDataExtend.class);
+            OptDataExtend optDataExtendNew = new OptDataExtend();
+            optDataExtendNew.setSceneName(optDataExtendOld.getSceneName());
+            optDataExtendNew.setStrategyName(optDataExtendOld.getStrategyName());
+            // todo 改为枚举值
+            optDataExtendNew.setIdeaName("手动干预");
+            return gson.toJson(optDataExtendNew);
         }
-        CrossSchemeOptLogPO crossSchemeOptLogPO = maxList.get(0);
-        String dataExtend = crossSchemeOptLogPO.getDataExtend();
-        OptDataExtend optDataExtendOld = gson.fromJson(dataExtend, OptDataExtend.class);
-        OptDataExtend optDataExtendNew = new OptDataExtend();
-        optDataExtendNew.setSceneName(optDataExtendOld.getSceneName());
-        optDataExtendNew.setStrategyName(optDataExtendOld.getStrategyName());
-        // todo 改为枚举值
-        optDataExtendNew.setIdeaName("手动干预");
-        return gson.toJson(optDataExtendNew);
+        return null;
     }
 
     private List<SchemeSendVO.Pattern> buildPatternList(String sendCrossId, Integer schemeId,
@@ -343,20 +344,16 @@ public class DiagnoServiceImpl implements DiagnoService {
         CrossInfoPO crossInfoPO = crossInfoMapper.selectById(crossId);
         optEffectVO.setCrossName(crossInfoPO.getName());
         List<CrossSchemeOptLogPO> maxList = crossSchemeOptLogMapper.selectMaxByCrossId(crossId);
-        CrossSchemeOptLogPO crossSchemeOptLogPO = null;
-        try {
-            crossSchemeOptLogPO = maxList.get(0);
-        } catch (IndexOutOfBoundsException e) {
-            throw new RuntimeException("没有该路口优化日志数据");
-        }
-        optEffectVO.setOptStartTime(crossSchemeOptLogPO.getStartTime());
-        Date endTime = crossSchemeOptLogPO.getEndTime();
-        if (ObjectUtil.isEmpty(endTime)) {
-            optEffectVO.setStatus(2);
-        } else {
-            optEffectVO.setStatus(1);
+        if (maxList != null) {
+            CrossSchemeOptLogPO crossSchemeOptLogPO = maxList.get(0);
+            optEffectVO.setOptStartTime(crossSchemeOptLogPO.getStartTime());
+            Date endTime = crossSchemeOptLogPO.getEndTime();
+            if (ObjectUtil.isEmpty(endTime)) {
+                optEffectVO.setStatus(2);
+            } else {
+                optEffectVO.setStatus(1);
+            }
         }
-
         Integer dir = crossIdAndDirDTO.getDir();
         // 获取当前时间之前45分钟的10位时间戳
         long currentSeconds = DateUtil.currentSeconds();
@@ -367,18 +364,22 @@ public class DiagnoServiceImpl implements DiagnoService {
             // 获取路口历史数据
             List<CrossDataHistPO> crossDataHistPOList =
                     crossDataHistMapper.selectByCrossIdAndTimestamp(crossId, preSeconds);
-            List<OptEffectVO.IndexDelay> indexDelayList = buildIndexDelayList(crossDataHistPOList);
-            optEffectVO.setIndexDelayList(indexDelayList);
-            List<OptEffectVO.QueueStop> queueStopList = buildQueueStopList(crossDataHistPOList);
-            optEffectVO.setQueueStopList(queueStopList);
+            if (CollectionUtil.isNotEmpty(crossDataHistPOList)) {
+                List<OptEffectVO.IndexDelay> indexDelayList = buildIndexDelayList(crossDataHistPOList);
+                optEffectVO.setIndexDelayList(indexDelayList);
+                List<OptEffectVO.QueueStop> queueStopList = buildQueueStopList(crossDataHistPOList);
+                optEffectVO.setQueueStopList(queueStopList);
+            }
         } else {
             // 获取路口方向历史数据
             List<CrossDirDataHistPO> crossDirDataHistPOList =
                     crossDirDataHistMapper.selectByCrossIdDirAndTimestamp(crossId, dir, preSeconds);
-            List<OptEffectVO.IndexDelay> indexDelayList = buildIndexDelayListDir(crossDirDataHistPOList);
-            optEffectVO.setIndexDelayList(indexDelayList);
-            List<OptEffectVO.QueueStop> queueStopList = buildQueueStopListDir(crossDirDataHistPOList);
-            optEffectVO.setQueueStopList(queueStopList);
+            if (CollectionUtil.isNotEmpty(crossDirDataHistPOList)) {
+                List<OptEffectVO.IndexDelay> indexDelayList = buildIndexDelayListDir(crossDirDataHistPOList);
+                optEffectVO.setIndexDelayList(indexDelayList);
+                List<OptEffectVO.QueueStop> queueStopList = buildQueueStopListDir(crossDirDataHistPOList);
+                optEffectVO.setQueueStopList(queueStopList);
+            }
         }
         return optEffectVO;
     }

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/EvaluateServiceImpl.java

@@ -67,22 +67,21 @@ public class EvaluateServiceImpl implements EvaluateService {
     private void fillOptData(EvaluateCrossDetailVO evaluateCrossDetailVO, String crossId) {
         // 选择数据批次时间最大的记录
         List<CrossSchemeOptLogPO> maxList = crossSchemeOptLogMapper.selectMaxByCrossId(crossId);
-        if (CollectionUtil.isEmpty(maxList)) {
-            throw new RuntimeException("没有该路口优化日志数据");
-        }
-        CrossSchemeOptLogPO crossSchemeOptLogPO = maxList.get(0);
-        // 解析dataExtend
-        String dataExtend = crossSchemeOptLogPO.getDataExtend();
-        OptDataExtend optDataExtend = gson.fromJson(dataExtend, OptDataExtend.class);
-        evaluateCrossDetailVO.setSceneName(optDataExtend.getSceneName());
-        evaluateCrossDetailVO.setStrategyName(optDataExtend.getStrategyName());
-        evaluateCrossDetailVO.setIdeaName(optDataExtend.getIdeaName());
-        evaluateCrossDetailVO.setOptStartTime(crossSchemeOptLogPO.getStartTime());
-        Date endTime = crossSchemeOptLogPO.getEndTime();
-        if (ObjectUtil.isEmpty(endTime)) {
-            evaluateCrossDetailVO.setOptStatus(2);
-        } else {
-            evaluateCrossDetailVO.setOptStatus(1);
+        if (CollectionUtil.isNotEmpty(maxList)) {
+            CrossSchemeOptLogPO crossSchemeOptLogPO = maxList.get(0);
+            // 解析dataExtend
+            String dataExtend = crossSchemeOptLogPO.getDataExtend();
+            OptDataExtend optDataExtend = gson.fromJson(dataExtend, OptDataExtend.class);
+            evaluateCrossDetailVO.setSceneName(optDataExtend.getSceneName());
+            evaluateCrossDetailVO.setStrategyName(optDataExtend.getStrategyName());
+            evaluateCrossDetailVO.setIdeaName(optDataExtend.getIdeaName());
+            evaluateCrossDetailVO.setOptStartTime(crossSchemeOptLogPO.getStartTime());
+            Date endTime = crossSchemeOptLogPO.getEndTime();
+            if (ObjectUtil.isEmpty(endTime)) {
+                evaluateCrossDetailVO.setOptStatus(2);
+            } else {
+                evaluateCrossDetailVO.setOptStatus(1);
+            }
         }
     }
 }

signal-optimize-service/src/main/resources/mapper/CrossSchemeOptLogMapper.xml

@@ -50,7 +50,7 @@
         <include refid="Base_Column_List"/>
         from t_base_cross_scheme_opt_log
         where cross_id = #{crossId}
-          and data_batch_time=(SELECT MAX(ABS(data_batch_time)) FROM t_base_cross_scheme_opt_log);
+          and data_batch_time=(SELECT MAX(ABS(data_batch_time)) FROM t_base_cross_scheme_opt_log WHERE cross_id = #{crossId});
     </select>
 
     <insert id="insertOne" parameterType="net.wanji.opt.po.base.CrossSchemeOptLogPO">