催发调整

yiming
1 parent 6ed3aa69
Showing 1 changed file with 11 additions and 6 deletions
src/main/java/com/bsth/data/zndd/OutEntrance.java
@@ -109,21 +109,26 @@ public class OutEntrance {
                  rtn.put("message",s+"车辆预计还有"+dzList.get(0).get("sj")+"抵达，请耐心等待");
              }else {
                  //筛选方向
-                 List<ScheduleRealInfo> rs = dayOfSchedule.findByLineCode(ssLogger.getLineCode());
+                 List<ScheduleRealInfo> rs = dayOfSchedule.findByLineAndUpDown(ssLogger.getLineCode(),Integer.parseInt(ssLogger.getDir()));
                  if(rs.size()>0){
                      //排序
                      Collections.sort(rs,new ScheduleComparator.FCSJ());
-                     SimpleDateFormat sdf= new SimpleDateFormat("HH:ss");
-                     String sjtext = "";
+                     SimpleDateFormat sdf= new SimpleDateFormat("HH:mm");
+                     String sjtext = null;
                      LocalTime t1 = LocalTime.parse(sdf.format(new Date()), DateTimeFormatter.ofPattern("HH:mm"));
                      for (ScheduleRealInfo sr:rs) {
                          LocalTime t2 = LocalTime.parse(sr.getFcsj(), DateTimeFormatter.ofPattern("HH:mm"));
-                         //判断上下行
-                         if(t1.isAfter(t2)){
+                         //最近的运营班次
+                         if(t2.isAfter(t1) && (sr.getBcType().equals("normal")||sr.getBcType().equals("region"))){
                              sjtext = sr.getFcsj();
+                             break;
                          }
                      }
-                     rtn.put("message","车辆预计"+sjtext+"发车，请耐心等待");
+                     if(sjtext!=null){
+                         rtn.put("message","车辆预计"+sjtext+"发车，请耐心等待");
+                     }else {
+                         rtn.put("message","当日运营已结束");
+                     }
                  }else {
                      rtn.put("message","当日运营已结束");
                  }