重写到离站匹配模块

潘钊
1 parent 1786ccee
Showing 24 changed files with 1146 additions and 145 deletions
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/arrival/AnalyseData.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/analyse/CircleQueue.java
src/main/java/com/bsth/data/gpsdata/analyse/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/analyse/GpsAnalyse.java
src/main/java/com/bsth/data/gpsdata/analyse/StationRoute.java
src/main/java/com/bsth/data/gpsdata/analyse/StationRouteComp.java
src/main/java/com/bsth/data/gpsdata/analyse/components/GpsArrival.java
src/main/java/com/bsth/data/gpsdata/analyse/components/GpsStateCorrective.java
src/main/java/com/bsth/data/gpsdata/analyse/util/GeoUtils.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/entity/realcontrol/ScheduleType.java
src/main/resources/static/pages/mapmonitor/real/js/map/platform/baidu.js
src/main/resources/static/pages/mapmonitor/real/js/map/platform/gaode.js
 package com.bsth.data;
 import com.bsth.Application;
+import com.bsth.data.gpsdata.analyse.GeoCacheData;
 import com.bsth.entity.*;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.*;
@@ -57,7 +58,7 @@ public class BasicData implements CommandLineRunner {
     public static Map<String, String> lineCode2NameMap;
     //线路编码_站点编码 == 0|1  上下行
-    public static Map<String, Integer> lineStationUpDownMap;
+    //public static Map<String, Integer> lineStationUpDownMap;
     //停车场
     public static List<String> parkCodeList;
@@ -86,7 +87,7 @@ public class BasicData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(dataLoader, 0, 1, TimeUnit.HOURS);
+        Application.mainServices.scheduleWithFixedDelay(dataLoader, 2, 2, TimeUnit.HOURS);
     }
@@ -117,6 +118,9 @@ public class BasicData implements CommandLineRunner {
         @Autowired
         BusinessRepository businessRepository;
+        @Autowired
+        GeoCacheData geoCacheData;
+
         @Override
         public void run() {
@@ -138,11 +142,13 @@ public class BasicData implements CommandLineRunner {
                 //车辆和线路映射信息
                 loadNbbm2LineInfo();
                 //站点路由信息
-                loadStationRouteInfo();
+                //loadStationRouteInfo();
                 //人员信息
                 loadPersonnelInfo();
                 //公司信息
                 loadBusinessInfo();
+
+                geoCacheData.loadData();
                 logger.info("加载基础数据成功！，");
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
@@ -151,7 +157,7 @@ public class BasicData implements CommandLineRunner {
         }
-        private void loadStationRouteInfo() {
+/*        private void loadStationRouteInfo() {
             Iterator<StationRoute> iterator = stationRouteRepository.findAllEffective().iterator();
             Map<String, String> sePointMap = new HashMap<>();
@@ -172,7 +178,7 @@ public class BasicData implements CommandLineRunner {
             }
             lineStationUpDownMap = map;
             lineSEPointMap = sePointMap;
-        }
+        }*/
         /**
          * loadBusinessInfo
@@ -280,7 +286,7 @@ public class BasicData implements CommandLineRunner {
                 /**
                  * 加载运管处的站点及序号
                  * 上行从1开始，下行顺序续编
-                 */
+
                 List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
                 if(ygcLines != null && ygcLines.size() > 0){
                     int size = ygcLines.size();
@@ -299,7 +305,7 @@ public class BasicData implements CommandLineRunner {
                         key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
                         tempStationName2YgcNumber.put(key,num++);
                     }
-                }
+                }*/
             }
             lineId2CodeMap = biMap;
 package com.bsth.data.arrival;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import com.bsth.data.BasicData;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 /**
  * 
@@ -98,14 +96,15 @@ public class AnalyseData {
 	}
 	private boolean effective(ArrivalEntity arr){
-		//停车场
+		/*//停车场
 		if(BasicData.parkCodeList.contains(arr.getStopNo())){
 			arr.setTcc(true);
 			return true;
 		}
-		
+
 		Integer upDown = BasicData.lineStationUpDownMap.get(arr.getLineCode() + "_" + arr.getStopNo());
-		
-		return arr.getUpDown() == upDown || BasicData.parkCodeList.contains(arr.getStopNo());
+
+		return arr.getUpDown() == upDown || BasicData.parkCodeList.contains(arr.getStopNo());*/
+		return false;
 	}
 }
