Skip to content

T
traffic-signal-platform
Commit aac881e9 authored by fengyasheng's avatar fengyasheng
Browse files
Options

路口周报bug修正

parent 10ed91dd
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 8 deletions
signal-optimize-service/src/main/java/net/wanji/opt/servicev2/report/impl/CrossRidLaneServiceImpl.java
View file @ aac881e9
......@@ -245,26 +245,36 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
if (workTotalFlowSum > 0) {
crossRunStateAnalysisResultResponseDTO.setAvgFlowLastWeekCompare("提升" + Math.round(workTotalFlowSum) + "辆");
} else if (workTotalFlowSum == 0) {
crossRunStateAnalysisResultResponseDTO.setAvgFlowLastWeekCompare("持平");
} else {
crossRunStateAnalysisResultResponseDTO.setAvgFlowLastWeekCompare("下降" + Math.abs(Math.round(workTotalFlowSum)) + "辆");
}
if (weekEndAvgFlowSum > 0) {
crossRunStateAnalysisResultResponseDTO.setEndAvgFlowLastWeekCompare("提升" + Math.round(weekEndAvgFlowSum) + "辆");
} else if (weekEndAvgFlowSum == 0) {
crossRunStateAnalysisResultResponseDTO.setEndAvgFlowLastWeekCompare("持平");
} else {
crossRunStateAnalysisResultResponseDTO.setEndAvgFlowLastWeekCompare("下降" + Math.abs(Math.round(weekEndAvgFlowSum)) + "辆");
}
if (workDayAmPeakMaxHourFlowSum > 0) {
crossRunStateAnalysisResultResponseDTO.setAmPeakMaxHourFlowLastWeekCompare("提升" + workDayAmPeakMaxHourFlowSum + "辆");
} else if (workDayAmPeakMaxHourFlowSum == 0) {
crossRunStateAnalysisResultResponseDTO.setAmPeakMaxHourFlowLastWeekCompare("持平");
} else {
crossRunStateAnalysisResultResponseDTO.setAmPeakMaxHourFlowLastWeekCompare("下降" + Math.abs(workDayAmPeakMaxHourFlowSum) + "辆");
}
if (workDayPmPeakMaxHourFlowSum > 0) {
crossRunStateAnalysisResultResponseDTO.setPmPeakMaxHourFlowLastWeekCompare("提升" + workDayPmPeakMaxHourFlowSum + "辆");
} else if (workDayPmPeakMaxHourFlowSum == 0) {
crossRunStateAnalysisResultResponseDTO.setPmPeakMaxHourFlowLastWeekCompare("持平");
} else {
crossRunStateAnalysisResultResponseDTO.setPmPeakMaxHourFlowLastWeekCompare("下降" + Math.abs(workDayPmPeakMaxHourFlowSum) + "辆");
}
if (workDayFmPeakMaxHourFlowSum > 0) {
crossRunStateAnalysisResultResponseDTO.setFmPeakMaxHourFlowLastWeekCompare("提升" + workDayFmPeakMaxHourFlowSum + "辆");
} else if (workDayFmPeakMaxHourFlowSum == 0) {
crossRunStateAnalysisResultResponseDTO.setFmPeakMaxHourFlowLastWeekCompare("持平");
} else {
crossRunStateAnalysisResultResponseDTO.setFmPeakMaxHourFlowLastWeekCompare("下降" + Math.abs(workDayFmPeakMaxHourFlowSum) + "辆");
}
......@@ -276,7 +286,7 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
}
} else {
if (workDayAmPeakAvgTrafficIndexLast == 0) {
crossRunStateAnalysisResultResponseDTO.setAmPeakAvgTrafficIndexLastWeekCompare("下降0%");
crossRunStateAnalysisResultResponseDTO.setAmPeakAvgTrafficIndexLastWeekCompare("持平");
} else {
crossRunStateAnalysisResultResponseDTO.setAmPeakAvgTrafficIndexLastWeekCompare("下降" + Math.abs(Math.round(workDayAmPeakAvgTrafficIndexSum * 100 / workDayAmPeakAvgTrafficIndexLast * 100) / 100.0) + "%");
}
......@@ -289,7 +299,7 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
}
} else {
if (workDayPmPeakAvgTrafficIndexLast == 0) {
crossRunStateAnalysisResultResponseDTO.setPmPeakAvgTrafficIndexLastWeekCompare("下降0%");
crossRunStateAnalysisResultResponseDTO.setPmPeakAvgTrafficIndexLastWeekCompare("持平");
} else {
crossRunStateAnalysisResultResponseDTO.setPmPeakAvgTrafficIndexLastWeekCompare("下降" + Math.abs(Math.round(workDayPmPeakAvgTrafficIndexSum * 100 / workDayPmPeakAvgTrafficIndexLast * 100) / 100.0) + "%");
}
......@@ -453,6 +463,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
amPeakAvgTrafficIndexLastWeekCompare = (amPeakTrafficIndex - amPeakTrafficIndexLast) / amPeakTrafficIndexLast;
if (amPeakAvgTrafficIndexLastWeekCompare > 0) {
peakResultResponseVO.setAmPeakAvgTrafficIndexLastWeekCompare("增加" + Math.round(amPeakAvgTrafficIndexLastWeekCompare * 100) + "%");
} else if (amPeakAvgTrafficIndexLastWeekCompare == 0) {
peakResultResponseVO.setAmPeakAvgTrafficIndexLastWeekCompare("持平");
} else {
peakResultResponseVO.setAmPeakAvgTrafficIndexLastWeekCompare("减少" + Math.abs(Math.round(amPeakAvgTrafficIndexLastWeekCompare * 100)) + "%");
}
......@@ -470,6 +482,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
pmPeakAvgTrafficIndexLastWeekCompare = (pmPeakTrafficIndex - pmPeakTrafficIndexLast) / pmPeakTrafficIndexLast;
if (pmPeakAvgTrafficIndexLastWeekCompare > 0) {
peakResultResponseVO.setPmPeakAvgTrafficIndexLastWeekCompare("增加" + Math.round(pmPeakAvgTrafficIndexLastWeekCompare * 100) + "%");
} else if (pmPeakAvgTrafficIndexLastWeekCompare == 0) {
peakResultResponseVO.setPmPeakAvgTrafficIndexLastWeekCompare("持平");
} else {
peakResultResponseVO.setPmPeakAvgTrafficIndexLastWeekCompare("减少" + Math.abs(Math.round(pmPeakAvgTrafficIndexLastWeekCompare * 100)) + "%");
}
......@@ -490,6 +504,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
double amPeakCapacityLastWeekCompare = (amPeakCapacity - amPeakCapacityLast) / amPeakCapacityLast;
if (amPeakCapacityLastWeekCompare > 0) {
peakResultResponseVO.setAmPeakCapacityLastWeekCompare("提升" + Math.round(amPeakCapacityLastWeekCompare * 100) + "%");
} else if (amPeakCapacityLastWeekCompare == 0) {
peakResultResponseVO.setAmPeakCapacityLastWeekCompare("持平");
} else {
peakResultResponseVO.setAmPeakCapacityLastWeekCompare("下降" + Math.abs(Math.round(amPeakCapacityLastWeekCompare * 100)) + "%");
}
......@@ -508,6 +524,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
double pmPeakCapacityLastWeekCompare = (pmPeakCapacity - pmPeakCapacityLast) / pmPeakCapacityLast;
if (pmPeakCapacityLastWeekCompare > 0) {
peakResultResponseVO.setPmPeakCapacityLastWeekCompare("提升" + Math.round(pmPeakCapacityLastWeekCompare * 100) + "%");
} else if (pmPeakCapacityLastWeekCompare == 0) {
peakResultResponseVO.setPmPeakCapacityLastWeekCompare("持平");
} else {
peakResultResponseVO.setPmPeakCapacityLastWeekCompare("下降" + Math.abs(Math.round(pmPeakCapacityLastWeekCompare * 100)) + "%");
}
......@@ -526,6 +544,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
double amPeakDelayTimeLastWeekCompare = (amPeakDelayTime - amPeakDelayTimeLast) / amPeakDelayTimeLast;
if (amPeakDelayTimeLastWeekCompare > 0) {
peakResultResponseVO.setAmPeakDelayTimeLastWeekCompare("增加" + Math.round(amPeakDelayTimeLastWeekCompare * 100) + "%");
} else if (amPeakDelayTimeLastWeekCompare == 0) {
peakResultResponseVO.setAmPeakDelayTimeLastWeekCompare("持平");
} else {
peakResultResponseVO.setAmPeakDelayTimeLastWeekCompare("减少" + Math.abs(Math.round(amPeakDelayTimeLastWeekCompare * 100)) + "%");
}
......@@ -544,6 +564,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
double pmPeakDelayTimeLastWeekCompare = (pmPeakDelayTime - pmPeakDelayTimeLast) / pmPeakDelayTimeLast;
if (pmPeakDelayTimeLastWeekCompare > 0) {
peakResultResponseVO.setPmPeakDelayTimeLastWeekCompare("增加" + Math.round(pmPeakDelayTimeLastWeekCompare * 100) + "%");
} else if (pmPeakDelayTimeLastWeekCompare == 0) {
peakResultResponseVO.setPmPeakDelayTimeLastWeekCompare("持平");
} else {
peakResultResponseVO.setPmPeakDelayTimeLastWeekCompare("减少" + Math.abs(Math.round(pmPeakDelayTimeLastWeekCompare * 100)) + "%");
}
......@@ -562,6 +584,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
double amPeakMaxQueueLengthLastWeekCompare = (amPeakMaxQueueLength - amPeakMaxQueueLengthLast) / amPeakMaxQueueLengthLast;
if (amPeakMaxQueueLengthLastWeekCompare > 0) {
peakResultResponseVO.setAmPeakMaxQueueLengthLastWeekCompare("增加" + Math.round(amPeakMaxQueueLengthLastWeekCompare * 100) + "%");
} else if (amPeakMaxQueueLengthLastWeekCompare == 0) {
peakResultResponseVO.setAmPeakMaxQueueLengthLastWeekCompare("持平");
} else {
peakResultResponseVO.setAmPeakMaxQueueLengthLastWeekCompare("减少" + Math.abs(Math.round(amPeakMaxQueueLengthLastWeekCompare * 100)) + "%");
}
......@@ -580,6 +604,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
double pmPeakMaxQueueLengthLastWeekCompare = (pmPeakMaxQueueLength - pmPeakMaxQueueLengthLast) / pmPeakMaxQueueLengthLast;
if (pmPeakMaxQueueLengthLastWeekCompare > 0) {
peakResultResponseVO.setPmPeakMaxQueueLengthLastWeekCompare("增加" + Math.round(pmPeakMaxQueueLengthLastWeekCompare * 100) + "%");
} else if (pmPeakMaxQueueLengthLastWeekCompare == 0) {
peakResultResponseVO.setPmPeakMaxQueueLengthLastWeekCompare("持平");
} else {
peakResultResponseVO.setPmPeakMaxQueueLengthLastWeekCompare("减少" + Math.abs(Math.round(pmPeakMaxQueueLengthLastWeekCompare * 100)) + "%");
}
......@@ -598,6 +624,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
double amPeakStopTimesLastWeekCompare = (amPeakStopTimes - amPeakStopTimesLast) / amPeakStopTimesLast;
if (amPeakStopTimesLastWeekCompare > 0) {
peakResultResponseVO.setAmPeakStopTimesLastWeekCompare("增加" + Math.round(amPeakStopTimesLastWeekCompare * 100) + "%");
} else if (amPeakStopTimesLastWeekCompare == 0) {
peakResultResponseVO.setAmPeakStopTimesLastWeekCompare("持平");
} else {
peakResultResponseVO.setAmPeakStopTimesLastWeekCompare("减少" + Math.abs(Math.round(amPeakStopTimesLastWeekCompare * 100)) + "%");
}
......@@ -616,17 +644,19 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
double pmPeakStopTimesLastWeekCompare = (pmPeakStopTimes - pmPeakStopTimesLast) / pmPeakStopTimesLast;
if (pmPeakStopTimesLastWeekCompare > 0) {
peakResultResponseVO.setPmPeakStopTimesLastWeekCompare("增加" + Math.round(pmPeakStopTimesLastWeekCompare * 100) + "%");
} else if (pmPeakStopTimesLastWeekCompare == 0) {
peakResultResponseVO.setPmPeakStopTimesLastWeekCompare("持平");
} else {
peakResultResponseVO.setPmPeakStopTimesLastWeekCompare("减少" + Math.abs(Math.round(pmPeakStopTimesLastWeekCompare * 100)) + "%");
}
}
//总体运行效果明显提升【略有下降】
if (pmPeakTrafficIndex + amPeakTrafficIndex - amPeakTrafficIndexLast - pmPeakTrafficIndexLast > 0) {
peakResultResponseVO.setTotalityRunSituation("明显提升");
peakResultResponseVO.setTotalityRunSituation("略有下降");
} else if (pmPeakTrafficIndex + amPeakTrafficIndex - amPeakTrafficIndexLast - pmPeakTrafficIndexLast == 0) {
peakResultResponseVO.setTotalityRunSituation("持平");
} else {
peakResultResponseVO.setTotalityRunSituation("略有下降");
peakResultResponseVO.setTotalityRunSituation("明显提升");
}
//本周早高峰集中时段7:30~8:30
List<String> timeList = new ArrayList<>();
......@@ -679,9 +709,9 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
//本周早高峰持续时长上周比较情况提前【延后】20分钟
Long thisWeekAmPeakDurationSituation = thisWeekAmPeakDuration - thisWeekAmPeakDurationLast;
if (thisWeekAmPeakDurationSituation > 0) {
peakResultResponseVO.setThisWeekAmPeakDurationSituation("延后" + thisWeekAmPeakDurationSituation + "分钟");
peakResultResponseVO.setThisWeekAmPeakDurationSituation("延长" + thisWeekAmPeakDurationSituation + "分钟");
} else {
peakResultResponseVO.setThisWeekAmPeakDurationSituation("提前" + Math.abs(thisWeekAmPeakDurationSituation) + "分钟");
peakResultResponseVO.setThisWeekAmPeakDurationSituation("缩短" + Math.abs(thisWeekAmPeakDurationSituation) + "分钟");
}
//本周晚高峰集中时段7:30~8:30
......@@ -736,9 +766,9 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
//本周晚高峰持续时长上周比较情况提前【延后】20分钟
Long thisWeekPmPeakDurationSituation = thisWeekPmPeakDuration - thisWeekPmPeakDurationLast;
if (thisWeekPmPeakDurationSituation > 0) {
peakResultResponseVO.setThisWeekPmPeakDurationSituation("延后" + thisWeekPmPeakDurationSituation + "分钟");
peakResultResponseVO.setThisWeekPmPeakDurationSituation("延长" + thisWeekPmPeakDurationSituation + "分钟");
} else {
peakResultResponseVO.setThisWeekPmPeakDurationSituation("提前" + Math.abs(thisWeekPmPeakDurationSituation) + "分钟");
peakResultResponseVO.setThisWeekPmPeakDurationSituation("缩短" + Math.abs(thisWeekPmPeakDurationSituation) + "分钟");
}
//峰期交通流参数对比分析
......@@ -926,6 +956,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
int weekCapacitySituation = (weekCapacity - weekCapacityLast) / weekCapacityLast * 100;
if (weekCapacitySituation > 0) {
resultResponseVO.setWeekCapacitySituation("提升" + weekCapacitySituation + "%");
} else if (weekCapacitySituation == 0) {
resultResponseVO.setWeekCapacitySituation("持平");
} else {
resultResponseVO.setWeekCapacitySituation("降低" + Math.abs(weekCapacitySituation) + "%");
}
......@@ -935,6 +967,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
long weekStopTimesSituation = Math.round((weekStopTimes - weekStopTimesLast) / weekStopTimesLast * 100);
if (weekCapacitySituation > 0) {
resultResponseVO.setWeekStopTimesSituation("增加" + weekStopTimesSituation + "%");
} else if (weekCapacitySituation == 0) {
resultResponseVO.setWeekStopTimesSituation("持平");
} else {
resultResponseVO.setWeekStopTimesSituation("减少" + Math.abs(weekStopTimesSituation) + "%");
}
......@@ -944,6 +978,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
long weekDelayTimeSituation = Math.round((weekDelayTime - weekDelayTimeLast) / weekDelayTimeLast * 100);
if (weekDelayTimeSituation > 0) {
resultResponseVO.setWeekDelayTimeSituation("增加" + weekDelayTimeSituation + "%");
} else if (weekDelayTimeSituation == 0) {
resultResponseVO.setWeekDelayTimeSituation("持平");
} else {
resultResponseVO.setWeekDelayTimeSituation("减少" + Math.abs(weekDelayTimeSituation) + "%");
}
......@@ -953,6 +989,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
long weekMaxQueueLengthSituation = Math.round((weekMaxQueueLength - weekMaxQueueLengthLast) / weekMaxQueueLengthLast * 100);
if (weekMaxQueueLengthSituation > 0) {
resultResponseVO.setWeekMaxQueueLengthSituation("增加" + weekMaxQueueLengthSituation + "%");
} else if (weekMaxQueueLengthSituation == 0) {
resultResponseVO.setWeekMaxQueueLengthSituation("持平");
} else {
resultResponseVO.setWeekMaxQueueLengthSituation("减少" + Math.abs(weekMaxQueueLengthSituation) + "%");
}
......@@ -1082,6 +1120,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
}
if (avgCapacityCompareSituation > 0) {
analysisResponseVO.setAvgCapacityCompareSituation("提升" + avgCapacityCompareSituation + "%");
} else if (avgCapacityCompareSituation == 0) {
analysisResponseVO.setAvgCapacityCompareSituation("持平");
} else {
analysisResponseVO.setAvgCapacityCompareSituation("降低" + Math.abs(avgCapacityCompareSituation) + "%");
}
......@@ -1097,6 +1137,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
}
if (delayTimeCompare > 0) {
analysisResponseVO.setDelayTimeCompare("增加" + delayTimeCompare + "%");
} else if (delayTimeCompare == 0) {
analysisResponseVO.setDelayTimeCompare("持平");
} else {
analysisResponseVO.setDelayTimeCompare("减少" + Math.abs(delayTimeCompare) + "%");
}
......@@ -1112,6 +1154,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
}
if (avgStopTimesCompare > 0) {
analysisResponseVO.setAvgStopTimesCompare("增加" + avgStopTimesCompare + "%");
} else if (avgStopTimesCompare == 0) {
analysisResponseVO.setAvgStopTimesCompare("持平");
} else {
analysisResponseVO.setAvgStopTimesCompare("减少" + Math.abs(avgStopTimesCompare) + "%");
}
......@@ -1127,6 +1171,8 @@ public class CrossRidLaneServiceImpl implements CrossRidLaneService {
}
if (maxQueueLengthCompare > 0) {
analysisResponseVO.setMaxQueueLengthCompare("提升" + maxQueueLengthCompare + "%");
} else if (maxQueueLengthCompare == 0) {
analysisResponseVO.setMaxQueueLengthCompare("持平");
} else {
analysisResponseVO.setMaxQueueLengthCompare("降低" + Math.abs(maxQueueLengthCompare) + "%");
}
......
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