update...

潘钊
1 parent 85e1836c
Showing 9 changed files with 64 additions and 15 deletions
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/ReverseRouteProcess.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataUtils.java
src/main/java/com/bsth/data/gpsdata_v2/utils/SignalSchPlanMatcher.java
@@ -97,6 +97,9 @@ public class DataHandleProcess {
             try {
                 for (GpsEntity gps : list) {
                     try{
+                        if(Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
+                            continue;
+
                         gpsStateProcess.process(gps);//状态处理
                         stationInsideProcess.process(gps);//场站内外判定
                         reverseRouteProcess.process(gps);//反向路由处理
@@ -297,6 +297,19 @@ public class GeoCacheData {
         }
     }
+    /**
+     * 是否是环线
+     * @param lineId
+     * @return
+     */
+    public static boolean isLoopLine(String lineId) {
+        List<StationRoute> srs = getStationRoute(lineId , 0);
+        if(srs.get(0).getName().equals(srs.get(srs.size()- 1).getName())
+                && getStationRoute(lineId , 1).size()==2)
+            return true;
+        return false;
+    }
+
     private static class PreconditionGeoComp implements Comparator<PreconditionGeo>{
         @Override
@@ -104,6 +104,29 @@ public class GpsCacheData {
         return null;
     }
+    /**
+     * 最后一段轨迹
+     * @param gps
+     * @return
+     */
+    public static int lastInTrailsSize(GpsEntity gps) {
+        //int size = 0;
+        List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
+        if(null == trails || trails.size() == 0)
+            return 0;
+
+        GpsExecTrail gs = trails.get(trails.size() - 1);
+        if(gs.isEnd())
+            return 0;
+
+        Set<String> set = new HashSet<>();
+        for(GpsEntity g : gs.getSrs()){
+            if(g.getInstation() == 1)
+                set.add(g.getStation().getName());
+        }
+        return set.size();
+    }
+
     public static List<StationRoute> prevMultiStation(GpsEntity gps) {
         List<StationRoute> rs = new ArrayList<>();
         List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
@@ -76,18 +76,17 @@ public class InStationProcess {
      * @param prev
      */
     private void inStation(GpsEntity gps, GpsEntity prev) {
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         boolean flow = true;
-        //要经过一个中途站才能进
-        StationRoute s = GpsCacheData.prevStation(gps);
+        //要经过2个中途站才能进
+        int count = GpsCacheData.lastInTrailsSize(gps);
         List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
-        if (gps.getInstation() == 1 && routes.size() > 3
-                && null != s && s.getName().equals(gps.getStation().getName())) {
+        if (isNotInOut(sch) && gps.getInstation() == 1 && routes.size() > 4
+                && count < 2) {
             logger.info("没有进中途站，拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp());
             flow = false;
         }
-
-        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         boolean isEnd = false;
         //进终点
@@ -99,6 +98,10 @@ public class InStationProcess {
         GpsCacheData.in(gps, isEnd);
     }
+    private boolean isNotInOut(ScheduleRealInfo sch) {
+        return !sch.getBcType().equals("in") && !sch.getBcType().equals("out");
+    }
+
     /**
      * 进班次终点
      *
@@ -73,7 +73,7 @@ public class OutStationProcess {
                 (sch.getQdzCode().equals(prev.getStopNo()) || sch.getQdzCode().equals(prev.getCarparkNo()))){
             //发车班次匹配
             if(!signalSchPlanMatcher.outMatch(gps, sch)){
-                //outStation(gps);
+                outStation(gps, prev);
                 return;
             }
 package com.bsth.data.gpsdata_v2.handlers;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.entity.StationRoute;
@@ -25,7 +26,7 @@ public class ReverseRouteProcess {
     DayOfSchedule dayOfSchedule;
     public void process(GpsEntity gps){
-        if(reversRoute(gps)){
+        if(reversRoute(gps) && !GeoCacheData.isLoopLine(gps.getLineId())){
             ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
             if(isInOut(sch) || !sch.getXlBm().equals(gps.getLineId()))
                 return;
@@ -40,6 +40,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
     static InStationProcess inStationProcess;
     static OutStationProcess outStationProcess;
     static AbnormalStateProcess abnormalStateProcess;
+    static ReverseRouteProcess reverseRouteProcess;
     public void recovery() {
         List<GpsEntity> list = loadData();
@@ -59,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.submit(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("S0L-065"))
+            /*if(nbbm.equals("W7C-035"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
             /*if(lineId.equals("60028"))
                 new RecoveryThread(listMap.get(lineId), count).run();*/
@@ -83,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,SERVER_TS from bsth_c_gps_info where days_year=327"; //+ dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -100,6 +101,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                         gps.setLineId(rs.getString("LINE_ID"));
                         gps.setTimestamp(rs.getLong("TS"));
                         gps.setUpDown((byte) getUpOrDown(rs.getLong("SERVICE_STATE")));
+                        gps.setServerTimestamp(rs.getLong("SERVER_TS"));
                         return gps;
                     }
                 });
@@ -125,6 +127,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         inStationProcess = applicationContext.getBean(InStationProcess.class);
         outStationProcess = applicationContext.getBean(OutStationProcess.class);
         abnormalStateProcess = applicationContext.getBean(AbnormalStateProcess.class);
+        reverseRouteProcess = applicationContext.getBean(ReverseRouteProcess.class);
     }
     public static class GpsComp implements Comparator<GpsEntity> {
@@ -151,12 +154,15 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 for (GpsEntity gps : list) {
                     try {
-                        /*if(gps.getTimestamp() >= 1511386080000L)
+                        /*if(gps.getTimestamp() >= 1511396220000L)
                             System.out.println("aaa");*/
+                        if(Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
+                            continue;
+
                         gpsStateProcess.process(gps);//状态处理
                         stationInsideProcess.process(gps);//场站内外判定
-
+                        reverseRouteProcess.process(gps);//反向路由处理
                         abnormalStateProcess.process(gps);//超速越界
@@ -25,7 +25,7 @@ public class GpsDataUtils {
         try {
             for (GpsEntity gps : list) {
-                if (gps.getValid() == 0)
+                if (gps.getValid() == 0 && Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
                     rs.add(gps);
             }
@@ -39,8 +39,8 @@ public class SignalSchPlanMatcher {
             return true;
         try{
-            //晚于待发时间 半小时 ，匹配一下最佳的班次
-            if(t - sch.getDfsjT() > 1000 * 60 * 30){
+            //晚于待发时间 10 分钟 ，匹配一下最佳的班次
+            if(t - sch.getDfsjT() > 1000 * 60 * 10){
                 ScheduleRealInfo near = searchNearOut(gps);
                 if(null != near && !near.getId().equals(sch.getId())){