[update] 车道级别指标查询

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

@@ -322,9 +322,6 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
         }
 
         RunningEvaluateMetricsDetailVO res = new RunningEvaluateMetricsDetailVO();
-        if (CollectionUtil.isEmpty(metricHistDTOList)) {
-            return res;
-        }
         // 路口级别全量数据
         List<MetricHistDTO> crossDTOList = crossDataHistMapper.selectMetricHistDTO(
                 crossId, startStamp, endStamp);
@@ -336,6 +333,9 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
             res.setProblemStatusList(buildProblemStatusList(filteredList));
             res.setSchemeList(buildSchemeList(filteredList, crossId));
         }
+        if (CollectionUtil.isEmpty(metricHistDTOList)) {
+            return res;
+        }
         // 使用全量数据按时间粒度聚合指标
         res.setMetricsList(buildMetricsList(metricHistDTOList, minutes));
         return res;

wj-databus/src/main/java/net/wanji/databus/dao/mapper/LaneInfoMapper.java

@@ -38,5 +38,5 @@ public interface LaneInfoMapper {
 
     List<LaneInfoPO> selectByTurnType(String crossId, Integer type, Integer dir, List<Integer> keyList);
 
-    String selectIdByCrossIdDirTurn2(String crossId, Integer dir, Integer turnInt);
+    String selectIdByCrossIdDirTurn2(String crossId, Integer dir, Integer turn);
 }