@@ -70,7 +70,7 @@ public class ForecastRealServer implements CommandLineRunner {
 /*	public void forecast(String nbbm){
 		logger.info("预测，" + nbbm);
 		//当前执行班次
-		ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+		ScheduleRealInfo sch = dayOfSchedule.execPlanMap().get(nbbm);
 		if(null == sch)
 			return;
@@ -86,7 +86,7 @@ public class ForecastRealServer implements CommandLineRunner {
 			//终点站
 			String eStation = null;
 			//当前执行班次
-			ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+			ScheduleRealInfo sch = dayOfSchedule.execPlanMap().get(nbbm);
 			if(null != sch)
 				eStation = sch.getZdzCode();
 package com.bsth.data.gpsdata;
+import com.bsth.data.gpsdata.analyse.StationRoute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 /**
  * 
  * @ClassName: GpsRealData
@@ -58,25 +61,33 @@ public class GpsEntity {
 	/** 预计到达终点时间 */
 	private Float expectStopTime;
-	/** 设备是否在线 */
+	/** 设备是否在线
 	private boolean online;
-	
+	 */
 	/** 当前执行班次ID */
 	private Long schId;
 	/** 是否异常数据 */
 	private boolean abnormal;
-	
-	private int valid;
+/*
+	private int valid;*/
 	private int version;
-	/** 是否起终点站 */
+	/** 是否起终点站
 	private boolean sEPoint;
+	 */
 	/** 站内 */
 	private boolean instation;
+	/** 站点信息，站内时有值 */
+	@JsonIgnore
+	private StationRoute station;
+
+	/** 状态 */
+	private String state2;
+
 	public Integer getCompanyCode() {
 		return companyCode;
 	}
@@ -181,14 +192,6 @@ public class GpsEntity {
 		this.stationName = stationName;
 	}
-	public boolean isOnline() {
-		return online;
-	}
-
-	public void setOnline(boolean online) {
-		this.online = online;
-	}
-
 	public long getArrTime() {
 		return arrTime;
 	}
@@ -221,43 +224,44 @@ public class GpsEntity {
 		this.schId = schId;
 	}
-	public boolean isAbnormal() {
-		return abnormal;
+
+	public int getVersion() {
+		return version;
 	}
-	public void setAbnormal(boolean abnormal) {
-		this.abnormal = abnormal;
+	public void setVersion(int version) {
+		this.version = version;
 	}
-	public int getValid() {
-		return valid;
+	public boolean isInstation() {
+		return instation;
 	}
-	public void setValid(int valid) {
-		this.valid = valid;
+	public void setInstation(boolean instation) {
+		this.instation = instation;
 	}
-	public int getVersion() {
-		return version;
+	public StationRoute getStation() {
+		return station;
 	}
-	public void setVersion(int version) {
-		this.version = version;
+	public void setStation(StationRoute station) {
+		this.station = station;
 	}
-	public boolean issEPoint() {
-		return sEPoint;
+	public boolean isAbnormal() {
+		return abnormal;
 	}
-	public void setsEPoint(boolean sEPoint) {
-		this.sEPoint = sEPoint;
+	public void setAbnormal(boolean abnormal) {
+		this.abnormal = abnormal;
 	}
-	public boolean isInstation() {
-		return instation;
+	public String getState2() {
+		return state2;
 	}
-	public void setInstation(boolean instation) {
-		this.instation = instation;
+	public void setState2(String state2) {
+		this.state2 = state2;
 	}
 }
@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
+import com.bsth.data.gpsdata.analyse.GpsAnalyse;
+import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.util.ConfigUtil;
@@ -55,6 +57,9 @@ public class GpsRealData implements CommandLineRunner{
 	@Autowired
 	ForecastRealServer forecastRealServer;
+
+
+
 	/**
 	 * 构造函数
 	 */
@@ -67,13 +72,17 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 15, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 40, 20, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
 		String device = gps.getDeviceId();
 		GpsEntity old = gpsMap.get(device);
+		//分析gps
+		if(isAvailable(gps) && (old == null || old.getTimestamp() != gps.getTimestamp()))
+			GpsAnalyse.start(gps);
+
 		if(!StringUtils.isEmpty(gps.getStopNo())){
 			//定时定距数据附带站点编码改变
 			if(null == old || !gps.getStopNo().equals(old.getStopNo())){
@@ -94,6 +103,11 @@ public class GpsRealData implements CommandLineRunner{
 		return gps;
 	}
+	public boolean isAvailable(GpsEntity gps){
+		return StringUtils.isNotEmpty(gps.getLineId()) &&
+				dayOfSchedule.getCurrSchDate().containsKey(gps.getLineId());
+	}
+
 	/**
 	 *
 	 * @Title: get @Description: TODO(设备号获取GPS)
@@ -118,7 +132,7 @@ public class GpsRealData implements CommandLineRunner{
 			if(gps.isAbnormal())
 				continue;
-			sch = dayOfSchedule.execPlamMap().get(gps.getNbbm());
+			sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
 			if(null != sch)
 				gps.setSchId(sch.getId());
 			rs.add(gps);
@@ -161,6 +175,11 @@ public class GpsRealData implements CommandLineRunner{
 		@Override
 		public void run() {
 			try{
+				//如果正在恢复数据
+				if(GpsDataRecovery.run){
+					return;
+				}
+
 				load();
 			}catch(Exception e){
 				logger.error("", e);
@@ -207,7 +226,7 @@ public class GpsRealData implements CommandLineRunner{
 						gpsRealData.add(gps);
 						//纠正走向
-						correctUpdown(gps);
+						//correctUpdown(gps);
 					}
 				} else
 					logger.error("result is null");
@@ -226,7 +245,7 @@ public class GpsRealData implements CommandLineRunner{
 		 * 是否是起终点
 		 * @param gps
 		 * @return
-		 */
+
 		public boolean isSEPoint(GpsEntity gps){
 			String key = gps.getLineId()+"_"+gps.getUpDown()+"_"
 					,stationCode;
@@ -247,12 +266,12 @@ public class GpsRealData implements CommandLineRunner{
 				}
 			}
 			return false;
-		}
+		}*/
 		/**
 		 * 纠正上下行
 		 * @param gps
-		 */
+
 		public void correctUpdown(GpsEntity gps){
 			Integer updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
 			if(updown != null && !updown.equals(gps.getUpDown()))
@@ -260,6 +279,6 @@ public class GpsRealData implements CommandLineRunner{
 			if(isSEPoint(gps))
 				return;
-		}
+		}*/
 	}
 }
@@ -109,4 +109,8 @@ public class CircleQueue&lt;T&gt; {
         }
         return elementDataSort;
     }
+
+    public T getTail(){
+        return elementData[tail] == null?null:(T)elementData[tail];
+    }
 }
@@ -5,7 +5,10 @@ import com.google.common.collect.ArrayListMultimap;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Polygon;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
@@ -13,9 +16,7 @@ import org.springframework.stereotype.Component;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 /**
  * Created by panzhao on 2016/12/23.
@@ -23,8 +24,10 @@ import java.util.Map;
 @Component
 public class GeoCacheData {
-    //每辆车缓存最后50条gps
-    private static final int CACHE_SIZE = 50;
+    static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
+
+    //每辆车缓存最后200条gps
+    private static final int CACHE_SIZE = 200;
     private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
     //线路路段走向
@@ -33,13 +36,52 @@ public class GeoCacheData {
     //线路站点路由
     private static ArrayListMultimap<String, StationRoute> stationCacheMap;
+    //停车场
+    public static Map<String, Polygon> tccMap;
+
     @Autowired
     JdbcTemplate jdbcTemplate;
-    public void loadData(){
+    public static CircleQueue<GpsEntity> getGps(String nbbm) {
+        return gpsCacheMap.get(nbbm);
+    }
+
+    public static void putGps(GpsEntity gps) {
+        CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getNbbm());
+        if (queue == null) {
+            //第一个点从站内开始
+            if(!gps.isInstation())
+                return;
+
+            queue = new CircleQueue<>(CACHE_SIZE);
+            gpsCacheMap.put(gps.getNbbm(), queue);
+        }
+        queue.add(gps);
+    }
+
+    public static List<StationRoute> getStationRoute(String lineCode, int directions) {
+        return stationCacheMap.get(lineCode + "_" + directions);
+    }
+
+    public static StationRoute getStation(String lineCode, int directions, String code) {
+        List<StationRoute> list = getStationRoute(lineCode, directions);
+
+        for (StationRoute sr : list) {
+            if (sr.getCode().equals(code)) {
+                return sr;
+            }
+        }
+        return null;
+    }
+
+    public static Polygon getTccPolygon(String code){
+        return tccMap.get(code);
+    }
+
+    public void loadData() {
         final GeometryFactory geometryFactory = new GeometryFactory();
         //加载站点路由
-        String sql = "select r.LINE_CODE,r.DIRECTIONS,r.STATION_CODE,r.STATION_MARK,s.SHAPES_TYPE,s.G_LONX,s.G_LATY,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID,s.RADIUS from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id";
+        String sql = "select r.LINE_CODE,r.DIRECTIONS,r.STATION_CODE,r.STATION_MARK,s.SHAPES_TYPE,s.G_LONX,s.G_LATY,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID,s.RADIUS, r.STATION_ROUTE_CODE from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id where r.destroy=0 order by r.station_route_code";
         List<StationRoute> routeList = jdbcTemplate.query(sql, new RowMapper<StationRoute>() {
             @Override
             public StationRoute mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -47,39 +89,82 @@ public class GeoCacheData {
                 sRoute.setCode(rs.getString("STATION_CODE"));
                 sRoute.setLineCode(rs.getString("LINE_CODE"));
                 sRoute.setDirections(rs.getInt("DIRECTIONS"));
-                sRoute.setPoint(geometryFactory.createPoint(new Coordinate(rs.getFloat("G_LONX"), rs.getFloat("G_LATY"))));
+                sRoute.setPoint(geometryFactory.createPoint(new Coordinate(rs.getFloat("G_LATY"), rs.getFloat("G_LONX"))));
                 sRoute.setRadius(rs.getFloat("RADIUS"));
+                sRoute.setRouteSort(rs.getInt("STATION_ROUTE_CODE"));
+                sRoute.setMark(rs.getString("STATION_MARK"));
                 String shapesType = rs.getString("SHAPES_TYPE");
                 //多边形电子围栏
-                if(StringUtils.isNotEmpty(shapesType) && shapesType.equals("d")){
+                if (StringUtils.isNotEmpty(shapesType) && shapesType.equals("d")) {
                     geometryFactory.createPolygon(parsePolygon(rs.getString("G_POLYGON_GRID")));
                 }
                 return sRoute;
             }
         });
         //按线路和走向分组
-        if(routeList.size() > 0){
+        if (routeList.size() > 0) {
             ArrayListMultimap<String, StationRoute> tempMap = ArrayListMultimap.create();
-            for(StationRoute sr : routeList){
+            for (StationRoute sr : routeList) {
                 tempMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
             }
+
+            StationRouteComp srCom = new StationRouteComp();
+            //连接路由
+            Set<String> set = tempMap.keySet();
+            for (String key : set) {
+                Collections.sort(tempMap.get(key), srCom);
+                connectStationRoute(tempMap.get(key));
+            }
+
             stationCacheMap = tempMap;
         }
-        System.out.println(stationCacheMap);
+        //加载停车场数据
+        sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null";
+        List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
+        Map<String, Polygon> tccTempMap = new HashMap<>();
+
+        Polygon polygon;
+        for (Map<String, Object> tMap : tccList) {
+
+            try {
+                polygon = geometryFactory.createPolygon(parsePolygon(tMap.get("G_PARK_POINT").toString()));
+                tccTempMap.put(tMap.get("PARK_CODE").toString()
+                        , polygon);
+            } catch (Exception e) {
+                logger.error("停车场：" + tMap.get("PARK_CODE") , e);
+            }
+        }
+
+        if(tccTempMap.size() > 0)
+            tccMap = tccTempMap;
     }
-    public Coordinate[] parsePolygon(String polygonStr){
-        String[] coords = polygonStr.substring(11, polygonStr.length() - 2).split(",")
-                ,temps;
+    private void connectStationRoute(List<StationRoute> list) {
+        int size = list.size();
+        StationRoute sr = null;
+        for (int i = 0; i < size; i++) {
+            sr = list.get(i);
+            //上一个
+            if (i > 0)
+                sr.setPrve(list.get(i - 1));
+            //下一个
+            if (i < size - 1)
+                sr.setNext(list.get(i + 1));
+        }
+    }
+
+    public Coordinate[] parsePolygon(String polygonStr) {
+        String[] coords = polygonStr.substring(9, polygonStr.length() - 2).split(","), temps;
         Coordinate[] cds = new Coordinate[coords.length];
         int len = coords.length;
-        for(int i = 0; i < len; i++){
+        for (int i = 0; i < len; i++) {
             temps = coords[i].split(" ");
-            cds[i] = new Coordinate(Float.parseFloat(temps[0]), Float.parseFloat(temps[1]));
+            cds[i] = new Coordinate(Float.parseFloat(temps[1]), Float.parseFloat(temps[0]));
         }
         return cds;
     }
+
 }
 package com.bsth.data.gpsdata.analyse;
 import com.bsth.data.gpsdata.GpsEntity;
-import com.vividsolutions.jts.geom.GeometryFactory;
+import com.bsth.data.gpsdata.analyse.components.GpsArrival;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -12,35 +14,26 @@ import java.util.concurrent.Executors;
  */
 public class GpsAnalyse {
-    //线程池
-    ExecutorService threadPool = Executors.newFixedThreadPool(50);
+    static Logger logger = LoggerFactory.getLogger(GpsAnalyse.class);
-    private static GeometryFactory geometryFactory = new GeometryFactory();
+    //线程池
+    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
-    public void start(GpsEntity gps){
+    public static void start(GpsEntity gps) {
         threadPool.execute(new ArrivalMatchThread(gps));
     }
-    public class ArrivalMatchThread implements Runnable{
+    public static class ArrivalMatchThread implements Runnable {
         private GpsEntity gps;
-        public ArrivalMatchThread(GpsEntity gps){
+        public ArrivalMatchThread(GpsEntity gps) {
             this.gps = gps;
         }
         @Override
         public void run() {
-            //CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getNbbm());
-
-            //站内还是站外
-            //Point p = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-
-            /*if(queue == null){
-                //首个GPS点
-                queue = new CircleQueue<>(CACHE_SIZE);
-                queue.add(gps);
-            }*/
+            GpsArrival.arrival(gps);
         }
     }
 }
@@ -30,6 +30,15 @@ public class StationRoute {
     /** 多边形电子围栏 */
     private Polygon polygon;
+    /** 站点标记 */
+    private String mark;
+
+    /** 下一站 */
+    private StationRoute next;
+
+    /** 上一站 */
+    private StationRoute prve;
+
     public String getCode() {
         return code;
     }
@@ -85,4 +94,28 @@ public class StationRoute {
     public void setDirections(int directions) {
         this.directions = directions;
     }
+
+    public StationRoute getNext() {
+        return next;
+    }
+
+    public void setNext(StationRoute next) {
+        this.next = next;
+    }
+
+    public StationRoute getPrve() {
+        return prve;
+    }
+
+    public void setPrve(StationRoute prve) {
+        this.prve = prve;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public void setMark(String mark) {
+        this.mark = mark;
+    }
 }
+package com.bsth.data.gpsdata.analyse;
+
+import java.util.Comparator;
+
+/**
+ * Created by panzhao on 2016/12/24.
+ */
+public class StationRouteComp implements Comparator<StationRoute>{
+    @Override
+    public int compare(StationRoute s1, StationRoute s2) {
+        return s1.getRouteSort() - s2.getRouteSort();
+    }
+}
+package com.bsth.data.gpsdata.analyse.components;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.analyse.CircleQueue;
+import com.bsth.data.gpsdata.analyse.GeoCacheData;
+import com.bsth.data.gpsdata.analyse.StationRoute;
+import com.bsth.data.gpsdata.analyse.util.GeoUtils;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * gps 到离站判断
+ * Created by panzhao on 2016/12/24.
+ */
+@Component
+public class GpsArrival implements ApplicationContextAware {
+
+    static Logger logger = LoggerFactory.getLogger(GpsArrival.class);
+
+    static DayOfSchedule dayOfSchedule;
+
+    static LineConfigData lineConfigData;
+
+    public static void arrival(GpsEntity gps) {
+
+        if (gps.getLat() == 0 || gps.getLon() == 0) {
+            //logger.error("无效的gps");
+            return;
+        }
+
+        Object task = DayOfSchedule.executeCurr(gps.getNbbm());
+        if (task == null)
+            return;
+        if (task.getClass().isAssignableFrom(ScheduleRealInfo.class)) {
+            ScheduleRealInfo sch = (ScheduleRealInfo) task;
+            //和班次同步走向
+            gps.setUpDown(Integer.parseInt(sch.getXlDir()));
+
+            //出场
+            if (sch.getBcType().equals("out")) {
+                outCarpark(gps, sch);
+            }
+            else if (sch.getBcType().equals("normal"))
+                normalInOut(gps, sch);
+            else if(sch.getBcType().equals("in")){
+                inCarpark(gps, sch);
+            }
+        }
+
+        GeoCacheData.putGps(gps);
+    }
+
+    /**
+     * 正常班次
+     *
+     * @param gps
+     * @param sch
+     */
+    private static void normalInOut(GpsEntity gps, ScheduleRealInfo sch) {
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        GpsEntity prev = null;
+        if (queue != null)
+            prev = queue.getTail();
+
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), gps.getUpDown());
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+
+        if (station != null) {
+            //站内
+            gps.setStopNo(station.getCode());
+            gps.setInstation(true);
+            stationInside(gps, prev, sch);
+        } else {
+            //站外
+            stationOutside(gps, prev, sch);
+        }
+    }
+
+    /**
+     * GPS在站点内
+     *
+     * @param gps
+     * @param prev
+     * @param sch
+     */
+    private static void stationInside(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch) {
+        if(prev == null)
+            return;
+
+        if (gps.getStopNo().equals(sch.getZdzCode()) && sch.getZdsjActual() == null) {
+            //到终点站
+            arriveEnd(sch, gps);
+            return;
+        }
+
+        //上一个点在站外
+        if(!prev.isInstation())
+            return;
+        //超过 （待发时间 + 90%的单程运送时间），还在起点站。默认烂一圈
+        if (prev.getStopNo().equals(gps.getStopNo())){
+            if(gps.getStopNo().equals(sch.getQdzCode())
+                    && gps.getTimestamp() > sch.getDfsjT() + (sch.getBcsj() * 60 * 1000 * 0.9)){
+
+                ScheduleRealInfo next = dayOfSchedule.next(dayOfSchedule.next(sch));
+                dayOfSchedule.addExecPlan(next);
+            }
+            return;
+        }
+
+        //发车
+        if (prev.getStopNo().equals(sch.getQdzCode())) {
+            busWillDepart(sch, gps);
+            return;
+        }
+
+        //中途站
+        StationRoute prevStation = GeoCacheData.getStation(prev.getLineId(), prev.getUpDown(), prev.getStopNo());
+        StationRoute currStation = GeoCacheData.getStation(gps.getLineId(), gps.getUpDown(), gps.getStopNo());
+        if (currStation.getRouteSort() < prevStation.getRouteSort()) {
+            //开始下一个班次
+            finishPlan(sch);
+
+            logger.info("路由反向。。。。。。:" + gps.getTimestamp());
+            //为班次补上实际时间
+
+        }
+    }
+
+    /**
+     * GPS在站点外
+     *
+     * @param gps
+     * @param prev
+     * @param sch
+     */
+    private static void stationOutside(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch) {
+        if(prev == null)
+            return;
+
+        gps.setStopNo(prev.getStopNo());
+        if (prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
+            //发车
+            busWillDepart(sch, gps);
+            return;
+        }
+    }
+
+    /**
+     * 公交车起点发出
+     */
+    final static long DRIFT_VAL_TIME = 1000 * 60 * 10;
+    //班次最大差值1小时
+    final static long MAX_DIFF = 1000 * 60 * 60;
+    private static void busWillDepart(ScheduleRealInfo sch, GpsEntity gps) {
+        //实发时间不覆盖
+        if (sch.getFcsjActual() == null && Math.abs(gps.getTimestamp() - sch.getDfsjT()) < MAX_DIFF) {
+
+            //提前10分钟以上发出，判断一下是否是漂移
+            if(sch.getDfsjT() - gps.getTimestamp() > DRIFT_VAL_TIME){
+                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+                if(schPrev != null && schPrev.getZdsjActual() != null){
+                    //计划停站时间
+                    long stopTimeJH = sch.getDfsjT() - schPrev.getZdsjT();
+                    //实际停站时间
+                    long actualStopTime = gps.getTimestamp() - schPrev.getZdsjActualTime();
+                    /*
+                        没停够计划百分之60的，算漂移
+                        （这里出现的误判，由程序在车辆到中途站的时候进行补偿）
+                     */
+                    if(stopTimeJH * 0.6 < actualStopTime){
+                        logger.info("漂移.... 车辆：" + gps.getNbbm() + " ts: " + gps.getTimestamp());
+                        return;
+                    }
+                }
+            }
+
+            LineConfig config = lineConfigData.get(sch.getXlBm());
+            if(config != null && config.getOutConfig() == 2){
+                //出站既出场
+                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+                if(schPrev.getBcType().equals("out")){
+                    schPrev.setFcsjActualAll(schPrev.getDfsjT());
+                    schPrev.setZdsjActualAll(schPrev.getZdsjT());
+                }
+            }
+
+            sch.setFcsjActualAll(gps.getTimestamp());
+            logger.info("（站外）班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
+        }
+    }
+
+    /**
+     * 公交车到达终点
+     *
+     * @param sch
+     * @param gps
+     */
+    private static void arriveEnd(ScheduleRealInfo sch, GpsEntity gps) {
+        sch.setZdsjActualAll(gps.getTimestamp());
+        ScheduleRealInfo next = finishPlan(sch);
+        logger.info("班次：" + sch.getDfsj() + "到达终点， 时间：" + sch.getZdsjActual());
+
+        if (next == null)
+            return;
+
+        //将gps转换为下一个班次走向的站内信号
+        int updown = Integer.parseInt(next.getXlDir());
+        List<StationRoute> srs = GeoCacheData.getStationRoute(next.getXlBm(), updown);
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+        if (station != null) {
+            gps.setUpDown(updown);
+            gps.setStopNo(station.getCode());
+        }
+    }
+
+    /**
+     * 出场班次
+     *
+     * @param gps
+     * @param sch
+     */
+    private static void outCarpark(GpsEntity gps, ScheduleRealInfo sch) {
+        String carpark = GeoUtils.gpsInCarpark(gps);
+        if (carpark != null) {
+            gps.setInstation(true);
+            gps.setStopNo(carpark);
+            return; // 还在场内
+        }
+
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        if (queue == null)
+            return;
+        //上一个gps
+        GpsEntity prev = queue.getTail();
+
+        if (carpark == null && prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
+            gps.setStopNo(prev.getStopNo());
+            //停车场发出
+            busWillDepart(sch, gps);
+            return;
+        }
+
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), gps.getUpDown());
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+
+        if (station != null && station.getCode().equals(sch.getZdzCode())) {
+            gps.setStopNo(station.getCode());
+            //到达终点
+            arriveEnd(sch, gps);
+        }
+    }
+
+
+    /**
+     * 进场班次
+     * @param gps
+     * @param sch
+     */
+    private static void inCarpark(GpsEntity gps, ScheduleRealInfo sch) {
+        String carpark = GeoUtils.gpsInCarpark(gps);
+        if (carpark != null && carpark.equals(sch.getZdzCode())) {
+            //进场班次取第一个实际进场时间
+            if(sch.getZdsjActual() != null)
+                return;
+
+            //进场
+            arriveEnd(sch, gps);
+            return;
+        }
+
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        if (queue == null)
+            return;
+        //上一个gps
+        GpsEntity prev = queue.getTail();
+
+        if (carpark == null && prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
+            gps.setStopNo(prev.getStopNo());
+            //进场班次发出
+            busWillDepart(sch, gps);
+            return;
+        }
+    }
+
+    /**
+     * 完成班次 -返回下一个班次
+     *
+     * @param sch
+     */
+    private static ScheduleRealInfo finishPlan(ScheduleRealInfo sch) {
+        ScheduleRealInfo next = dayOfSchedule.next(sch);
+        if (next != null) {
+            next.setQdzArrDatesj(sch.getZdsjActual());
+            dayOfSchedule.addExecPlan(next);
+        }
+        return next;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        dayOfSchedule = applicationContext.getBean(DayOfSchedule.class);
+        lineConfigData = applicationContext.getBean(LineConfigData.class);
+    }
+}
+package com.bsth.data.gpsdata.analyse.components;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * GPS状态纠正
+ * Created by panzhao on 2016/12/23.
+ */
+@Component
+public class GpsStateCorrective implements ApplicationContextAware {
+
+    static Logger logger = LoggerFactory.getLogger(GpsStateCorrective.class);
+
+    static DayOfSchedule dayOfSchedule;
+
+    private static GeometryFactory geometryFactory = new GeometryFactory();
+
+    public static void correct(GpsEntity gps, ScheduleRealInfo sch){
+/*        int upDown = Integer.parseInt(sch.getXlDir());
+        gps.setUpDown(upDown);
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), upDown);
+
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        //之前的点位
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        GpsEntity prev = null;
+        if(queue != null)
+            prev = queue.getTail();
+
+        //线路上，站点间
+        StationRoute station = GeoUtils.pointInStation(point, srs);
+        //在站内
+        if(station != null){
+            gps.setStopNo(station.getCode());
+            gps.setInstation(true);
+            gps.setStation(station);
+
+            if(prev != null && prev.getUpDown() == upDown){
+                StationRoute prevStation = GeoCacheData.getStation(prev.getLineId(), upDown, prev.getStopNo());
+
+                //倒着开？？
+                if(prevStation.getRouteSort() > station.getRouteSort()){
+                    reversalHandle(gps, prev, sch);
+                }
+            }
+        }
+        else{
+            if(prev != null)
+                gps.setStopNo(prev.getStopNo());
+        }
+
+        //是否在停车场内
+        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
+        Set<String> codes = carparkMap.keySet();
+        Polygon p;
+        for(String code : codes){
+            p = carparkMap.get(code);
+            //场内
+            if(p.contains(point)){
+                gps.setCarparkNo(code);
+                if(sch.getBcType().equals("out")){
+                    gps.setInstation(true);
+                    gps.setStopNo(code);
+                }
+            }
+        }*/
+    }
+
+    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("HH:mm");
+
+    private static void reversalHandle(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch){
+        /*if(sch.getBcType().equals("out") && gps.getTimestamp() < sch.getZdsjT())
+            return;
+
+        //先假设没到终点，直接开始了下一个班次
+        ScheduleRealInfo next = dayOfSchedule.next(sch);
+        String log = "倒着开？？？ nbbm: " + gps.getNbbm() + " 当前：" + gps.getStopNo() + " 上一站：" + prev.getStopNo() + " 当前班次：" + sch.getDfsj();
+        if(next != null){
+            dayOfSchedule.addExecPlan(next);
+
+            log += (" 下一个班次：" + next.getDfsj());
+        }
+
+        log += (" GPS时间：" + fmt.print(gps.getTimestamp()));
+
+        logger.info(log);*/
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        dayOfSchedule = applicationContext.getBean(DayOfSchedule.class);
+    }
+}
+package com.bsth.data.gpsdata.analyse.util;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.analyse.GeoCacheData;
+import com.bsth.data.gpsdata.analyse.StationRoute;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+public class GeoUtils {
+
+    private final static double EARTHRADIUS = 6378137;
+
+    private static GeometryFactory geometryFactory = new GeometryFactory();
+    /**
+     * gps是否在路由上的某个站内
+     *
+     * @param gps
+     * @param srs
+     * @return
+     */
+    public static StationRoute gpsInStation(GpsEntity gps, List<StationRoute> srs) {
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+        double min = -1, distance, distance2;
+        StationRoute stationRoute = null;
+
+        for (StationRoute sr : srs) {
+            if (sr.getPolygon() == null) {
+                //圆形
+                distance = getDistance(sr.getPoint(), point);//sr.getPoint().distance(point);
+
+                if (distance > sr.getRadius())
+                    continue;
+
+                if (min > distance || min == -1) {
+                    min = distance;
+                    stationRoute = sr;
+                }
+            } else {
+                //多边形
+                if (sr.getPolygon().contains(point)) {
+                    stationRoute = sr;
+                    break;
+                }
+            }
+        }
+        return stationRoute;
+    }
+
+    public static double getDistance(Point p1, Point p2) {
+        double lng1 = getLoop(p1.getY(), -180, 180), lat1 = getRange(
+                p1.getX(), -74, 74);
+        double lng2 = getLoop(p2.getY(), -180, 180), lat2 = getRange(
+                p2.getX(), -74, 74);
+
+        double x1, x2, y1, y2;
+        x1 = degreeToRad(lng1);
+        y1 = degreeToRad(lat1);
+        x2 = degreeToRad(lng2);
+        y2 = degreeToRad(lat2);
+        return EARTHRADIUS
+                * Math.acos((Math.sin(y1) * Math.sin(y2) + Math.cos(y1)
+                * Math.cos(y2) * Math.cos(x2 - x1)));
+    }
+
+    private static double getLoop(double v, double a, double b) {
+        while (v > b) {
+            v -= b - a;
+        }
+        while (v < a) {
+            v += b - a;
+        }
+        return v;
+    }
+
+    private static double getRange(double v, double a, double b) {
+        v = Math.min(Math.max(v, a), b);
+        return v;
+    }
+
+    private static double degreeToRad(double degree) {
+        return Math.PI * degree / 180;
+    }
+
+
+    /**
+     * gps 是否在某个停车场内
+     * @param gps
+     * @return
+     */
+    public static String gpsInCarpark(GpsEntity gps){
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
+        Set<String> codes = carparkMap.keySet();
+        Polygon polygon;
+        for(String code : codes){
+            polygon = carparkMap.get(code);
+            if(point.within(polygon)){
+                return code;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 是否是有效的连续点
+     * @param prevGps
+     * @param gps
+     * @return
+     */
+    public static boolean overdue(GpsEntity prevGps, GpsEntity gps) {
+        return gps.getTimestamp() - prevGps.getTimestamp() < 120000;
+    }
+}
+package com.bsth.data.gpsdata.recovery;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.analyse.components.GpsArrival;
+import com.bsth.util.db.DBUtils_MS;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * 数据恢复
+ * Created by panzhao on 2016/12/24.
+ */
+public class GpsDataRecovery {
+
+    static Logger logger = LoggerFactory.getLogger(GpsDataRecovery.class);
+
+    public static boolean run;
+
+    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
+
+    private static CountDownLatch count;
+
+    public static void recovery() {
+        List<GpsEntity> list = loadData();
+
+        //按车辆分组数据
+        ArrayListMultimap<String, GpsEntity> listMap = ArrayListMultimap.create();
+        for (GpsEntity gps : list) {
+            if(gps.getNbbm() != null)
+                listMap.put(gps.getNbbm(), gps);
+        }
+
+        count = new CountDownLatch(listMap.keySet().size());
+
+        Set<String> keys = listMap.keySet();
+        for (String nbbm : keys) {
+            threadPool.execute(new RecoveryDataThread(listMap.get(nbbm), count));
+            /*if(nbbm.equals("W9A-250"))
+                new RecoveryDataThread(listMap.get(nbbm), count).run();*/
+        }
+        try {
+            //等待子线程结束
+            count.await();
+            logger.info("GPS 数据恢复完成....");
+        } catch (InterruptedException e) {
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 加载当天的gps数据
+     *
+     * @return
+     */
+    public static List<GpsEntity> loadData() {
+        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;
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
+
+        List<GpsEntity> list =
+                jdbcTemplate.query(sql, new RowMapper<GpsEntity>() {
+                    @Override
+                    public GpsEntity mapRow(ResultSet rs, int rowNum) throws SQLException {
+                        GpsEntity gps = new GpsEntity();
+
+                        gps.setDeviceId(rs.getString("DEVICE_ID"));
+                        gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
+                        gps.setSpeed(rs.getFloat("SPEED_GPS"));
+                        gps.setLat(rs.getFloat("LAT"));
+                        gps.setLon(rs.getFloat("LON"));
+                        gps.setLineId(rs.getString("LINE_ID"));
+                        gps.setTimestamp(rs.getLong("TS"));
+                        gps.setUpDown(getUpOrDown(rs.getLong("SERVICE_STATE")));
+                        return gps;
+                    }
+                });
+        return list;
+    }
+
+    /**
+     * 王通 2016/6/29 9:23:24 获取车辆线路上下行
+     *
+     * @return -1无效 0上行 1下行
+     */
+    public static int getUpOrDown(long serviceState) {
+        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+                || (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
+            return -1;
+        return (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
+    }
+
+    public static class RecoveryDataThread implements Runnable {
+
+        List<GpsEntity> list;
+        CountDownLatch count;
+
+        public RecoveryDataThread(List<GpsEntity> list, CountDownLatch count) {
+            this.list = list;
+            this.count = count;
+        }
+
+        @Override
+        public void run() {
+            try {
+                //排序
+                Collections.sort(list, new GpsComp());
+                //依次跑完gps
+                //int i = 0;
+                for(GpsEntity gps : list){
+                   /* i++;
+                    if(i == 383){
+                        System.out.println("aaa");
+                    }*/
+                    GpsArrival.arrival(gps);
+                }
+            } catch (Exception e) {
+                logger.error("", e);
+            } finally {
+                count.countDown();
+            }
+        }
+    }
+
+    public static class GpsComp implements Comparator<GpsEntity>{
+
+        @Override
+        public int compare(GpsEntity g1, GpsEntity g2) {
+            return (int) (g1.getTimestamp() - g2.getTimestamp());
+        }
+    }
+}
@@ -3,9 +3,11 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.FirstScheduleCheckThread;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.thread.ScheduleLateThread;
 import com.bsth.data.schedule.thread.SchedulePstThread;
 import com.bsth.data.schedule.thread.ScheduleRefreshThread;
@@ -111,19 +113,30 @@ public class DayOfSchedule implements CommandLineRunner {
 	@Autowired
 	SubmitToTrafficManage submitToTrafficManage;
+	@Autowired
+	LineConfigData lineConfigs;
+
+	@Autowired
+	BasicData.BasicDataLoader dataLoader;
+
 	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
 				,fmtHHmm = DateTimeFormat.forPattern("HH:mm");
 	@Override
 	public void run(String... arg0) throws Exception {
+		//加载基础数据
+		dataLoader.loadAllData();
+		//从数据库恢复排班
+		//dataRecovery();
+
 		//翻班线程
 		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
 		//入库
-//		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
 		//首班出场指令补发器
 //		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
 		//班次误点扫描
-//		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
 		//每天凌晨2点20提交数据到运管处
 		long diff = (DateUtils.getTimestamp() + 1000*60*140) - System.currentTimeMillis();
@@ -134,6 +147,23 @@ public class DayOfSchedule implements CommandLineRunner {
 		//Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
 	}
+	//数据恢复
+	private void dataRecovery() {
+		GpsDataRecovery.run = true;
+
+		Collection<LineConfig> confs = lineConfigs.getAll();
+		String lineCode, currSchDate;
+		for(LineConfig conf : confs){
+			lineCode = conf.getLine().getLineCode();
+			currSchDate = calcSchDate(lineCode);
+			//加载班次数据
+			reloadSch(lineCode, currSchDate, false);
+		}
+
+		//恢复gps数据
+		GpsDataRecovery.recovery();
+	}
+
 	public Map<String, String> getCurrSchDate() {
 		return currSchDateMap;
 	}
@@ -189,17 +219,20 @@ public class DayOfSchedule implements CommandLineRunner {
 			putAll(list);
 			Set<String> cars = searchAllCars(list);
-			//计算“起点站应到”时间
-			for(String nbbm : cars)
+			for(String nbbm : cars){
+				//计算“起点站应到”时间
 				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
-			
+				//车辆 ——> 要执行的班次对照
+				carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(nbbmScheduleMap.get(nbbm)));
+			}
+
 			//是否是出站即出场
 			LineConfig conf = lineConfigData.get(lineCode);
 			if(conf.getOutConfig() == 2){
 				for(String nbbm : cars)
 					schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
 			}
-			
+
 			// 页面 翻班通知
 			sendUtils.shiftSchedule(lineCode);
 		} catch (Exception e) {
@@ -451,6 +484,10 @@ public class DayOfSchedule implements CommandLineRunner {
 	public ScheduleRealInfo next(ScheduleRealInfo sch) {
 		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		int outConfig = -1;
+		LineConfig config = lineConfigData.get(sch.getXlBm());
+		if(config != null)
+			outConfig = config.getOutConfig();
 		boolean flag = false;
 		ScheduleRealInfo next = null;
@@ -462,6 +499,10 @@ public class DayOfSchedule implements CommandLineRunner {
 			//忽略烂班
 			if(temp.isDestroy())
 				continue;
+
+			//出站既出场，忽略出场班次
+			if(outConfig == 2 && temp.getBcType().equals("out"))
+				continue;
 			if(flag){
 				next = temp;
@@ -471,6 +512,30 @@ public class DayOfSchedule implements CommandLineRunner {
 		return next;
 	}
+	/**
+	 * 上一个班次
+	 * @param sch
+	 * @return
+	 */
+	public ScheduleRealInfo prev(ScheduleRealInfo sch){
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+
+		//boolean flag = false;
+		ScheduleRealInfo prev = null;
+		int size = list.size();
+
+		for(int i = 0; i < size; i ++){
+			if(list.get(i).isDestroy())
+				continue;
+
+			if(list.get(i).getId().equals(sch.getId())){
+				return prev;
+			}
+			prev = list.get(i);
+		}
+		return prev;
+	}
+
 	public void put(ScheduleRealInfo sch) {
 		schAttrCalculator
 			.calcRealDate(sch)
@@ -666,9 +731,18 @@ public class DayOfSchedule implements CommandLineRunner {
 		carExecutePlanMap.remove(clzbh);
 	}
-	public Map<String, ScheduleRealInfo> execPlamMap(){
+	public Map<String, ScheduleRealInfo> execPlanMap(){
 		return carExecutePlanMap;
 	}
+
+	/**
+	 * 车辆当前执行的班次
+	 * @param nbbm
+	 * @return
+	 */
+	public static ScheduleRealInfo executeCurr(String nbbm){
+		return carExecutePlanMap.get(nbbm);
+	}
 	/**
 	 * @Title: changeCar 
@@ -215,4 +215,30 @@ public class SchAttrCalculator {
 		if(sch.getZdsjActualTime() == null && sch.getZdsjActual() != null)
 			sch.setZdsjActualAll(sch.getZdsjActual());
 	}
+
+	/**
+	 * 计算当前要执行的班次
+	 * @param list
+	 * @return
+	 */
+	public ScheduleRealInfo calcCurrentExecSch(List<ScheduleRealInfo> list){
+		String lineCode = list.get(0).getXlBm();
+		LineConfig conf = lineConfigData.get(lineCode);
+		int outConfig = -1;
+		if(conf != null)
+			outConfig = conf.getOutConfig();
+
+		for(ScheduleRealInfo sch : list){
+			//如果是出站既出场，忽略出场班次
+			if(outConfig == 2 && sch.getBcType().equals("out"))
+				continue;
+
+			//已执行
+			if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+				continue;
+
+			return sch;
+		}
+		return null;
+	}
 }
 package com.bsth.data.schedule.thread;
-import java.util.Collection;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.arrival.ArrivalData_GPS;
@@ -15,6 +7,13 @@ import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.LineConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.Set;
 /**
  * 
@@ -57,6 +56,7 @@ public class ScheduleRefreshThread extends Thread{
 				currSchDate = dayOfSchedule.calcSchDate(lineCode);
 				if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
+
 					logger.info(lineCode + "开始翻班， " + currSchDate);
 					//清除进出站数据
 					arrivalData.clearRAMData(lineCode);
+package com.bsth.entity.realcontrol;
+
+/**
+ * 班次类型
+ * Created by panzhao on 2016/12/23.
+ */
+public enum ScheduleType {
+
+    normal, //正常班次
+    out,    //出场
+    in,     //进场
+    region, //区间
+    venting,//直放
+    major   //放站
+}
@@ -57,37 +57,39 @@ var baiduMap = (function(){
 			map.clearOverlays();
 			linePolyline = [];
-			//从localStorage里读取路由信息
 			var upLineOps = {strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
 				,downLineOps = {strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
-			var upPos = [], downPos = [], tempArray;
 			var route = opts.route;
-			//上行
+			var pos,temps, polyline;
 			if(route.up){
-				$.each(route.up.split(','), function(){
-					tempArray = this.split(' ');
-					upPos.push(new BMap.Point(tempArray[0], tempArray[1]));
+				$.each(route.up_bd, function (i, item) {
+					pos = [];
+					$.each(item.split(','), function () {
+						temps = this.split(' ');
+						pos.push(new BMap.Point(temps[0], temps[1]));
+					});
+					polyline = new BMap.Polyline(pos, upLineOps);
+					map.addOverlay(polyline);
+
+					linePolyline.push(polyline);
 				});
-				var upLine = new BMap.Polyline(upPos, upLineOps);
-				map.addOverlay(upLine);
-
-				linePolyline.push(upLine);
-
-				map.panTo(upPos[parseInt(upPos.length / 2)]);
+				map.panTo(pos[parseInt(pos.length / 2)]);
 			}
-			//下行
+
 			if(route.down){
-				$.each(route.down.split(','), function(){
-					tempArray = this.split(' ');
-					downPos.push(new BMap.Point(tempArray[0], tempArray[1]));
+				$.each(route.down_bd, function (i, item) {
+					pos = [];
+					$.each(item.split(','), function () {
+						temps = this.split(' ');
+						pos.push(new BMap.Point(temps[0], temps[1]));
+					});
+					polyline = new BMap.Polyline(pos, downLineOps);
+					map.addOverlay(polyline);
+
+					linePolyline.push(polyline);
 				});
-
-				var downLine = new BMap.Polyline(downPos, downLineOps);
-				map.addOverlay(downLine);
-
-				linePolyline.push(downLine);
 			}
 		},
 		//绘制GPS信号
@@ -77,11 +77,43 @@ var gaodeMap = (function() {
 			map.clearMap();
-			var upArr = [], downArr = [];
-			var upLineOps = {path: upArr, strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
-				,downLineOps = {path: downArr, strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
+			//var upArr = [], downArr = [];
+			var upLineOps = {strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
+				,downLineOps = {strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
 			var route = opts.route;
-			//上行
+
+			var pos,temps;
+			if(route.up){
+				$.each(route.up_gcj, function (i, item) {
+					pos = [];
+					$.each(item.split(','), function () {
+						temps = this.split(' ');
+						pos.push([temps[0], temps[1]]);
+					});
+					upLineOps.path=pos;
+					var polyline = new AMap.Polyline(upLineOps);
+					polyline.setMap(map);
+
+					linePolyline.push(polyline);
+				});
+				map.setCenter(pos[parseInt(pos.length / 2)]);
+			}
+
+			if(route.down){
+				$.each(route.down_gcj, function (i, item) {
+					pos = [];
+					$.each(item.split(','), function () {
+						temps = this.split(' ');
+						pos.push([temps[0], temps[1]]);
+					});
+					downLineOps.path=pos;
+					var polyline = new AMap.Polyline(downLineOps);
+					polyline.setMap(map);
+
+					linePolyline.push(polyline);
+				});
+			}
+			/*//上行
 			if(route.up){
 				$.each(route.up_gcj.split(','), function(){
 					tempArray = this.split(' ');
@@ -104,7 +136,7 @@ var gaodeMap = (function() {
 				 //保存线条引用
 				 linePolyline.push(downLine);
 				 downLine.setMap(map);
-			}
+			}*/
 			//实时路况下不显示
 			if(traffVisible)
 				hideLinePolyline();
@@ -965,22 +965,32 @@ dd.fcsjActualCell div.last-sch-sunken{
     /*border-top: 1px solid #eeeeee;*/
 }
+dd.fcsjActualCell.tl-yzx div.last-sch-sunken {
+    background: #c1ddf0;
+    border-top: 1px solid #c1d3df;
+}
+
+dd.fcsjActualCell.tl-yzx div.last-sch-sunken span._badge {
+    background: rgb(255, 255, 255);
+    color: black;
+}
+
 dd.fcsjActualCell div.last-sch-sunken span._badge{
     font-size: 12px;
     border-radius: 0 7px 7px 0;
     padding-left: 0;
-    width: 29px;
+    width: 79px;
     display: inline-block;
-    height: 18px;
-    line-height: 18px;
+    height: 22px;
+    line-height: 22px;
     box-shadow: 2px 0px 2px 0 rgba(0,0,0,0.16), 2px 0px 4px 0 rgba(0,0,0,0.12);
     vertical-align: top;
     margin-right: 3px;
-    margin-top: 3px;
+    margin-top: 1px;
     margin-left: -7px;
-    text-indent: 2px;
+    /*text-indent: 2px;*/
     border-left: 0;
-    transform: scale(.9);
+    /* transform: scale(.9); */
     color: grey;
 }
@@ -167,7 +167,7 @@
     <script id="last-sch-sunken-temp" type="text/html">
         <div class="last-sch-sunken">
-            <span class="_badge">终点</span>{{zdsj}}/{{zdsjActual}}
+            <span class="_badge">{{zdsj}}/{{zdsjActual}}</span>
         </div>
     </script>
 </div>
@@ -30,7 +30,7 @@ var gb_data_gps = (function() {
             },
             error: function (xr, t) {
                 notify_err('刷新GPS失败，稍后重试' + t);
-                cb();
+                //cb();
             }
         });
     };
@@ -43,7 +43,7 @@ var gb_map_gps_tree = (function () {
                     'keep_selected_style': false,
                     'whole_node': false,
                     'tie_selection': false
-                },
+                }/*,
                 'contextmenu': {
                     'items': {
                         '轨迹回放': {
@@ -59,12 +59,12 @@ var gb_map_gps_tree = (function () {
                             }
                         }
                     }
-                },
+                }*/,
                 //local storage里的key
                 'state': {
                     'key': 'jstree_map_devices'
                 },
-                'plugins': ['checkbox', 'contextmenu', 'state']
+                'plugins': ['checkbox'/*, 'contextmenu'*/, 'state']
             });
     };