update...

潘钊
1 parent d7d44988
Showing 2 changed files with 9 additions and 2 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
@@ -70,6 +70,8 @@ public class DayOfSchedule {
     // 排序器
     private static ScheduleComparator.FCSJ schFCSJComparator;
+    private static ScheduleComparator.DFSJ schDFSJComparator;
+
     private static Long sch_max_id=-1L;
     @Autowired
@@ -580,6 +582,8 @@ public class DayOfSchedule {
      */
     public ScheduleRealInfo next(ScheduleRealInfo sch) {
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        //排序
+        Collections.sort(list, schDFSJComparator);
         return next(list, sch);
     }
@@ -916,7 +920,7 @@ public class DayOfSchedule {
     public void reCalcExecPlan(String nbbm) {
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
-        Collections.sort(list, schFCSJComparator);
+        Collections.sort(list, schDFSJComparator);
         ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
         if(null != sch)
@@ -68,7 +68,10 @@ public class LateAdjustHandle implements ApplicationContextAware{
                 ScheduleRealInfo cancel = null;
                 //之前存在误点班次没有发出
                 ScheduleRealInfo old = lateSchMap.get(sch.getClZbh());
-                if(old != null && old.getDfsjT() < sch.getDfsjT()){
+                //如果之前班次的 待发应到时间已经过了
+                long t = System.currentTimeMillis();
+                if(old != null && (old.getDfsjT() + (old.getBcsj() * 60 * 1000) > t)
+                        && old.getDfsjT() < sch.getDfsjT()){
                     remove(old);
                     cancel = old;
                     logger.info("【应发未到】old 班次 " + old.getId() + " -被覆盖！");