Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

# Conflicts: # src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java # src/main/java/com/bsth/data/gpsdata/arrival/utils/ScheduleSignalState.java

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
# Conflicts: # src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java # src/main/java/com/bsth/data/gpsdata/arrival/utils/ScheduleSignalState.java
潘钊
2 parents 922a65c0 0734f5ef
Showing 23 changed files with 1327 additions and 1311 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/realcontrol/SignalStateController.java
src/main/java/com/bsth/data/gpsdata/SignalStateData.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/RouteReverse.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/SignalAbnormal.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/SignalState.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/OfflineSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/ReverseSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/ScheduleSignalState.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/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/pages/forms/mould/allline.xls
src/main/resources/static/pages/forms/mould/executionrate.xls
@@ -321,31 +321,34 @@ public class ExportController {
 		List<Turnoutrate> turnoutrate = formsService.turnoutrate(map);
 		Map<String, Object> map1 = new HashMap<String, Object>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		/*Float xlts=0f;
-		Float jh=0f;
+		String xlts="";
+		String zsgs="";
+		String jh="";
+		Float j=0f;
 		Float sj=0f;
 		Float qz=0f;
 		Float ccl=0f;
 		Float bcjh=0f;
-		Float bcsj=0f;
+		String bcsj="";
 		Float bczxl=0f;
-		Float gs=0f;
-		Float zhgs=0f;*/
+		String gs="";
+		String zhgs="";
 		for (Turnoutrate l : turnoutrate) {
 			Map<String, Object> m = new HashMap<String, Object>();
-		/*	xlts +=l.getGs()==""?0f:Float.valueOf(l.getGs());
-			jh +=l.getZhgs()==""?0f:Float.valueOf(l.getZhgs());
-			sj +=l.getXl()==""?0f:Float.valueOf(l.getXl());
-			ccl +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
-			bcjh +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
-			bcsj +=l.getChl()==""?0f:Float.valueOf(l.getChl());
+			xlts +=l.getGsgs()==""?0:String.valueOf(l.getGsgs());
+			zsgs +=l.getFgsgs()==""?0:String.valueOf(l.getFgsgs());
+			jh +=l.getXl()==""?0:String.valueOf(l.getXl());
+			sj +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
+			ccl +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
+			bcjh +=l.getCchqz()==""?0f:Float.valueOf(l.getCchqz());
+			bcsj +=l.getChl()==""?0:String.valueOf(l.getChl());
 			bczxl +=l.getBcjh()==""?0f:Float.valueOf(l.getBcjh());
-			gs +=l.getBbzxl()==""?0f:Float.valueOf(l.getBbzxl());
-			zhgs +=l.getBbzxl()==""?0f:Float.valueOf(l.getBbzxl());
+			gs +=l.getBcsj()==""?0:String.valueOf(l.getBcsj());
+			zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());
+			
-			*/
 			m.put("rq", l.getRq());
 			m.put("gs", l.getGs());
 			m.put("zhgs", l.getZhgs());
@@ -355,23 +358,27 @@ public class ExportController {
 			m.put("cchqz", l.getCchqz());
 			m.put("chl", l.getChl());
 			m.put("bcjh", l.getBcjh());
-			m.put("bcsj", l.getBbzxl());
+			m.put("bcsj", l.getBcsj());
 			m.put("bbzxl", l.getBbzxl());
 			m.put("sm", l.getSm());
 			resList.add(m);
-			/*m=new HashMap<String,Object>();
-			m.put("total_xlts", jh);
+			
+			
+			m=new HashMap<String,Object>();
+			m.put("total_xlts", xlts);
+			m.put("total_zhgs", zsgs);
 			m.put("total_jh", jh);
 			m.put("total_sj", sj);
-			m.put("total_qz", qz);
-			m.put("total_ccl", ccl);
-			m.put("total_bcjh", bcjh);
-			m.put("total_bcsj", bcsj);
+			m.put("total_qz", ccl);
+			m.put("total_ccl", bcjh);
+			m.put("total_bcjh",bcsj);
+			m.put("total_bcsj", bczxl);
 			m.put("total_bczxl", bczxl);
-			m.put("total_gs", gs);
-			m.put("total_zhgs", zhgs);
-			*/
+			m.put("total_gs", zhgs);
+			
+
+			map1 = m;
 		}
 		try {
@@ -385,7 +392,7 @@ public class ExportController {
 		return resList;
 	}
-	//营运线路出车率统计表
+	//班次执行率统计表
 	@RequestMapping(value = "/executionrateExport", method = RequestMethod.POST)
 	public List<Map<String, Object>> executionrateExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
@@ -394,29 +401,33 @@ public class ExportController {
 		List<Executionrate> executionrate = formsService.executionrate(map);
 		Map<String, Object> map1 = new HashMap<String, Object>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-	/*	Float xlts=0f;
-		Float jh=0f;
+		String xlts="";
+		String zsgs="";
+		String jh="";
 		Float sj=0f;
 		Float ccl=0f;
 		Float bcjh=0f;
-		Float bcsj=0f;
+		String bcsj="";
 		Float bczxl=0f;
-		Float gs=0f;
-		Float zhgs=0f;*/
+		String gs="";
+		String zhgs="";
+		Map<String, Object> m = new HashMap<String, Object>();
+
 		for (Executionrate l : executionrate) {
-			Map<String, Object> m = new HashMap<String, Object>();
-		/*	xlts +=l.getGs()==""?0f:Float.valueOf(l.getGs());
-			jh +=l.getZhgs()==""?0f:Float.valueOf(l.getZhgs());
-			sj +=l.getXl()==""?0f:Float.valueOf(l.getXl());
-			ccl +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
-			bcjh +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
-			bcsj +=l.getChl()==""?0f:Float.valueOf(l.getChl());
+			
+			xlts +=l.getGsgs()==""?0:String.valueOf(l.getGsgs());
+			zsgs +=l.getFgsgs()==""?0:String.valueOf(l.getFgsgs());
+			jh +=l.getXl()==""?0:String.valueOf(l.getXl());
+			sj +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
+			ccl +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
+			bcsj +=l.getChl()==""?0:String.valueOf(l.getChl());
 			bczxl +=l.getBcjh()==""?0f:Float.valueOf(l.getBcjh());
-			gs +=l.getBbzxl()==""?0f:Float.valueOf(l.getBbzxl());
-			zhgs +=l.getBbzxl()==""?0f:Float.valueOf(l.getBbzxl());
+			gs +=l.getBcsj()==""?0:String.valueOf(l.getBcsj());
+			zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());
+			
+			
-			*/
 			m.put("rq", l.getRq());
 			m.put("gs", l.getGs());
 			m.put("zhgs", l.getZhgs());
@@ -425,23 +436,24 @@ public class ExportController {
 			m.put("cchsj", l.getCchsj());
 			m.put("chl", l.getChl());
 			m.put("bcjh", l.getBcjh());
-			m.put("bcsj", l.getBbzxl());
+			m.put("bcsj", l.getBcsj());
 			m.put("bbzxl", l.getBbzxl());
 			m.put("sm", l.getSm());
 			resList.add(m);
-		/*	m=new HashMap<String,Object>();
+		    m=new HashMap<String,Object>();
+			m.put("total_gs", xlts);
+			m.put("total_zhgs", zsgs);
 			m.put("total_xlts", jh);
-			m.put("total_jh", jh);
-			m.put("total_sj", sj);
-			m.put("total_ccl", ccl);
-			m.put("total_bcjh", bcjh);
-			m.put("total_bcsj", bcsj);
-			m.put("total_bczxl", bczxl);
-			m.put("total_gs", gs);
-			m.put("total_zhgs", zhgs);*/
+			m.put("total_jh", sj);
+			m.put("total_sj", ccl);
+			m.put("total_ccl",bcsj);
+			m.put("total_bcjh", bczxl);
+			m.put("total_bcsj", gs);
+			m.put("total_bczxl", zhgs);
+			map1 = m;
 		}
 		try {
@@ -465,41 +477,42 @@ public class ExportController {
 		List<Allline> allline = formsService.allline(map);
 		Map<String, Object> map1 = new HashMap<String, Object>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-	/*	Integer jh=0;
+		Integer jh=0;
 		Integer  sj=0;
 		Integer  ccl=0;
-		Integer bcjh=0;
-		Float bcsj=0f;
+		Double bcjh=0.0;
+		String bcsj="";
 		Integer bczxl=0;
-		Integer  gs=0;
-		Float zhgs=0f;
-		*/
+		String  gs="";
+		String zhgs="";
+		Map<String, Object> m ;
 		for (Allline l : allline) {
-			Map<String, Object> m = new HashMap<String, Object>();
+			m = new HashMap<String, Object>();
-			/*jh +=l.getGsgs()=="" ? 0: Integer.valueOf(l.getGsgs());
+			jh +=l.getGsgs()=="" ? 0: Integer.valueOf(l.getGsgs());
 			sj +=l.getFgsgs()==""?0: Integer.valueOf(l.getFgsgs());
 			ccl +=l.getCchjh()==""?0: Integer.valueOf(l.getCchjh());
-			bcjh +=l.getCchsj()==""?0: Integer.valueOf(l.getCchsj());
-			bcsj +=l.getChl()==""?0f:Float.valueOf(l.getChl());
+			bcjh +=l.getCchsj()==""?0: Double.valueOf(l.getCchsj());
+			
+			bcsj +=l.getChl()==""? 0:String.valueOf(l.getChl());
 			bczxl +=l.getBcjh()==""?0: Integer.valueOf(l.getBcjh());
-			gs +=l.getBbzxl()==""?0: Integer.valueOf(l.getBbzxl());
-			zhgs +=l.getBbzxl()==""?0f:Float.valueOf(l.getBbzxl());
-			*/
+			gs +=l.getBcsj()==""?0: String.valueOf(l.getBcsj());
+			zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());
+			
 			m.put("rq", l.getRq());
-			m.put("gs", l.getGsgs());
-			m.put("zhgs", l.getFgsgs());
-			//m.put("xl", l.getXl());
+			m.put("gs", l.getGs());
+			m.put("zhgs", l.getZhgs());
+			m.put("xl", l.getXl());
 			m.put("cchjh", l.getCchjh());
 			m.put("cchsj", l.getCchsj());
 			m.put("chl", l.getChl());
 			m.put("bcjh", l.getBcjh());
-			m.put("bcsj", l.getBbzxl());
+			m.put("bcsj", l.getBcsj());
 			m.put("bbzxl", l.getBbzxl());
 			m.put("sm", l.getSm());
 			resList.add(m);
-			/*m=new HashMap<String,Object>();
+			m=new HashMap<String,Object>();
 			m.put("total_jh", jh);
 			m.put("total_sj", sj);
 			m.put("total_ccl", ccl);
@@ -508,7 +521,8 @@ public class ExportController {
 			m.put("total_bczxl", bczxl);
 			m.put("total_gs", gs);
 			m.put("total_zhgs", zhgs);
-			*/
+			map1 = m;
+			
 		}
 		try {
-package com.bsth.controller.realcontrol;
-
-import com.bsth.data.gpsdata.SignalStateData;
-import com.bsth.data.gpsdata.arrival.entity.SignalState;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * Created by panzhao on 2016/12/30.
- */
-@RestController
-@RequestMapping("signalState")
-public class SignalStateController {
-
-    @Autowired
-    SignalStateData signalStateData;
-
-    @RequestMapping("/multi")
-    public List<SignalState> findByMultiLine(@RequestParam String idx){
-        return signalStateData.get(idx);
-    }
-}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.gpsdata.SignalStateData;
+import com.bsth.data.gpsdata.arrival.entity.SignalState;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2016/12/30.
+ */
+@RestController
+@RequestMapping("signalState")
+public class SignalStateController {
+
+    @Autowired
+    SignalStateData signalStateData;
+
+    @RequestMapping("/multi")
+    public List<SignalState> findByMultiLine(@RequestParam String idx){
+        return signalStateData.get(idx);
+    }
+}
-package com.bsth.data.gpsdata;
-
-import com.bsth.data.gpsdata.arrival.entity.SignalState;
-import com.bsth.websocket.handler.SendUtils;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ArrayListMultimap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 信号状态数据
- * Created by panzhao on 2016/12/30.
- */
-@Component
-public class SignalStateData {
-
-    @Autowired
-    SendUtils sendUtils;
-
-    private static ArrayListMultimap<String, SignalState> listMultimap = ArrayListMultimap.create();
-
-    public void put(SignalState state){
-        listMultimap.put(state.getLineCode(), state);
-        //推送到客户端
-        sendUtils.sendSignalState(state);
-    }
-
-    public List<SignalState> get(String idx){
-        List<SignalState> rs = new ArrayList<>();
-        List<String> ids = Splitter.on(",").splitToList(idx);
-
-        for(String lineCode : ids){
-            rs.addAll(listMultimap.get(lineCode));
-        }
-        return rs;
-    }
-}
+package com.bsth.data.gpsdata;
+
+import com.bsth.data.gpsdata.arrival.entity.SignalState;
+import com.bsth.websocket.handler.SendUtils;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 信号状态数据
+ * Created by panzhao on 2016/12/30.
+ */
+@Component
+public class SignalStateData {
+
+    @Autowired
+    SendUtils sendUtils;
+
+    private static ArrayListMultimap<String, SignalState> listMultimap = ArrayListMultimap.create();
+
+    public void put(SignalState state){
+        listMultimap.put(state.getLineCode(), state);
+        //推送到客户端
+        sendUtils.sendSignalState(state);
+    }
+
+    public List<SignalState> get(String idx){
+        List<SignalState> rs = new ArrayList<>();
+        List<String> ids = Splitter.on(",").splitToList(idx);
+
+        for(String lineCode : ids){
+            rs.addAll(listMultimap.get(lineCode));
+        }
+        return rs;
+    }
+}
-package com.bsth.data.gpsdata.arrival;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.entity.StationRoute;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.StationRouteComp;
-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;
-import org.springframework.stereotype.Component;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-
-/**
- * Created by panzhao on 2016/12/23.
- */
-@Component
-public class GeoCacheData {
-
-    static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
-
-    //每辆车缓存最后1000条gps
-    private static final int CACHE_SIZE = 1000;
-    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
-
-    //线路路段走向
-    private static ArrayListMultimap<String, LineString> sectionCacheMap;
-
-    //线路站点路由
-    private static ArrayListMultimap<String, StationRoute> stationCacheMap;
-
-    //线路_上下行_站点编码 ——> 站点
-    private static Map<String, StationRoute> routeCodeMap;
-
-    //停车场
-    public static Map<String, Polygon> tccMap;
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    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.getInstation() == 0)
-                return;*/
-
-            queue = new CircleQueue<>(CACHE_SIZE);
-            gpsCacheMap.put(gps.getNbbm(), queue);
-        }
-        queue.add(gps);
-    }
-
-    public static void clear(String nbbm) {
-        try {
-            CircleQueue<GpsEntity> queue = gpsCacheMap.get(nbbm);
-            if (queue != null)
-                queue.clear();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
-
-    public static StationRoute getRouteCode(GpsEntity gps) {
-        return routeCodeMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo());
-    }
-
-    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 List<StationRoute> midwayStation(String lineCode, int directions, String sCode, String eCode) {
-        List<StationRoute> list = getStationRoute(lineCode, directions), rs = new ArrayList<>();
-
-        boolean flag = false;
-        for (StationRoute sr : list) {
-            if (flag)
-                rs.add(sr);
-            if (sr.getCode().equals(sCode))
-                flag = true;
-            else if (sr.getCode().equals(eCode))
-                break;
-        }
-        return rs;
-    }
-
-    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, r.STATION_ROUTE_CODE,s.STATION_NAME 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 {
-                StationRoute sRoute = new StationRoute();
-                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_LATY"), rs.getFloat("G_LONX"))));
-                sRoute.setRadius(rs.getFloat("RADIUS"));
-                sRoute.setRouteSort(rs.getInt("STATION_ROUTE_CODE"));
-                sRoute.setMark(rs.getString("STATION_MARK"));
-                sRoute.setName(rs.getString("STATION_NAME"));
-
-                String shapesType = rs.getString("SHAPES_TYPE");
-                //多边形电子围栏
-                if (StringUtils.isNotEmpty(shapesType) && shapesType.equals("d")) {
-                    sRoute.setPolygon(geometryFactory.createPolygon(parsePolygon(rs.getString("G_POLYGON_GRID"))));
-                }
-                return sRoute;
-            }
-        });
-        //按线路和走向分组
-        if (routeList.size() > 0) {
-            ArrayListMultimap<String, StationRoute> tempMap = ArrayListMultimap.create();
-            Map<String, StationRoute> codeMap = new HashMap<>(routeList.size());
-            for (StationRoute sr : routeList) {
-                tempMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
-                //站点编码 ——> 和路由顺序对照
-                codeMap.put(sr.getLineCode() + "_" + sr.getDirections() + "_" + sr.getCode(), 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;
-            routeCodeMap = codeMap;
-        }
-
-        //加载停车场数据
-        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;
-    }
-
-    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++) {
-            temps = coords[i].split(" ");
-            cds[i] = new Coordinate(Float.parseFloat(temps[1]), Float.parseFloat(temps[0]));
-        }
-        return cds;
-    }
-
-    /**
-     * 是不是终点站
-     * @param lineId
-     * @param upDown
-     * @param stationCode
-     * @return
-     */
-    public static boolean isEndStation(String lineId, Integer upDown, String stationCode) {
-        StationRoute station = routeCodeMap.get(lineId + "_" + upDown + "_" + stationCode);
-        return station != null && station.getMark().equals("E");
-    }
+package com.bsth.data.gpsdata.arrival;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.StationRouteComp;
+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;
+import org.springframework.stereotype.Component;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+@Component
+public class GeoCacheData {
+
+    static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
+
+    //每辆车缓存最后1000条gps
+    private static final int CACHE_SIZE = 1000;
+    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
+
+    //线路路段走向
+    private static ArrayListMultimap<String, LineString> sectionCacheMap;
+
+    //线路站点路由
+    private static ArrayListMultimap<String, StationRoute> stationCacheMap;
+
+    //线路_上下行_站点编码 ——> 站点
+    private static Map<String, StationRoute> routeCodeMap;
+
+    //停车场
+    public static Map<String, Polygon> tccMap;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    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.getInstation() == 0)
+                return;*/
+
+            queue = new CircleQueue<>(CACHE_SIZE);
+            gpsCacheMap.put(gps.getNbbm(), queue);
+        }
+        queue.add(gps);
+    }
+
+    public static void clear(String nbbm) {
+        try {
+            CircleQueue<GpsEntity> queue = gpsCacheMap.get(nbbm);
+            if (queue != null)
+                queue.clear();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    public static StationRoute getRouteCode(GpsEntity gps) {
+        return routeCodeMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo());
+    }
+
+    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 List<StationRoute> midwayStation(String lineCode, int directions, String sCode, String eCode) {
+        List<StationRoute> list = getStationRoute(lineCode, directions), rs = new ArrayList<>();
+
+        boolean flag = false;
+        for (StationRoute sr : list) {
+            if (flag)
+                rs.add(sr);
+            if (sr.getCode().equals(sCode))
+                flag = true;
+            else if (sr.getCode().equals(eCode))
+                break;
+        }
+        return rs;
+    }
+
+    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, r.STATION_ROUTE_CODE,s.STATION_NAME 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 {
+                StationRoute sRoute = new StationRoute();
+                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_LATY"), rs.getFloat("G_LONX"))));
+                sRoute.setRadius(rs.getFloat("RADIUS"));
+                sRoute.setRouteSort(rs.getInt("STATION_ROUTE_CODE"));
+                sRoute.setMark(rs.getString("STATION_MARK"));
+                sRoute.setName(rs.getString("STATION_NAME"));
+
+                String shapesType = rs.getString("SHAPES_TYPE");
+                //多边形电子围栏
+                if (StringUtils.isNotEmpty(shapesType) && shapesType.equals("d")) {
+                    sRoute.setPolygon(geometryFactory.createPolygon(parsePolygon(rs.getString("G_POLYGON_GRID"))));
+                }
+                return sRoute;
+            }
+        });
+        //按线路和走向分组
+        if (routeList.size() > 0) {
+            ArrayListMultimap<String, StationRoute> tempMap = ArrayListMultimap.create();
+            Map<String, StationRoute> codeMap = new HashMap<>(routeList.size());
+            for (StationRoute sr : routeList) {
+                tempMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
+                //站点编码 ——> 和路由顺序对照
+                codeMap.put(sr.getLineCode() + "_" + sr.getDirections() + "_" + sr.getCode(), 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;
+            routeCodeMap = codeMap;
+        }
+
+        //加载停车场数据
+        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;
+    }
+
+    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++) {
+            temps = coords[i].split(" ");
+            cds[i] = new Coordinate(Float.parseFloat(temps[1]), Float.parseFloat(temps[0]));
+        }
+        return cds;
+    }
+
+    /**
+     * 是不是终点站
+     * @param lineId
+     * @param upDown
+     * @param stationCode
+     * @return
+     */
+    public static boolean isEndStation(String lineId, Integer upDown, String stationCode) {
+        StationRoute station = routeCodeMap.get(lineId + "_" + upDown + "_" + stationCode);
+        return station != null && station.getMark().equals("E");
+    }
 }
 \ No newline at end of file
