update...

潘钊
1 parent ec6480bb
Showing 2 changed files with 11 additions and 4 deletions
src/main/java/com/bsth/data/gpsdata_v2/handlers/ReverseRouteProcess.java
src/main/java/com/bsth/data/gpsdata_v2/utils/SignalSchPlanMatcher.java
@@ -35,6 +35,7 @@ public class ReverseRouteProcess {
         LineConfig config = lineConfigData.get(gps.getLineId());
         if(null != config && config.isReadReverse() &&
                 reversRoute(gps) && !GeoCacheData.isLoopLine(gps.getLineId())){
+
             ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
             if(isInOut(sch) || !sch.getXlBm().equals(gps.getLineId()))
                 return;
@@ -41,11 +41,15 @@ public class SignalSchPlanMatcher {
         try{
             //晚于待发时间 10 分钟 ，匹配一下最佳的班次
             if(t - sch.getDfsjT() > 1000 * 60 * 10){
-                ScheduleRealInfo near = searchNearOut(gps);
+                ScheduleRealInfo near = searchNearOut(gps, sch.getXlDir());
                 if(null != near && !near.getId().equals(sch.getId())){
-                    dayOfSchedule.addExecPlan(near);
-                    return false;
+
+                    if(Math.abs(t - near.getDfsjT()) < Math.abs((t - sch.getDfsjT()))){
+
+                        dayOfSchedule.addExecPlan(near);
+                        return false;
+                    }
                 }
             }
@@ -101,7 +105,7 @@ public class SignalSchPlanMatcher {
      * @param gps
      * @return
      */
-    private ScheduleRealInfo searchNearOut(GpsEntity gps) {
+    private ScheduleRealInfo searchNearOut(GpsEntity gps, String upDown) {
         List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(gps.getNbbm());
         //排序
         Collections.sort(list, schComp);
@@ -109,6 +113,8 @@ public class SignalSchPlanMatcher {
         ScheduleRealInfo near = null;
         int diff, minDiff=-1;
         for(ScheduleRealInfo sch : list){
+            if(!sch.getXlDir().equals(upDown))
+                continue;
             if(StringUtils.isNotEmpty(sch.getFcsjActual()))
                 continue;