update...

潘钊
1 parent 9024e8ac
Showing 4 changed files with 14 additions and 11 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
@@ -206,8 +206,8 @@ public class InOutStationSignalHandle extends SignalHandle{
             }
             if(next != null && prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
-                dayOfSchedule.addExecPlan(next);
-                outStation(gps, prev);
+                if(dayOfSchedule.addExecPlan(next))
+                    outStation(gps, prev);
             }
         }
         //当前班次是区间
@@ -219,8 +219,8 @@ public class InOutStationSignalHandle extends SignalHandle{
             //是环线
             if(prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
-                dayOfSchedule.addExecPlan(next);
-                outStation(gps, prev);
+                if(dayOfSchedule.addExecPlan(next))
+                    outStation(gps, prev);
             }
         }
     }
@@ -402,9 +402,8 @@ public class InOutStationSignalHandle extends SignalHandle{
                     if(nearSch != null){
                         //直接跳到这个班次
-                        dayOfSchedule.addExecPlan(nearSch);
-                        //重新进站
-                        inStation(gps, prev);
+                        if(dayOfSchedule.addExecPlan(nearSch))
+                            inStation(gps, prev);//重新进站
                     }
                 }
             }
@@ -69,8 +69,8 @@ public class SignalSchPlanMatcher {
         double s = (int) (next.getDfsjT() - sch.getDfsjT());
         double r = (int) (t - sch.getDfsjT());
         if(r / s > 0.7){
-            dayOfSchedule.addExecPlan(next);
-            outMatch(outSigal, next);
+            if(dayOfSchedule.addExecPlan(next))
+                outMatch(outSigal, next);
         }
     }
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=245";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=246";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -912,7 +912,8 @@ public class DayOfSchedule {
         return nbbmScheduleMap.values();
     }
-    public void addExecPlan(ScheduleRealInfo sch) {
+    public boolean addExecPlan(ScheduleRealInfo sch) {
+        ScheduleRealInfo oldExec = executeCurr(sch.getClZbh());
         if (sch != null){
             if(sch.getStatus()==2)
                 reCalcExecPlan(sch.getClZbh());
@@ -921,6 +922,8 @@ public class DayOfSchedule {
         }
         else
             carExecutePlanMap.remove(sch.getClZbh());
+
+        return executeCurr(sch.getClZbh()) != oldExec;
     }
     public void removeExecPlan(String clzbh) {
@@ -977,6 +980,7 @@ public class DayOfSchedule {
     }
     public void reCalcExecPlan(String nbbm) {
+        logger.info("reCalcExecPlan...: " + nbbm);
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
         Collections.sort(list, schFCSJComparator);