-package com.bsth.data.gpsdata.arrival;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.entity.StationRoute;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-
-import java.util.List;
-
-/**
- * Created by panzhao on 2016/12/27.
- */
-public abstract class SignalHandle {
-
-    public abstract boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs);
-
-    protected boolean isNotEmpty(CircleQueue<GpsEntity> prevs) {
-        return prevs != null && prevs.size() > 0 && prevs.getTail() != null;
-    }
-
-    protected boolean isDriftSignal(GpsEntity gps) {
-        return gps.getLat() == 0 || gps.getLon() == 0;
-    }
-
-    /**
-     * 是不是异常信号
-     *
-     * @param gps
-     * @return protected boolean isAbnormal(GpsEntity gps) {
-    return gps.getLat() == 0 || gps.getLon() == 0;
-    }*/
-
-    /**
-     * 连续异常信号个数统计
-     *
-     * @param prevs
-     * @return protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
-     * int count = 0;
-     * <p>
-     * if (!isNotEmpty(prevs))
-     * return count;
-     * <p>
-     * GpsEntity[] array = (GpsEntity[]) prevs.getQueue();
-     * GpsEntity gps;
-     * for (int i = array.length - 1; i > 0; i--) {
-     * gps = array[i];
-     * <p>
-     * if (isAbnormal(gps))
-     * count++;
-     * else
-     * break;
-     * }
-     * <p>
-     * return count;
-     * }
-     */
-
-    protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
-        int updown = Integer.parseInt(sch.getXlDir());
-        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), updown);
-        StationRoute station = GeoUtils.gpsInStation(gps, srs);
-        if (station != null) {
-            gps.setUpDown(updown);
-            gps.setStopNo(station.getCode());
-        }
-    }
-
-    /**
-     * 是否是从异常状态恢复的第一个信号
-     *
-     * @param gps
-     * @param prevs
-     * @return
-     */
-    protected boolean abnormalRecovery(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        if (prevs == null || prevs.size() == 0)
-            return false;
-
-        GpsEntity prev = prevs.getTail();
-        //从漂移状态恢复
-        if (isDriftSignal(prev)
-                && !isDriftSignal(gps)) {
-            return true;
-        }
-
-        return false;
-    }
+package com.bsth.data.gpsdata.arrival;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2016/12/27.
+ */
+public abstract class SignalHandle {
+
+    public abstract boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs);
+
+    protected boolean isNotEmpty(CircleQueue<GpsEntity> prevs) {
+        return prevs != null && prevs.size() > 0 && prevs.getTail() != null;
+    }
+
+    protected boolean isDriftSignal(GpsEntity gps) {
+        return gps.getLat() == 0 || gps.getLon() == 0;
+    }
+
+    /**
+     * 是不是异常信号
+     *
+     * @param gps
+     * @return protected boolean isAbnormal(GpsEntity gps) {
+    return gps.getLat() == 0 || gps.getLon() == 0;
+    }*/
+
+    /**
+     * 连续异常信号个数统计
+     *
+     * @param prevs
+     * @return protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
+     * int count = 0;
+     * <p>
+     * if (!isNotEmpty(prevs))
+     * return count;
+     * <p>
+     * GpsEntity[] array = (GpsEntity[]) prevs.getQueue();
+     * GpsEntity gps;
+     * for (int i = array.length - 1; i > 0; i--) {
+     * gps = array[i];
+     * <p>
+     * if (isAbnormal(gps))
+     * count++;
+     * else
+     * break;
+     * }
+     * <p>
+     * return count;
+     * }
+     */
+
+    protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
+        int updown = Integer.parseInt(sch.getXlDir());
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), updown);
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+        if (station != null) {
+            gps.setUpDown(updown);
+            gps.setStopNo(station.getCode());
+        }
+    }
+
+    /**
+     * 是否是从异常状态恢复的第一个信号
+     *
+     * @param gps
+     * @param prevs
+     * @return
+     */
+    protected boolean abnormalRecovery(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        if (prevs == null || prevs.size() == 0)
+            return false;
+
+        GpsEntity prev = prevs.getTail();
+        //从漂移状态恢复
+        if (isDriftSignal(prev)
+                && !isDriftSignal(gps)) {
+            return true;
+        }
+
+        return false;
+    }
 }
 \ No newline at end of file
