Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents 41e4b946 93a8257b
Showing 52 changed files with 1637 additions and 2734 deletions
pom.xml
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/DeviceGpsController.java
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/controller/calc/CalcWaybillController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/controller/realcontrol/SignalStateController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/LineVersionsData.java
src/main/java/com/bsth/data/ThreadMonotor.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.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/ArrivalInfo.java
@@ -250,15 +250,6 @@
 			<version>1.7.4</version>
 		</dependency>
-
-		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> 
-			<optional>true</optional> </dependency> -->
-		<dependency>
-			<groupId>com.vividsolutions</groupId>
-			<artifactId>jts</artifactId>
-			<version>1.13</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.dbunit</groupId>
 			<artifactId>dbunit</artifactId>
@@ -5,10 +5,10 @@ import com.bsth.data.ThreadMonotor;
 import com.bsth.data.car_out_info.UpdateDBThread;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.forecast.SampleTimeDataLoader;
-import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
-import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
+import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.auto_exec.AutoExecScanThread;
 import com.bsth.data.schedule.edit_logs.SeiPstThread;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
@@ -42,10 +42,6 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     UpdateDBThread fcxxUpdateThread;
     @Autowired
-    GpsDataLoaderThread gpsDataLoader;
-    @Autowired
-    OfflineMonitorThread offlineMonitorThread;
-    @Autowired
     ScheduleRefreshThread scheduleRefreshThread;
     @Autowired
     SchedulePstThread schedulePstThread;
@@ -68,6 +64,9 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     AutoExecScanThread autoExecScanThread;
+    @Autowired
+    GpsDataLoaderThread gpsDataLoader;
+
     private static long timeDiff;
     private static long timeDiffTraffic;
@@ -103,15 +102,15 @@ public class XDApplication implements CommandLineRunner {
         }
     }
-    //@Autowired
-    //DayOfSchedule dayOfSchedule;
+    @Autowired
+    DayOfSchedule dayOfSchedule;
     public void devInit(){
         log.info("devInit...");
         ScheduledExecutorService sexec = Application.mainServices;
         //抓取GPS数据
         gpsDataLoader.setFlag(-1);
         //dayOfSchedule.dataRecovery();
-        //sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(gpsDataLoader, 60, 4, TimeUnit.SECONDS);
         //实际排班更新线程
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //sexec.scheduleWithFixedDelay(autoExecScanThread, 100, 50, TimeUnit.SECONDS);//班次自动执行
@@ -135,7 +134,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(scheduleLateThread, 70, 30, TimeUnit.SECONDS);//检查班次误点
         sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
-        sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
+        //sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
         sexec.scheduleWithFixedDelay(schedulePstThread, 120, 10, TimeUnit.SECONDS);//班次延迟入库线程
         sexec.scheduleWithFixedDelay(seiPstThread, 160, 60, TimeUnit.SECONDS);//班次修正日志入库
         sexec.scheduleWithFixedDelay(directivesPstThread, 180, 120, TimeUnit.SECONDS);//调度指令延迟入库
 package com.bsth.controller;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata_v2.GpsRealData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -77,28 +77,7 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 	@RequestMapping(value = "add", method = RequestMethod.POST)
 	public Map<String, Object> add(@RequestParam Map<String, Object> map) {
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		
-		LineVersions lineVersions = new LineVersions();
-		try {
-			Date startDate = simpleDateFormat.parse(map.get("startDate").toString());
-			Date endDate = simpleDateFormat.parse(map.get("endDate").toString());
-			Line line = lineRepository.findOne(Integer.valueOf(map.get("lineId").toString())); 
-			lineVersions.setName(map.get("name").toString());
-			lineVersions.setLine(line);
-			lineVersions.setLineCode(map.get("lineCode").toString());
-			lineVersions.setStartDate(new java.sql.Date(startDate.getTime()));
-			lineVersions.setEndDate(new java.sql.Date(endDate.getTime()));
-			lineVersions.setVersions(Integer.valueOf(map.get("versions").toString()));
-			lineVersions.setStatus(Integer.valueOf(map.get("status").toString()));
-			lineVersions.setRemark(map.get("remark").toString());
-			
-			
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return service.save(lineVersions);
+		return service.add(map);
 	}
 }
+package com.bsth.controller.calc;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.BaseController;
+import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.service.calc.CalcWaybillService;
+
+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;
+
+/**
+ * Created by 17/10/23.
+ */
+@RestController
+@RequestMapping("calcWaybill")
+public class CalcWaybillController extends BaseController<CalcWaybill, Integer> {
+	
+	@Autowired
+	private CalcWaybillService calcWaybillService;
+	
+	@RequestMapping(value="/generateNew")
+	public Map<String, Object> generateNews(@RequestParam Map<String, Object> map) throws Exception{
+		String date = "", line = "";
+		if(map.get("date")!=null){
+			date=map.get("date").toString().trim();
+		}
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		
+		Map<String, Object> m = new HashMap<String, Object>();
+		try {
+			
+			m = calcWaybillService.generateNew(date, line);
+			
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+			m.put("status", ResponseCode.ERROR);
+			return m;
+		}
+		
+		return m;
+	}
+	
+	@RequestMapping(value="/statisticsDailyTj")
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString().trim();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString().trim();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString().trim();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString().trim();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString().trim();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+		return calcWaybillService.statisticsDailyTj(gsdm,fgsdm,line,date,date2,xlName,type);
+	}
+	
+}
 package com.bsth.controller.gps;
 import com.bsth.data.BasicData;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.GpsRealData;
-import com.bsth.entity.excep.Speeding;
+import com.bsth.data.gpsdata_v2.GpsRealData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.service.gps.GpsService;
 import com.bsth.service.gps.entity.GpsSpeed;
