Commit 80ab35e8 authored by duanruiming's avatar duanruiming

[update] 绿波实时数据日期优化

parent 82a29932
...@@ -524,7 +524,7 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService { ...@@ -524,7 +524,7 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
crossDataIndexDTO.setLoadBalance(Double.valueOf(decimalFormat.format(loadBalance))); crossDataIndexDTO.setLoadBalance(Double.valueOf(decimalFormat.format(loadBalance)));
CrossRealTimeCache.crossDataIndexMap.put(crossId, crossDataIndexDTO); CrossRealTimeCache.crossDataIndexMap.put(crossId, crossDataIndexDTO);
} }
saveGreenWaveRealTime(insertCrossDirDataRealtimePOS, decimalFormat); saveGreenWaveRealTime(insertCrossDirDataRealtimePOS, decimalFormat, startDate);
return insertCrossDirDataRealtimePOS; return insertCrossDirDataRealtimePOS;
} }
...@@ -690,7 +690,7 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService { ...@@ -690,7 +690,7 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
} }
} }
private void saveGreenWaveRealTime(List<CrossDirDataRealtimePO> crossDirDataRealtimePOS, DecimalFormat decimalFormat) throws Exception { private void saveGreenWaveRealTime(List<CrossDirDataRealtimePO> crossDirDataRealtimePOS, DecimalFormat decimalFormat, Date date) throws Exception {
try { try {
Map<Integer, List<GreenwaveCrossPO>> greenWaveInfoMap = CrossGreenWaveInfoCache.greenWaveInfoMap; Map<Integer, List<GreenwaveCrossPO>> greenWaveInfoMap = CrossGreenWaveInfoCache.greenWaveInfoMap;
if (!greenWaveInfoMap.isEmpty()) { if (!greenWaveInfoMap.isEmpty()) {
...@@ -734,8 +734,6 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService { ...@@ -734,8 +734,6 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
for (CrossDirDataRealtimePO dirDataRealtimePO : crossDirDataRealtimePOS) { for (CrossDirDataRealtimePO dirDataRealtimePO : crossDirDataRealtimePOS) {
String crossIdDir = dirDataRealtimePO.getCrossId(); String crossIdDir = dirDataRealtimePO.getCrossId();
Integer dirType = dirDataRealtimePO.getDirType(); Integer dirType = dirDataRealtimePO.getDirType();
startTime = crossDirDataRealtimePOS.get(0).getStartTime();
if (StringUtils.equals(crossIdDir, crossId) && Objects.equals(inDir, dirType)) { if (StringUtils.equals(crossIdDir, crossId) && Objects.equals(inDir, dirType)) {
status = status > dirDataRealtimePO.getStatus() ? status : dirDataRealtimePO.getStatus(); status = status > dirDataRealtimePO.getStatus() ? status : dirDataRealtimePO.getStatus();
trafficIndex = trafficIndex > dirDataRealtimePO.getTrafficIndex() ? trafficIndex : dirDataRealtimePO.getTrafficIndex(); trafficIndex = trafficIndex > dirDataRealtimePO.getTrafficIndex() ? trafficIndex : dirDataRealtimePO.getTrafficIndex();
...@@ -759,7 +757,7 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService { ...@@ -759,7 +757,7 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
} }
setTraffixIndex(decimalFormat, speedAvg, freeFlowSpeedAvg, greenwaveRealtimePO); setTraffixIndex(decimalFormat, speedAvg, freeFlowSpeedAvg, greenwaveRealtimePO);
greenwaveRealtimePO.setGreenId(greenWaveId); greenwaveRealtimePO.setGreenId(greenWaveId);
greenwaveRealtimePO.setStartTime(startTime); greenwaveRealtimePO.setStartTime(date);
greenwaveRealtimePO.setStatus(status); greenwaveRealtimePO.setStatus(status);
greenwaveRealtimePO.setType(1); greenwaveRealtimePO.setType(1);
greenwaveRealtimePO.setSpeed(speedAvg); greenwaveRealtimePO.setSpeed(speedAvg);
......
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