Commit 0a9a273f authored by hanbing's avatar hanbing

[update] 干线评价-修改工作日绿波时段

parent 0ee22d84
...@@ -640,7 +640,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService { ...@@ -640,7 +640,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
private void mergeLineSchemeBuffer(Map<String, LineSchemeDTO> lineSchemeBuffer, String mainlineName) { private void mergeLineSchemeBuffer(Map<String, LineSchemeDTO> lineSchemeBuffer, String mainlineName) {
if (mainlineName.contains("转山西路至霞景路")) { if (mainlineName.contains("转山西路至霞景路")) {
// 工作日合并 07:00-09:00,09:00-16:00,21:30-23:59 // 工作日合并 07:00-09:30,09:30-16:30,21:30-23:59
// 周末和节假日合并 13:30-20:00,21:30-23:59 // 周末和节假日合并 13:30-20:00,21:30-23:59
Map<String, LineSchemeDTO> mergedRecords = new HashMap<>(); Map<String, LineSchemeDTO> mergedRecords = new HashMap<>();
...@@ -685,8 +685,8 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService { ...@@ -685,8 +685,8 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
private List<int[]> getMergingPeriods(boolean isWeekday) { private List<int[]> getMergingPeriods(boolean isWeekday) {
if (isWeekday) { if (isWeekday) {
return Arrays.asList( return Arrays.asList(
new int[] {timeToInt("07:00"), timeToInt("09:00")}, new int[] {timeToInt("07:00"), timeToInt("09:30")},
new int[] {timeToInt("09:00"), timeToInt("16:00")}, new int[] {timeToInt("09:30"), timeToInt("16:30")},
new int[] {timeToInt("21:30"), timeToInt("23:59")} new int[] {timeToInt("21:30"), timeToInt("23:59")}
); );
} else { } else {
......
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