-import com.bsth.util.PageObject;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
-
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 package com.bsth.controller.realcontrol;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
 import com.bsth.service.realcontrol.RealMapService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -77,9 +74,4 @@ public class RealMapController {
     public Map<String, Object> multiSectionRoute(@RequestParam String codeIdx){
         return realMapService.multiSectionRoute(codeIdx);
     }
-
-    @RequestMapping(value = "/lockAndFlxedTimeEnabled", method = RequestMethod.POST)
-    public void lockAndFlxedTimeEnabled(TimedEnableStationRoute tes){
-        GeoCacheData.tesMap.put(tes.getLineCode(), tes);
-    }
 }
 package com.bsth.controller.realcontrol;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.directive.DirectiveCreator;
 import com.bsth.data.directive.GatewayHttpUtils;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata_v2.GpsRealData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -50,33 +49,35 @@ public class ServiceDataInterface {
      * @return
      */
     @RequestMapping("/execSchList")
-    public List<JSONObject> execSchList(@RequestParam String secretKey){
+    public List<Map<String, Object>> execSchList(@RequestParam String secretKey){
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
-        List<JSONObject> rs = new ArrayList<>();
+        List<Map<String, Object>> rs = new ArrayList<>();
         Collection<ScheduleRealInfo> list = dayOfSchedule.execPlanMap().values();
-        JSONObject obj;
+        Map<String, Object> map;
         for(ScheduleRealInfo sch : list){
-            obj = new JSONObject();
-            obj.put("clZbh", sch.getClZbh());
-            obj.put("jGh", sch.getjGh());
-            obj.put("sGh", sch.getsGh());
-            obj.put("lpName", sch.getLpName());
-            obj.put("xlBm", sch.getXlBm());
-            obj.put("xlName", sch.getXlName());
-            obj.put("xlDir", sch.getXlDir());
-            obj.put("qdzName", sch.getQdzName());
-            obj.put("zdzName", sch.getZdzName());
-            obj.put("fcsj", sch.getFcsj());
-            obj.put("dfsj", sch.getDfsj());
-            obj.put("zdsj", sch.getZdsj());
-            obj.put("bcType", sch.getBcType());
-            obj.put("remarks", sch.getRemark());
-            obj.put("status", sch.getStatus());
-
-            rs.add(obj);
+            if(null == sch)
+                continue;
+            map = new HashMap<>();
+            map.put("clZbh", sch.getClZbh());
+            map.put("jGh", sch.getjGh());
+            map.put("sGh", sch.getsGh());
+            map.put("lpName", sch.getLpName());
+            map.put("xlBm", sch.getXlBm());
+            map.put("xlName", sch.getXlName());
+            map.put("xlDir", sch.getXlDir());
+            map.put("qdzName", sch.getQdzName());
+            map.put("zdzName", sch.getZdzName());
+            map.put("fcsj", sch.getFcsj());
+            map.put("dfsj", sch.getDfsj());
+            map.put("zdsj", sch.getZdsj());
+            map.put("bcType", sch.getBcType());
+            map.put("remarks", sch.getRemark());
+            map.put("status", sch.getStatus());
+
+            rs.add(map);
         }
         return rs;
     }
-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.controller.realcontrol;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
-import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
@@ -59,11 +58,6 @@ public class anomalyCheckController {
         }
     }
-    @RequestMapping(value = "/shutdownThreadPool")
-    public void shutdownThreadPool(){
-        GpsRealAnalyse.shutdown();
-    }
-
     @RequestMapping(value = "/directivePushQueue")
     public void directivePushQueue(){
         DirectivePushQueue.start();
 package com.bsth.data;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.pinyin.PersionPinYinBuffer;
 import com.bsth.entity.*;
 import com.bsth.entity.schedule.CarConfigInfo;
@@ -2,7 +2,6 @@ package com.bsth.data;
 import com.bsth.Application;
 import com.bsth.entity.Line;
-import com.bsth.entity.realcontrol.D80ReplyTemp;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.LineService;
@@ -135,31 +134,15 @@ public class LineConfigData implements CommandLineRunner {
         conf.setLine(line);
         //开始运营时间
         conf.setStartOpt("02:00");
-        //托管状态
-        conf.setTrust(true);
         //出场时间类型
         conf.setOutConfig(0);
-        //进场时间类型
-        //conf.setInConfig(1);
-        //短语模板
-        conf.setPhraseTemps("");
         //调度指令模板
         conf.setSchDirectiveTemp("");
-        //80指令回复  闵行用
-        D80ReplyTemp t50 = new D80ReplyTemp(conf, (short) 0x50, "同意，回电详谈", "不同意，请回电"), t60 = new D80ReplyTemp(conf, (short) 0x60, "同意，回电详谈", "不同意，请回电"), tA2 = new D80ReplyTemp(conf, (short) 0xA2, "同意，回电详谈", "不同意，请回电"), t70 = new D80ReplyTemp(conf, (short) 0x70, "同意，回电详谈", "不同意，请回电"), t11 = new D80ReplyTemp(conf, (short) 0x11, "同意，回电详谈", "不同意，请回电");
-
         //应急停靠默认值
         conf.setYjtkStart("00:00");
         conf.setYjtkEnd("23:59");
-        Set<D80ReplyTemp> temps = conf.getD80Temps();
-        temps.add(t50);
-        temps.add(t60);
-        temps.add(tA2);
-        temps.add(t70);
-        temps.add(t11);
-
         set(conf);
     }
 }
@@ -21,7 +21,7 @@ import com.bsth.service.StationRouteService;
  */
 @Component
 @Order(20)
-public class LineVersionsData implements CommandLineRunner {
+public class LineVersionsData extends Thread {
     static Logger logger = LoggerFactory.getLogger(LineVersionsData.class);
@@ -33,9 +33,7 @@ public class LineVersionsData implements CommandLineRunner {
     StationRouteService stationRouteService;
     @Override
-    public void run(String... arg0) throws Exception {
-    	
-    	
+    public void run() {
     	try {
     		List<LineVersions> list = lineVersionsService.lineUpdate();
     		for (LineVersions lineVersions : list) {
@@ -44,10 +42,11 @@ public class LineVersionsData implements CommandLineRunner {
     			Map<String, Object> map = new HashMap<>();
     			map.put("lineId", lineId);
     			stationRouteService.usingSingle(map);
+    			logger.info("线路版本更新成功！");
     		}
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
+			logger.error("线路版本更新出现异常!", e);
 		}
     }
 }
 package com.bsth.data;
-import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
-import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
-import com.bsth.data.msg_queue.DirectivePushQueue;
-import com.bsth.data.msg_queue.WebSocketPushQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -20,26 +16,26 @@ public class ThreadMonotor extends Thread{
     public void run() {
         //线调GPS分析主线程
-        if(GpsRealAnalyse.isBlock()){
+        /*if(GpsRealAnalyse.isBlock()){
             log.warn("GpsRealAnalyse isBlock true !!!!");
             GpsRealAnalyse.shutdown();
-        }
+        }*/
-        if(GpsRealAnalyse.isIdle()){
+        /*if(GpsRealAnalyse.isIdle()){
             //切换到备用的网关实时GPS对照数据
             GpsDataLoaderThread.setFlag(-1);
-        }
+        }*/
         //webSocket 消息推送队列
-        if(WebSocketPushQueue.isIdle()){
+        /*if(WebSocketPushQueue.isIdle()){
             log.warn("WebSocketPushQueue isIdle true !!!!");
             WebSocketPushQueue.start();
-        }
+        }*/
         //网关指令推送队列（系统自动发送的）
-        if(DirectivePushQueue.isIdle()){
+        /*if(DirectivePushQueue.isIdle()){
             log.warn("DirectivePushQueue isIdle true !!!!");
             DirectivePushQueue.start();
-        }
+        }*/
     }
 }
 \ No newline at end of file
@@ -152,13 +152,14 @@ public class DayOfDirectives {
 	public void clear(String device){
 		int c60 = 0, c64 = 0;
-		//找到该设备的60数据
+
 		Collection<D60> d60s = d60Map.values();
 		List<D60> rem60List = new ArrayList<>();
 		for(D60 d60 : d60s){
 			if(device.equals(d60.getDeviceId()))
 				rem60List.add(d60);
 		}
+
 		//清除60数据
 		for(D60 d60 : rem60List){
 			if(d60.getReply47() == null)
@@ -166,6 +167,8 @@ public class DayOfDirectives {
 			if(null != d60Map.remove(d60.getMsgId()))
 				c60 ++;
 		}
+
+		rem60List.clear();
 		if(c60 > 0)
 			logger.info("清除60数据 ，" + c60);
@@ -186,6 +189,7 @@ public class DayOfDirectives {
 				c64 ++;
 		}
+		rem64List.clear();
 		if(c64 > 0)
 			logger.info("清除64数据 ，" + c64);
 	}
@@ -4,8 +4,8 @@ import com.bsth.data.forecast.entity.ForecastResult;
 import com.bsth.data.forecast.entity.ForecastResult.ForecastResultItem;
 import com.bsth.data.forecast.entity.SimpleRoute;
 import com.bsth.data.forecast.entity.SimpleRoute.TimeRange;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata_v2.GpsRealData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.ArrayListMultimap;
-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.entity.TimedEnableStationRoute;
-import com.bsth.data.gpsdata.arrival.precondition.entity.PreconditionGeo;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.StationRouteComp;
-import com.google.common.base.Splitter;
-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.BeanPropertyRowMapper;
-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);
-
-    //每辆车缓存最后500条gps
-    private static final int CACHE_SIZE = 500;
-    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
-
-    //线路路段走向
-    private static ArrayListMultimap<String, LineString> sectionCacheMap;
-
-    //路段编码和名称对照
-    private static Map<String, String> sectionCode2Name;
-
-    //线路站点路由
-    private static ArrayListMultimap<String, StationRoute> stationCacheMap;
-    //线路前置进站围栏
-    public static ArrayListMultimap<String, PreconditionGeo> premiseGeoMap;
-
-    //线路_上下行_站点编码 ——> 站点
-    private static Map<String, StationRoute> routeCodeMap;
-
-    //停车场
-    public static Map<String, Polygon> tccMap;
-    //停车场
-    public static Map<String, com.bsth.util.Geo.Polygon> tccMap2;
-
-    //线路限速信息
-    private static Map<String, Double> speedLimitMap;
-
-    //需要定时刷新的站点路由
-    public static Map<String, TimedEnableStationRoute> tesMap = new HashMap<>();
-
-    @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) {
-            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 Map<String, String> sectionCode2NameMap(){
-        return sectionCode2Name;
-    }
-
-    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 Double speedLimit(String lineCode){
-        return speedLimitMap.get(lineCode);
-    }
-
-    public static List<LineString> getLineStringList(GpsEntity gps){
-        return sectionCacheMap.get(gps.getLineId() + "_" + gps.getUpDown());
-    }
-
-    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);
-    }
-
-    GeometryFactory geometryFactory = new GeometryFactory();
-    public void loadData() {
-        loadStationRoutesData();
-        loadTccMapData();
-        loadSpeedLimit();
-
-        //加载路段信息
-        loadRoadsData();
-
-        //加载前置进站围栏
-        loadPremiseGeoData();
-    }
-
-    private void loadPremiseGeoData() {
-        ArrayListMultimap<String, PreconditionGeo> premiseGeoMapCopy = ArrayListMultimap.create();
-
-        String sql = "select * from  bsth_f_geo_premise";
-        List<PreconditionGeo> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(PreconditionGeo.class));
-
-        List<String> coordList;
-        String[] cs;
-        com.bsth.util.Geo.Point point;
-        List<com.bsth.util.Geo.Point> ps;
-        StationRoute sr;
-        for(PreconditionGeo p : list){
-            try{
-                sr = routeCodeMap.get(p.getLineCode()+"_"+p.getUpDown()+"_"+p.getStationCode());
-                p.setOrder(sr.getRouteSort());
-                //polygon
-                ps = new ArrayList<>();
-                coordList = Splitter.on(",").trimResults().splitToList(p.getCoords());
-                for(String c : coordList){
-                    cs = c.split(" ");
-                    point = new com.bsth.util.Geo.Point(Double.parseDouble(cs[0]), Double.parseDouble(cs[1]));
-                    ps.add(point);
-                }
-
-                p.setPolygon(new com.bsth.util.Geo.Polygon(ps));
-
-                sr.setPremise(true);
-                //按线路，走向分组
-                premiseGeoMapCopy.put(p.getLineCode()+"_"+p.getUpDown(), p);
-            }catch (Exception e){
-                logger.error("", e);
-            }
-        }
-
-        //排序
-        Set<String> ks = premiseGeoMapCopy.keySet();
-        PreconditionGeoComp comp = new PreconditionGeoComp();
-        for(String k : ks){
-            Collections.sort(premiseGeoMapCopy.get(k), comp);
-        }
-
-        premiseGeoMap = premiseGeoMapCopy;
-    }
-
-    private static class PreconditionGeoComp implements Comparator<PreconditionGeo>{
-
-        @Override
-        public int compare(PreconditionGeo p1, PreconditionGeo p2) {
-            return p1.getOrder() - p2.getOrder();
-        }
-    }
-
-    private void loadRoadsData() {
-        //加载线路下路段空间数据
-        String sql = "select r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) as GSECTION_VECTOR, r.DIRECTIONS, s.CROSES_ROAD from bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section=s.id where r.destroy=0 and GSECTION_VECTOR is not null order by line_code,directions,sectionroute_code";
-        List<Map<String, Object>> secList = jdbcTemplate.queryForList(sql);
-
-        String polygonStr, key;
-        String[] coords;
-        int i, len;
-        ArrayListMultimap<String, LineString> sectionCacheTempMap = ArrayListMultimap.create();
-        Coordinate[] cds;
-        String[] temps1, temps2;
-        for (Map<String, Object> tMap : secList) {
-            //空间数据映射
-            polygonStr = tMap.get("GSECTION_VECTOR").toString();
-            key = tMap.get("LINE_CODE") + "_" + tMap.get("DIRECTIONS");
-
-            coords = polygonStr.substring(11, polygonStr.length() - 1).split(",");
-            len = coords.length - 1;
-            //每2个点连一条线
-            for(i = 0; i < len; i ++){
-                temps1 = coords[i].split(" ");
-                temps2 = coords[i + 1].split(" ");
-
-                cds = new Coordinate[2];
-                cds[0] = new Coordinate(Float.parseFloat(temps1[1]), Float.parseFloat(temps1[0]));
-                cds[1] = new Coordinate(Float.parseFloat(temps2[1]), Float.parseFloat(temps2[0]));
-
-                sectionCacheTempMap.put(key, geometryFactory.createLineString(cds));
-            }
-        }
-
-        if(sectionCacheTempMap.size() > 0)
-            sectionCacheMap = sectionCacheTempMap;
-
-        Map<String, String> sectionCode2NameTemp = new HashMap<>();
-
-        //加载全量路段编码和名称对照
-        sql = "select SECTION_CODE,SECTION_NAME,CROSES_ROAD from bsth_c_section";
-        secList = jdbcTemplate.queryForList(sql);
-        String name = null, code;
-        for (Map<String, Object> tMap : secList) {
-            if(tMap.get("CROSES_ROAD") != null && StringUtils.isNotEmpty(tMap.get("CROSES_ROAD").toString()))
-                name = tMap.get("CROSES_ROAD").toString();
-            else if(tMap.get("SECTION_NAME") != null && StringUtils.isNotEmpty(tMap.get("SECTION_NAME").toString()))
-                name = tMap.get("SECTION_NAME").toString();
-
-            code = tMap.get("SECTION_CODE").toString();
-            sectionCode2NameTemp.put(code, name);
-        }
-        if(sectionCode2NameTemp.size() > 0)
-            sectionCode2Name = sectionCode2NameTemp;
-    }
-
-    private void loadTccMapData(){
-        //加载停车场数据
-        String 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;
-            tccMap2 = convertPolygonMap(tccMap);
-        }
-    }
-
-    private Map<String, com.bsth.util.Geo.Polygon> convertPolygonMap(Map<String, Polygon> tccMap) {
-        Map<String, com.bsth.util.Geo.Polygon> rsMap = new HashMap<>();
-        Set<String> ks = tccMap.keySet();
-        for(String k : ks){
-            rsMap.put(k, convertPolygon(tccMap.get(k)));
-        }
-        return rsMap;
-    }
-
-    public static com.bsth.util.Geo.Polygon convertPolygon(Polygon polygon) {
-        List<com.bsth.util.Geo.Point> ps = new ArrayList<>();
-        com.bsth.util.Geo.Point p;
-
-        Coordinate[] cs = polygon.getCoordinates();
-        for(int i = 0; i < cs.length;i ++){
-            p = new com.bsth.util.Geo.Point(cs[i].y, cs[i].x);
-            ps.add(p);
-        }
-        return new com.bsth.util.Geo.Polygon(ps);
-    }
-
-    private void loadStationRoutesData(){
-        //加载站点路由
-        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));
-            }
-
-            //定时启用的站点走向
-            if(tesMap.size() > 0){
-                List<String> rems = new ArrayList<>();
-                long t = System.currentTimeMillis();
-                for(TimedEnableStationRoute tes : tesMap.values()){
-                    if(tes.getEnableTime() > t){
-                        logger.info("锁住站点路由，"  + tes.getLineCode());
-                        tempMap.replaceValues(tes.getLineCode() + "_0", stationCacheMap.get(tes.getLineCode() + "_0"));
-                        tempMap.replaceValues(tes.getLineCode() + "_1", stationCacheMap.get(tes.getLineCode() + "_1"));
-                    }
-                    else
-                        rems.add(tes.getLineCode());
-                }
-
-                //remove
-                if(rems.size() > 0){
-                    for(String lineCode : rems){
-                        logger.info("启用路由，"  + lineCode);
-                        tesMap.remove(lineCode);
-                    }
-                }
-            }
-            stationCacheMap = tempMap;
-            routeCodeMap = codeMap;
-        }
-    }
-
-    private void loadSpeedLimit(){
-        //加载线路限速信息
-        String sql = "select l.LINE_CODE,i.SPEEDING from bsth_c_line_information i left join bsth_c_line l on i.line=l.id where i.speed_limit is not null";
-        List<Map<String, Object>> speedMap = jdbcTemplate.queryForList(sql);
-        Map<String, Double> speedTempMap = new HashMap<>();
-        for (Map<String, Object> tMap : speedMap) {
-            try {
-                speedTempMap.put(tMap.get("LINE_CODE").toString(), Double.parseDouble(tMap.get("SPEEDING").toString()));
-            } catch (NumberFormatException e) {
-                logger.error("speeding is null...");
-            }
-        }
-        speedLimitMap = speedTempMap;
-    }
-
-    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, Byte 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 org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-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;
-    }*/
-
-    /**
-     * gps掉线
-     * @param gps
-     * @return
-     */
-    protected boolean isGpsOffline(GpsEntity gps){
-        return gps.getLat() == 0 || gps.getLon() == 0;
-    }
-
-    protected boolean isOffline(GpsEntity gps){
-        return gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline");
-    }
-    /**
-     * 是不是异常信号
-     *
-     * @param gps
-     * @return protected boolean isAbnormal(GpsEntity gps) {
-    return gps.getLat() == 0 || gps.getLon() == 0;
-    }*/
-
-    /**
-     * 连续异常信号个数统计
-     *
-     * @param
-     * @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;
-     * }
-     */
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
-    protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
-        byte updown = Byte.parseByte(sch.getXlDir());
-        //gps 切换走向
-        gps.setUpDown(updown);
-        gps.setPremiseCode(null);
-
-        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), updown);
-        StationRoute station = GeoUtils.gpsInStation(gps, srs);
-        if (station != null) {
-            gps.setStopNo(station.getCode());
-        }
-
-        logger.info(gps.getTimestamp() + " -" + fmtHHmm.print(gps.getTimestamp()) + " 车辆 ：" + gps.getNbbm() + " 切换到走向 : " + updown);
-    }
-
-    /**
-     * 是否是从异常状态恢复的第一个信号
-     *
-     * @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 (isGpsOffline(prev)
-                && !isGpsOffline(gps)) {
-            return true;
-        }
-
-        return false;
-    }
-}
 \ No newline at end of file
-package com.bsth.data.gpsdata.arrival.entity;
-
-/**
- * 到离站信息
- * Created by panzhao on 2017/2/20.
- */
-public class ArrivalInfo {
-
-    private String lineCode;
-
-    private String deviceId;
-
-    /** 时间戳 */
-    private Long ts;
-
-    private String stop;
-
-    private Integer upDown;
-
-    private int inOut;
-
-
-}
-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;
-
-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;
-
-/**
- * 定时启用站点路由
- * Created by panzhao on 2017/8/28.
- */
-public class TimedEnableStationRoute {
-
-    private String lineCode;
-
-    private Long enableTime;
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public Long getEnableTime() {
-        return enableTime;
-    }
-
-    public void setEnableTime(Long enableTime) {
-        this.enableTime = enableTime;
-    }
-}
-package com.bsth.data.gpsdata.arrival.handlers;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.SignalHandle;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.status_manager.GpsStatusManager;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.directive.DirectiveService;
-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/27.
- */
-@Component
-public class CorrectSignalHandle extends SignalHandle {
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-    @Autowired
-    DirectiveService directiveService;
-
-    @Autowired
-    GpsStatusManager gpsStatusManager;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        ScheduleRealInfo task = dayOfSchedule.executeCurr(gps.getNbbm());
-        if(task == null)
-            return false;
-        //ScheduleRealInfo sch;
-
-        //子任务
-        /*if(task.getClass().isAssignableFrom(ChildTaskPlan.class)){
-            ChildTaskPlan childTask = (ChildTaskPlan) task;
-            sch = childTask.getSchedule();
-        }
-        else
-            sch = (ScheduleRealInfo) task;*/
-
-        byte updown = Byte.parseByte(task.getXlDir());
-        //走向
-        if(gps.getUpDown() != updown){
-            gps.setUpDown(updown);
-            //gps.setState(0);
-        }
-
-        //（转发的数据不管）
-        if(gps.getSource() != 0){
-            //gps=非营运 或走向不对 && 班次=非空驶 ;切换到营运状态
-            if((!gps.isService() || gps.getUpDown() != updown) &&
-                    !dayOfSchedule.emptyService(task)){
-                gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, "同步@系统");
-            }
-
-            //需要切换线路
-            if(!task.getXlBm().equals(gps.getLineId())){
-                gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), "同步@系统");
-            }
-        }
-
-        return true;
-    }
-}
 \ No newline at end of file
