update...

潘钊
1 parent 8cc146af
Showing 6 changed files with 129 additions and 53 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
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
@@ -86,11 +86,14 @@ public class XDApplication implements CommandLineRunner {
         }
     }
+    //@Autowired
+    //DayOfSchedule dayOfSchedule;
     public void devInit(){
         log.info("devInit...");
         ScheduledExecutorService sexec = Application.mainServices;
         //抓取GPS数据
         gpsDataLoader.setFlag(-1);
+        //dayOfSchedule.dataRecovery();
         //sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
         //实际排班更新线程
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
@@ -117,29 +117,31 @@ public class GpsRealAnalyse {
             try {
                 Collections.sort(list, comp);
                 for (GpsEntity gps : list) {
-                    //是否有任务
-                    boolean task;
-                    CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
-                    //掉线处理
-                    offlineSignalHandle.handle(gps, prevs);
-                    //状态处理
-                    task = correctSignalHandle.handle(gps, prevs);
-                    //场，站内外判断
-                    stationInsideHandle.handle(gps, prevs);
-                    //异常判定（越界/超速）
-                    abnormalStateHandle.handle(gps, prevs);
-
-                    if (!task)
-                        continue; //无任务的，到这里就结束
-
-                    //反向处理
-                    reverseSignalHandle.handle(gps, prevs);
-                    //进出站动作处理
-                    inOutStationSignalHandle.handle(gps, prevs);
-                    GeoCacheData.putGps(gps);
+                    try {
+                        //是否有任务
+                        boolean task;
+                        CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
+                        //掉线处理
+                        offlineSignalHandle.handle(gps, prevs);
+                        //状态处理
+                        task = correctSignalHandle.handle(gps, prevs);
+                        //场，站内外判断
+                        stationInsideHandle.handle(gps, prevs);
+                        //异常判定（越界/超速）
+                        abnormalStateHandle.handle(gps, prevs);
+
+                        if (!task)
+                            continue; //无任务的，到这里就结束
+
+                        //反向处理
+                        reverseSignalHandle.handle(gps, prevs);
+                        //进出站动作处理
+                        inOutStationSignalHandle.handle(gps, prevs);
+                        GeoCacheData.putGps(gps);
+                    }catch (Exception e){
+                        logger.error("", e);
+                    }
                 }
-            } catch (Exception e) {
-                logger.error("", e);
             } finally {
                 if (count != null)
                     count.countDown();
@@ -46,7 +46,7 @@ public class InOutStationSignalHandle extends SignalHandle{
     @Autowired
     SignalSchPlanMatcher signalSchPlanMatcher;
-    private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
+    private final static int MAX_BEFORE_TIME = 1000 * 60 * 120;
     //最大的班次时间差，防止异常的GPS时间打乱数据
     private final static int MAX_NORMAL_DIFF = 1000 * 60 * 60 * 12;
@@ -113,8 +113,8 @@ public class InOutStationSignalHandle extends SignalHandle{
         int diff = (int) (sch.getDfsjT() - gps.getTimestamp());
-        //首班出场最多提前1.2小时
-        if(dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME)
+        //首班出场最多提前2小时
+        if((dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME / 2)
             return;
         //正常班次最大时间差
@@ -129,9 +129,11 @@ public class InOutStationSignalHandle extends SignalHandle{
             signalSchPlanMatcher.outMatch(gps, sch);
             sch = dayOfSchedule.executeCurr(gps.getNbbm());
-            //实发时间不覆盖
-            if(StringUtils.isNotEmpty(sch.getFcsjActual()))
+            //班次已经实发
+            if(StringUtils.isNotEmpty(sch.getFcsjActual())
+                    && !outManyFit(gps, sch)){
                 return;
+            }
             //应用到离站缓冲区设置参数
             long rsT = lineConfigData.applyOut(sch, gps.getTimestamp());
@@ -185,6 +187,26 @@ public class InOutStationSignalHandle extends SignalHandle{
         }
     }
+    /**
+     * 是否是一个更合适的发车信号
+     * @param gps
+     * @param sch
+     * @return
+     */
+    private boolean outManyFit(GpsEntity gps, ScheduleRealInfo sch) {
+        if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+            return false;
+
+        long t1 = sch.getFcsjActualTime();
+        long t2 = gps.getTimestamp();
+        long c = sch.getDfsjT();
+
+        if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
+            return true;
+        }
+        return false;
+    }
+
     private void outStationAndOutPark(ScheduleRealInfo sch){
         LineConfig config = lineConfigData.get(sch.getXlBm());
@@ -230,7 +252,7 @@ public class InOutStationSignalHandle extends SignalHandle{
                 logger.info("NullPointerException " + sch.getXlName() + " 有班次无班次历时，，，检查一下是否需要出站既出场。");
             }
             //进场最多提前1.2小时
-            if(sch.getBcType().equals("in") && diff > MAX_BEFORE_TIME)
+            if((sch.getBcType().equals("in") && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME/2)
                 return;
             //正常班次最大时间差
@@ -3,6 +3,8 @@ package com.bsth.data.gpsdata.arrival.utils;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -16,6 +18,8 @@ public class SignalSchPlanMatcher {
     @Autowired
     DayOfSchedule dayOfSchedule;
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
     /**
      * 发车信号匹配
      * @param outSigal
@@ -27,6 +31,25 @@ public class SignalSchPlanMatcher {
         if(t < sch.getDfsjT())
             return;
+        try{
+            //会不会是分班没有完成
+            if(sch.getBcType().equals("in")){
+                ScheduleRealInfo fbFirst = dayOfSchedule.nextByBcType(sch, "normal");
+
+                if(fbFirst == null)
+                    return;
+
+                long dt = fbFirst.getDfsjT();
+                //前5后10  -执行分班的首个营运
+                if(dt - t < 1000 * 60 * 5 || t - dt < 1000 * 60 * 10){
+                    dayOfSchedule.addExecPlan(fbFirst);
+                    return;
+                }
+            }
+        }catch (Exception e){
+            log.error("", e);
+        }
+
         //下一个相同走向的班次
         ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
         if(next == null || !next.getQdzCode().equals(sch.getQdzCode()))
@@ -60,8 +60,10 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String lineId : keys) {
             Collections.sort(listMap.get(lineId), comp);
             threadPool.execute(new RecoveryThread(listMap.get(lineId), count));
-            /*if(nbbm.equals("W7C-001"))
+            /*if(nbbm.equals("W7E-016"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
+            /*if(lineId.equals("60028"))
+                new RecoveryThread(listMap.get(lineId), count).run();*/
         }
         try {
@@ -82,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=" + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=143";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -150,30 +152,34 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 CircleQueue<GpsEntity> prevs;
                 boolean task;
                 for (GpsEntity gps : list) {
-
-                    //是否有任务
-
-                    prevs = GeoCacheData.getGps(gps.getNbbm());
-                    //掉线处理
-                    offlineSignalHandle.handle(gps, prevs);
-                    //状态处理
-                    task = correctSignalHandle.handle(gps, prevs);
-                    //场，站内外判断
-                    stationInsideHandle.handle(gps, prevs);
-                    //异常判定（越界/超速）
-                    //abnormalStateHandle.handle(gps, prevs);
-
-                    if(!task)
-                        continue; //无任务的，到这里就结束
-
-                    //反向处理
-                    reverseSignalHandle.handle(gps, prevs);
-                    //进出站动作处理
-                    inOutStationSignalHandle.handle(gps, prevs);
-                    GeoCacheData.putGps(gps);
+                    try {
+                        /*if(gps.getTimestamp() >= 1495512240000L){
+                            System.out.println("debugger...");
+                        }*/
+                        //是否有任务
+
+                        prevs = GeoCacheData.getGps(gps.getNbbm());
+                        //掉线处理
+                        offlineSignalHandle.handle(gps, prevs);
+                        //状态处理
+                        task = correctSignalHandle.handle(gps, prevs);
+                        //场，站内外判断
+                        stationInsideHandle.handle(gps, prevs);
+                        //异常判定（越界/超速）
+                        //abnormalStateHandle.handle(gps, prevs);
+
+                        if (!task)
+                            continue; //无任务的，到这里就结束
+
+                        //反向处理
+                        reverseSignalHandle.handle(gps, prevs);
+                        //进出站动作处理
+                        inOutStationSignalHandle.handle(gps, prevs);
+                        GeoCacheData.putGps(gps);
+                    } catch (Exception e) {
+                        logger.error("", e);
+                    }
                 }
-            } catch (Exception e) {
-                logger.error("", e);
             } finally {
                 count.countDown();
             }
@@ -781,6 +781,26 @@ public class DayOfSchedule {
     }
     /**
+     * @Title: nextByBcType
+     * @Description: TODO(获取下一个指定班次类型的班次)
+     */
+    public ScheduleRealInfo nextByBcType(ScheduleRealInfo sch, String bcType) {
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        Collections.sort(list, schFCSJComparator);
+
+        boolean flag = false;
+        for(ScheduleRealInfo temp : list){
+            if(temp == sch){
+                flag = true;
+            }
+
+            if(flag && temp.getBcType().equals(bcType))
+                return temp;
+        }
+        return null;
+    }
+
+    /**
      * 搜索离当前时间最近的一个指定类型的班次
      * @param nbbm
      * @param bcType