-package com.bsth.data.gpsdata.arrival.entity;
-
-/** 路由反转
- * Created by panzhao on 2016/12/28.
- */
-public class RouteReverse {
-
-    private String nbbm;
-    //反转个数
-    private int count;
-
-    //详细 1,2,3,2,1
-    private String detail;
-
-    //掉头站点
-    private String turned;
-
-    //掉头时间
-    private long zt;
-
-    //检测时间
-    private long ct;
-
-    //是否闭合
-    private boolean close;
-
-    //信号不明确
-    private boolean vague;
-
-    public int getCount() {
-        return count;
-    }
-
-    public void setCount(int count) {
-        this.count = count;
-    }
-
-    public String getDetail() {
-        return detail;
-    }
-
-    public void setDetail(String detail) {
-        this.detail = detail;
-    }
-
-    public String getTurned() {
-        return turned;
-    }
-
-    public void setTurned(String turned) {
-        this.turned = turned;
-    }
-
-    public boolean isClose() {
-        return close;
-    }
-
-    public void setClose(boolean close) {
-        this.close = close;
-    }
-
-    public long getZt() {
-        return zt;
-    }
-
-    public void setZt(long zt) {
-        this.zt = zt;
-    }
-
-    public long getCt() {
-        return ct;
-    }
-
-    public void setCt(long ct) {
-        this.ct = ct;
-    }
-
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
-    public boolean isVague() {
-        return vague;
-    }
-
-    public void setVague(boolean vague) {
-        this.vague = vague;
-    }
+package com.bsth.data.gpsdata.arrival.entity;
+
+/** 路由反转
+ * Created by panzhao on 2016/12/28.
+ */
+public class RouteReverse {
+
+    private String nbbm;
+    //反转个数
+    private int count;
+
+    //详细 1,2,3,2,1
+    private String detail;
+
+    //掉头站点
+    private String turned;
+
+    //掉头时间
+    private long zt;
+
+    //检测时间
+    private long ct;
+
+    //是否闭合
+    private boolean close;
+
+    //信号不明确
+    private boolean vague;
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public String getTurned() {
+        return turned;
+    }
+
+    public void setTurned(String turned) {
+        this.turned = turned;
+    }
+
+    public boolean isClose() {
+        return close;
+    }
+
+    public void setClose(boolean close) {
+        this.close = close;
+    }
+
+    public long getZt() {
+        return zt;
+    }
+
+    public void setZt(long zt) {
+        this.zt = zt;
+    }
+
+    public long getCt() {
+        return ct;
+    }
+
+    public void setCt(long ct) {
+        this.ct = ct;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public boolean isVague() {
+        return vague;
+    }
+
+    public void setVague(boolean vague) {
+        this.vague = vague;
+    }
 }
 \ No newline at end of file
-package com.bsth.data.gpsdata.arrival.entity;
-
-/**
- * 班次信号异常（漂移 或 断线）
- * Created by panzhao on 2016/12/31.
- */
-public class SignalAbnormal {
-
-    private Long et;
-
-    /** drift or reconnection */
-    private String abnormalType;
-
-    private Long st;
-
-    private String nearPoint;
-
-    private String destCode;
-
-    private Long ct;
-
-    //0: 发车  1：到站
-    private int outOrIn;
-
-    public Long getEt() {
-        return et;
-    }
-
-    public void setEt(Long et) {
-        this.et = et;
-    }
-
-    public String getAbnormalType() {
-        return abnormalType;
-    }
-
-    public void setAbnormalType(String abnormalType) {
-        this.abnormalType = abnormalType;
-    }
-
-    public Long getSt() {
-        return st;
-    }
-
-    public void setSt(Long st) {
-        this.st = st;
-    }
-
-    public String getNearPoint() {
-        return nearPoint;
-    }
-
-    public void setNearPoint(String nearPoint) {
-        this.nearPoint = nearPoint;
-    }
-
-    public Long getCt() {
-        return ct;
-    }
-
-    public void setCt(Long ct) {
-        this.ct = ct;
-    }
-
-    public int getOutOrIn() {
-        return outOrIn;
-    }
-
-    public void setOutOrIn(int outOrIn) {
-        this.outOrIn = outOrIn;
-    }
-
-    public String getDestCode() {
-        return destCode;
-    }
-
-    public void setDestCode(String destCode) {
-        this.destCode = destCode;
-    }
-}
+package com.bsth.data.gpsdata.arrival.entity;
+
+/**
+ * 班次信号异常（漂移 或 断线）
+ * Created by panzhao on 2016/12/31.
+ */
+public class SignalAbnormal {
+
+    private Long et;
+
+    /** drift or reconnection */
+    private String abnormalType;
+
+    private Long st;
+
+    private String nearPoint;
+
+    private String destCode;
+
+    private Long ct;
+
+    //0: 发车  1：到站
+    private int outOrIn;
+
+    public Long getEt() {
+        return et;
+    }
+
+    public void setEt(Long et) {
+        this.et = et;
+    }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
+
+    public Long getSt() {
+        return st;
+    }
+
+    public void setSt(Long st) {
+        this.st = st;
+    }
+
+    public String getNearPoint() {
+        return nearPoint;
+    }
+
+    public void setNearPoint(String nearPoint) {
+        this.nearPoint = nearPoint;
+    }
+
+    public Long getCt() {
+        return ct;
+    }
+
+    public void setCt(Long ct) {
+        this.ct = ct;
+    }
+
+    public int getOutOrIn() {
+        return outOrIn;
+    }
+
+    public void setOutOrIn(int outOrIn) {
+        this.outOrIn = outOrIn;
+    }
+
+    public String getDestCode() {
+        return destCode;
+    }
+
+    public void setDestCode(String destCode) {
+        this.destCode = destCode;
+    }
+}
-package com.bsth.data.gpsdata.arrival.entity;
-
-import com.bsth.data.BasicData;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-
-/**
- * 信号状态
- * Created by panzhao on 2016/12/30.
- */
-public class SignalState {
-
-    private String type;
-
-    private Long st;
-
-    //private Long checkTime;
-
-    private Long schId;
-
-    private String lineCode;
-
-    private String text;
-
-    private RouteReverse reverse;
-
-    private SignalAbnormal signalAbnormal;
-
-    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
-
-    /**
-     * 记录区间调头
-     *
-     * @param sch
-     * @param reverse
-     * @return
-     */
-    public static SignalState reverseSignalSTate(ScheduleRealInfo sch, RouteReverse reverse) {
-        if(reverse.isVague())
-            return null;
-
-        SignalState state = new SignalState();
-        state.setSchId(sch.getId());
-        state.setType("route_reverse");
-        //state.setCheckTime(System.currentTimeMillis());
-
-        String stationName = BasicData.stationCode2NameMap.get(sch.getXlBm() + "_" + sch.getXlDir() + "_" + reverse.getTurned());
-        state.setText(fmtHHmm.print(reverse.getZt()) + " 从 " + stationName + " 站掉头");
-        state.setSt(sch.getFcsjActualTime());
-        state.setLineCode(sch.getXlBm());
-        state.setReverse(reverse);
-        return state;
-    }
-
-    public static SignalState abnormalSignalSTate(ScheduleRealInfo sch, SignalAbnormal signalAbnormal) {
-        SignalState state = new SignalState();
-        state.setSchId(sch.getId());
-        state.setType("abnormal_signal");
-        //state.setCheckTime(signalAbnormal.getCt());
-        state.setLineCode(sch.getXlBm());
-
-        String text = (fmtHHmm.print(signalAbnormal.getSt()) + " ~ " + fmtHHmm.print(signalAbnormal.getEt()));
-        String abnormType = signalAbnormal.getAbnormalType();
-        if (abnormType.equals("drift"))
-            text += "（GPS无效）";
-        else if (abnormType.equals("reconnection"))
-            text += "（信号丢失）";
-
-        state.setText(text);
-        state.setSignalAbnormal(signalAbnormal);
-        return state;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public long getSchId() {
-        return schId;
-    }
-
-    public void setSchId(long schId) {
-        this.schId = schId;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public Long getSt() {
-        return st;
-    }
-
-    public void setSt(Long st) {
-        this.st = st;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public RouteReverse getReverse() {
-        return reverse;
-    }
-
-    public void setReverse(RouteReverse reverse) {
-        this.reverse = reverse;
-    }
-
-    public SignalAbnormal getSignalAbnormal() {
-        return signalAbnormal;
-    }
-
-    public void setSignalAbnormal(SignalAbnormal signalAbnormal) {
-        this.signalAbnormal = signalAbnormal;
-    }
-}
+package com.bsth.data.gpsdata.arrival.entity;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+/**
+ * 信号状态
+ * Created by panzhao on 2016/12/30.
+ */
+public class SignalState {
+
+    private String type;
+
+    private Long st;
+
+    //private Long checkTime;
+
+    private Long schId;
+
+    private String lineCode;
+
+    private String text;
+
+    private RouteReverse reverse;
+
+    private SignalAbnormal signalAbnormal;
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    /**
+     * 记录区间调头
+     *
+     * @param sch
+     * @param reverse
+     * @return
+     */
+    public static SignalState reverseSignalSTate(ScheduleRealInfo sch, RouteReverse reverse) {
+        if(reverse.isVague())
+            return null;
+
+        SignalState state = new SignalState();
+        state.setSchId(sch.getId());
+        state.setType("route_reverse");
+        //state.setCheckTime(System.currentTimeMillis());
+
+        String stationName = BasicData.stationCode2NameMap.get(sch.getXlBm() + "_" + sch.getXlDir() + "_" + reverse.getTurned());
+        state.setText(fmtHHmm.print(reverse.getZt()) + " 从 " + stationName + " 站掉头");
+        state.setSt(sch.getFcsjActualTime());
+        state.setLineCode(sch.getXlBm());
+        state.setReverse(reverse);
+        return state;
+    }
+
+    public static SignalState abnormalSignalSTate(ScheduleRealInfo sch, SignalAbnormal signalAbnormal) {
+        SignalState state = new SignalState();
+        state.setSchId(sch.getId());
+        state.setType("abnormal_signal");
+        //state.setCheckTime(signalAbnormal.getCt());
+        state.setLineCode(sch.getXlBm());
+
+        String text = (fmtHHmm.print(signalAbnormal.getSt()) + " ~ " + fmtHHmm.print(signalAbnormal.getEt()));
+        String abnormType = signalAbnormal.getAbnormalType();
+        if (abnormType.equals("drift"))
+            text += "（GPS无效）";
+        else if (abnormType.equals("reconnection"))
+            text += "（信号丢失）";
+
+        state.setText(text);
+        state.setSignalAbnormal(signalAbnormal);
+        return state;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public long getSchId() {
+        return schId;
+    }
+
+    public void setSchId(long schId) {
+        this.schId = schId;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getSt() {
+        return st;
+    }
+
+    public void setSt(Long st) {
+        this.st = st;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public RouteReverse getReverse() {
+        return reverse;
+    }
+
+    public void setReverse(RouteReverse reverse) {
+        this.reverse = reverse;
+    }
+
+    public SignalAbnormal getSignalAbnormal() {
+        return signalAbnormal;
+    }
+
+    public void setSignalAbnormal(SignalAbnormal signalAbnormal) {
+        this.signalAbnormal = signalAbnormal;
+    }
+}
@@ -246,4 +246,4 @@ public class InOutStationSignalHandle extends SignalHandle{
         }*/
         return false;
     }
 -}
+}
 \ No newline at end of file
-package com.bsth.data.gpsdata.arrival.handlers;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.SignalHandle;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import org.springframework.stereotype.Component;
-
-/**
- * 信号断线重连处理
- * Created by panzhao on 2016/12/27.
- */
-@Component
-public class OfflineSignalHandle extends SignalHandle{
-
-    //断开2分钟，标记为重连信号
-    private final static int OFFLINE_TIME = 1000 * 60 * 2;
-
-    //断开70分钟，之前的信号不再有参考价值
-    private final static int CLEAR_TIME = 1000 * 60 * 70;
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //漂移信号不管
-        if(isDriftSignal(gps)){
-            gps.setSignalState("drift");
-            return true;
-        }
-
-        if(isNotEmpty(prevs)){
-            GpsEntity prev = prevs.getTail();
-            int space = (int) (gps.getTimestamp() - prev.getTimestamp());
-            if(space > OFFLINE_TIME)
-                gps.setSignalState("reconnection");
-
-            if(space > CLEAR_TIME){
-                //清理缓存的信号
-                GeoCacheData.clear(gps.getNbbm());
-            }
-        }
-        return true;
-    }
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import org.springframework.stereotype.Component;
+
+/**
+ * 信号断线重连处理
+ * Created by panzhao on 2016/12/27.
+ */
+@Component
+public class OfflineSignalHandle extends SignalHandle{
+
+    //断开2分钟，标记为重连信号
+    private final static int OFFLINE_TIME = 1000 * 60 * 2;
+
+    //断开70分钟，之前的信号不再有参考价值
+    private final static int CLEAR_TIME = 1000 * 60 * 70;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //漂移信号不管
+        if(isDriftSignal(gps)){
+            gps.setSignalState("drift");
+            return true;
+        }
+
+        if(isNotEmpty(prevs)){
+            GpsEntity prev = prevs.getTail();
+            int space = (int) (gps.getTimestamp() - prev.getTimestamp());
+            if(space > OFFLINE_TIME)
+                gps.setSignalState("reconnection");
+
+            if(space > CLEAR_TIME){
+                //清理缓存的信号
+                GeoCacheData.clear(gps.getNbbm());
+            }
+        }
+        return true;
+    }
 }
 \ No newline at end of file
-package com.bsth.data.gpsdata.arrival.handlers;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.SignalHandle;
-import com.bsth.data.gpsdata.arrival.entity.RouteReverse;
-import com.bsth.data.gpsdata.arrival.entity.StationRoute;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
-import com.bsth.data.schedule.DayOfSchedule;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 路由反向信号处理
- * Created by panzhao on 2016/12/28.
- */
-@Component
-public class ReverseSignalHandle extends SignalHandle {
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Autowired
-    ScheduleSignalState scheduleSignalState;
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        if (!isNotEmpty(prevs))
-            return false;
-
-        GpsEntity prev = prevs.getTail();
-
-        if (isReverse(gps, prev)) {
-            RouteReverse reverse = reverseSearch(prevs, gps);
-
-            if (reverse.getCount() >= 4
-                    && reverse.isClose()
-                    && !GeoCacheData.isEndStation(gps.getLineId(), gps.getUpDown(), reverse.getTurned())) {
-                scheduleSignalState.reverseAnalyse(reverse);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 搜索路由反向详细
-     *
-     * @param prevs
-     * @param gps
-     * @return
-     */
-    public RouteReverse reverseSearch(CircleQueue<GpsEntity> prevs, GpsEntity gps) {
-        RouteReverse routeReverse = new RouteReverse();
-        int count = 0;
-        String path = "";
-        long zt = 0L;
-        boolean half = false;
-
-        //当前站点
-        StationRoute curr = GeoCacheData.getRouteCode(gps), sr;
-        GpsEntity prev;
-        Object[] array = prevs.getQueue();
-        for (int i = array.length - 1; i > 0; i--) {
-            prev = (GpsEntity) array[i];
-
-            if (!prev.getUpDown().equals(gps.getUpDown())
-                    || prev.getSignalState().equals("reconnection"))
-                break;
-
-            if (prev.getInstation() == 1) {
-                sr = GeoCacheData.getRouteCode(prev);
-
-                if (sr.getRouteSort() > curr.getRouteSort()) {
-                    if(half){
-                        routeReverse.setVague(true);
-                    }
-
-                    path += (curr.getCode() + ",");
-                    count++;
-                    zt = prev.getTimestamp();
-                } else if (sr.getRouteSort() < curr.getRouteSort()) {
-                    if (routeReverse.getTurned() == null) {
-                        routeReverse.setTurned(curr.getCode());
-                        half = true;
-                    }
-
-                    path += (curr.getCode() + ",");
-                    //掉头前当前站
-                    if (sr.getCode().equals(gps.getStopNo())) {
-                        routeReverse.setClose(true);
-                        path += sr.getCode();
-                        break;
-                    }
-                }
-
-                curr = sr;
-            }
-        }
-
-        routeReverse.setZt(zt);
-        routeReverse.setCount(count);
-        routeReverse.setDetail(path);
-        routeReverse.setCt(gps.getTimestamp());
-        routeReverse.setNbbm(gps.getNbbm());
-        return routeReverse;
-    }
-
-    /**
-     * 是否反向
-     *
-     * @param gps
-     * @param prev
-     * @return
-     */
-    public boolean isReverse(GpsEntity gps, GpsEntity prev) {
-        if (gps.getInstation() == 1
-                &&
-                gps.getUpDown().equals(prev.getUpDown())
-                && !gps.getStopNo().equals(prev.getStopNo())) {
-
-            StationRoute currStation = GeoCacheData.getRouteCode(gps);
-            StationRoute prevStation = GeoCacheData.getRouteCode(prev);
-
-            if (currStation == null || prevStation == null)
-                return false;
-
-            if (currStation.getRouteSort() < prevStation.getRouteSort())
-                return true;
-        }
-        return false;
-    }
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.entity.RouteReverse;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
+import com.bsth.data.schedule.DayOfSchedule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 路由反向信号处理
+ * Created by panzhao on 2016/12/28.
+ */
+@Component
+public class ReverseSignalHandle extends SignalHandle {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    ScheduleSignalState scheduleSignalState;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        if (!isNotEmpty(prevs))
+            return false;
+
+        GpsEntity prev = prevs.getTail();
+
+        if (isReverse(gps, prev)) {
+            RouteReverse reverse = reverseSearch(prevs, gps);
+
+            if (reverse.getCount() >= 4
+                    && reverse.isClose()
+                    && !GeoCacheData.isEndStation(gps.getLineId(), gps.getUpDown(), reverse.getTurned())) {
+                scheduleSignalState.reverseAnalyse(reverse);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 搜索路由反向详细
+     *
+     * @param prevs
+     * @param gps
+     * @return
+     */
+    public RouteReverse reverseSearch(CircleQueue<GpsEntity> prevs, GpsEntity gps) {
+        RouteReverse routeReverse = new RouteReverse();
+        int count = 0;
+        String path = "";
+        long zt = 0L;
+        boolean half = false;
+
+        //当前站点
+        StationRoute curr = GeoCacheData.getRouteCode(gps), sr;
+        GpsEntity prev;
+        Object[] array = prevs.getQueue();
+        for (int i = array.length - 1; i > 0; i--) {
+            prev = (GpsEntity) array[i];
+
+            if (!prev.getUpDown().equals(gps.getUpDown())
+                    || prev.getSignalState().equals("reconnection"))
+                break;
+
+            if (prev.getInstation() == 1) {
+                sr = GeoCacheData.getRouteCode(prev);
+
+                if (sr.getRouteSort() > curr.getRouteSort()) {
+                    if(half){
+                        routeReverse.setVague(true);
+                    }
+
+                    path += (curr.getCode() + ",");
+                    count++;
+                    zt = prev.getTimestamp();
+                } else if (sr.getRouteSort() < curr.getRouteSort()) {
+                    if (routeReverse.getTurned() == null) {
+                        routeReverse.setTurned(curr.getCode());
+                        half = true;
+                    }
+
+                    path += (curr.getCode() + ",");
+                    //掉头前当前站
+                    if (sr.getCode().equals(gps.getStopNo())) {
+                        routeReverse.setClose(true);
+                        path += sr.getCode();
+                        break;
+                    }
+                }
+
+                curr = sr;
+            }
+        }
+
+        routeReverse.setZt(zt);
+        routeReverse.setCount(count);
+        routeReverse.setDetail(path);
+        routeReverse.setCt(gps.getTimestamp());
+        routeReverse.setNbbm(gps.getNbbm());
+        return routeReverse;
+    }
+
+    /**
+     * 是否反向
+     *
+     * @param gps
+     * @param prev
+     * @return
+     */
+    public boolean isReverse(GpsEntity gps, GpsEntity prev) {
+        if (gps.getInstation() == 1
+                &&
+                gps.getUpDown().equals(prev.getUpDown())
+                && !gps.getStopNo().equals(prev.getStopNo())) {
+
+            StationRoute currStation = GeoCacheData.getRouteCode(gps);
+            StationRoute prevStation = GeoCacheData.getRouteCode(prev);
+
+            if (currStation == null || prevStation == null)
+                return false;
+
+            if (currStation.getRouteSort() < prevStation.getRouteSort())
+                return true;
+        }
+        return false;
+    }
 }
 \ No newline at end of file
@@ -249,4 +249,4 @@ public class ScheduleSignalState {
         SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
         signalStateData.put(signalState);
     }
 -}
+}
 \ No newline at end of file
-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.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 班次匹配器
- * Created by panzhao on 2016/12/31.
- */
-@Component
-public class SignalSchPlanMatcher {
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    /**
-     * 发车信号匹配
-     * @param outSigal
-     * @param sch
-     * @return
-     */
-    public void outMatch(GpsEntity outSigal, ScheduleRealInfo sch){
-        long t = outSigal.getTimestamp();
-        if(t < sch.getDfsjT())
-            return;
-
-        //下一个相同走向的班次
-        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){
-            dayOfSchedule.addExecPlan(next);
-            outMatch(outSigal, next);
-        }
-    }
-}
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 班次匹配器
+ * Created by panzhao on 2016/12/31.
+ */
+@Component
+public class SignalSchPlanMatcher {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    /**
+     * 发车信号匹配
+     * @param outSigal
+     * @param sch
+     * @return
+     */
+    public void outMatch(GpsEntity outSigal, ScheduleRealInfo sch){
+        long t = outSigal.getTimestamp();
+        if(t < sch.getDfsjT())
+            return;
+
+        //下一个相同走向的班次
+        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){
+            dayOfSchedule.addExecPlan(next);
+            outMatch(outSigal, next);
+        }
+    }
+}
-package com.bsth.data.gpsdata.recovery;
-
-import com.bsth.data.BasicData;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.handlers.*;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.util.db.DBUtils_MS;
-import com.google.common.collect.ArrayListMultimap;
-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.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Component;
-
-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;
-
-/**
- * gps数据恢复
- * Created by panzhao on 2016/12/24.
- */
-@Component
-public class GpsDataRecovery implements ApplicationContextAware {
-
-    static Logger logger = LoggerFactory.getLogger(GpsDataRecovery.class);
-
-    public static boolean run;
-
-    static ExecutorService threadPool = Executors.newFixedThreadPool(10);
-
-    static OfflineSignalHandle offlineSignalHandle;
-    static CorrectSignalHandle correctSignalHandle;
-    static StationInsideHandle stationInsideHandle;
-    static InOutStationSignalHandle inOutStationSignalHandle;
-    static ReverseSignalHandle reverseSignalHandle;
-
-    public 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);
-        }
-
-
-        Set<String> keys = listMap.keySet();
-
-        CountDownLatch count = new CountDownLatch(keys.size());
-        GpsComp comp = new GpsComp();
-        for (String nbbm : keys) {
-            Collections.sort(listMap.get(nbbm), comp);
-            threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("YT-CD008"))
-                new RecoveryThread(listMap.get(nbbm), count).run();*/
-        }
-
-        try {
-            count.await();
-            run = false;
-            logger.info("数据恢复完成....");
-        } catch (InterruptedException e) {
-            logger.error("", e);
-        }
-    }
-
-    /**
-     * 加载当天的gps数据
-     *
-     * @return
-     */
-    public 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);
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        offlineSignalHandle = applicationContext.getBean(OfflineSignalHandle.class);
-        correctSignalHandle = applicationContext.getBean(CorrectSignalHandle.class);
-        stationInsideHandle = applicationContext.getBean(StationInsideHandle.class);
-        inOutStationSignalHandle = applicationContext.getBean(InOutStationSignalHandle.class);
-        reverseSignalHandle = applicationContext.getBean(ReverseSignalHandle.class);
-    }
-
-    public static class GpsComp implements Comparator<GpsEntity> {
-
-        @Override
-        public int compare(GpsEntity g1, GpsEntity g2) {
-            return g1.getTimestamp().compareTo(g2.getTimestamp());
-        }
-    }
-
-    public static class RecoveryThread implements Runnable {
-        List<GpsEntity> list;
-        CountDownLatch count;
-
-        RecoveryThread(List<GpsEntity> list, CountDownLatch count) {
-            this.list = list;
-            this.count = count;
-        }
-
-        @Override
-        public void run() {
-            try {
-                //循环gps恢复数据
-                CircleQueue<GpsEntity> prevs;
-
-                for (GpsEntity gps : list) {
-
-                    prevs = GeoCacheData.getGps(gps.getNbbm());
-                    //掉线处理
-                    offlineSignalHandle.handle(gps, prevs);
-                    //状态处理
-                    if (!correctSignalHandle.handle(gps, prevs))
-                        continue;
-                    //场，站内外判断
-                    stationInsideHandle.handle(gps, prevs);
-                    //反向处理
-                    reverseSignalHandle.handle(gps, prevs);
-                    //进出站动作处理
-                    inOutStationSignalHandle.handle(gps, prevs);
-                    GeoCacheData.putGps(gps);
-
-                    //Thread.sleep(50);
-                }
-            } catch (Exception e) {
-                logger.error("", e);
-            } finally {
-                count.countDown();
-            }
-        }
-    }
+package com.bsth.data.gpsdata.recovery;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.handlers.*;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.util.db.DBUtils_MS;
+import com.google.common.collect.ArrayListMultimap;
+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.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Component;
+
+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;
+
+/**
+ * gps数据恢复
+ * Created by panzhao on 2016/12/24.
+ */
+@Component
+public class GpsDataRecovery implements ApplicationContextAware {
+
+    static Logger logger = LoggerFactory.getLogger(GpsDataRecovery.class);
+
+    public static boolean run;
+
+    static ExecutorService threadPool = Executors.newFixedThreadPool(10);
+
+    static OfflineSignalHandle offlineSignalHandle;
+    static CorrectSignalHandle correctSignalHandle;
+    static StationInsideHandle stationInsideHandle;
+    static InOutStationSignalHandle inOutStationSignalHandle;
+    static ReverseSignalHandle reverseSignalHandle;
+
+    public 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);
+        }
+
+
+        Set<String> keys = listMap.keySet();
+
+        CountDownLatch count = new CountDownLatch(keys.size());
+        GpsComp comp = new GpsComp();
+        for (String nbbm : keys) {
+            Collections.sort(listMap.get(nbbm), comp);
+            threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
+            /*if(nbbm.equals("YT-CD008"))
+                new RecoveryThread(listMap.get(nbbm), count).run();*/
+        }
+
+        try {
+            count.await();
+            run = false;
+            logger.info("数据恢复完成....");
+        } catch (InterruptedException e) {
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 加载当天的gps数据
+     *
+     * @return
+     */
+    public 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);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        offlineSignalHandle = applicationContext.getBean(OfflineSignalHandle.class);
+        correctSignalHandle = applicationContext.getBean(CorrectSignalHandle.class);
+        stationInsideHandle = applicationContext.getBean(StationInsideHandle.class);
+        inOutStationSignalHandle = applicationContext.getBean(InOutStationSignalHandle.class);
+        reverseSignalHandle = applicationContext.getBean(ReverseSignalHandle.class);
+    }
+
+    public static class GpsComp implements Comparator<GpsEntity> {
+
+        @Override
+        public int compare(GpsEntity g1, GpsEntity g2) {
+            return g1.getTimestamp().compareTo(g2.getTimestamp());
+        }
+    }
+
+    public static class RecoveryThread implements Runnable {
+        List<GpsEntity> list;
+        CountDownLatch count;
+
+        RecoveryThread(List<GpsEntity> list, CountDownLatch count) {
+            this.list = list;
+            this.count = count;
+        }
+
+        @Override
+        public void run() {
+            try {
+                //循环gps恢复数据
+                CircleQueue<GpsEntity> prevs;
+
+                for (GpsEntity gps : list) {
+
+                    prevs = GeoCacheData.getGps(gps.getNbbm());
+                    //掉线处理
+                    offlineSignalHandle.handle(gps, prevs);
+                    //状态处理
+                    if (!correctSignalHandle.handle(gps, prevs))
+                        continue;
+                    //场，站内外判断
+                    stationInsideHandle.handle(gps, prevs);
+                    //反向处理
+                    reverseSignalHandle.handle(gps, prevs);
+                    //进出站动作处理
+                    inOutStationSignalHandle.handle(gps, prevs);
+                    GeoCacheData.putGps(gps);
+
+                    //Thread.sleep(50);
+                }
+            } catch (Exception e) {
+                logger.error("", e);
+            } finally {
+                count.countDown();
+            }
+        }
+    }
 }
 \ No newline at end of file
