Commit 2dbbce32 authored by zhoushiguang's avatar zhoushiguang

进口道指标查询bug修复

parent 4ad74c69
......@@ -347,16 +347,16 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
List<CrossDirDataHistPO> filteredList = dirPOList.stream()
.filter(po -> po.getDirType().equals(dirCode))
//.filter(po -> po.getInOutType().equals(1))
// .filter(po -> {
// // 将 batchTime 转换为小时和分钟
// Calendar batchTimeCal = Calendar.getInstance();
// batchTimeCal.setTimeInMillis(po.getBatchTime() * 1000L); // 将时间戳转换为毫秒
// String batchTimeStr = hourMinuteFormat.format(batchTimeCal.getTime());
//
// // 比较 batchTime 是否在 timeStr 和 endTimeStr 之间
// String endTimeStr = hourMinuteFormat.format(endTimeCal.getTime());
// return (batchTimeStr.compareTo(timeStr) >= 0 && batchTimeStr.compareTo(endTimeStr) <= 0);
// })
.filter(po -> {
// 将 batchTime 转换为小时和分钟
Calendar batchTimeCal = Calendar.getInstance();
batchTimeCal.setTimeInMillis(po.getBatchTime() * 1000L); // 将时间戳转换为毫秒
String batchTimeStr = hourMinuteFormat.format(batchTimeCal.getTime());
// 比较 batchTime 是否在 timeStr 和 endTimeStr 之间
String endTimeStr = hourMinuteFormat.format(endTimeCal.getTime());
return (batchTimeStr.compareTo(timeStr) >= 0 && batchTimeStr.compareTo(endTimeStr) <= 0);
})
.collect(Collectors.toList());
if (Objects.equals(metricCode, StrategyAndMetricsEnum.Metrics.NO_STOP_RATE.getCode())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment