update...

潘钊
1 parent 1c9476a8
Showing 2 changed files with 18 additions and 3 deletions
src/main/java/com/bsth/data/gpsdata/arrival/utils/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
@@ -46,6 +46,16 @@ public class SignalSchPlanMatcher {
                     return;
                 }
             }
+
+            //线路编码不匹配
+            if("out".equals(sch.getBcType()) && !sch.getXlBm().equals(outSigal.getLineId())){
+                ScheduleRealInfo nextOut = dayOfSchedule.nextByBcType(sch, "out");
+                if(nextOut != null && nextOut.getXlBm().equals(outSigal.getLineId())
+                        && fcSpace(sch, outSigal) > fcSpace(nextOut, outSigal)){
+                    dayOfSchedule.addExecPlan(nextOut);
+                    return;
+                }
+            }
         }catch (Exception e){
             log.error("", e);
         }
@@ -63,4 +73,8 @@ public class SignalSchPlanMatcher {
             outMatch(outSigal, next);
         }
     }
+
+    public static int fcSpace(ScheduleRealInfo sch, GpsEntity gps){
+        return (int) Math.abs((sch.getDfsjT() - gps.getTimestamp()));
+    }
 }
@@ -790,12 +790,13 @@ public class DayOfSchedule {
  
         boolean flag = false;
         for(ScheduleRealInfo temp : list){
-            if(temp == sch){
-                flag = true;
-            }
  
             if(flag && temp.getBcType().equals(bcType))
                 return temp;
+
+            if(temp == sch){
+                flag = true;
+            }
         }
         return null;
     }