update...

潘钊
1 parent 854edf24
Showing 4 changed files with 25 additions and 3 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
@@ -155,12 +155,32 @@ public class InOutStationSignalHandle extends SignalHandle{
         }
         else if(sch.getBcType().equals("out")){
             ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            //如果下一个班次是区间，并且是环线
+            if(next != null && next.getBcType().equals("region")){
+                next = dayOfSchedule.nextSame(next);
+                if(next == null || !next.getQdzName().equals(next.getZdzName())){
+                    return;
+                }
+            }
             if(next != null && prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
                 dayOfSchedule.addExecPlan(next);
                 outStation(gps, prev);
             }
         }
+        //当前班次是区间
+        else if(sch.getBcType().equals("region")){
+            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            if(next==null || !next.getQdzName().equals(next.getZdzName())){
+                return;
+            }
+            //是环线
+            if(prev.getStopNo().equals(next.getQdzCode())){
+                //发下一个班次
+                dayOfSchedule.addExecPlan(next);
+                outStation(gps, prev);
+            }
+        }
     }
  
  
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("SXC-YD012"))
+            /*if(nbbm.equals("W9G-013"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
  
@@ -150,6 +150,8 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 CircleQueue<GpsEntity> prevs;
                 boolean task;
                 for (GpsEntity gps : list) {
+                    /*if(gps.getTimestamp() > 1491951840000L)
+                        System.out.print("");*/
  
                     //是否有任务
  
@@ -424,7 +424,7 @@
                                 name: '加油'
                             },
                             'add_sub_task_in': {
-                                name: '回场'
+                                name: '进场'
                             },
                             'add_sub_task_out': {
                                 name: '出场'
@@ -227,7 +227,7 @@ var gb_schedule_context_menu = (function () {
                         name: '（子任务）加油'
                     },
                     'add_sub_task_in': {
-                        name: '（子任务）回场'
+                        name: '（子任务）进场'
                     },
                     'add_sub_task_out': {
                         name: '（子任务）出场'