潘钊 / bsth_control · Commits

Commit a77679115bc972d68d09618ced5b17bca48d8937

Authored by yiming
1 parent 6ed3aa69
build: skipped

催发调整

Inline Side-by-side
Showing 1 changed file with 11 additions and 6 deletions
src/main/java/com/bsth/data/zndd/OutEntrance.java
  View file @a776791
@@ -109,21 +109,26 @@ public class OutEntrance { @@ -109,21 +109,26 @@ public class OutEntrance {
109 rtn.put("message",s+"车辆预计还有"+dzList.get(0).get("sj")+"抵达，请耐心等待"); 109 rtn.put("message",s+"车辆预计还有"+dzList.get(0).get("sj")+"抵达，请耐心等待");
110 }else { 110 }else {
111 //筛选方向 111 //筛选方向
112 - List<ScheduleRealInfo> rs = dayOfSchedule.findByLineCode(ssLogger.getLineCode()); 112 + List<ScheduleRealInfo> rs = dayOfSchedule.findByLineAndUpDown(ssLogger.getLineCode(),Integer.parseInt(ssLogger.getDir()));
113 if(rs.size()>0){ 113 if(rs.size()>0){
114 //排序 114 //排序
115 Collections.sort(rs,new ScheduleComparator.FCSJ()); 115 Collections.sort(rs,new ScheduleComparator.FCSJ());
116 - SimpleDateFormat sdf= new SimpleDateFormat("HH:ss");  
117 - String sjtext = ""; 116 + SimpleDateFormat sdf= new SimpleDateFormat("HH:mm");
  117 + String sjtext = null;
118 LocalTime t1 = LocalTime.parse(sdf.format(new Date()), DateTimeFormatter.ofPattern("HH:mm")); 118 LocalTime t1 = LocalTime.parse(sdf.format(new Date()), DateTimeFormatter.ofPattern("HH:mm"));
119 for (ScheduleRealInfo sr:rs) { 119 for (ScheduleRealInfo sr:rs) {
120 LocalTime t2 = LocalTime.parse(sr.getFcsj(), DateTimeFormatter.ofPattern("HH:mm")); 120 LocalTime t2 = LocalTime.parse(sr.getFcsj(), DateTimeFormatter.ofPattern("HH:mm"));
121 - //判断上下行  
122 - if(t1.isAfter(t2)){ 121 + //最近的运营班次
  122 + if(t2.isAfter(t1) && (sr.getBcType().equals("normal")||sr.getBcType().equals("region"))){
123 sjtext = sr.getFcsj(); 123 sjtext = sr.getFcsj();
  124 + break;
124 } 125 }
125 } 126 }
126 - rtn.put("message","车辆预计"+sjtext+"发车，请耐心等待"); 127 + if(sjtext!=null){
  128 + rtn.put("message","车辆预计"+sjtext+"发车，请耐心等待");
  129 + }else {
  130 + rtn.put("message","当日运营已结束");
  131 + }
127 }else { 132 }else {
128 rtn.put("message","当日运营已结束"); 133 rtn.put("message","当日运营已结束");
129 } 134 }