-package com.bsth.data.gpsdata.arrival.handlers;
-
-import com.bsth.data.LineConfigData;
-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.StationRoute;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
-import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
-import com.bsth.data.gpsdata.status_manager.GpsStatusManager;
-import com.bsth.data.msg_queue.DirectivePushQueue;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.ScheduleComparator;
-import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.websocket.handler.SendUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * 进出站动作处理
- * Created by panzhao on 2016/12/27.
- */
-@Component
-public class InOutStationSignalHandle extends SignalHandle{
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Autowired
-    LineConfigData lineConfigData;
-
-    @Autowired
-    SendUtils sendUtils;
-
-    @Autowired
-    ScheduleSignalState scheduleSignalState;
-
-    @Autowired
-    SignalSchPlanMatcher signalSchPlanMatcher;
-
-    @Autowired
-    GpsStatusManager gpsStatusManager;
-
-    private final static int MAX_BEFORE_TIME = 1000 * 60 * 120;
-
-    //最大的班次时间差，防止异常的GPS时间打乱数据
-    private final static int MAX_NORMAL_DIFF = 1000 * 60 * 60 * 12;
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //忽略掉线信号
-        if(isGpsOffline(gps))
-            return false;
-
-        /*//从异常状态恢复的第一个信号*/
-        if(abnormalRecovery(gps, prevs)){
-            //回溯一下之前的轨迹
-            //scheduleSignalState.signalRetrospect(gps);
-            return false;
-        }
-
-        try{
-            if(isNotEmpty(prevs)){
-                GpsEntity prev = prevs.getTail();
-                if(isOutStation(gps, prev))
-                    outStation(gps, prev);
-
-
-                if(isInStation(gps, prev))
-                    inStation(gps, prev);
-            }
-        }catch (Exception e){
-            logger.error("in out error info ..", e);
-        }
-
-        return true;
-    }
-
-    private boolean isOutStation(GpsEntity gps, GpsEntity prev){
-        //从站内到站外
-        if(prev.getInstation() > 0 && gps.getInstation() == 0)
-            return true;
-
-        //从站内到另一个站内
-        if(prev.getInstation() > 0 && gps.getInstation() > 0
-                && !prev.getStopNo().equals(gps.getStopNo()))
-            return true;
-
-        //在被起点站覆盖的情况下出场
-        if(isOutPark(gps, prev)){
-            return true;
-        }
-        return false;
-    }
-
-    private boolean isInStation(GpsEntity gps, GpsEntity prev){
-        //从站外到站内
-        if(prev.getInstation() == 0 && gps.getInstation() > 0
-                /*&& !prev.getStopNo().equals(gps.getStopNo())*/){
-            return true;
-        }
-
-        //从站内到另一个站内
-        if(prev.getInstation() == 1 && gps.getInstation() == 1
-                && !prev.getStopNo().equals(gps.getStopNo())
-                && !prev.getStation().getName().equals(gps.getStation().getName()))
-            return true;
-
-        //从场内到站内
-        if(prev.getInstation() == 2 && gps.getInstation() == 1){
-            return true;
-        }
-
-        //被起点站覆盖的情况下进场
-        if(isInPark(gps, prev))
-            return true;
-        return false;
-    }
-
-    /**
-     * 出站/出场
-     * @param gps 当前点
-     * @param prev 上一个点
-     */
-    private void outStation(GpsEntity gps, GpsEntity prev) {
-        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-        String qdzCode = sch.getQdzCode();
-
-        int diff = (int) (sch.getDfsjT() - gps.getTimestamp());
-
-        //首班出场最多提前2小时
-        if((dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME / 2)
-            return;
-
-        //正常班次最大时间差
-        if(Math.abs(diff) > MAX_NORMAL_DIFF)
-            return;
-
-        //起点发车
-        if(qdzCode != null
-                && prev.getStopNo().equals(qdzCode)
-                && (gps.getInstation()==0 || !gps.getStopNo().equals(prev.getStopNo()))
-                && !willDepart(gps, prev, sch)){
-
-            gps.setPremiseCode(null);
-            //发车班次匹配
-            signalSchPlanMatcher.outMatch(gps, sch);
-            sch = dayOfSchedule.executeCurr(gps.getNbbm());
-
-            //班次已经实发
-            if(StringUtils.isNotEmpty(sch.getFcsjActual())
-                    && !outManyFit(gps, sch)){
-                return;
-            }
-
-            //应用到离站缓冲区设置参数
-            long rsT = lineConfigData.applyOut(sch, gps.getTimestamp());
-
-            //实发时间
-            sch.setFcsjActualAll(rsT);
-            sch.setSiginCompate(1);
-
-            //出站既出场
-            outStationAndOutPark(sch);
-            //通知客户端
-            sendUtils.sendFcsj(sch);
-            //持久化
-            dayOfSchedule.save(sch);
-
-            //清理应发未发标记
-            LateAdjustHandle.remove(sch.getClZbh());
-
-            if(!gps.isService() && !dayOfSchedule.emptyService(sch)){
-                //切换成营运状态
-                gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 0, "发车@系统");
-            }
-
-            logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
-        }
-        else if(isOutSch(sch)){
-            //有出场动作（起点站覆盖停车场时，并且不设置出站既出场，逻辑可能会走到这里）
-            try{
-                if(isOutPark(gps, prev)){
-                    if(prev.getCarparkNo().equals(sch.getQdzCode())){
-                        //再试一下出场
-                        GpsEntity prevClone = (GpsEntity) prev.clone(),
-                                gpsClone = (GpsEntity) gps.clone();
-                        prevClone.setStopNo(prevClone.getCarparkNo());
-                        gpsClone.setInstation(0);
-                        outStation(gpsClone, prevClone);
-                        return;
-                    }
-                }
-            }catch (Exception e){logger.error("",e);}
-
-            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
-            //如果下一个班次是区间，并且是环线
-            if(next != null && next.getBcType().equals("region")){
-                next = dayOfSchedule.nextSame(next);
-                if(next == null || !next.getQdzName().equals(next.getZdzName())){
-                    return;
-                }
-            }
-            if(next != null && prev.getStopNo().equals(next.getQdzCode())){
-                //发下一个班次
-                if(dayOfSchedule.addExecPlan(next))
-                    outStation(gps, prev);
-            }
-        }
-        //当前班次是区间
-        else if(sch.getBcType().equals("region")){
-            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
-            if(next==null || !next.getQdzName().equals(next.getZdzName())){
-                return;
-            }
-            //是环线
-            if(prev.getStopNo().equals(next.getQdzCode())){
-                //发下一个班次
-                if(dayOfSchedule.addExecPlan(next))
-                    outStation(gps, prev);
-            }
-        }
-    }
-
-    /**
-     * 是否是一个更合适的发车信号
-     * @param gps
-     * @param sch
-     * @return
-     */
-    private boolean outManyFit(GpsEntity gps, ScheduleRealInfo sch) {
-        LineConfig conf = lineConfigData.get(sch.getXlBm());
-        if(null != conf && conf.isLockFirstOutTime())
-            return false;//锁定第一个发车信号，不匹配最佳
-
-        if(StringUtils.isNotEmpty(sch.getZdsjActual()))
-            return false;
-
-        long t1 = sch.getFcsjActualTime();
-        long t2 = gps.getTimestamp();
-        long c = sch.getDfsjT();
-
-        /*if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
-            return true;
-        }*/
-        int threshold = 1000 * 60 * 5;
-        if(Math.abs(t2 - c) < threshold && c - t1 > threshold){
-            return true;
-        }
-        //if(Math.abs(t2 - c) < 1000 * 60 * 5 && c - t1 > 1000 * 60 * 5)
-        return false;
-    }
-
-
-    private void outStationAndOutPark(ScheduleRealInfo sch){
-        try{
-            LineConfig config = lineConfigData.get(sch.getXlBm());
-            //限定出站既出场的停车场
-            String park = config.getTwinsPark();
-            boolean limitPark = StringUtils.isNotEmpty(park);
-
-            if (config != null && config.getOutConfig() == 2) {
-                //出站既出场
-                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-                if (schPrev != null && schPrev.getBcType().equals("out") && (schPrev.getBcsj()==0 || schPrev.getJhlcOrig().intValue()==0)
-                        && (!limitPark || park.equals(schPrev.getQdzCode()))) {
-
-                    schPrev.setFcsjActualAll(sch.getFcsjActualTime());
-                    schPrev.setZdsjActualAll(sch.getFcsjActualTime());
-                    //起点实到
-                    sch.setQdzArrDatesj(schPrev.getZdsjActual());
-
-                    sendUtils.refreshSch(schPrev);
-                    dayOfSchedule.save(schPrev);
-                }
-            }
-        }catch (Exception e){
-            logger.error("", e);
-        }
-    }
-
-    /**
-     * 进站
-     * @param gps 当前点
-     * @param prev 上一个点
-     */
-    private void inStation(GpsEntity gps, GpsEntity prev){
-        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-
-        if(gps.getStopNo().equals(sch.getZdzCode())
-                && (!gps.getStopNo().equals(prev.getStopNo()) || gps.getStopNo().equals(prev.getPremiseCode()))){
-
-            int diff = 0;
-            try{
-                diff = (int) (sch.getZdsjT() - gps.getTimestamp());
-            }catch(NullPointerException e){
-                logger.info("NullPointerException " + sch.getXlName() + " 有班次无班次历时，，，检查一下是否需要出站既出场。");
-            }
-            //进场最多提前1.2小时
-            if((sch.getBcType().equals("in") && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME/2)
-                return;
-
-            //正常班次最大时间差
-            if(Math.abs(diff) > MAX_NORMAL_DIFF)
-                return;
-
-            //校验进站前置约束
-            if(!validInPremise(gps)){
-                return;
-            }
-
-            //环线或内外圈 ，飘出去再回来
-            if(sch.getQdzCode().equals(sch.getZdzCode())
-                    && StringUtils.isNotEmpty(sch.getFcsjActual())
-                    && gps.getTimestamp() - sch.getFcsjActualTime() < 1000 * 60 * 3){
-                sch.clearFcsjActual();
-                sendUtils.refreshSch(sch);
-                return;
-            }
-
-            //实达时间不覆盖
-            if(StringUtils.isNotEmpty(sch.getZdsjActual()))
-                return;
-
-            //应用到离站缓冲区设置参数
-            long rsT = lineConfigData.applyIn(sch, gps.getTimestamp());
-
-            sch.setZdsjActualAll(rsT);
-            sch.setSiginCompate(2);
-            //通知误点停靠程序，有车辆到站
-            LateAdjustHandle.carArrive(gps);
-
-            //已完成班次数
-            int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
-            ScheduleRealInfo next = dayOfSchedule.next(sch);
-            //持久化
-            dayOfSchedule.save(sch);
-
-            if(next != null){
-                dayOfSchedule.addExecPlan(next);
-                //进站既进场
-                inStationAndInPark(sch, next);
-            }
-
-            //该路牌的下一个班次，起点实际到达时间
-            ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch);
-            if(lpNext != null){
-                lpNext.setQdzArrDatesj(sch.getZdsjActual());
-            }
-
-            //通知客户端
-            sendUtils.sendZdsj(sch, lpNext, doneSum);
-            logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "到终点， 时间：" + sch.getZdsjActual());
-            //清除车辆误点调整监听
-            LateAdjustHandle.remove(sch.getClZbh());
-            //准备执行下一个班次
-            if (next != null) {
-                //将gps转换为下一个班次走向的站内信号
-                transformUpdown(gps, next);
-                //下发调度指令
-                DirectivePushQueue.put6002(next, doneSum, "到站@系统");
-
-                //套跑  -下发线路切换指令
-                if(!next.getXlBm().equals(sch.getXlBm())){
-                    gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
-                }
-
-                //下一个班次是空驶班次
-                if(dayOfSchedule.emptyService(next))
-                    nonService(sch, "空驶@系统");
-            } else
-                nonService(sch, "结束@系统");
-        }
-        else {
-            /*if(sch.getFcsjActual() == null){
-                //有进站，但班次没有实发，向前追溯一下信号
-                scheduleSignalState.signalRetrospect(gps, sch);
-            }
-*/
-            //被起点站覆盖的情况下进场，没有设置出站既是出场，逻辑会走到这里（模拟进站信号）
-            if(isInSch(sch)){
-                try{
-                    if(isInPark(gps, prev)){
-                        if(gps.getCarparkNo().equals(sch.getZdzCode())){
-                            //再试一下进场
-                            GpsEntity gpsClone = (GpsEntity) gps.clone(),
-                                prevClone = (GpsEntity) prev.clone();
-                            gpsClone.setStopNo(gpsClone.getCarparkNo());
-                            prevClone.setStopNo(null);
-                            inStation(gpsClone, prevClone);
-                            return;
-                        }
-                    }
-                }catch (Exception e){
-                    logger.error("", e);
-                }
-            }
-
-            //如果当前班次是出场，并且进的是下一个班次的终点
-            if(sch.getBcType().equals("out")){
-                ScheduleRealInfo next = dayOfSchedule.next(sch);
-                if(next != null && next.getZdzCode().equals(gps.getStopNo())){
-                    List<ScheduleRealInfo> halfList = dayOfSchedule.findByNbbm(sch.getClZbh());
-                    //和当前进站信号最匹配的一个班次
-                    ScheduleRealInfo nearSch = nearScheduleByGpsIn(gps, halfList);
-
-                    if(nearSch != null){
-                        //直接跳到这个班次
-                        if(dayOfSchedule.addExecPlan(nearSch))
-                            inStation(gps, prev);//重新进站
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 校验进站前置约束
-     * @param gps
-     * @return
-     */
-    private boolean validInPremise(GpsEntity gps) {
-        StationRoute sr = gps.getStation();
-        if(null == sr || !sr.isPremise())
-            return true;
-
-        String premiseCode = gps.getPremiseCode();
-
-        if(StringUtils.isNotEmpty(premiseCode) && premiseCode.equals(gps.getStopNo())){
-            logger.info("满足前置进站约束 " + premiseCode);
-            return true;
-        }
-        else{
-            logger.info(gps.getNbbm() + " not premiseCode 不满足前置进站约束 " + premiseCode);
-        }
-        return false;
-    }
-
-    /**
-     * 和当前进站信号最匹配的一个班次
-     * @param gps
-     * @param halfList
-     * @return
-     */
-    private ScheduleRealInfo nearScheduleByGpsIn(GpsEntity gps, List<ScheduleRealInfo> halfList){
-        if(halfList == null || halfList.size() == 0)
-            return null;
-
-        //排序
-        Collections.sort(halfList, new ScheduleComparator.FCSJ());
-        ScheduleRealInfo near = null;// = halfList.get(0);
-        ScheduleRealInfo sch;
-
-        String stopId = gps.getStopNo();
-        for(int i = 0; i < halfList.size(); i ++){
-            sch = halfList.get(i);
-            if(!sch.getZdzCode().equals(stopId) || sch.getStatus()==2)
-                continue;
-
-            if(sch.getZdsjT() < gps.getTimestamp())
-                near = sch;
-            else
-                break;
-
-        }
-        return near;
-    }
-
-    /**
-     * 进站既进场
-     * @param sch
-     */
-    private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next){
-        LineConfig config = lineConfigData.get(sch.getXlBm());
-        //限定出站既出场的停车场
-        String park = config.getTwinsPark();
-        boolean limitPark = StringUtils.isNotEmpty(park);
-
-
-        if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().intValue()==0)
-                && (!limitPark || park.equals(next.getZdzCode()))) {
-
-            next.setFcsjActualAll(sch.getZdsjActualTime());
-            next.setZdsjActualAll(sch.getZdsjActualTime());
-
-            sendUtils.refreshSch(next);
-            dayOfSchedule.save(next);
-
-            //分班的时候，需要再跳过1个班次
-            next = dayOfSchedule.next(next);
-            if(next != null)
-                dayOfSchedule.addExecPlan(next);
-
-            //进场，切换成非营运状态
-            nonService(sch, "进场@系统");
-        }
-    }
-
-    /**
-     * 发车漂移判定（这里出现的误判，由车辆到达中途站的时候补偿）
-     * @param gps
-     * @param prev
-     * @param task
-     * @return
-     */
-    private boolean willDepart(GpsEntity gps, GpsEntity prev, Object task){
-
-        /*ScheduleRealInfo sch = (ScheduleRealInfo) task;
-        ScheduleRealInfo prevTask = dayOfSchedule.prev(sch);
-        if(prevTask == null || prevTask.getBcType().equals("out"))
-            return false;
-
-        //计划停站时间
-        int stopTimePlan = (int) (sch.getDfsjT() - prevTask.getZdsjT());
-
-        if(stopTimePlan < 1000 * 60 * 10)
-            return false;
-
-        //实际停站时间
-        if(prevTask.getZdsjActual() != null){
-            int actualTime = (int) (gps.getTimestamp() - prevTask.getZdsjActualTime());
-
-            if(actualTime < stopTimePlan * 0.8){
-                logger.info("漂移判定");
-
-                return true;
-            }
-        }*/
-        return false;
-    }
-
-    private boolean isOutPark(GpsEntity gps, GpsEntity prve){
-        if(StringUtils.isNotEmpty(prve.getCarparkNo()) && StringUtils.isEmpty(gps.getCarparkNo()))
-            return true;
-        return false;
-    }
-
-    private boolean isInPark(GpsEntity gps, GpsEntity prve){
-        if(StringUtils.isNotEmpty(gps.getCarparkNo()) && StringUtils.isEmpty(prve.getCarparkNo()))
-            return true;
-        return false;
-    }
-
-    private boolean isOutSch(ScheduleRealInfo sch){
-        return sch.getBcType().equals("out") || GeoCacheData.tccMap.keySet().contains(sch.getQdzCode());
-    }
-
-    private boolean isInSch(ScheduleRealInfo sch){
-        return sch.getBcType().equals("in") || GeoCacheData.tccMap.keySet().contains(sch.getZdzCode());
-    }
-
-    /**
-     * 切换为非营运状态
-     * @param sch
-     * @param sender
-     */
-    private void nonService(ScheduleRealInfo sch, String sender){
-        gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, sender);
-    }
-}
 \ 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{
-
-    //断开4分钟，标记为重连信号
-    private final static int OFFLINE_TIME = 1000 * 60 * 4;
-
-    //断开70分钟，之前的信号不再有参考价值
-    private final static int CLEAR_TIME = 1000 * 60 * 70;
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //掉线信号不管
-        if(isGpsOffline(gps)){
-            gps.setSignalState("gps-offline");
-            gps.setAbnormalStatus("gps-offline");
-            return true;
-        }
-
-        if(isNotEmpty(prevs)){
-            GpsEntity prev = prevs.getTail();
-            //间隔太大就丢弃，不管之前还是之后
-            int space = Math.abs((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 != null && reverse.getCount() >= 3
-                    && 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 == null)
-                    return null;
-
-                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
-package com.bsth.data.gpsdata.arrival.precondition;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import org.springframework.stereotype.Component;
-
-/**
- * 进站（前置电子围栏）
- * Created by panzhao on 2017/9/23.
- */
-@Component
-public class InPreconditionHandler {
-
-    /**
-     * 进站动作是否有通过前置围栏
-     * @param gps
-     * @param prev
-     * @return
-     */
-    public boolean isPass(GpsEntity gps, GpsEntity prev){
-        return false;
-    }
-}
-package com.bsth.data.gpsdata.arrival.utils;
-
-import com.bsth.data.LineConfigData;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.SignalStateData;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.entity.RouteReverse;
-import com.bsth.data.gpsdata.arrival.entity.SignalAbnormal;
-import com.bsth.data.gpsdata.arrival.entity.SignalState;
-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.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 班次信号状态分析
- * Created by panzhao on 2016/12/29.
- */
-@Component
-public class ScheduleSignalState {
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    LineConfigData lineConfigData;
-
-    @Autowired
-    SignalStateData signalStateData;
-
-    /**
-     * 路由反向分析
-     */
-    public void reverseAnalyse(RouteReverse reverse) {
-        ScheduleRealInfo sch = dayOfSchedule.executeCurr(reverse.getNbbm());
-
-        String bcType = sch.getBcType();
-
-        switch (bcType) {
-            case "out":
-                outReverseAnalyse(sch, reverse);
-                break;
-            case "normal":
-                normalReverseAnalyse(sch, reverse);
-                break;
-        }
-    }
-
-    /**
-     * 出场班次路由反向分析
-     *
-     * @param sch
-     */
-    private void outReverseAnalyse(ScheduleRealInfo sch, RouteReverse reverse) {
-        long t = reverse.getCt();
-        //出场班次终点时间前，允许反向轨迹
-        if (sch.getZdsjT() != null && sch.getZdsjT() > t) {
-            return;
-        }
-
-        int rt;
-        //从实发 到 当前时间 < 计划运送时间 * 0.9
-        if (sch.getFcsjActual() != null && sch.getBcsj() != null) {
-            rt = (int) (t - sch.getFcsjActualTime());
-            if (rt < sch.getBcsj() * 0.9)
-                return;
-        }
-
-        ScheduleRealInfo next = dayOfSchedule.next(sch);
-        if (next != null && next.getXlDir().equals(sch.getXlDir()))
-            return;
-
-        if(next == null)
-            return;
-        //时间足够下一个班次待发时间运行到当前站
-        int runTime = reverse.getCount() * 1500 * 60;
-        if (next.getDfsjT() + runTime < t) {
-            //跳到下一个班次
-            dayOfSchedule.addExecPlan(next);
-        }
-    }
-
-    /**
-     * 正常班次路由反向分析
-     *
-     * @param sch
-     * @param reverse
-     */
-    private void normalReverseAnalyse(ScheduleRealInfo sch, RouteReverse reverse) {
-        LineConfig conf = lineConfigData.get(sch.getXlBm());
-
-        if (conf.isReadReverse()) {
-            //跳下一个班次
-            ScheduleRealInfo next = dayOfSchedule.next(sch);
-            if (next != null)
-                dayOfSchedule.addExecPlan(next);
-
-            //记录信号状态
-            SignalState signalState = SignalState.reverseSignalSTate(sch, reverse);
-            if(signalState != null)
-                signalStateData.put(signalState);
-        }
-    }
-
-    public void signalRetrospect(GpsEntity gps) {
-        signalRetrospect(gps, dayOfSchedule.executeCurr(gps.getNbbm()));
-    }
-
-    /**
-     * 信号追溯
-     *
-     * @param gps
-     * @param sch
-     */
-    public void signalRetrospect(GpsEntity gps, ScheduleRealInfo sch) {
-        //回放数据，是否有掉线或者漂移
-        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
-        if (queue == null || queue.size() == 0 /*|| gps.getInstation() == 0*/)
-            return;
-
-        //起始时间点
-        long st = 0;
-        ScheduleRealInfo prev = dayOfSchedule.prev(sch);
-
-        if (prev != null) {
-            if (prev.getZdsjActual() != null)
-                st = prev.getZdsjActualTime();
-            else
-                st = (GeoCacheData.midwayStation(gps.getLineId(), gps.getUpDown(), sch.getQdzCode(), gps.getStopNo()).size() + 1) * (1000 * 60 * 5);
-        }
-
-        Object[] tempArray = queue.getQueue();
-        int len = tempArray.length;
-
-        Object[] array = new Object[len + 1];
-        System.arraycopy(tempArray, 0, array, 0, len);
-        array[len] = gps;
-
-        String gpsState = "";
-        GpsEntity tempGps, nearGps = null;
-        int i = len - 1;
-        for (; i >= 0; i--) {
-            tempGps = (GpsEntity) array[i];
-
-            gpsState = tempGps.getSignalState();
-            if (gpsState.equals("truncation"))
-                break;
-            else if (gpsState.equals("drift")) {
-                nearGps = (GpsEntity) array[i + 1];
-                break;
-            } else if (gpsState.equals("reconnection")) {
-                nearGps = tempGps;
-                break;
-            }
-
-            if (tempGps.getTimestamp() < st)
-                break;
-        }
-
-        if (nearGps != null && i > 0) {
-            createSignalAbnormal(gpsState, nearGps, i, array, sch);
-        }
-    }
-
-    private void createSignalAbnormal(String gpsState, GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
-        switch (gpsState) {
-            case "drift":
-                driftSignalAbnormal(nearGps, i, array, sch);
-                break;
-            case "reconnection":
-                offlineSignalAbnormal(nearGps, ((GpsEntity) array[i - 1]), sch);
-                break;
-        }
-    }
-
-    /**
-     * 掉线异常状态记录
-     *
-     * @param e
-     * @param s
-     */
-    private void offlineSignalAbnormal(GpsEntity e, GpsEntity s, ScheduleRealInfo sch) {
-        long st = s.getTimestamp(), et = e.getTimestamp();
-
-        //掉线超过10分钟才记录
-        if (et - st < (1000 * 60 * 10))
-            return;
-
-        SignalAbnormal signalAbnormal = new SignalAbnormal();
-        signalAbnormal.setSt(st);
-        signalAbnormal.setEt(et);
-        signalAbnormal.setAbnormalType("reconnection");
-        signalAbnormal.setDestCode(sch.getQdzCode());
-        signalAbnormal.setOutOrIn(0);
-
-        //截断GPS
-        e.setSignalState("truncation");
-
-        //记录信号状态
-        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
-        signalStateData.put(signalState);
-    }
-
-    /**
-     * 漂移异常状态记录
-     *
-     * @param nearGps
-     * @param i
-     * @param array
-     */
-    private void driftSignalAbnormal(GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
-        GpsEntity gps, s = null;
-        //找到漂移开始时间
-        for (; i >= 0; i--) {
-            gps = (GpsEntity) array[i];
-
-            if (!gps.getSignalState().equals("drift") || i == 0
-                    || gps.getSignalState().equals("truncation")) {
-                s = gps;
-                break;
-            }
-        }
-
-        long st = s.getTimestamp(), et = nearGps.getTimestamp();
-        if (et - st < (1000 * 60 * 3))
-            return;
-        /*if (s != null){
-            st = s.getTimestamp();
-            //漂移小于3分钟
-            if(et - st < (1000 * 60 * 3))
-                return;
-        }*/
-
-
-        SignalAbnormal signalAbnormal = new SignalAbnormal();
-        signalAbnormal.setSt(st);
-        signalAbnormal.setEt(et);
-        signalAbnormal.setAbnormalType("drift");
-        signalAbnormal.setDestCode(sch.getQdzCode());
-        signalAbnormal.setOutOrIn(0);
-
-        //截断GPS
-        nearGps.setSignalState("truncation");
-
-        //记录信号状态
-        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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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;
-
-    Logger log = LoggerFactory.getLogger(this.getClass());
-
-    /**
-     * 发车信号匹配
-     * @param outSigal
-     * @param sch
-     * @return
-     */
-    public void outMatch(GpsEntity outSigal, ScheduleRealInfo sch){
-        long t = outSigal.getTimestamp();
-        if(t < sch.getDfsjT())
-            return;
-
-        try{
-            //会不会是分班没有完成
-            if(sch.getBcType().equals("in") && t - sch.getDfsjT() > 1000 * 60 * 20){
-                ScheduleRealInfo fbFirst = dayOfSchedule.nextByBcType(sch, "normal");
-
-                if(fbFirst == null || !fbFirst.getQdzCode().equals(outSigal.getStopNo()))
-                    return;
-
-                long dt = fbFirst.getDfsjT();
-                //晚于待发前4分钟  -执行分班的首个营运
-                if(dt - t < 1000 * 60 * 4){
-                    dayOfSchedule.addExecPlan(fbFirst);
-                    return;
-                }
-            }
-
-            //线路编码不匹配
-            if("out".equals(sch.getBcType()) && !sch.getXlBm().equals(outSigal.getLineId())){
-                ScheduleRealInfo nextOut = dayOfSchedule.nextByBcType(sch, "out");
-                if(nextOut != null && nextOut.getXlBm().equals(outSigal.getLineId())
-                        && fcSpace(sch, outSigal) > fcSpace(nextOut, outSigal)){
-                    dayOfSchedule.addExecPlan(nextOut);
-                    return;
-                }
-            }
-        }catch (Exception e){
-            log.error("", e);
-        }
-
-        //下一个相同走向的班次
-        ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
-        if(next == null || !next.getQdzCode().equals(sch.getQdzCode()))
-            return;
-
-        //晚于班次间隔百分之70，跳下一个班次
-        double s = (int) (next.getDfsjT() - sch.getDfsjT());
-        double r = (int) (t - sch.getDfsjT());
-        if(r / s > 0.7){
-            if(dayOfSchedule.addExecPlan(next))
-                outMatch(outSigal, next);
-        }
-    }
-
-    public static int fcSpace(ScheduleRealInfo sch, GpsEntity gps){
-        return (int) Math.abs((sch.getDfsjT() - gps.getTimestamp()));
-    }
-}
-package com.bsth.data.gpsdata.thread;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.data.BasicData;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.GpsRealData;
-import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
-import com.bsth.util.ConfigUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by panzhao on 2017/1/11.
- */
-@Component
-public class GpsDataLoaderThread extends Thread {
-
-    Logger logger = LoggerFactory.getLogger(GpsDataLoaderThread.class);
-
-    /**
-     * 构造函数
-     */
-    public GpsDataLoaderThread() {
-        url = ConfigUtil.get("http.gps.real.url");
-        clientUrl = ConfigUtil.get("http.gps.real.cache.url");
-    }
-
-    // 网关数据接口地址
-    private static String url;
-    // GPS客户端内存数据接口
-    private static String clientUrl;
-
-    //0：从GPS客户端内存获取  -1：从网关获取
-    private static int flag = 0;
-
-    public static void setFlag(int v) {
-        flag = v;
-    }
-
-    public static int getFlag(int v) {
-        return flag;
-    }
-
-    @Autowired
-    GpsRealData gpsRealData;
-
-    @Autowired
-    GpsRealAnalyse gpsRealAnalyse;
-
-    @Override
-    public void run() {
-        try {
-            if (flag == 0)
-                load();
-            else
-                loadByGateway();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
-
-    /**
-     * 从网关获取实时GPS数据
-     *
-     * @throws Exception
-     */
-    public void loadByGateway() throws Exception {
-        List<GpsEntity> list = null;
-        List<GpsEntity> updateList = new ArrayList<>();
-        CloseableHttpClient httpClient = null;
-        CloseableHttpResponse response = null;
-        try {
-            httpClient = HttpClients.createDefault();
-            HttpGet get = new HttpGet(url);
-            //超时时间
-            RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
-                    .setSocketTimeout(1500).build();
-            get.setConfig(requestConfig);
-
-            response = httpClient.execute(get);
-
-            HttpEntity entity = response.getEntity();
-            if (null != entity) {
-                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
-                StringBuilder stringBuffer = new StringBuilder();
-                String str = "";
-                while ((str = br.readLine()) != null)
-                    stringBuffer.append(str);
-
-                JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
-
-                if (jsonObj != null)
-                    list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
-
-                //过滤掉无效的点位
-                list = filterInvalid(list);
-
-                String nbbm;
-                GpsEntity old;
-                for (GpsEntity gps : list) {
-
-                    //没有设备号
-                    if (StringUtils.isBlank(gps.getDeviceId()))
-                        continue;
-
-                    old = gpsRealData.get(gps.getDeviceId());
-                    if (old != null &&
-                            old.getTimestamp().equals(gps.getTimestamp()) &&
-                            old.getLat().equals(gps.getLat()) &&
-                            old.getLon().equals(gps.getLon()))
-                        continue;
-
-                    nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
-                    if (StringUtils.isBlank(nbbm))
-                        gps.setIncomplete(true);//标记为异常数据
-                    else
-                        gps.setNbbm(nbbm);
-                    //有更新的点位
-                    updateList.add(gps);
-                }
-                logger.info("全量点：" + list.size() + "，更新点" + updateList.size());
-                //分析数据
-                gpsRealAnalyse.analyse(updateList);
-            } else
-                logger.error("real gps result is null");
-        } catch (Exception e) {
-            logger.error("", e);
-        } finally {
-            if (null != httpClient)
-                httpClient.close();
-            if (null != response)
-                response.close();
-        }
-    }
-
-    /**
-     * 过滤无效的gps点位
-     *
-     * @param list
-     * @return
-     */
-    private List<GpsEntity> filterInvalid(List<GpsEntity> list) {
-        List<GpsEntity> rsList = new ArrayList<>();
-
-        try {
-            for (GpsEntity gps : list) {
-                if (gps.getValid() == 0)
-                    rsList.add(gps);
-            }
-
-            if (rsList.size() < list.size())
-                logger.info("过滤无效的点位 : " + (list.size() - rsList.size()));
-        } catch (Exception e) {
-            logger.error("", e);
-            rsList = list;
-        }
-        return rsList;
-    }
-
-    /**
-     * 从客户端内存获取GPS数据
-     */
-    public void load() throws Exception {
-        List<GpsEntity> list = null;
-        CloseableHttpClient httpClient = null;
-        CloseableHttpResponse response = null;
-
-        try {
-            logger.info("load start...");
-            httpClient = HttpClients.createDefault();
-            HttpGet get = new HttpGet(clientUrl);
-            //超时时间
-            RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(2000).setConnectionRequestTimeout(1000)
-                    .setSocketTimeout(3000).build();
-            get.setConfig(requestConfig);
-
-            response = httpClient.execute(get);
-
-            HttpEntity entity = response.getEntity();
-            if (null != entity) {
-                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
-                StringBuilder stringBuffer = new StringBuilder();
-                String str = "";
-                while ((str = br.readLine()) != null)
-                    stringBuffer.append(str);
-
-                list = JSON.parseArray(stringBuffer.toString(), GpsEntity.class);
-
-                //过滤掉无效的点位
-                list = filterInvalid(list);
-
-                String nbbm;
-                logger.info("load end!");
-                for (GpsEntity gps : list) {
-
-                    //没有设备号
-                    if (StringUtils.isBlank(gps.getDeviceId()))
-                        continue;
-
-                    nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
-                    if (StringUtils.isBlank(nbbm))
-                        gps.setIncomplete(true);//标记为异常数据
-                    else
-                        gps.setNbbm(nbbm);
-                }
-                //分析数据
-                gpsRealAnalyse.analyse(list);
-            } else
-                logger.error("client gps result is null");
-        } catch (Exception e) {
-            logger.error("", e);
-        } finally {
-            if (null != httpClient)
-                httpClient.close();
-            if (null != response)
-                response.close();
-        }
-    }
-}
 \ No newline at end of file
-package com.bsth.data.gpsdata.thread;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.GpsRealData;
-import com.bsth.websocket.handler.SendUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Collection;
-
-/**
- * GPS掉离线监控
- * Created by panzhao on 2017/1/11.
- */
-@Component
-public class OfflineMonitorThread extends Thread{
-
-    @Autowired
-    GpsRealData gpsRealData;
-
-    //掉线阈值
-    private final static int LOSE_TIME = 1000 * 60 * 10;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    SendUtils sendUtils;
-
-    //无任务时 离线阈值
-    //private final static int OFFLINE_TIME = 1000 * 60 * 10;
-
-    @Override
-    public void run() {
-        try{
-            long t = System.currentTimeMillis();
-            Collection<GpsEntity> list = gpsRealData.all();
-
-            String state;
-            for(GpsEntity gps : list){
-                state = gps.getAbnormalStatus();
-
-                if(state != null && state.equals("offline"))
-                    continue;
-
-                if (t - gps.getTimestamp() > LOSE_TIME){
-                    gps.offline();
-
-                    //通知页面有设备掉线
-                    sendUtils.deviceOffline(gps);
-                }
-            }
-        }catch (Exception e){
-            logger.error("", e);
-        }
-    }
-}
-package com.bsth.data.gpsdata.arrival;
+package com.bsth.data.gpsdata_v2;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.GpsRealData;
-import com.bsth.data.gpsdata.arrival.handlers.*;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
+import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.*;
 import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 /**
- * gps 实时数据分析
- * Created by panzhao on 2016/12/27.
+ * 实时信号数据处理
+ * Created by panzhao on 2017/11/15.
  */
 @Component
-public class GpsRealAnalyse {
+public class DataHandleProcess {
-    static Logger logger = LoggerFactory.getLogger(GpsRealAnalyse.class);
+    static Logger logger = LoggerFactory.getLogger(DataHandleProcess.class);
+    final static int POOL_SIZE = 25;
+
+    static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1, new HandlerThreadFactory());
+    public static CountDownLatch count;
     @Autowired
-    OfflineSignalHandle offlineSignalHandle;
+    GpsStateProcess gpsStateProcess;
     @Autowired
-    CorrectSignalHandle correctSignalHandle;
+    StationInsideProcess stationInsideProcess;
     @Autowired
-    StationInsideHandle stationInsideHandle;
+    AbnormalStateProcess abnormalStateProcess;
     @Autowired
-    InOutStationSignalHandle inOutStationSignalHandle;
+    InStationProcess inStationProcess;
     @Autowired
-    ReverseSignalHandle reverseSignalHandle;
+    OutStationProcess outStationProcess;
     @Autowired
-    AbnormalStateHandle abnormalStateHandle;
+    ReverseRouteProcess reverseRouteProcess;
     @Autowired
     GpsRealData gpsRealData;
-    final static int POOL_SIZE = 25;
-    static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
-
-    public static long st;
-    public static CountDownLatch count;
-
-    public static boolean isBlock() {
-        return System.currentTimeMillis() - st > 1000 * 20;
-    }
-
-    public static boolean isIdle(){
-        return System.currentTimeMillis() - st > 1000 * 60;
-    }
-
-    public void analyse(List<GpsEntity> list) {
+    public void handle(List<GpsEntity> list) {
         try {
-            if(list.size() == 0 || GpsDataRecovery.run)
-                return;
-            st = System.currentTimeMillis();
-
-            //按设备号分组数据（一个设备号的多条数据，必须在一个线程里跑）
+            //按设备号分组数据（一个设备的多条数据，必须在一个线程里跑）
             ArrayListMultimap multimap = ArrayListMultimap.create();
             for (GpsEntity gps : list) {
                 multimap.put(gps.getDeviceId(), gps);
@@ -70,10 +57,10 @@ public class GpsRealAnalyse {
             //数据均分给线程
             ArrayListMultimap dataListMap = ArrayListMultimap.create();
-            int size = deviceList.size(), threadIndex=0, threadSize = size / POOL_SIZE;
-            for(int i = 0; i < size; i++){
-                if(i % threadSize == 0)
-                    threadIndex ++;
+            int size = deviceList.size(), threadIndex = 0, threadSize = size / POOL_SIZE;
+            for (int i = 0; i < size; i++) {
+                if (i % threadSize == 0)
+                    threadIndex++;
                 dataListMap.putAll(threadIndex, multimap.get(deviceList.get(i)));
             }
             Set<Integer> ks = dataListMap.keySet();
@@ -81,7 +68,7 @@ public class GpsRealAnalyse {
             count = new CountDownLatch(ks.size());
             for (Integer index : ks) {
-                threadPool.execute(new SignalHandleThread(dataListMap.get(index), count));
+                threadPool.submit(new SignalHandleThread(dataListMap.get(index), count));
             }
             //等待子线程结束
@@ -90,26 +77,11 @@ public class GpsRealAnalyse {
             //加入实时gps对照
             for (GpsEntity gps : list)
                 gpsRealData.put(gps);
-
-            logger.info("time , " + (System.currentTimeMillis() - st));
         } catch (Exception e) {
             logger.error("", e);
         }
     }
-    public static void shutdown() {
-        logger.warn("GpsRealAnalyse shutdown！！");
-        threadPool.shutdownNow();
-        long len = count.getCount();
-        for (int i = 0; i < len; i++) {
-            count.countDown();
-        }
-
-        threadPool = Executors.newFixedThreadPool(100);
-    }
-
-    static GpsComp comp = new GpsComp();
-
     public class SignalHandleThread implements Runnable {
         List<GpsEntity> list;
@@ -122,31 +94,18 @@ public class GpsRealAnalyse {
         @Override
         public void run() {
-
             try {
-                Collections.sort(list, comp);
                 for (GpsEntity gps : list) {
-                    try {
-                        //是否有任务
-                        boolean task;
-                        CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
-                        //掉线处理
-                        offlineSignalHandle.handle(gps, prevs);
-                        //状态处理
-                        task = correctSignalHandle.handle(gps, prevs);
-                        //场，站内外判断
-                        stationInsideHandle.handle(gps, prevs);
-                        //异常判定（越界/超速）
-                        abnormalStateHandle.handle(gps, prevs);
-
-                        if (!task)
-                            continue; //无任务的，到这里就结束
-
-                        //反向处理
-                        reverseSignalHandle.handle(gps, prevs);
-                        //进出站动作处理
-                        inOutStationSignalHandle.handle(gps, prevs);
-                        GeoCacheData.putGps(gps);
+                    try{
+                        gpsStateProcess.process(gps);//状态处理
+                        stationInsideProcess.process(gps);//场站内外判定
+                        reverseRouteProcess.process(gps);//反向路由处理
+                        abnormalStateProcess.process(gps);//超速越界
+
+                        inStationProcess.process(gps);//进站
+                        outStationProcess.process(gps);//出站
+
+                        GpsCacheData.putGps(gps);//历史gps缓存
                     }catch (Exception e){
                         logger.error("", e);
                     }
@@ -158,11 +117,19 @@ public class GpsRealAnalyse {
         }
     }
-    public static class GpsComp implements Comparator<GpsEntity> {
+    static class MyUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
+        @Override
+        public void uncaughtException(Thread t, Throwable e) {
+            logger.error("caught " , e);
+        }
+    }
+    static class HandlerThreadFactory implements ThreadFactory {
         @Override
-        public int compare(GpsEntity g1, GpsEntity g2) {
-            return g1.getTimestamp().compareTo(g2.getTimestamp());
+        public Thread newThread(Runnable r) {
+            Thread t = new Thread(r);
+            t.setUncaughtExceptionHandler(new MyUncaughtExceptionHandler());
+            return t;
         }
     }
 }
-package com.bsth.data.gpsdata;
+package com.bsth.data.gpsdata_v2;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.TreeMultimap;
@@ -130,7 +131,7 @@ public class GpsRealData {
         for (String device : set) {
             gps = gpsMap.get(device);
             //过滤异常GPS数据
-            if (gps == null || gps.isIncomplete())
+            if (gps == null || StringUtils.isBlank(gps.getNbbm()))
                 continue;
             sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
+package com.bsth.data.gpsdata_v2.cache;
+
+import com.bsth.data.gpsdata_v2.entity.CtLineString;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.entity.PreconditionGeo;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
+import com.bsth.data.gpsdata_v2.utils.StationRouteComp;
+import com.bsth.util.Geo.Point;
+import com.bsth.util.Geo.Polygon;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ArrayListMultimap;
+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.BeanPropertyRowMapper;
+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 2017/11/15.
+ */
+@Component
+public class GeoCacheData {
+
+    static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
+
+    /**
+     * 线路路段走向
+     */
+    private static ArrayListMultimap<String, CtLineString> sectionCacheMap;
+    /**
+     * 路段编码和名称对照
+     */
+    private static Map<String, String> sectionCode2Name;
+    /**
+     * 线路站点路由
+     */
+    private static ArrayListMultimap<String, StationRoute> stationCacheMap;
+    /**
+     * 线路前置进站围栏
+     */
+    public static ArrayListMultimap<String, PreconditionGeo> premiseGeoMap;
+    /**
+     * 线路_上下行_站点编码 ——> 站点
+     */
+    private static Map<String, StationRoute> routeCodeMap;
+    /**
+     * 停车场
+     */
+    public static Map<String, Polygon> tccMap;
+    /**
+     * 线路限速信息
+     */
+    private static Map<String, Double> speedLimitMap;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    public void loadData() {
+        loadStationRoutesData();
+        loadTccMapData();
+        loadSpeedLimit();
+
+        //加载路段信息
+        loadRoadsData();
+
+        //加载前置进站围栏
+        loadPremiseGeoData();
+    }
+
+    public static List<StationRoute> getStationRoute(String lineCode, int directions) {
+        return stationCacheMap.get(lineCode + "_" + directions);
+    }
+
+    public static StationRoute getRouteCode(GpsEntity gps) {
+        return routeCodeMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo());
+    }
+
+    public static Double speedLimit(String lineCode){
+        return speedLimitMap.get(lineCode);
+    }
+
+    public static List<CtLineString> getLineStringList(GpsEntity gps){
+        return sectionCacheMap.get(gps.getLineId() + "_" + gps.getUpDown());
+    }
+
+    private void loadStationRoutesData(){
+        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(new Point(rs.getFloat("G_LONX"), rs.getFloat("G_LATY")));
+                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(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;
+        }
+    }
+
+    private void loadTccMapData(){
+        //加载停车场数据
+        String 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 = 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 loadSpeedLimit(){
+        //加载线路限速信息
+        String sql = "select l.LINE_CODE,i.SPEEDING from bsth_c_line_information i left join bsth_c_line l on i.line=l.id where i.speed_limit is not null";
+        List<Map<String, Object>> speedMap = jdbcTemplate.queryForList(sql);
+        Map<String, Double> speedTempMap = new HashMap<>();
+        for (Map<String, Object> tMap : speedMap) {
+            try {
+                speedTempMap.put(tMap.get("LINE_CODE").toString(), Double.parseDouble(tMap.get("SPEEDING").toString()));
+            } catch (NumberFormatException e) {
+                logger.error("speeding is null...");
+            }
+        }
+        speedLimitMap = speedTempMap;
+    }
+
+    private void loadRoadsData() {
+        //加载线路下路段空间数据
+        String sql = "select r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) as GSECTION_VECTOR, r.DIRECTIONS, s.CROSES_ROAD from bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section=s.id where r.destroy=0 and GSECTION_VECTOR is not null order by line_code,directions,sectionroute_code";
+        List<Map<String, Object>> secList = jdbcTemplate.queryForList(sql);
+
+        String polygonStr, key;
+        String[] coords;
+        int i, len;
+        ArrayListMultimap<String, CtLineString> sectionCacheTempMap = ArrayListMultimap.create();
+        String[] temps1, temps2;
+        CtLineString lineString;
+        for (Map<String, Object> tMap : secList) {
+            //空间数据映射
+            polygonStr = tMap.get("GSECTION_VECTOR").toString();
+            key = tMap.get("LINE_CODE") + "_" + tMap.get("DIRECTIONS");
+
+            coords = polygonStr.substring(11, polygonStr.length() - 1).split(",");
+            len = coords.length - 1;
+            //每2个点连一条线
+            for(i = 0; i < len; i ++){
+                temps1 = coords[i].split(" ");
+                temps2 = coords[i + 1].split(" ");
+
+                lineString = new CtLineString();
+                lineString.setS(new Point(Float.parseFloat(temps1[0]), Float.parseFloat(temps1[1])));
+                lineString.setE(new Point(Float.parseFloat(temps2[0]), Float.parseFloat(temps2[1])));
+
+                sectionCacheTempMap.put(key, lineString);
+            }
+        }
+
+        if(sectionCacheTempMap.size() > 0)
+            sectionCacheMap = sectionCacheTempMap;
+
+        Map<String, String> sectionCode2NameTemp = new HashMap<>();
+
+        //加载全量路段编码和名称对照
+        sql = "select SECTION_CODE,SECTION_NAME,CROSES_ROAD from bsth_c_section";
+        secList = jdbcTemplate.queryForList(sql);
+        String name = null, code;
+        for (Map<String, Object> tMap : secList) {
+            if(tMap.get("CROSES_ROAD") != null && StringUtils.isNotEmpty(tMap.get("CROSES_ROAD").toString()))
+                name = tMap.get("CROSES_ROAD").toString();
+            else if(tMap.get("SECTION_NAME") != null && StringUtils.isNotEmpty(tMap.get("SECTION_NAME").toString()))
+                name = tMap.get("SECTION_NAME").toString();
+
+            code = tMap.get("SECTION_CODE").toString();
+            sectionCode2NameTemp.put(code, name);
+        }
+        if(sectionCode2NameTemp.size() > 0)
+            sectionCode2Name = sectionCode2NameTemp;
+    }
+
+    private void loadPremiseGeoData() {
+        ArrayListMultimap<String, PreconditionGeo> premiseGeoMapCopy = ArrayListMultimap.create();
+
+        String sql = "select * from  bsth_f_geo_premise";
+        List<PreconditionGeo> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(PreconditionGeo.class));
+
+        List<String> coordList;
+        String[] cs;
+        Point point;
+        List<Point> ps;
+        StationRoute sr;
+        for(PreconditionGeo p : list){
+            try{
+                sr = routeCodeMap.get(p.getLineCode()+"_"+p.getUpDown()+"_"+p.getStationCode());
+                p.setOrder(sr.getRouteSort());
+                //polygon
+                ps = new ArrayList<>();
+                coordList = Splitter.on(",").trimResults().splitToList(p.getCoords());
+                for(String c : coordList){
+                    cs = c.split(" ");
+                    point = new Point(Double.parseDouble(cs[0]), Double.parseDouble(cs[1]));
+                    ps.add(point);
+                }
+
+                p.setPolygon(new Polygon(ps));
+
+                sr.setPremise(true);
+                //按线路，走向分组
+                premiseGeoMapCopy.put(p.getLineCode()+"_"+p.getUpDown(), p);
+            }catch (Exception e){
+                logger.error("", e);
+            }
+        }
+
+        //排序
+        Set<String> ks = premiseGeoMapCopy.keySet();
+        PreconditionGeoComp comp = new PreconditionGeoComp();
+        for(String k : ks){
+            Collections.sort(premiseGeoMapCopy.get(k), comp);
+        }
+
+        premiseGeoMap = premiseGeoMapCopy;
+    }
+
+    public Polygon parsePolygon(String polygonStr) {
+        String[] coords = polygonStr.substring(9, polygonStr.length() - 2).split(","), temps;
+
+        List<Point> cds = new ArrayList<>(coords.length);
+        int len = coords.length;
+        for (int i = 0; i < len; i++) {
+            temps = coords[i].split(" ");
+            cds.add(new Point(Float.parseFloat(temps[1]), Float.parseFloat(temps[0])));
+        }
+        return new Polygon(cds);
+    }
+
+    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));
+        }
+    }
+
+    private static class PreconditionGeoComp implements Comparator<PreconditionGeo>{
+
+        @Override
+        public int compare(PreconditionGeo p1, PreconditionGeo p2) {
+            return p1.getOrder() - p2.getOrder();
+        }
+    }
+
+    public static Map<String, String> sectionCode2NameMap(){
+        return sectionCode2Name;
+    }
+}
+package com.bsth.data.gpsdata_v2.cache;
+
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
+import com.bsth.data.gpsdata_v2.entity.trail.GpsExecTrail;
+import com.bsth.data.gpsdata_v2.utils.CircleQueue;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+/**
+ * gps 数据缓存
+ * Created by panzhao on 2017/11/15.
+ */
+public class GpsCacheData {
+
+    /**
+     * 每辆车缓存最后300条gps
+     */
+    private static final int CACHE_SIZE = 300;
+    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
+
+    /**
+     * 车辆执行班次的详细 进出站数据
+     */
+    private static ArrayListMultimap<String, GpsExecTrail> trailListMultimap = ArrayListMultimap.create();
+
+    static Logger logger = LoggerFactory.getLogger(GpsCacheData.class);
+
+    public static CircleQueue<GpsEntity> getGps(String device) {
+        return gpsCacheMap.get(device);
+    }
+
+    public static GpsExecTrail gpsExecTrail(String nbbm){
+        List<GpsExecTrail> list = trailListMultimap.get(nbbm);
+
+        GpsExecTrail trail;
+        if(null == list || list.size() == 0
+                || list.get(list.size() - 1).isEnd()){
+            trail = new GpsExecTrail();
+
+            trailListMultimap.put(nbbm, trail);
+        }
+        else{
+            trail = list.get(list.size() - 1);
+        }
+
+        return trail;
+    }
+
+    public static void out(GpsEntity gps){
+        GpsExecTrail trail = gpsExecTrail(gps.getNbbm());
+        trail.getSrs().add(gps);
+
+    }
+
+    public static void in(GpsEntity gps, boolean end){
+        GpsExecTrail trail = gpsExecTrail(gps.getNbbm());
+        trail.getSrs().add(gps);
+        trail.setEnd(end);
+    }
+
+    public static GpsEntity getPrev(GpsEntity gps){
+        CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getDeviceId());
+        if(queue != null)
+            return queue.getTail();
+        return null;
+    }
+
+    public static void putGps(GpsEntity gps) {
+        CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getDeviceId());
+        if (queue == null) {
+            queue = new CircleQueue<>(CACHE_SIZE);
+            gpsCacheMap.put(gps.getDeviceId(), queue);
+        }
+        queue.add(gps);
+    }
+
+    public static void clear(String deviceId) {
+        try {
+            CircleQueue<GpsEntity> queue = gpsCacheMap.get(deviceId);
+            if (queue != null)
+                queue.clear();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    public static StationRoute prevStation(GpsEntity gps) {
+        List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
+        if(null == trails || trails.size() == 0)
+            return null;
+
+        GpsEntity prev;
+        for(int i = trails.size() - 1; i > 0; i--){
+            prev = trails.get(i).getSrs().peekLast();
+
+            if(prev != null){
+                return GeoCacheData.getRouteCode(prev);
+            }
+        }
+        return null;
+    }
+
+    public static List<StationRoute> prevMultiStation(GpsEntity gps) {
+        List<StationRoute> rs = new ArrayList<>();
+        List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
+        if(null == trails || trails.size() == 0)
+            return null;
+
+        for(int i = trails.size() - 1; i > 0; i--){
+            rs.addAll(searchLinked(trails.get(i).getSrs(), gps.getUpDown()));
+            if(rs.size() > 3)
+                break;
+        }
+        return rs;
+    }
+
+    private static List<StationRoute> searchLinked(LinkedList<GpsEntity> list, int upDown){
+        List<StationRoute> rs = new ArrayList<>();
+        Iterator<GpsEntity> iterator = list.iterator();
+        GpsEntity gps;
+        int prevCode=0;
+        while (iterator.hasNext()){
+            gps = iterator.next();
+            if(gps.getInstation()!=1)
+                continue;
+
+            if(gps.getUpDown() != upDown)
+                break;
+
+            if(gps.getStation().getRouteSort() != prevCode)
+                rs.add(gps.getStation());
+
+            prevCode = gps.getStation().getRouteSort();
+
+            if(rs.size() >= 3)
+                break;
+        }
+        return rs;
+    }
+}
+package com.bsth.data.gpsdata_v2.entity;
+
+import com.bsth.util.Geo.Point;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/11/15.
+ */
+public class CtLineString {
+
+    public CtLineString(){}
+    public CtLineString(List<Point> ps){
+        s = ps.get(0);
+        e = ps.get(1);
+    }
+
+    Point s;
+
+    Point e;
+
+    public Point getS() {
+        return s;
+    }
+
+    public void setS(Point s) {
+        this.s = s;
+    }
+
+    public Point getE() {
+        return e;
+    }
+
+    public void setE(Point e) {
+        this.e = e;
+    }
+}
-package com.bsth.data.gpsdata;
+package com.bsth.data.gpsdata_v2.entity;
-import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
@@ -66,9 +65,6 @@ public class GpsEntity implements Cloneable{
 	/** 当前执行班次ID */
 	private Long schId;
-	
-	/** 是否是不完整的数据 */
-	private boolean incomplete;
 	private int version;
@@ -258,14 +254,6 @@ public class GpsEntity implements Cloneable{
 		this.abnormalStatus = abnormalStatus;
 	}
-	public boolean isIncomplete() {
-		return incomplete;
-	}
-
-	public void setIncomplete(boolean incomplete) {
-		this.incomplete = incomplete;
-	}
-
 	public double getOutOfBoundDistance() {
 		return outOfBoundDistance;
 	}
-package com.bsth.data.gpsdata.arrival.precondition.entity;
+package com.bsth.data.gpsdata_v2.entity;
 import com.bsth.util.Geo.Polygon;
-package com.bsth.data.gpsdata.arrival.entity;
+package com.bsth.data.gpsdata_v2.entity;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
+import com.bsth.util.Geo.Point;
+import com.bsth.util.Geo.Polygon;
 /**
  * Created by panzhao on 2016/12/23.
+package com.bsth.data.gpsdata_v2.entity.trail;
+
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+
+import java.util.LinkedList;
+
+/**
+ * GPS 班次执行轨迹，过程数据
+ * Created by panzhao on 2017/11/16.
+ */
+public class GpsExecTrail {
+
+    /**
+     * 执行的班次ID
+     */
+    private Long schId;
+
+    /**
+     * 实际经过的站点路由
+     */
+    private LinkedList<GpsEntity> srs = new LinkedList<>();
+
+    /**
+     * 车辆编码
+     */
+    private String nbbm;
+
+    /**
+     * 是否结束
+     */
+    private boolean end;
+
+    public Long getSchId() {
+        return schId;
+    }
+
+    public void setSchId(Long schId) {
+        this.schId = schId;
+    }
+
+    public LinkedList<GpsEntity> getSrs() {
+        return srs;
+    }
+
+    public void setSrs(LinkedList<GpsEntity> srs) {
+        this.srs = srs;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public boolean isEnd() {
+        return end;
+    }
+
+    public void setEnd(boolean end) {
+        this.end = end;
+    }
+}
-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 com.bsth.data.gpsdata.arrival.utils.GeoUtils;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Point;
+package com.bsth.data.gpsdata_v2.handlers;
+
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.entity.CtLineString;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.utils.GeoUtils;
+import com.bsth.util.Geo.Point;
 import org.springframework.stereotype.Component;
 import java.util.List;
 /**
- * GPS异常状态判定 （越界/超速）
- * Created by panzhao on 2017/1/10.
+ * 越界/超速 判断
+ * Created by panzhao on 2017/11/16.
  */
 @Component
-public class AbnormalStateHandle extends SignalHandle{
+public class AbnormalStateProcess {
-    //默认限速
+    /**
+     * 默认限速
+     */
     private static final double DEFAULT_SPEED_LIMIT = 60;
-    //越界阈值
+    /**
+     * 越界阈值
+     */
     private static final double OUT_BOUNDS_THRESHOLD = 100;
-    GeometryFactory geometryFactory = new GeometryFactory();
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+    public void process(GpsEntity gps) {
         if(isOffline(gps))
-            return false;
+            return;
         if(overspeed(gps))
-            return true;
+            return;
         if(outOfBounds((gps)))
-            return true;
+            return;
+    }
-        return false;
+    private boolean isOffline(GpsEntity gps){
+        return gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline");
     }
+
     /**
      * 是否超速
      * @param gps
      * @return
      */
-    public boolean overspeed(GpsEntity gps){
+    private boolean overspeed(GpsEntity gps){
         double maxSpeed = DEFAULT_SPEED_LIMIT;
         if(GeoCacheData.speedLimit(gps.getLineId()) != null)
             maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
@@ -59,24 +59,25 @@ public class AbnormalStateHandle extends SignalHandle{
         return false;
     }
+
     /**
      * 是否越界
      * @param gps
      * @return
      */
     public boolean outOfBounds(GpsEntity gps){
-        //只处理电子围栏外的车
+        //只处理场站外的车
         if(gps.getInstation() != 0){
             return false;
         }
-        List<LineString> list = GeoCacheData.getLineStringList(gps);
-        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+        List<CtLineString> list = GeoCacheData.getLineStringList(gps);
+        Point point = new Point(gps.getLon(), gps.getLat());
         double min = -1, distance;
-        for(LineString lineString : list){
-            distance = GeoUtils.getDistanceFromLine(lineString, point);
+        for(CtLineString lineString : list){
+            distance = GeoUtils.getDistanceFromLine(lineString.getS(),lineString.getE(), point);
             if(min == -1 || min > distance)
                 min = distance;
+package com.bsth.data.gpsdata_v2.handlers;
+
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.status_manager.GpsStatusManager;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * GPS 状态处理
+ * Created by panzhao on 2017/11/15.
+ */
+@Component
+public class GpsStateProcess {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    GpsStatusManager gpsStatusManager;
+
+    public void process(GpsEntity gps){
+        //在执行的任务
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+        if(null == sch)
+            return;
+
+        byte upDown = Byte.parseByte(sch.getXlDir());
+
+        if(gps.getUpDown() != upDown){
+            gps.setUpDown(upDown);//修正走向
+        }
+
+        if((!gps.isService() || gps.getUpDown() != upDown) &&
+                !dayOfSchedule.emptyService(sch)){
+            //下发指令纠正车载的 营运状态 和 走向
+            gpsStatusManager.changeServiceState(gps.getNbbm(), upDown, 0, "同步@系统");
+        }
+
+        if(!sch.getXlBm().equals(gps.getLineId())){
+            //切换车载的 线路编码
+            gpsStatusManager.changeLine(gps.getNbbm(), sch.getXlBm(), "同步@系统");
+        }
+    }
+}
+package com.bsth.data.gpsdata_v2.handlers;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
+import com.bsth.data.gpsdata_v2.status_manager.GpsStatusManager;
+import com.bsth.data.gpsdata_v2.utils.GeoUtils;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 车辆到站处理程序
+ * Created by panzhao on 2017/11/16.
+ */
+@Component
+public class InStationProcess {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    LineConfigData lineConfigData;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    GpsStatusManager gpsStatusManager;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void process(GpsEntity gps){
+        GpsEntity prev = GpsCacheData.getPrev(gps);
+
+        if(isInsideStation(gps) &&
+                (prev == null || !isInsideStation(prev) || !prev.getStopNo().equals(gps.getStopNo()))){
+            inStation(gps, prev); //进站
+        }
+    }
+
+    private boolean isInsideStation(GpsEntity gps){
+        return gps.getInstation() >= 1;
+    }
+
+    /**
+     * 进站
+     * @param gps
+     * @param prev
+     */
+    private void inStation(GpsEntity gps, GpsEntity prev){
+        boolean flow=true;
+        //要经过一个中途站才能进
+        StationRoute s = GpsCacheData.prevStation(gps);
+        List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
+        if(routes.size() > 3 && null != s && s.getName().equals(gps.getStation().getName())){
+            logger.info("没有进中途站，拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp());
+            flow = false;
+        }
+
+
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+        boolean isEnd=false;
+
+        //进终点
+        if(flow && null != sch && sch.getZdzCode().equals(gps.getStopNo())){
+            inEndStation(sch, gps);
+            isEnd = true;
+        }
+
+        GpsCacheData.in(gps, isEnd);
+    }
+
+    /**
+     * 进班次终点
+     * @param gps
+     */
+    private void inEndStation(ScheduleRealInfo sch, GpsEntity gps) {
+        String nbbm = sch.getClZbh();
+        //校验进站前置约束
+        if(!validInPremise(gps))
+            return;
+
+        //实达时间不覆盖
+        if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+            return;
+
+        //应用到离站缓冲区设置参数
+        long rsT = lineConfigData.applyIn(sch, gps.getTimestamp());
+
+        sch.setZdsjActualAll(rsT);
+        sch.setSiginCompate(2);
+        //通知误点停靠程序，有车辆到站
+        LateAdjustHandle.carArrive(gps);
+
+        //持久化
+        dayOfSchedule.save(sch);
+
+        //车辆的下一个班次
+        ScheduleRealInfo next = dayOfSchedule.next(sch);
+        if(next != null){
+            dayOfSchedule.addExecPlan(next);
+            inStationAndInPark(sch, next);//进站既进场
+        }
+
+        //路牌的下一个班次，页面显示起点实际到达时间
+        ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch);
+        if(lpNext != null){
+            lpNext.setQdzArrDatesj(sch.getZdsjActual());
+        }
+
+        //已完成班次数
+        int doneSum = dayOfSchedule.doneSum(nbbm);
+        //webSocket
+        sendUtils.sendZdsj(sch, lpNext, doneSum);
+
+        logger.info("车辆：" + nbbm + " 班次：" + sch.getDfsj() + "到终点， 时间：" + sch.getZdsjActual());
+
+        //清除车辆误点调整监听
+        LateAdjustHandle.remove(nbbm);
+
+        //将gps转换成下一个班次走向的站内信号（应对只有一个站内信号 即 发出时）
+        transformUpDown(gps, next);
+
+        //下发调度指令
+        DirectivePushQueue.put6002(next, doneSum, "到站@系统");
+
+        //套跑  -下发线路切换指令
+        if(null != next && !next.getXlBm().equals(sch.getXlBm())){
+            gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
+        }
+
+        if(null == next && gps.isService())
+            nonService(sch, "结束@系统");//班次结束
+        else if(dayOfSchedule.emptyService(next))
+            nonService(sch, "空驶@系统");//下一班非营运
+    }
+
+    /**
+     * 校验进站前置约束
+     * @param gps
+     * @return
+     */
+    private boolean validInPremise(GpsEntity gps) {
+        StationRoute sr = gps.getStation();
+        if(null == sr || !sr.isPremise())
+            return true;
+
+        String premiseCode = gps.getPremiseCode();
+
+        if(StringUtils.isNotEmpty(premiseCode) && premiseCode.equals(gps.getStopNo())){
+            logger.info("满足前置进站约束 " + premiseCode);
+            return true;
+        }
+        else{
+            logger.info(gps.getNbbm() + " not premiseCode 不满足前置进站约束 " + premiseCode);
+        }
+        return false;
+    }
+
+    /**
+     * 进站既进场
+     * @param sch
+     */
+    private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next){
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        //限定出站既出场的停车场
+        String park = config.getTwinsPark();
+        boolean limitPark = StringUtils.isNotEmpty(park);
+
+
+        if (next.getBcType().equals("in") && config.getOutConfig() == 2 && isEmptyMileage(next)
+                && (!limitPark || park.equals(next.getZdzCode()))) {
+
+            endSch(next, sch.getZdsjActualTime());
+
+            sendUtils.refreshSch(next);
+            dayOfSchedule.save(next);
+
+            //分班的时候，需要再跳过1个班次
+            next = dayOfSchedule.next(next);
+            if(next != null)
+                dayOfSchedule.addExecPlan(next);
+
+            //进场，切换成非营运状态
+            nonService(sch, "进场@系统");
+        }
+    }
+
+
+    private boolean isEmptyMileage(ScheduleRealInfo sch){
+        return sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0;
+    }
+
+
+    /**
+     * 切换为非营运状态
+     * @param sch
+     * @param sender
+     */
+    private void nonService(ScheduleRealInfo sch, String sender){
+        gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, sender);
+    }
+
+    private void endSch(ScheduleRealInfo sch, Long t){
+        sch.setFcsjActualAll(t);
+        sch.setZdsjActualAll(t);
+    }
+
+    private void transformUpDown(GpsEntity gps, ScheduleRealInfo sch) {
+        if(null == sch)
+            return;
+        byte upDown = Byte.parseByte(sch.getXlDir());
+        //gps 切换走向
+        gps.setUpDown(upDown);
+        gps.setPremiseCode(null);
+
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), upDown);
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+        if (station != null) {
+            gps.setStopNo(station.getCode());
+        }
+    }
+}
+package com.bsth.data.gpsdata_v2.handlers;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.status_manager.GpsStatusManager;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 车辆出站处理程序
+ * Created by panzhao on 2017/11/16.
+ */
+@Component
+public class OutStationProcess {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    LineConfigData lineConfigData;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    GpsStatusManager gpsStatusManager;
+
+    public void process(GpsEntity gps){
+        GpsEntity prev = GpsCacheData.getPrev(gps);
+        if(gps.getInstation()==0 && prev!=null && isInsideStation(prev)){
+            outStation(gps); //出站
+        }
+    }
+
+    private boolean isInsideStation(GpsEntity gps){
+        return gps.getInstation() >= 1;
+    }
+
+    /**
+     * 出站
+     * @param gps
+     */
+    private void outStation(GpsEntity gps) {
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+        //起点发车
+        if (null != sch && sch.getQdzCode().equals(gps.getStopNo())){
+            gps.setPremiseCode(null);//清除前置围栏标记
+
+            if(StringUtils.isNotEmpty(sch.getFcsjActual())
+                    && !outManyFit(gps, sch)){
+                return;//班次已经实发
+            }
+
+            //应用到离站缓冲区设置参数
+            long rsT = lineConfigData.applyOut(sch, gps.getTimestamp());
+            //实发时间
+            sch.setFcsjActualAll(rsT);
+            sch.setSiginCompate(1);
+
+            //出站既出场
+            outStationAndOutPark(sch);
+
+            //webSocket
+            sendUtils.sendFcsj(sch);
+
+            //持久化
+            dayOfSchedule.save(sch);
+
+            //清理应发未发标记
+            LateAdjustHandle.remove(sch.getClZbh());
+
+            //发车的时候，同步一下状态
+            if(!gps.isService() && !dayOfSchedule.emptyService(sch))
+                gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 0, "发车@系统");
+
+            logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
+        }
+
+        GpsCacheData.out(gps);
+    }
+
+    /**
+     * 是否是一个更合适的发车信号
+     * @param gps
+     * @param sch
+     * @return
+     */
+    private boolean outManyFit(GpsEntity gps, ScheduleRealInfo sch) {
+        LineConfig conf = lineConfigData.get(sch.getXlBm());
+        if(null != conf && conf.isLockFirstOutTime())
+            return false;
+
+        if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+            return false;
+
+        long t1 = sch.getFcsjActualTime();
+        long t2 = gps.getTimestamp();
+        long c = sch.getDfsjT();
+
+        int threshold = 1000 * 60 * 5;
+        if(Math.abs(t2 - c) < threshold && c - t1 > threshold){
+            return true;
+        }
+        return false;
+    }
+
+    private void outStationAndOutPark(ScheduleRealInfo sch){
+        try{
+            LineConfig config = lineConfigData.get(sch.getXlBm());
+            //限定出站既出场的停车场
+            String park = config.getTwinsPark();
+            boolean limitPark = StringUtils.isNotEmpty(park);
+
+            if (config != null && config.getOutConfig() == 2) {
+                //出站既出场
+                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+                if (isOut(schPrev) && isEmptyMileage(schPrev)
+                        && (!limitPark || park.equals(schPrev.getQdzCode()))) {
+
+                    endSch(schPrev, sch.getFcsjActualTime());
+
+                    //起点实到
+                    sch.setQdzArrDatesj(schPrev.getZdsjActual());
+
+                    sendUtils.refreshSch(schPrev);
+                    dayOfSchedule.save(schPrev);
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+
+    private boolean isEmptyMileage(ScheduleRealInfo sch){
+        return sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0;
+    }
+
+    private boolean isOut(ScheduleRealInfo sch){
+        return sch != null && sch.getBcType().equals("out");
+    }
+
+    private void endSch(ScheduleRealInfo sch, Long t){
+        sch.setFcsjActualAll(t);
+        sch.setZdsjActualAll(t);
+    }
+}
+package com.bsth.data.gpsdata_v2.handlers;
+
+import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 反向路由处理（进站的时候处理）
+ * Created by panzhao on 2017/11/20.
+ */
+@Component
+public class ReverseRouteProcess {
+
+    private static final int REVER_THRESHOLD = 3;
+
+    private static final long TIME_THRESHOLD = 1000 * 60 * 120;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    public void process(GpsEntity gps){
+        if(reversRoute(gps)){
+            ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+            if(isInOut(sch) || !sch.getXlBm().equals(gps.getLineId()))
+                return;
+
+            //next
+            ScheduleRealInfo next = dayOfSchedule.next(sch);
+            if(isInOut(next))
+                return;
+
+            //跳下一个班次
+            if(Math.abs(next.getDfsjT() - gps.getTimestamp()) < TIME_THRESHOLD)
+                dayOfSchedule.addExecPlan(next);
+        }
+    }
+
+    private boolean reversRoute(GpsEntity gps) {
+        if(gps.getInstation() != 1)
+            return false;
+
+        int sortNo = gps.getStation().getRouteSort();
+                StationRoute prev = GpsCacheData.prevStation(gps);
+        //和上一个站点是反向
+        if(null != prev && sortNo < prev.getRouteSort()){
+
+            //满足3个进站反向信号
+            List<StationRoute> prevs = GpsCacheData.prevMultiStation(gps);
+
+            int count = 0;
+            for(StationRoute s : prevs){
+                if(sortNo < s.getRouteSort())
+                    count ++;
+                sortNo = s.getRouteSort();
+            }
+
+            if(count >= REVER_THRESHOLD)
+                return true;
+        }
+
+        return false;
+    }
+
+    private boolean isInOut(ScheduleRealInfo sch){
+        return sch.getBcType().equals("in") || sch.getBcType().equals("out");
+    }
+}
-package com.bsth.data.gpsdata.arrival.handlers;
+package com.bsth.data.gpsdata_v2.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.StationRoute;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
+import com.bsth.data.gpsdata_v2.utils.GeoUtils;
 import org.springframework.stereotype.Component;
 import java.util.List;
 /**
- * 站内站外判定
- * Created by panzhao on 2016/12/27.
+ * 站内 场内判定
+ * Created by panzhao on 2017/11/16.
  */
 @Component
-public class StationInsideHandle extends SignalHandle {
+public class StationInsideProcess {
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+    public void process(GpsEntity gps){
         //是否在场内
         String parkCode = GeoUtils.gpsInCarpark(gps);
+
         if (parkCode != null) {
             gps.setInstation(2);
             gps.setStopNo(parkCode);
@@ -44,37 +39,18 @@ public class StationInsideHandle extends SignalHandle {
         String premiseCode = GeoUtils.gpsInPremiseGeo(gps);
         gps.setPremiseCode(premiseCode);
-        if(isNotEmpty(prevs)){
-            try {
-                GpsEntity prev = prevs.getTail();
-                //继承前置围栏
-                if(null == premiseCode && null != prev.getPremiseCode())
-                    gps.setPremiseCode(prev.getPremiseCode());
+        //上一个点位
+        GpsEntity prev = GpsCacheData.getPrev(gps);
-                //在场，站外
-                if(gps.getInstation() == 0){
-                    //继承上一个点的站点编码
-                    gps.setStopNo(prev.getStopNo());
+        if(null != prev){
+            //继承前置围栏状态
+            if(null == premiseCode && null != prev.getPremiseCode())
+                gps.setPremiseCode(prev.getPremiseCode());
-                    /*if(null == premiseCode && null != prev.getPremiseCode())
-                        gps.setPremiseCode(prev.getPremiseCode());*/
-                }
-                /*else if(null != gps.getPremiseCode() && !gps.getStopNo().equals(gps.getPremiseCode())){
-                    gps.setPremiseCode(null);
-                }*/
-            }catch (Exception e){
-                logger.error("", e);
+            //在场，站外
+            if(gps.getInstation() == 0){
+                gps.setStopNo(prev.getStopNo());//继承上一个点的站点编码
             }
         }
-
-/*
-        //在场，站外
-        if(gps.getInstation() == 0 && isNotEmpty(prevs)){
-            //继承上一个点的站点编码
-            GpsEntity prev = prevs.getTail();
-            gps.setStopNo(prev.getStopNo());
-        }
-*/
-        return true;
     }
 }
+package com.bsth.data.gpsdata_v2.load;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata_v2.GpsRealData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.utils.GpsDataUtils;
+import com.bsth.util.ConfigUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+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.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 从网关http 接口加载数据
+ * Created by panzhao on 2017/11/15.
+ */
+@Component
+public class GatewayHttpLoader implements ApplicationContextAware{
+
+    static Logger logger = LoggerFactory.getLogger(GatewayHttpLoader.class);
+
+    static String url;
+    static List<GpsEntity> list;
+    static CloseableHttpClient httpClient = null;
+    static HttpGet get;
+    static RequestConfig requestConfig;
+    static CloseableHttpResponse response;
+    static HttpEntity entity;
+    static BufferedReader br;
+
+    static GpsRealData gpsRealData;
+
+    static{
+        url = ConfigUtil.get("http.gps.real.url");
+        list = new ArrayList<>();
+        httpClient = HttpClients.createDefault();
+        get = new HttpGet(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
+                .setSocketTimeout(1500).build();
+        get.setConfig(requestConfig);
+    }
+
+    public static List<GpsEntity> load(){
+        try{
+            if(list.size() > 0)
+                list.clear();
+
+            response = httpClient.execute(get);
+            entity = response.getEntity();
+
+            if(null == entity)
+                return list;
+
+            br = new BufferedReader(new InputStreamReader(entity.getContent()));
+
+            StringBuilder sb = new StringBuilder();
+            String str;
+            while ((str = br.readLine()) != null)
+                sb.append(str);
+
+            list = JSON.parseArray(JSON.parseObject(sb.toString()).getString("data"), GpsEntity.class);
+            //过滤掉无效的点位
+            list = GpsDataUtils.clearInvalid(list);
+
+            List<GpsEntity> ups = new ArrayList<>();
+            String nbbm;
+            for (GpsEntity gps : list) {
+                if (StringUtils.isBlank(gps.getDeviceId()))
+                    continue;
+
+                if (gps_equals(gpsRealData.get(gps.getDeviceId()), gps))
+                    continue;
+
+                nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+                gps.setNbbm(nbbm);
+                ups.add(gps);
+            }
+            list = ups;
+
+            if (null != response)
+                response.close();
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        return list;
+    }
+
+
+    private static boolean gps_equals(GpsEntity old, GpsEntity gps){
+        if(old != null &&
+                old.getTimestamp().equals(gps.getTimestamp()) &&
+                old.getLat().equals(gps.getLat()) &&
+                old.getLon().equals(gps.getLon()))
+            return true;
+        return false;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        gpsRealData = applicationContext.getBean(GpsRealData.class);
+    }
+}
+package com.bsth.data.gpsdata_v2.load;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.utils.GpsDataUtils;
+import com.bsth.util.ConfigUtil;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 从专用的socket client 加载数据
+ * Created by panzhao on 2017/11/15.
+ */
+@Component
+public class SocketClientLoader {
+
+    static Logger logger = LoggerFactory.getLogger(SocketClientLoader.class);
+
+    static String url;
+    static List<GpsEntity> list;
+    static CloseableHttpClient httpClient = null;
+    static HttpGet get;
+    static RequestConfig requestConfig;
+    static CloseableHttpResponse response;
+    static HttpEntity entity;
+    static BufferedReader br;
+
+    static {
+        url = ConfigUtil.get("http.gps.real.cache.url");
+        list = new ArrayList<>();
+        httpClient = HttpClients.createDefault();
+        get = new HttpGet(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
+                .setSocketTimeout(1500).build();
+        get.setConfig(requestConfig);
+    }
+
+    public static List<GpsEntity> load(){
+        try {
+            if(list.size() > 0)
+                list.clear();
+            logger.info("load start...");
+            response = httpClient.execute(get);
+            entity = response.getEntity();
+            if(null == entity)
+                return list;
+
+            br = new BufferedReader(new InputStreamReader(entity.getContent()));
+            StringBuilder sb = new StringBuilder();
+            String str;
+            while ((str = br.readLine()) != null)
+                sb.append(str);
+
+            list = JSON.parseArray(sb.toString(), GpsEntity.class);
+
+            //过滤掉无效的点位
+            list = GpsDataUtils.clearInvalid(list);
+
+            logger.info("load end!");
+            for (GpsEntity gps : list) {
+                gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
+            }
+
+            if (null != response)
+                response.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+
+        return list;
+    }
+}
+package com.bsth.data.gpsdata_v2.rfid;
+
+import com.bsth.data.gpsdata_v2.rfid.entity.RfidInoutStation;
+import com.bsth.data.gpsdata_v2.rfid.handle.RfidSignalHandle;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * RFID 数据上传入口
+ * Created by panzhao on 2017/11/22.
+ */
+@RestController
+@RequestMapping("/up/rfid")
+public class UploadRfidDataService {
+
+    @Autowired
+    RfidSignalHandle rfidSignalHandle;
+
+    @RequestMapping("inside")
+    public void inside(@RequestBody List<RfidInoutStation> list) {
+        rfidSignalHandle.handle(list);
+    }
+}
+package com.bsth.data.gpsdata_v2.rfid.entity;
+
+/**
+ * RFID 进出数据
+ * Created by panzhao on 2017/11/22.
+ */
+public class RfidInoutStation {
+
+    private String nbbm;
+
+    private String station;
+
+    /**
+     * 0 进
+     * 1 出
+     */
+    private int type;
+
+    /**
+     * 信号时间
+     */
+    private long t;
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getStation() {
+        return station;
+    }
+
+    public void setStation(String station) {
+        this.station = station;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public long getT() {
+        return t;
+    }
+
+    public void setT(long t) {
+        this.t = t;
+    }
+}