@@ -32,7 +32,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//把sum(addMileage) 替换为0   数据表去掉了 add_mileage 字段
 	@Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,"
-			+ " 0 as ksgl,count(jName) as bcs) from ScheduleRealInfo s where"
+			+ "0 as ksgl,count(jName) as bcs) from ScheduleRealInfo s where"
 			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
@@ -71,7 +71,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and sflj != 0")
 	int findLjbc(String jName,String clZbh,String lpName);
-	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id like %?1% and c.inside_code like %?3%",nativeQuery=true)
+	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T') FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code = ?3",nativeQuery=true)
 	List<Object[]> account(String line,String date,String code);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') "
@@ -125,4 +125,4 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select new map(xlBm as xlBm) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm ORDER BY xlBm")
 	List<Map<String,Object>> setDDRBGroup(String date);
-}
 \ No newline at end of file
+}
@@ -616,8 +616,8 @@ public class FormsServiceImpl implements FormsService {
 				tu.setRq(rq);
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
-				//tu.setXl(arg0.getString("xlgs"));这个是根据公司判断线路有几条
-				tu.setXl(arg0.getString("sxl"));
+				tu.setXl(arg0.getString("xlgs"));//这个是根据公司判断线路有几条
+				//tu.setXl(arg0.getString("sxl"));
 				tu.setXlmc(arg0.getString("sxl"));
 				tu.setCchjh(arg0.getString("jcl").toString());
 				tu.setCchsj(arg0.getString("scl").toString());
@@ -7,13 +7,13 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password=
-#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+#spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
-#spring.datasource.password= root
+#spring.datasource.password= 123456
+spring.datasource.url= jdbc:mysql://localhost/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= root
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.168.117:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.password= root
 \ No newline at end of file
-<div class="uk-modal ct-form-modal" id="signal_state_config-modal">
-    <div class="uk-modal-dialog" style="width: 530px;">
-        <a href="" class="uk-modal-close uk-close"></a>
-        <div class="uk-modal-header">
-            <h2>信号标记设置</h2></div>
-
-        <p style="border-bottom: 1px solid #efefef;color: grey;padding-bottom: 9px;">
-            <small>
-                <i class="uk-icon-question-circle"> </i>
-                设置项将会保存在本地客户端，清理缓存和更换电脑会重置.</small>
-        </p>
-        <form class="uk-form uk-form-horizontal">
-            <div class="uk-grid">
-                <div class="uk-width-2-3 uk-container-center">
-                    <div class="uk-form-row">
-                        <label class="uk-form-label">是否启用</label>
-                        <div class="uk-form-controls">
-                            <select name="enable">
-                                <option value="1">启用</option>
-                                <option value="0">禁用</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
-                <button type="button" class="uk-button uk-modal-close">取消</button>
-                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
-            </div>
-        </form>
-    </div>
-
-    <script>
-        (function() {
-            var modal = '#signal_state_config-modal';
-            var f = $('form', modal);
-
-            $(modal).on('init', function(e, data) {
-                var val = gb_signal_state.isEnable()?1:0;
-                $('[name=enable]', f).val(val);
-            });
-
-            f.formValidation(gb_form_validation_opts);
-            f.on('success.form.fv', function(e) {
-                e.preventDefault();
-                var data = $(this).serializeJSON();
-
-                if(data.enable=='1')
-                    gb_signal_state.enable();
-                else
-                    gb_signal_state.disable();
-
-                UIkit.modal(modal).hide();
-            });
-
-        })();
-    </script>
+<div class="uk-modal ct-form-modal" id="signal_state_config-modal">
+    <div class="uk-modal-dialog" style="width: 530px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>信号标记设置</h2></div>
+
+        <p style="border-bottom: 1px solid #efefef;color: grey;padding-bottom: 9px;">
+            <small>
+                <i class="uk-icon-question-circle"> </i>
+                设置项将会保存在本地客户端，清理缓存和更换电脑会重置.</small>
+        </p>
+        <form class="uk-form uk-form-horizontal">
+            <div class="uk-grid">
+                <div class="uk-width-2-3 uk-container-center">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">是否启用</label>
+                        <div class="uk-form-controls">
+                            <select name="enable">
+                                <option value="1">启用</option>
+                                <option value="0">禁用</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+                <button type="button" class="uk-button uk-modal-close">取消</button>
+                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+            </div>
+        </form>
+    </div>
+
+    <script>
+        (function() {
+            var modal = '#signal_state_config-modal';
+            var f = $('form', modal);
+
+            $(modal).on('init', function(e, data) {
+                var val = gb_signal_state.isEnable()?1:0;
+                $('[name=enable]', f).val(val);
+            });
+
+            f.formValidation(gb_form_validation_opts);
+            f.on('success.form.fv', function(e) {
+                e.preventDefault();
+                var data = $(this).serializeJSON();
+
+                if(data.enable=='1')
+                    gb_signal_state.enable();
+                else
+                    gb_signal_state.disable();
+
+                UIkit.modal(modal).hide();
+            });
+
+        })();
+    </script>
 </div>
 \ No newline at end of file
-/**
- * GPS信号状态
- * @type {{}}
- */
-var gb_signal_state = (function () {
-    var storage = window.localStorage;
-
-    $(document).on('click', 'i.signal_state_icon', function (e) {
-        e.stopPropagation();
-    });
-
-    var signal_state_data = {};
-    var enable = true;
-    //读取本地状态
-    var locStatus = storage.getItem("signal_state_enable");
-    if (locStatus && locStatus=='0')
-        enable = false;
-
-    var init = function () {
-        $.get('/signalState/multi', {idx: gb_data_basic.line_idx}, function (rs) {
-            //按班次ID分组
-            signal_state_data = gb_common.groupBy(rs, 'schId');
-
-            for (var schId in signal_state_data) {
-                multi_render(signal_state_data[schId]);
-            }
-        });
-    };
-
-    var multi_render = function (list) {
-        if (!enable)
-            return;
-
-        if (!list || list.length == 0)
-            return;
-        var line = list[0].lineCode
-            , schId = list[0].schId;
-
-        var sch = gb_schedule_table.findScheduleByLine(line)[schId];
-        var dl = gb_schedule_table.getDl(sch);
-        var icon = 'question-circle';
-        var t = '';
-        $.each(list, function () {
-            t += (this.text + '<br>');
-        });
-
-        if (list.length == 1 && list[0].type == 'route_reverse')
-            icon = 'reply';
-
-        var dd = $('dd.fcsjActualCell', dl);
-        var se = $('i.signal_state_icon', dd);
-        if (se && se.length > 0)
-            se.remove();
-
-        dd.append('<i data-uk-tooltip title="' + t + '" class="uk-icon-' + icon + ' signal_state_icon"></i>');
-    };
-
-    var put = function (obj) {
-        if (!signal_state_data[obj.schId]) {
-            signal_state_data[obj.schId] = [];
-        }
-
-        signal_state_data[obj.schId].push(obj);
-        multi_render(signal_state_data[obj.schId]);
-    };
-
-    var marker_sch = function (sch) {
-        var list = signal_state_data[sch.id];
-        if (list) {
-            multi_render(list);
-        }
-    };
-
-    var clearAll = function () {
-        $('.signal_state_icon').remove();
-    };
-
-    return {
-        init: init,
-        put: put,
-        marker_sch: marker_sch,
-        isEnable: function () {
-            return enable;
-        },
-        disable: function () {
-            enable = false;
-            storage.setItem("signal_state_enable", 0);
-
-            clearAll();
-        },
-        enable: function () {
-            enable = true;
-            storage.setItem("signal_state_enable", 1);
-            for (var schId in signal_state_data) {
-                multi_render(signal_state_data[schId]);
-            }
-        }
-    };
+/**
+ * GPS信号状态
+ * @type {{}}
+ */
+var gb_signal_state = (function () {
+    var storage = window.localStorage;
+
+    $(document).on('click', 'i.signal_state_icon', function (e) {
+        e.stopPropagation();
+    });
+
+    var signal_state_data = {};
+    var enable = true;
+    //读取本地状态
+    var locStatus = storage.getItem("signal_state_enable");
+    if (locStatus && locStatus=='0')
+        enable = false;
+
+    var init = function () {
+        $.get('/signalState/multi', {idx: gb_data_basic.line_idx}, function (rs) {
+            //按班次ID分组
+            signal_state_data = gb_common.groupBy(rs, 'schId');
+
+            for (var schId in signal_state_data) {
+                multi_render(signal_state_data[schId]);
+            }
+        });
+    };
+
+    var multi_render = function (list) {
+        if (!enable)
+            return;
+
+        if (!list || list.length == 0)
+            return;
+        var line = list[0].lineCode
+            , schId = list[0].schId;
+
+        var sch = gb_schedule_table.findScheduleByLine(line)[schId];
+        var dl = gb_schedule_table.getDl(sch);
+        var icon = 'question-circle';
+        var t = '';
+        $.each(list, function () {
+            t += (this.text + '<br>');
+        });
+
+        if (list.length == 1 && list[0].type == 'route_reverse')
+            icon = 'reply';
+
+        var dd = $('dd.fcsjActualCell', dl);
+        var se = $('i.signal_state_icon', dd);
+        if (se && se.length > 0)
+            se.remove();
+
+        dd.append('<i data-uk-tooltip title="' + t + '" class="uk-icon-' + icon + ' signal_state_icon"></i>');
+    };
+
+    var put = function (obj) {
+        if (!signal_state_data[obj.schId]) {
+            signal_state_data[obj.schId] = [];
+        }
+
+        signal_state_data[obj.schId].push(obj);
+        multi_render(signal_state_data[obj.schId]);
+    };
+
+    var marker_sch = function (sch) {
+        var list = signal_state_data[sch.id];
+        if (list) {
+            multi_render(list);
+        }
+    };
+
+    var clearAll = function () {
+        $('.signal_state_icon').remove();
+    };
+
+    return {
+        init: init,
+        put: put,
+        marker_sch: marker_sch,
+        isEnable: function () {
+            return enable;
+        },
+        disable: function () {
+            enable = false;
+            storage.setItem("signal_state_enable", 0);
+
+            clearAll();
+        },
+        enable: function () {
+            enable = true;
+            storage.setItem("signal_state_enable", 1);
+            for (var schId in signal_state_data) {
+                multi_render(signal_state_data[schId]);
+            }
+        }
+    };
 })();
 \ No newline at end of file