Commit 55c4f113 authored by hanbing's avatar hanbing

[update] 信号优化,态势监测-问题路口详情按时间正序

parent 4a96477e
...@@ -883,19 +883,20 @@ public class TrendServiceImpl implements TrendService { ...@@ -883,19 +883,20 @@ public class TrendServiceImpl implements TrendService {
List<Integer> dirs = baseCrossDirInfoMapper.selectInDirsByCrossId(crossId); List<Integer> dirs = baseCrossDirInfoMapper.selectInDirsByCrossId(crossId);
Date currentMinute = DateUtil.date(currentSeconds * 1000); Date currentMinute = DateUtil.date(currentSeconds * 1000);
Date startMinute = DateUtil.offsetMinute(currentMinute, -59);
for (int i = 1; i <= 60; i++) { for (int i = 1; i <= 60; i++) {
// 一分钟 // 一分钟
Date preMinute = DateUtil.offsetMinute(currentMinute, -1); Date nextMinute = DateUtil.offsetMinute(startMinute, 1);
for (Integer dir : dirs) { for (Integer dir : dirs) {
AbnormalCrossDetailVO.DirDataElement dirDataElement = new AbnormalCrossDetailVO.DirDataElement(); AbnormalCrossDetailVO.DirDataElement dirDataElement = new AbnormalCrossDetailVO.DirDataElement();
dirDataElement.setDir(dir); dirDataElement.setDir(dir);
dirDataElement.setTime(currentMinute); dirDataElement.setTime(startMinute);
int status = calcStatus(crossDirDataHistPOList, preMinute, currentMinute, dir); int status = calcStatus(crossDirDataHistPOList, startMinute, nextMinute, dir);
dirDataElement.setStatus(status); dirDataElement.setStatus(status);
dirData.add(dirDataElement); dirData.add(dirDataElement);
} }
currentMinute = preMinute; startMinute = nextMinute;
} }
return dirData; return dirData;
......
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