update...

潘钊
1 parent a16b07b2
Showing 3 changed files with 12 additions and 48 deletions
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/gpsdata_v2/utils/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
@@ -50,6 +50,8 @@ public class CarOutInfoHandler {
     Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    ArrayListMultimap<String, ScheduleRealInfo> xlMaps  = ArrayListMultimap.create();
     /**
      * 全量更新发车信息表
      */
@@ -57,7 +59,6 @@ public class CarOutInfoHandler {
         try{
             //将班次按线路分组
             List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
-            ArrayListMultimap<String, ScheduleRealInfo> xlMaps = ArrayListMultimap.create();
             for(ScheduleRealInfo sch : all){
                 xlMaps.put(sch.getXlBm(), sch);
             }
@@ -66,6 +67,9 @@ public class CarOutInfoHandler {
             for (String k : ks) {
                 update(xlMaps.get(k));
             }
+
+            xlMaps.clear();
+            logger.info("更新发车信息表！！");
         }catch (Exception e){
             logger.error("", e);
         }
@@ -159,8 +163,8 @@ public class CarOutInfoHandler {
         ScheduleRealInfo[] array = new ScheduleRealInfo[3];
         Collections.sort(list, schDFSJComparator);
-        int count = 0, threshold = 1000 * 60 * 60 * 4;
-        long t = System.currentTimeMillis();
+        int count = 0;//, threshold = 1000 * 60 * 60 * 4;
+        //long t = System.currentTimeMillis();
         for (ScheduleRealInfo sch : list) {
             if (count == 3)
                 break;
@@ -180,8 +184,8 @@ public class CarOutInfoHandler {
                     || StringUtils.isNotEmpty(sch.getZdsjActual()))
                 continue;
-            if (t - sch.getDfsjT() > threshold)
-                continue;
+            /*if (t - sch.getDfsjT() > threshold)
+                continue;*/
             array[count] = sch;
             count++;
@@ -45,7 +45,8 @@ public class SignalSchPlanMatcher {
                 if(null != near && !near.getId().equals(sch.getId())){
-                    if(Math.abs(t - near.getDfsjT()) < Math.abs((t - sch.getDfsjT()))){
+                    int nearDiff = (int) Math.abs(t - near.getDfsjT());
+                    if(nearDiff < 1000 * 60 * 8 && nearDiff < Math.abs((t - sch.getDfsjT()))){
                         dayOfSchedule.addExecPlan(near);
                         return false;
@@ -57,47 +58,6 @@ public class SignalSchPlanMatcher {
             log.error("", e);
         }
         return true;
-        /*try{
-            //会不会是分班没有完成
-            if(sch.getBcType().equals("in") && t - sch.getDfsjT() > 1000 * 60 * 20){
-                ScheduleRealInfo fbFirst = dayOfSchedule.nextByBcType(sch, "normal");
-
-                if(fbFirst == null || !fbFirst.getQdzCode().equals(gps.getStopNo()))
-                    return;
-
-                long dt = fbFirst.getDfsjT();
-                //晚于待发前4分钟  -执行分班的首个营运
-                if(dt - t < 1000 * 60 * 4){
-                    dayOfSchedule.addExecPlan(fbFirst);
-                    return;
-                }
-            }
-
-            //线路编码不匹配
-            if("out".equals(sch.getBcType()) && !sch.getXlBm().equals(gps.getLineId())){
-                ScheduleRealInfo nextOut = dayOfSchedule.nextByBcType(sch, "out");
-                if(nextOut != null && nextOut.getXlBm().equals(gps.getLineId())
-                        && fcSpace(sch, gps) > fcSpace(nextOut, gps)){
-                    dayOfSchedule.addExecPlan(nextOut);
-                    return;
-                }
-            }
-        }catch (Exception e){
-            log.error("", e);
-        }
-
-        //下一个相同走向的班次
-        ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
-        if(next == null || !next.getQdzCode().equals(sch.getQdzCode()))
-            return;
-
-        //晚于班次间隔百分之70，跳下一个班次
-        double s = (int) (next.getDfsjT() - sch.getDfsjT());
-        double r = (int) (t - sch.getDfsjT());
-        if(r / s > 0.7){
-            if(dayOfSchedule.addExecPlan(next))
-                outMatch(gps, next);
-        }*/
     }
     /**
@@ -825,7 +825,7 @@ public class DayOfSchedule {
     }
     public Collection<ScheduleRealInfo> findAll() {
-        return nbbmScheduleMap.values();
+        return id2SchedulMap.values();
     }
     public boolean addExecPlan(ScheduleRealInfo sch) {