Merge branch 'pudong' into jiading

# Conflicts: # src/main/resources/application-prod.properties # src/main/resources/datatools/config-prod.properties # src/main/resources/ms-jdbc.properties # src/main/resources/static/index.html # src/main/resources/static/login.html # src/main/resources/static/real_control_v2/main.html

Merge branch 'pudong' into jiading
# Conflicts: # src/main/resources/application-prod.properties # src/main/resources/datatools/config-prod.properties # src/main/resources/ms-jdbc.properties # src/main/resources/static/index.html # src/main/resources/static/login.html # src/main/resources/static/real_control_v2/main.html
潘钊
2 parents 106e4427 effff2cb
Showing 59 changed files with 1254 additions and 2756 deletions
pom.xml
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/DeviceGpsController.java
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/controller/RoadSpeedController.java
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/calc/CalcWaybillController.java
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/oil/CwjyController.java
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/oil/YlxxbController.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>
@@ -17,7 +17,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(16);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(18);
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
 package com.bsth;
 import com.bsth.data.BasicData;
+import com.bsth.data.LineVersionsData;
 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.gpsdata_v2.thread.OfflineMonitorThread;
 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;
 import com.bsth.data.schedule.signal.SchSiginUpdateDBThread;
@@ -41,10 +44,6 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     UpdateDBThread fcxxUpdateThread;
     @Autowired
-    GpsDataLoaderThread gpsDataLoader;
-    @Autowired
-    OfflineMonitorThread offlineMonitorThread;
-    @Autowired
     ScheduleRefreshThread scheduleRefreshThread;
     @Autowired
     SchedulePstThread schedulePstThread;
@@ -64,6 +63,17 @@ public class XDApplication implements CommandLineRunner {
     SampleTimeDataLoader sampleTimeDataLoader;
     @Autowired
     SchSiginUpdateDBThread schSiginUpdateDBThread;
+    @Autowired
+    AutoExecScanThread autoExecScanThread;
+
+    @Autowired
+    GpsDataLoaderThread gpsDataLoader;
+
+    @Autowired
+    OfflineMonitorThread offlineMonitorThread;
+
+    @Autowired
+    LineVersionsData lineVersionsData;
     private static long timeDiff;
     private static long timeDiffTraffic;
@@ -100,17 +110,19 @@ 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);//班次自动执行
+        //WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         //实际排班延迟入库线程
         //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
         //班次修正日志延迟入库
@@ -126,29 +138,34 @@ public class XDApplication implements CommandLineRunner {
         ScheduledExecutorService sexec = Application.mainServices;
         /** 线调业务 */
-        sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);//抓取GPS数据
+        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
+        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(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);//班次更新线程
-        sexec.scheduleWithFixedDelay(schedulePstThread, 60, 10, TimeUnit.SECONDS);//班次延迟入库线程
-        sexec.scheduleWithFixedDelay(seiPstThread, 60, 60, TimeUnit.SECONDS);//班次修正日志入库
-        sexec.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);//检查班次误点
-        sexec.scheduleWithFixedDelay(directivesPstThread, 180, 100, TimeUnit.SECONDS);//调度指令延迟入库
-        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
-        sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 12, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
+        sexec.scheduleWithFixedDelay(schedulePstThread, 120, 10, TimeUnit.SECONDS);//班次延迟入库线程
+        sexec.scheduleWithFixedDelay(seiPstThread, 160, 60, TimeUnit.SECONDS);//班次修正日志入库
+        sexec.scheduleWithFixedDelay(directivesPstThread, 180, 120, TimeUnit.SECONDS);//调度指令延迟入库
+        //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
+        sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
         sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新
+        sexec.scheduleWithFixedDelay(autoExecScanThread, 160, 50, TimeUnit.SECONDS);//班次自动执行
         DirectivePushQueue.start();//消息队列 -指令，系统下发的
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         /** 线调为其他程序提供的数据 --写入数据库 */
-        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 60, 40, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
+        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
         //线路首末班数据（网关用，班次更新时写入）
         //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
-        sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 60, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
+        sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
         //运管处静态数据提交
         log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
         sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //计算油、公里加注
         sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+
+        //线路版本更新
+        sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
     }
 }
@@ -33,6 +33,8 @@ public class Constants {
 	//车载网关上行接口
 	public static final String UPSTREAM_URL = "/control/upstream";
+	//rfid 上传入口
+	public static final String UP_RFID_URL = "/rfid/**";
 	public static final String SESSION_USERNAME = "sessionUserName";
 	public static final String COMPANY_AUTHORITYS = "cmyAuths";
 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;
 package com.bsth.controller;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -11,7 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
+import com.bsth.entity.LineVersions;
 import com.bsth.service.LineService;
+import com.bsth.service.LineVersionsService;
 import com.bsth.util.GetUIDAndCode;
 /**
@@ -36,6 +41,9 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	@Autowired
 	private LineService service;
+	@Autowired
+	private LineVersionsService lineVersionsService;
+	
 	/**
 	 * 获取线路编码与ID
 	 * 
@@ -47,6 +55,16 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	}
 	/**
+	 * 验证线路编码是否存在
+	 * 
+	 * @return Map < {valid: true }：是否通过验证>
+	 */
+	@RequestMapping(value = "lineCodeVerification", method = RequestMethod.GET)
+	public String lineCodeVerification(@RequestParam(defaultValue = "lineCode") String lineCode) {
+		return service.lineCodeVerification(lineCode);
+	}
+	
+	/**
 	 * 
 	 * 保存
 	 * 
@@ -59,12 +77,46 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 			t.setId(Integer.valueOf(t.getLineCode()));
 		}
-		if( (t.getId().toString().length()) > 6) {
+		if( (t.getId().toString().length()) > 6 || service.lineCodeVerification(t.getLineCode()).equals("false") ) {
+			
+			map.put("status", ResponseCode.ERROR); 
+			return map;
+		}
+		// 添加线路版本
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try {
+			Date endDate = simpleDateFormat.parse("2088-08-08 00:00:00");
+			LineVersions lineVersions = new LineVersions();
+			lineVersions.setName("原始版本");
+			lineVersions.setLine(t);
+			lineVersions.setLineCode(t.getLineCode());
+			lineVersions.setStartDate(t.getCreateDate());
+			lineVersions.setEndDate(new java.sql.Date(endDate.getTime()));// 2088-8-8 00:00:00
+			lineVersions.setVersions(1);
+			lineVersions.setStatus(1);
+			// 先添加线路再添加版本
+			service.save(t);
+			return lineVersionsService.save(lineVersions);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			map.put("status", ResponseCode.ERROR); 
+			return map;
+		}
+	} 
+	
+	/**
+	 * 更改
+	 */
+	@RequestMapping(value="/update", method = RequestMethod.POST)
+	public Map<String, Object> update(Line l){
+		Map<String, Object> map = new HashMap<>();
+		if((l.getId().toString().length()) > 6 || service.lineCodeVerification(l.getLineCode()).equals("true") ) {
 			map.put("status", ResponseCode.ERROR); 
 			return map;
 		}
-		return service.save(t);
+		return service.update(l);
 	} 
 	@RequestMapping(value ="/findById" , method = RequestMethod.GET)
+package com.bsth.controller;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+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;
+
+import com.bsth.entity.Line;
+import com.bsth.entity.LineVersions;
+import com.bsth.repository.LineRepository;
+import com.bsth.service.LineVersionsService;
+
+/**
+ * 
+ * @ClassName: LineController(线路版本控制器)
+ * 
+ * @Extends : BaseController
+ * 
+ * @Description: TODO(线路版本版控制层)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+@RestController
+@RequestMapping("lineVersions")
+public class LineVersionsController extends BaseController<LineVersions, Integer> {
+	
+	@Autowired
+	private LineVersionsService service;
+	
+	@Autowired
+	LineRepository lineRepository;
+	
+	/**
+	 * 获取线路所有版本
+	 */
+	@RequestMapping(value = "findLineVersionsMax", method = RequestMethod.GET)
+	public LineVersions findLineVersionsMax(@RequestParam(defaultValue = "lineId") int lineId) {
+		return service.findLineVersionsMax(lineId);
+	}
+	
+	/**
+	 * 获取线路所有版本
+	 * 
+	 */
+	@RequestMapping(value = "findByLineId", method = RequestMethod.GET)
+	public List<LineVersions> getLineCode(@RequestParam(defaultValue = "lineId") int lineId) {
+		return service.findByLineCode(lineId);
+	}
+	
+	/**
+	 * 根据id查询线路版本信息
+	 * 
+	 */
+	@RequestMapping(value = "findById", method = RequestMethod.GET)
+	public LineVersions findOne(@RequestParam(defaultValue = "id") int id) {
+		return service.findById(id);
+	}
+	
+	/**
+	 * 根据id修改线路版本信息
+	 * 
+	 */
+	@RequestMapping(value = "update", method = RequestMethod.POST)
+	public Map<String, Object> update(@RequestParam Map<String, Object> map) {
+		return service.update(map);
+	}
+	
+	@RequestMapping(value = "add", method = RequestMethod.POST)
+	public Map<String, Object> add(@RequestParam Map<String, Object> map) {
+		return service.add(map);
+	}
+	
+}
+package com.bsth.controller;
+
+import java.util.List;
+import java.util.Map;
+
+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;
+
+import com.bsth.entity.RoadSpeed;
+import com.bsth.service.RoadSpeedService;
+
+/**
+ * 
+ * @ClassName: RoadSpeedController(路段限速控制器)
+ * 
+ * @Extends : BaseController
+ * 
+ * @Description: TODO(路段限速控制层)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+@RestController
+@RequestMapping("roadSpeed")
+public class RoadSpeedController extends BaseController<RoadSpeed, Integer> {
+	
+	@Autowired
+	private RoadSpeedService service;
+	
+	/*@RequestMapping(value="all", method = RequestMethod.GET)
+	public List<RoadSpeed> allRoadSpeed(){
+		return service.allRoadSpeed();
+	}*/
+	
+	@RequestMapping(value="save", method = RequestMethod.POST)
+	public Map<String, Object> save(@RequestParam Map<String, Object> map){
+		return service.roadSpeedSave(map);
+	}
+	
+	@RequestMapping(value="update", method = RequestMethod.POST)
+	public Map<String, Object> update(@RequestParam Map<String, Object> map){
+		return service.update(map);
+	}
+	
+	@RequestMapping(value="findById", method = RequestMethod.GET)
+	public RoadSpeed findById(@RequestParam(defaultValue = "id") Integer id){
+		return service.findId(id);
+	}
+}
@@ -74,6 +74,24 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	}
 	/**
+	 * @Description :TODO(编辑线路走向保存到线路历史表)
+	 * 
+	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
+	 * 
+	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 */
+	@RequestMapping(value="sectionCutSaveLineLS" , method = RequestMethod.POST)
+	public Map<String, Object> sectionCutSaveLineLS(@RequestParam Map<String, Object> map) {
+		
+		map.put("updateBy", "");
+		
+		map.put("createBy", "");
+		
+		return service.sectionCutSaveLineLS(map);
+		
+	}
+	
+	/**
 	 * @Description :TODO(编辑线路走向)
 	 * 
 	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
@@ -8,8 +8,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import antlr.collections.List;
-
 import com.bsth.entity.Station;
 import com.bsth.service.StationService;
 import com.bsth.util.GetUIDAndCode;
@@ -128,6 +126,27 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 		map.put("updateBy", "");
 		return service.stationUpdate(map);
 	}
+	
+	/**
+	 * @Description :TODO(更新缓存站点保存)
+	 * 
+	 * @param map <bJwpoints：中心点百度坐标；bPolygonGrid：多边形图形百度坐标；dbType：原坐标类型；
+	 * 
+	 * 			  descriptions：说明；destroy：是否撤销；directions：方向；distances：到站距离；gJwpoints：中心点WGS坐标；
+	 * 
+	 * 			  gPolygonGrid：多边形图形WGS坐标；lineId：线路ID；radius：圆半径；roadCoding：道路编码；shapesType：图形类型；
+	 * 
+	 * 			  stationCod：站点编码；stationMark：站点类型；stationName：站点名称；stationRouteCode：站点序号；toTime：到站时间
+	 * 			  
+	 * 			  versions：版本号；x：城建坐标x；y：城建坐标y>
+	 * 
+	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 */
+	@RequestMapping(value="stationCacheUpdate" , method = RequestMethod.POST)
+	public Map<String, Object> stationCacheUpdate(@RequestParam Map<String, Object> map) {
+		map.put("updateBy", "");
+		return service.stationCacheUpdate(map);
+	}
 	/**
 	 * @Description :TODO(查询站点编码)
 	 * 
 package com.bsth.controller;
 import com.bsth.entity.StationRoute;
+import com.bsth.entity.StationRouteCache;
+import com.bsth.repository.StationRouteCacheRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.StationRouteService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +39,8 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	StationRouteService service;
     @Autowired
     StationRouteRepository stationRouteRepository;
+    @Autowired
+    StationRouteCacheRepository stationRouteCacheRepository;
     /**
      * @param @param map
@@ -49,6 +53,11 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
         return service.list(map);
     }
+    @RequestMapping(value = "/cacheList", method = RequestMethod.GET)
+    public List<StationRouteCache> cacheList(@RequestParam Map<String, Object> map) {
+        return service.cacheList(map);
+    }
+    
     /**
 	 * @Description :TODO(查询路段信息)
 	 * 
@@ -101,6 +110,14 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	}
 	/**
+	 * @Description :TODO(查询缓存站点的上一个缓存站点)
+	 */
+	@RequestMapping(value = "/findCacheUpStationRouteCode" , method = RequestMethod.GET)
+	public List<Map<String, Object>> findCacheUpStationRouteCode(@RequestParam Map<String, Object> map) {
+		return service.findCacheUpStationRouteCode(map);
+	}
+	
+	/**
 	 * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
 	 * 
 	 * @param map <lineId:线路ID； direction：方向>
@@ -195,4 +212,31 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	public Map<String, Object> upddis(@RequestParam Map<String, Object> map) {
 		return service.upddis(map);
 	}
+    
+    /**
+     * 
+     * @Title: findCacheStationRoute 
+     * @Description: TODO(查询缓存路由) 
+     */
+    @RequestMapping(value = "/findCacheStationRoute",method = RequestMethod.GET)
+    public List<StationRouteCache> findCacheStationRoute(@RequestParam Map<String, Object> map) {
+    	int lineId = Integer.parseInt(map.get("lineId").toString());
+    	int dir = Integer.parseInt(map.get("dir").toString());
+    	return stationRouteCacheRepository.findstationRoute(lineId, dir);
+    }
+    
+    /**
+     * 
+     * @Title: findCachePoint 
+     * 
+     *  @param map <lineId:线路ID； dir：方向>
+     * 
+     * @Description: TODO(查询缓存路由) 
+     */
+    @RequestMapping(value = "/findCachePoint",method = RequestMethod.GET)
+    public List<Map<String, Object>> findCachePoint(@RequestParam Map<String, Object> map) {
+    	int lineId = Integer.parseInt(map.get("lineId").toString());
+    	int dir = Integer.parseInt(map.get("dir").toString());
+    	return service.findCachePoint(lineId, dir);
+    }
 }
+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);
+	}
+	
+}
@@ -165,11 +165,11 @@ public class DirectiveController {
 	 * @throws
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Map<String, Object> findDirective(String nbbm,@RequestParam int dType
+	public Map<String, Object> findDirective(String nbbms,@RequestParam int dType
 							, @RequestParam(defaultValue = "0") int page,
 							@RequestParam(defaultValue = "10") int size){
-		return directiveService.findDirective(nbbm, dType, page, size);
+		return directiveService.findDirective(nbbms, dType, page, size);
 	}
 	@RequestMapping(value = "/c0a4", method = RequestMethod.POST)
@@ -186,13 +186,10 @@ public class ExportController {
 			m.put("i", i);
 			m.put("rQ", l.getrQ());
 			m.put("gS", l.getgS());
-			m.put("xL", l.getxL());
+			m.put("xL", l.getXlmc());
 			m.put("clzbh", l.getClzbh());
 			m.put("jsy", l.getJsy());
 			m.put("jName", l.getjName());
-			
-			
-			
 			m.put("sgh", l.getSgh());
 			m.put("sName", l.getsName());
 			m.put("jhlc", l.getJhlc());
@@ -78,6 +78,13 @@ public class MCY_FormsController {
 		return formsService.singledata(map);
 	}
+	
+	// 路单数据
+	@RequestMapping(value = "/singledatanew", method = RequestMethod.GET)
+	public List<Singledata> singledatanew(@RequestParam Map<String, Object> map) {
+
+		return formsService.singledata(map);
+	}
 	// 车辆加注
 	@RequestMapping(value = "/vehicleloading", method = RequestMethod.GET)
 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;
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Line;
@@ -35,7 +36,16 @@ public class CwjyController extends BaseController&lt;Cwjy, Integer&gt;{
 		t.setNbbm(t.getNbbm().trim().toUpperCase());
 		Line line=BasicData.nbbm2LineMap.get(t.getNbbm());
 		t.setLine(line == null?"" : line.getLineCode());
-		return service.save(t);
+		Map<String, Object> map = new HashMap<>();
+		try {
+		 map=service.save(t);
+		}catch (Exception e) {
+			// TODO: handle exception
+			if(e.getMessage().indexOf("PK_CWJYUK")>0){
+				map.put("fage", "存在相同数据,数据已经过滤");
+			}
+		}
+		return map;
 	}
 	@RequestMapping(value = "/checkNbbm",method = RequestMethod.GET)
@@ -2,6 +2,7 @@ package com.bsth.controller.oil;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -20,6 +21,7 @@ import com.bsth.controller.BaseController;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.service.oil.DlbService;
+import com.bsth.util.Arith;
 import com.bsth.util.ReportUtils;
 import com.google.common.base.Splitter;
@@ -162,10 +164,11 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			m.put("hd", y.getHd()<=0?"0":y.getHd());
 			String shyy ="无";
 			if(y.getShyy()!=null){
-				 if(shyy.equals("1")){shyy="票务用油";}
-				 else if(shyy.equals("2")){shyy="保养用油";}
-				 else if(shyy.equals("3")){shyy="报废车用油";}
-				 else if(shyy.equals("4")){shyy="其它用油";}
+				shyy=y.getShyy();
+				 if(shyy.equals("1")){shyy="票务用电";}
+				 else if(shyy.equals("2")){shyy="保养用电";}
+				 else if(shyy.equals("3")){shyy="报废车用电";}
+				 else if(shyy.equals("4")){shyy="其它用电";}
 				 else if(shyy.equals("5")){shyy="人保部";}
 				 else if(shyy.equals("6")){shyy="车队";}
 				 else if(shyy.equals("7")){shyy="车间(高保)";}
@@ -178,6 +181,7 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
 			m.put("rdlx", "");
 			m.put("bglyh", y.getBglyh());
+			m.put("zdh", Arith.add(y.getSh(), y.getHd()));
 			resList.add(m);
 		}
 		try {
@@ -194,4 +198,30 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 	}
+	
+	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
+	public String checkJsy(@RequestParam Map<String, Object> map){
+		String list=service.checkJsy(map);
+		return list;
+	}
+	
+	@RequestMapping(value = "/deleteIds", method = RequestMethod.POST)
+    public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
+		Map<String, Object> maps=new HashMap<String, Object>();
+        try {
+        	maps= service.deleteIds(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return maps;
+    }
+	
+	@RequestMapping(value = "/saveDlb",method = RequestMethod.POST)
+	public Map<String, Object> saveDlb(Dlb t){
+//		SysUser user = SecurityUtils.getCurrentUser();
+		t.setCreatetime(new Date());
+//		Ylb t=new Ylb();
+		return service.saveDlb(t);
+	}
 }
@@ -27,6 +27,7 @@ import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.oil.YlbService;
+import com.bsth.util.Arith;
 import com.bsth.util.ReportUtils;
 import com.google.common.base.Splitter;
@@ -209,8 +210,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
         return maps;
     }
 	@RequestMapping(value="/oilListMonth")
-	public List<Ylb> oilListMonth(@RequestParam String line,@RequestParam String date,@RequestParam String type){
-		return yblService.oilListMonth(line, date, type);
+	public List<Ylb> oilListMonth(@RequestParam Map<String, Object> map){
+		return yblService.oilListMonth(map);
 	}
 	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
@@ -273,6 +274,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("sh", y.getSh()<=0?"0":y.getSh());
 			m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
 			m.put("bglyh", y.getBglyh());
+			m.put("zyh", Arith.add(y.getSh(), y.getYh()));
 			resList.add(m);
 		}
 		try {
@@ -288,4 +290,22 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return resList;
 	}
+	
+	/*
+	 *   历史修改行车路单后重新统计油量信息  (传参：line --线路编码   date --日期)
+	 */
+	
+	@RequestMapping(value = "/updateHistory",method = RequestMethod.POST)
+	public Map<String, Object> updateHistory(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> list =new HashMap<String, Object>();
+		try {
+			list = yblService.updateHistory(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw e;
+		}
+		return list;
+	}
+	
+	
 }
 package com.bsth.controller.oil;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,12 @@ public class YlxxbController extends BaseController&lt;Ylxxb, Integer&gt;{
 		return pagequery;
 	}
+	@RequestMapping(value = "/listNbbm",method = RequestMethod.GET)
+	public List<Ylxxb> listNbbm(@RequestParam Map<String, Object> map){
+		List<Ylxxb> list=service.Pagequery_nbbm(map);
+		return list;
+	}
+	
 	/**
 	 * 核对油量（有加油没里程）
@@ -45,4 +52,17 @@ public class YlxxbController extends BaseController&lt;Ylxxb, Integer&gt;{
 		}
 		return list;
 	}
+	
+	@RequestMapping(value = "/checkNbbm",method = RequestMethod.POST)
+	public Map<String, Object> checkNbbm(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=new HashMap<>();
+		try {
+			list = service.checkNbbm(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return list;
+	}
+	
 }
@@ -131,7 +131,7 @@ public class BasicDataController {
 	 */
 	@RequestMapping("/nbbm2PlateNo")
 	public Map<String, String> nbbm2PlateNo(){
-		return basicData.getNbbm2PlateNo();
+		return basicData.nbbmCompanyPlateMap;
 	}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.realcontrol.FrequentPhrases;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by panzhao on 2017/9/17.
+ */
+@RestController
+@RequestMapping("frequent_phrases")
+public class FrequentPhrasesController extends BaseController<FrequentPhrases, Integer>{
+
+}
@@ -79,6 +79,11 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 		return lineConfigService.getByLineCode(lineCode);
 	}
+	@RequestMapping(value = "/findByIdx")
+	public Map<String, Object> findByIdx(@RequestParam String idx){
+		return lineConfigService.findByIdx(idx);
+	}
+
 	/**
 	 * 到站缓冲区设置
 	 * @param lineCode
@@ -111,4 +116,14 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	public Map<String, Object> parkAndStationSet(@RequestParam Map<String, String> map){
 		return lineConfigService.parkAndStationSet(map);
 	}
+
+	@RequestMapping(value = "/setAutoExec", method = RequestMethod.POST)
+	public Map<String, Object> setAutoExec(@RequestParam Map<String, String> map){
+		return lineConfigService.setAutoExec(map);
+	}
+
+	@RequestMapping(value = "/setReadReverse")
+	public Map<String, Object> setReadReverse(@RequestParam int status,@RequestParam String lineCode){
+		return lineConfigService.setReadReverse(status, lineCode);
+	}
 }
 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);
-    }
 }
@@ -529,8 +529,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	@RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
-	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks){
-		return scheduleRealInfoService.changeBcType(id, bcType, remarks);
+	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
+		return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
 	}
 	@RequestMapping(value="/history", method=RequestMethod.POST)
@@ -549,9 +549,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
 		List<String> rs = new ArrayList<>();
-		long t = new Date().getTime();
+		long t = System.currentTimeMillis();
 		if(c != 1)
-		 	t -= ONE_DAY - (1000 * 60 * 60 * 2);
+		 	t -= (ONE_DAY + (1000 * 60 * 60 * 2));
 		for(int i = 0; i < 3; i ++){
 			rs.add(fmtyyyyMMdd.print(t));
 			t -= ONE_DAY;
 package com.bsth.controller.realcontrol;
+import com.alibaba.fastjson.JSON;
+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_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;
+import com.bsth.repository.directive.D60Repository;
+import com.google.common.base.Splitter;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 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 org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 /**
- * 对外的营运数据接口，主要输出当日的数据
+ * 对外的营运数据接口
  * Created by panzhao on 2017/3/15.
  */
 @RestController
@@ -21,9 +30,58 @@ public class ServiceDataInterface {
     private final static String SECRE_KEY = "dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki";
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
     @Autowired
     DayOfSchedule dayOfSchedule;
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
+    @Autowired
+    D60Repository d60Repository;
+
+    @Autowired
+    GpsRealData gpsRealData;
+
+    /**
+     * 获取车辆 和 当前执行班次对照信息
+     * @return
+     */
+    @RequestMapping("/execSchList")
+    public List<Map<String, Object>> execSchList(@RequestParam String secretKey){
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+        List<Map<String, Object>> rs = new ArrayList<>();
+        Collection<ScheduleRealInfo> list = dayOfSchedule.execPlanMap().values();
+
+        Map<String, Object> map;
+        for(ScheduleRealInfo sch : list){
+            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;
+    }
+
     @RequestMapping("/getCurrentDayPlan")
     public List<ScheduleRealInfo> getCurrentDayPlan(
             @RequestParam String companyId,
@@ -78,4 +136,107 @@ public class ServiceDataInterface {
         }
         return rs;
     }
+
+    /**
+     * 获取全量的进出场数据， 仅供接口项目调用。 由接口项目负责对外所有场站输出
+     * @return
+     */
+    @RequestMapping("/findCurrInAndOut")
+    public List<ScheduleRealInfo> findCurrInAndOut(@RequestParam String secretKey){
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getBcType().equals("in")
+                    || sch.getBcType().equals("out")) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    /**
+     * 向指定的车辆下发消息短语
+     * @param nbbm
+     * @param txt
+     * @return
+     */
+    @RequestMapping(value = "/send60Phrase", method = RequestMethod.POST)
+    public int send60Phrase(@RequestBody Map<String, String> map,@RequestParam String secretKey){
+        try{
+            String nbbm = map.get("nbbm");
+            String txt = map.get("txt");
+            String sender = map.get("sender");
+            if(txt.length() > 50)
+                txt = txt.substring(0, 50);
+            if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+                return -500;
+
+            //车辆和设备号对照
+            String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+            if(StringUtils.isEmpty(deviceId))
+                return -404;
+
+            //检查设备是否在线
+            long t = System.currentTimeMillis();
+            GpsEntity gps = gpsRealData.get(deviceId);
+            if(null == gps ||  (t - gps.getServerTimestamp()) > 1000 * 60 * 5)
+                return -405;
+
+            Short dispatchInstruct = 0;//消息短语
+            D60 d60 = new DirectiveCreator().createD60(nbbm, txt, dispatchInstruct, gps.getUpDown(), gps.getState(), gps.getLineId());
+            d60.setSender(sender);
+            // 发送指令
+            int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
+            d60.setHttpCode(code);
+
+            if (code == 0) {
+                // 添加到缓存
+                dayOfDirectives.put60(d60, true);
+            } else {
+                d60.setErrorText("网关通讯失败, code: " + code);
+                d60Repository.save(d60);
+                dayOfDirectives.put60(d60, false);
+            }
+
+            return d60.getMsgId();
+        }catch (Exception e){
+            logger.error("", e);
+            return -500;
+        }
+    }
+
+    /**
+     * 根据msg id 查询指令响应情况
+     * @param msgIDs
+     * @return
+     */
+    @RequestMapping("/findD60Reply")
+    public List<Map<String, Object>> findD60Reply(@RequestParam String msgIds){
+        List<Map<String, Object>> rs = new ArrayList<>();
+        try{
+            Map<String, Object> map = new HashMap();
+
+            List<String> ids = Splitter.on(",").splitToList(msgIds);
+            D60 d60;
+            for(String id : ids){
+                if(StringUtils.isEmpty(id))
+                    continue;
+
+                d60 = dayOfDirectives.get(Integer.parseInt(id));
+                if(null == d60)
+                    continue;
+
+                map.put("msgId", d60.getMsgId());
+                map.put("deviceReplyTime", d60.getReply46Time());
+                map.put("jsyReplyTime", d60.getReply47Time());
+                rs.add(map);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        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();
@@ -105,4 +99,15 @@ public class anomalyCheckController {
     public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
         return dayOfSchedule.getLpScheduleMap().get(lpName);
     }
+
+    @RequestMapping(value = "/findSchByNbbm")
+    public List<ScheduleRealInfo> findSchByNbbm(@RequestParam String nbbm){
+        return dayOfSchedule.findByNbbm(nbbm);
+    }
+
+    @RequestMapping(value = "/removeExecPlan")
+    public int removeExecPlan(@RequestParam String nbbm){
+        dayOfSchedule.removeExecPlan(nbbm);
+        return 1;
+    }
 }
+package com.bsth.controller.realcontrol.summary;
+
+import com.bsth.controller.BaseController;
+import com.bsth.data.summary.entity.DestroySituation;
+import com.bsth.data.summary.service.DestroySituationService;
+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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@RestController
+@RequestMapping("/summary/destroy_detail")
+public class DestroySituationController extends BaseController<DestroySituation, Long> {
+
+    @Autowired
+    DestroySituationService destroySituationService;
+
+    @RequestMapping("excel")
+    public void excel(@RequestParam Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
+        destroySituationService.excel(map, request, response);
+    }
+}
+package com.bsth.controller.realcontrol.summary;
+
+import com.bsth.controller.BaseController;
+import com.bsth.data.summary.entity.FastAndSlow;
+import com.bsth.data.summary.service.FastAndSlowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 快慢误点统计
+ * Created by panzhao on 2017/10/24.
+ */
+@RestController
+@RequestMapping("/summary/fastAndSlow")
+public class FastAndSlowController extends BaseController<FastAndSlow, Long> {
+
+    @Autowired
+    FastAndSlowService fastAndSlowService;
+
+    @RequestMapping("/excel/{lineCode}")
+    public void excel(@PathVariable("lineCode") String lineCode, @RequestParam String st
+            , @RequestParam String et, @RequestParam int type, HttpServletRequest request, HttpServletResponse response) {
+        fastAndSlowService.excel(lineCode, st, et, type, request, response);
+    }
+}
 \ No newline at end of file
@@ -82,7 +82,8 @@ public class ReportController {
 	@RequestMapping(value="/queryStrinon" ,method = RequestMethod.GET)
 	public List<StationRoute> queryStrinon(@RequestParam String line,
 			@RequestParam int zd){
-		return service.queryStrinon(line,zd);
+		List<StationRoute> list=service.queryStrinon(line,zd);
+		return list;
 	}
 	//根据排班查到离站
 	@RequestMapping(value="/queryInOutStrtion" ,method = RequestMethod.GET)
@@ -2,14 +2,16 @@ package com.bsth.controller.schedule.core;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
+import com.bsth.entity.LineVersions;
 import com.bsth.entity.schedule.TTInfo;
+import com.bsth.service.LineVersionsService;
 import com.bsth.service.schedule.TTInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 /**
  * Created by xu on 16/12/20.
@@ -19,6 +21,56 @@ import java.util.Map;
 public class TTInfoController extends BController<TTInfo, Long> {
     @Autowired
     private TTInfoService ttInfoService;
+    @Autowired
+    private LineVersionsService lineVersionsService;
+
+    @RequestMapping(value = "/stationroute/{lineid}", method = RequestMethod.GET)
+    public Map<String, Object> getLineStationRouteVersions(@PathVariable(value = "lineid") Integer lineid) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            List<LineVersions> lineVersionses = lineVersionsService.findByLineCode(lineid);
+            Collections.sort(lineVersionses, new Comparator<LineVersions>() {
+                @Override
+                public int compare(LineVersions o1, LineVersions o2) {
+                    if (o1.getVersions() > o2.getVersions()) {
+                        return -1;
+                    } else if (o1.getVersions() < o2.getVersions()) {
+                        return 1;
+                    } else {
+                        return 0;
+                    }
+                }
+            });
+
+            // 取最近2条记录
+            List<Map<String, Object>> mapList = new ArrayList<>();
+            for (LineVersions lv: lineVersionses) {
+                String vname = lv.getName();
+                String rq = lv.getStartDate() == null ? "未知启用日期" : new DateTime(lv.getStartDate()).toString("YYYY年MM月dd日");
+                String sdesc = lv.getStatus() == 0 ? "历史" : (lv.getStatus() == 1 ? "当前" : "待更新");
+
+                Map<String, Object> value = new HashMap<>();
+                value.put("desc", vname + "-" + rq + "-" + sdesc);
+                value.put("version", lv.getVersions());
+
+                mapList.add(value);
+
+                if (mapList.size() == 2) {
+                    break;
+                }
+            }
+
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", mapList);
+
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+
+    }
     @RequestMapping(value = "/validate_name", method = RequestMethod.GET)
     public Map<String, Object> validate_name(@RequestParam Map<String, Object> param) {
@@ -35,10 +35,27 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
      * @return
      */
     @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST)
-    public Map<String, Object> validate_sheet(String filename, String sheetname, Integer lineid, String linename) {
+    public Map<String, Object> validate_sheet(
+            String filename, String sheetname, Integer lineid, String linename,
+            Integer zdlytype, Integer zdlyversion) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename);
+            if (zdlytype == null) {
+                throw new Exception("请选择路由版本类型");
+            } else {
+                if (zdlytype == 1) {
+                    ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, null);
+                } else if (zdlytype == 2) {
+                    if (zdlyversion == null || zdlyversion == -1) {
+                        throw new Exception("请选择具体版本");
+                    } else {
+                        ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, zdlyversion);
+                    }
+                } else {
+                    throw new Exception("未知路由版本类型");
+                }
+            }
+
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -31,220 +31,252 @@ import java.util.*;
 @RequestMapping("user")
 public class UserController extends BaseController<SysUser, Integer> {
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	SysUserService sysUserService;
-
-	@Autowired
-	CompanyAuthorityService companyAuthorityService;
-	
-	@RequestMapping(value = "/login/jCryptionKey")
-	public Map<String, Object> jCryptionKey(HttpServletRequest request){
-		//公匙返回页面
-		Map<String, Object> rs = new HashMap<>();
-		rs.put("publickey", RSAUtils.generateBase64PublicKey());
-		return rs;
-	}
-	
-	//需要验证码的账号
-	public static Map<String, Integer> captchaMap = new HashMap<>();
-
-	@RequestMapping(value = "/login", method = RequestMethod.POST)
-	public Map<String, Object> login(HttpServletRequest request, @RequestParam String userName,
-			@RequestParam String password, String captcha) {
-		
-		Map<String, Object> rs = new HashMap<>();
-		rs.put("status", ResponseCode.ERROR);
-		try {
-			HttpSession session = request.getSession();
-			rs.put("captcha", session.getAttribute("captcha"));
-			
-			if(captchaMap.get(userName) != null && captchaMap.get(userName) >= 3){
-				//校验验证码
-				String verCode = (String) session
-						.getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY);
-				
-				if(StringUtils.isBlank(captcha))
-					return put(rs, "msg", "请输入验证码");
-				
-				if(!verCode.equals(captcha))
-					return put(rs, "msg", "验证码有误，请刷新后重新输入");
-			}
-			
-			//解密RSA
-			try {
-				userName = RSAUtils.decryptBase64(userName);
-				password = RSAUtils.decryptBase64(password);
-			} catch (RuntimeException e) {
-				return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
-			}
-
-			SysUser user = sysUserService.findByUserName(userName);
-			if (null == user) 
-				return put(rs, "msg", "不存在的用户");
-			
-			if (!user.isEnabled()) 
-				return put(rs, "msg", "该用户已被锁定，请联系管理员");
-			
-			// 校验密码
-			boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
-			if (!matchStatus) {
-				rs.put("msg", "密码有误");
-				
-				Integer captchSize = captchaMap.get(userName);
-				if(null == captchSize)
-					captchSize = 0;
-				
-				captchSize ++;
-				captchaMap.put(userName, captchSize);
-				return rs;
-			}
-
-			// 登录
-			SecurityUtils.login(user, request);
-			//session里写入用户名，webSocket连接时标识身份用
-			session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
-
-			//获取公司权限数据
-			List<CompanyAuthority> cmyAuths=companyAuthorityService.findByUser(user);
-			session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
-
-			captchaMap.remove(userName);
-			rs.put("status", ResponseCode.SUCCESS);
-		} catch (Exception e) {
-			logger.error("", e);
-			rs.put("msg", "服务器出现异常，请联系管理员");
-		}
-		return rs;
-	}
-
-	/**
-	 * 返回当前用户的公司权限数据，用于构建页面级联下拉框
-	 * @return
-	 */
-	@RequestMapping("companyData")
-	public List<CompanyData> companyData(HttpServletRequest request){
-		List<CompanyData> rs = new ArrayList<>();
-		CompanyData companyData;
-
-		ArrayListMultimap<String, CompanyAuthority> map = ArrayListMultimap.create();
-		List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) request.getSession().getAttribute(Constants.COMPANY_AUTHORITYS);
-
-		for(CompanyAuthority cAuth : cmyAuths){
-			map.put(cAuth.getCompanyCode()+"_"+cAuth.getCompanyName(), cAuth);
-		}
-
-		Set<String> keys = map.keySet();
-		String[] temps;
-		for(String k : keys){
-			temps = k.split("_");
-
-			companyData = new CompanyData();
-			companyData.setCompanyCode(temps[0]);
-			companyData.setCompanyName(temps[1]);
-			companyData.setChildren(new ArrayList<CompanyData.ChildrenCompany>());
-
-			cmyAuths = map.get(k);
-			for(CompanyAuthority c : cmyAuths){
-				companyData.getChildren().add(new CompanyData.ChildrenCompany(c.getSubCompanyCode(), c.getSubCompanyName()));
-			}
-
-			rs.add(companyData);
-		}
-
-		return rs;
-	}
-	
-	@RequestMapping(value = "/login/captchaStatus")
-	public int captchaStatus(String userName){
-		Integer size = captchaMap.get(userName);
-		return size == null?0:size;
-	}
-	
-	public Map<String, Object> put(Map<String, Object> rs, String key, Object val){
-		rs.put(key, val);
-		return rs;
-	}
-
-	/**
-	 * 
-	 * @Title: loginFailure @Description: TODO(查询登录失败的详细信息) @param @param
-	 * request @return String 返回类型 @throws
-	 */
-	@RequestMapping("/loginFailure")
-	public String loginFailure(HttpServletRequest request) {
-		String msg = "";
-		HttpSession session = request.getSession();
-
-		Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
-
-		if (obj instanceof BadCredentialsException)
-			msg = "登录失败，用户名或密码错误.";
-		else if (obj instanceof SessionAuthenticationException)
-			msg = "登录失败，当前策略不允许重复登录.";
-		session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
-		return msg;
-	}
-
-	@RequestMapping("/currentUser")
-	public SysUser currentUser() {
-		return SecurityUtils.getCurrentUser();
-	}
-
-	/**
-	 * @Title changeEnabled
-	 * @Description: TODO(改变用户状态)
-	 * @param id
-	 *            用户ID
-	 * @param enabled
-	 *            状态
-	 * @return
-	 */
-	@RequestMapping("/changeEnabled")
-	public int changeEnabled(@RequestParam int id, @RequestParam int enabled) {
-		return sysUserService.changeEnabled(id, enabled);
-	}
-
-	/**
-	 * @Title changePWD
-	 * @Description: TODO(修改密码)
-	 * @param oldPWD
-	 *            原始密码
-	 * @param newPWD
-	 *            新密码
-	 * @param cnewPWD
-	 *            确认新密码
-	 * @return
-	 */
-	@RequestMapping(value = "/changePWD", method = RequestMethod.POST)
-	public String changePWD(@RequestParam String oldPWD, @RequestParam String newPWD, @RequestParam String cnewPWD) {
-		SysUser sysUser = SecurityUtils.getCurrentUser();
-		String msg = "";
-		if (new BCryptPasswordEncoder(4).matches(oldPWD, sysUser.getPassword())) {
-			if (oldPWD.equals(newPWD)) {
-				msg = "新密码不能跟原始密码一样！";
-			} else {
-				if (newPWD.equals(cnewPWD)) {
-					sysUserService.changePWD(sysUser.getId(), newPWD);
-					msg = "修改成功！";
-				} else {
-					msg = "新密码两次输入不一致！";
-				}
-			}
-		} else {
-			msg = "原始密码错误！";
-		}
-		return msg;
-	}
-
-	@RequestMapping(value = "/register" ,method = RequestMethod.POST)
-	public Map<String, Object> register(SysUser u){
-		return sysUserService.register(u);
-	}
-
-	@RequestMapping(value = "/all_distinct")
-	public List<SysUser> findAll_distinct(){
-		return sysUserService.findAll_distinct();
-	}
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    SysUserService sysUserService;
+
+    @Autowired
+    CompanyAuthorityService companyAuthorityService;
+
+    @RequestMapping(value = "/login/jCryptionKey")
+    public Map<String, Object> jCryptionKey(HttpServletRequest request) {
+        //公匙返回页面
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("publickey", RSAUtils.generateBase64PublicKey());
+        return rs;
+    }
+
+    //需要验证码的账号
+    public static Map<String, Integer> captchaMap = new HashMap<>();
+
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public Map<String, Object> login(HttpServletRequest request, @RequestParam String userName,
+                                     @RequestParam String password, String captcha) {
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            HttpSession session = request.getSession();
+            rs.put("captcha", session.getAttribute("captcha"));
+
+            if (captchaMap.get(userName) != null && captchaMap.get(userName) >= 3) {
+                //校验验证码
+                String verCode = (String) session
+                        .getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY);
+
+                if (StringUtils.isBlank(captcha))
+                    return put(rs, "msg", "请输入验证码");
+
+                if (!verCode.equals(captcha))
+                    return put(rs, "msg", "验证码有误，请刷新后重新输入");
+            }
+
+            //解密RSA
+            try {
+                userName = RSAUtils.decryptBase64(userName);
+                password = RSAUtils.decryptBase64(password);
+            } catch (RuntimeException e) {
+                return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
+            }
+
+            SysUser user = sysUserService.findByUserName(userName);
+            if (null == user)
+                return put(rs, "msg", "不存在的用户");
+
+            if (!user.isEnabled())
+                return put(rs, "msg", "该用户已被锁定，请联系管理员");
+
+            // 校验密码
+            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
+            if (!matchStatus) {
+                rs.put("msg", "密码有误");
+
+                Integer captchSize = captchaMap.get(userName);
+                if (null == captchSize)
+                    captchSize = 0;
+
+                captchSize++;
+                captchaMap.put(userName, captchSize);
+                return rs;
+            }
+
+            // 登录
+            SecurityUtils.login(user, request);
+            //session里写入用户名，webSocket连接时标识身份用
+            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+
+            //获取公司权限数据
+            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
+            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
+
+            captchaMap.remove(userName);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("msg", "服务器出现异常，请联系管理员");
+        }
+        return rs;
+    }
+
+    @RequestMapping(value = "/change_user", method = RequestMethod.POST)
+    public Map<String, Object> changeUser(HttpServletRequest request, @RequestParam String userName,
+                                          @RequestParam String password) {
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            HttpSession session = request.getSession();
+
+            SysUser user = sysUserService.findByUserName(userName);
+            if (null == user)
+                return put(rs, "msg", "不存在的用户");
+
+            if (!user.isEnabled())
+                return put(rs, "msg", "该用户已被锁定，请联系管理员");
+
+            // 校验密码
+            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
+            if (!matchStatus)
+                return put(rs, "msg", "密码有误");
+
+            // 登录
+            SecurityUtils.login(user, request);
+            //session里写入用户名，webSocket连接时标识身份用
+            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+
+            //获取公司权限数据
+            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
+            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("msg", "服务器出现异常，请联系管理员");
+        }
+        return rs;
+    }
+
+    /**
+     * 返回当前用户的公司权限数据，用于构建页面级联下拉框
+     *
+     * @return
+     */
+    @RequestMapping("companyData")
+    public List<CompanyData> companyData(HttpServletRequest request) {
+        List<CompanyData> rs = new ArrayList<>();
+        CompanyData companyData;
+
+        ArrayListMultimap<String, CompanyAuthority> map = ArrayListMultimap.create();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) request.getSession().getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        for (CompanyAuthority cAuth : cmyAuths) {
+            map.put(cAuth.getCompanyCode() + "_" + cAuth.getCompanyName(), cAuth);
+        }
+
+        Set<String> keys = map.keySet();
+        String[] temps;
+        for (String k : keys) {
+            temps = k.split("_");
+
+            companyData = new CompanyData();
+            companyData.setCompanyCode(temps[0]);
+            companyData.setCompanyName(temps[1]);
+            companyData.setChildren(new ArrayList<CompanyData.ChildrenCompany>());
+
+            cmyAuths = map.get(k);
+            for (CompanyAuthority c : cmyAuths) {
+                companyData.getChildren().add(new CompanyData.ChildrenCompany(c.getSubCompanyCode(), c.getSubCompanyName()));
+            }
+
+            rs.add(companyData);
+        }
+
+        return rs;
+    }
+
+    @RequestMapping(value = "/login/captchaStatus")
+    public int captchaStatus(String userName) {
+        Integer size = captchaMap.get(userName);
+        return size == null ? 0 : size;
+    }
+
+    public Map<String, Object> put(Map<String, Object> rs, String key, Object val) {
+        rs.put(key, val);
+        return rs;
+    }
+
+    /**
+     * @Title: loginFailure @Description: TODO(查询登录失败的详细信息) @param @param
+     * request @return String 返回类型 @throws
+     */
+    @RequestMapping("/loginFailure")
+    public String loginFailure(HttpServletRequest request) {
+        String msg = "";
+        HttpSession session = request.getSession();
+
+        Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
+
+        if (obj instanceof BadCredentialsException)
+            msg = "登录失败，用户名或密码错误.";
+        else if (obj instanceof SessionAuthenticationException)
+            msg = "登录失败，当前策略不允许重复登录.";
+        session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
+        return msg;
+    }
+
+    @RequestMapping("/currentUser")
+    public SysUser currentUser() {
+        return SecurityUtils.getCurrentUser();
+    }
+
+    /**
+     * @param id      用户ID
+     * @param enabled 状态
+     * @return
+     * @Title changeEnabled
+     * @Description: TODO(改变用户状态)
+     */
+    @RequestMapping("/changeEnabled")
+    public int changeEnabled(@RequestParam int id, @RequestParam int enabled) {
+        return sysUserService.changeEnabled(id, enabled);
+    }
+
+    /**
+     * @param oldPWD  原始密码
+     * @param newPWD  新密码
+     * @param cnewPWD 确认新密码
+     * @return
+     * @Title changePWD
+     * @Description: TODO(修改密码)
+     */
+    @RequestMapping(value = "/changePWD", method = RequestMethod.POST)
+    public String changePWD(@RequestParam String oldPWD, @RequestParam String newPWD, @RequestParam String cnewPWD) {
+        SysUser sysUser = SecurityUtils.getCurrentUser();
+        String msg = "";
+        if (new BCryptPasswordEncoder(4).matches(oldPWD, sysUser.getPassword())) {
+            if (oldPWD.equals(newPWD)) {
+                msg = "新密码不能跟原始密码一样！";
+            } else {
+                if (newPWD.equals(cnewPWD)) {
+                    sysUserService.changePWD(sysUser.getId(), newPWD);
+                    msg = "修改成功！";
+                } else {
+                    msg = "新密码两次输入不一致！";
+                }
+            }
+        } else {
+            msg = "原始密码错误！";
+        }
+        return msg;
+    }
+
+    @RequestMapping(value = "/register", method = RequestMethod.POST)
+    public Map<String, Object> register(SysUser u) {
+        return sysUserService.register(u);
+    }
+
+    @RequestMapping(value = "/all_distinct")
+    public List<SysUser> findAll_distinct() {
+        return sysUserService.findAll_distinct();
+    }
 }
+package com.bsth.controller.traffic;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.traffic.VehicleInoutStop;
+import com.bsth.service.traffic.VehicleInoutStopService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ *
+ * @author BSTH
+ *
+ */
+@RestController
+@RequestMapping("vehicle_stop")
+public class VehicleInoutStopController extends BaseController<VehicleInoutStop,Integer> {
+
+    @Autowired
+    VehicleInoutStopService vehicleInoutStopService;
+
+    /**
+     * 给定条件查车载上报停靠站
+     * @param map
+     * @param page
+     * @param size
+     * @return
+     */
+    @RequestMapping(value = "getVehicleInoutStopByParam")
+    public Page<Map<String, Object>> getVehicleInoutStopByParam(@RequestParam Map<String, Object> map,
+                        @RequestParam(defaultValue = "0") int page,
+                        @RequestParam(defaultValue = "10") int size) {
+        map.put("page",page);
+        map.put("size",size);
+        long total = vehicleInoutStopService.getVehicleInoutStopCountByParam(map);
+        Page<Map<String, Object>> result = new PageImpl<>(vehicleInoutStopService.getVehicleInoutStopByParam(map),
+                new PageRequest(page, size, null),total);
+        return result;
+    }
+}
 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;
@@ -12,7 +12,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import java.util.*;
@@ -82,7 +81,7 @@ public class BasicData {
         return name != null? name: stationCode2NameMap.get(prefix + code);
     }
-    @Autowired
+/*    @Autowired
     JdbcTemplate jdbcTemplate;
     public Map<String, String> getNbbm2PlateNo(){
         List<Map<String, Object>> list = jdbcTemplate.queryForList("select CAR_CODE,CAR_PLATE from bsth_c_cars where CAR_CODE is not null and CAR_PLATE is not null");
@@ -92,7 +91,7 @@ public class BasicData {
             rs.put(map.get("CAR_CODE").toString(), map.get("CAR_PLATE").toString());
         }
         return rs;
-    }
+    }*/
     @Component
     public static class BasicDataLoader extends Thread {
@@ -258,7 +257,7 @@ public class BasicData {
          * @Description: TODO(加载线路相关信息)
          */
         public void loadLineInfo() {
-            Iterator<Line> iterator = lineRepository.findAll().iterator();
+            Iterator<Line> iterator = lineRepository.findAllService().iterator();
             Line line;
             BiMap<Integer, String> biMap = HashBiMap.create();
@@ -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;
@@ -132,34 +131,19 @@ public class LineConfigData implements CommandLineRunner {
         if (null == line)
             throw new NullPointerException("异常的lineCode");
+        conf.setReadReverse(true);
         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);
     }
 }
+package com.bsth.data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import com.bsth.entity.LineVersions;
+import com.bsth.service.LineVersionsService;
+import com.bsth.service.StationRouteService;
+
+/**
+ * @ClassName: LineVersionsData
+ * @Description: TODO(线路版本数据管理)
+ */
+@Component
+@Order(20)
+public class LineVersionsData extends Thread {
+
+    static Logger logger = LoggerFactory.getLogger(LineVersionsData.class);
+
+
+    @Autowired
+    LineVersionsService lineVersionsService;
+    
+    @Autowired
+    StationRouteService stationRouteService;
+
+    @Override
+    public void run() {
+    	try {
+    		List<LineVersions> list = lineVersionsService.lineUpdate();
+    		for (LineVersions lineVersions : list) {
+        		Integer lineId = lineVersions.getLine().getId();
+        		// 更新线路文件
+    			Map<String, Object> map = new HashMap<>();
+    			map.put("lineId", lineId);
+    			stationRouteService.usingSingle(map);
+    			logger.info("线路版本更新成功！");
+    		}
+		} catch (Exception e) {
+			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
@@ -159,7 +159,7 @@ public class CarOutInfoHandler {
         ScheduleRealInfo[] array = new ScheduleRealInfo[3];
         Collections.sort(list, schDFSJComparator);
-        int count = 0, threshold = 1000 * 60 * 60;
+        int count = 0, threshold = 1000 * 60 * 60 * 4;
         long t = System.currentTimeMillis();
         for (ScheduleRealInfo sch : list) {
             if (count == 3)
@@ -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(d60.getDeviceId().equals(device))
+			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);
@@ -173,7 +176,7 @@ public class DayOfDirectives {
 		Collection<D64> d64s = d64Map.values();
 		List<D64> rem64List = new ArrayList<>();
 		for(D64 d64 : d64s){
-			if(d64.getDeviceId().equals(device))
+			if(device.equals(d64.getDeviceId()))
 				rem64List.add(d64);
 		}
@@ -186,6 +189,7 @@ public class DayOfDirectives {
 				c64 ++;
 		}
+		rem64List.clear();
 		if(c64 > 0)
 			logger.info("清除64数据 ，" + c64);
 	}
@@ -197,7 +201,11 @@ public class DayOfDirectives {
 	public Collection<D64> all64(){
 		return d64Map.values();
 	}
-	
+
+	public D60 get(Integer msgId){
+		return d60Map.get(msgId);
+	}
+
 	public Collection<Directive> all(){
 		List<Directive> all = new ArrayList<>();
 		all.addAll(d60Map.values());
@@ -12,7 +12,7 @@ public class MsgIdGenerator {
 	private static int msgId = 1;
-	private final static int MAX_VALUE = Integer.MAX_VALUE - 10;
+	private final static int MAX_VALUE = Integer.MAX_VALUE - 1000;
 	public synchronized static int getMsgId(){
 		msgId ++;
@@ -3,7 +3,6 @@ package com.bsth.data.forecast;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.forecast.entity.ArrivalEntity;
-import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.util.db.DBUtils_MS;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,7 +15,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.List;
 /**
@@ -43,7 +41,7 @@ public class ArrivalDataLoader {
 	 * 
 	 * @Title: load 
 	 * @Description: TODO(根据上次加载时间，查询之后的增量数据) 
-	 */
+
 	public List<ArrivalEntity> load(){
 		List<ArrivalEntity> list = null;
@@ -79,13 +77,13 @@ public class ArrivalDataLoader {
 			}
 		}
 		return list;
-	}
+	}*/
 	/**
 	 * 
 	 * @Title: recovery 
 	 * @Description: TODO(从数据库恢复数据，按照线路的开始运营时间恢复) 
-	 */
+
 	public List<ArrivalEntity> recovery(){
 		Collection<LineConfig> confs = lineConfigData.getAll();
 		long t = System.currentTimeMillis()
@@ -105,7 +103,7 @@ public class ArrivalDataLoader {
 		prveLoadTime = t;
 		return all;
-	}
+	}*/
 	/**
 	 * 
@@ -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.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.StationRouteComp;
-import com.google.common.collect.ArrayListMultimap;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Polygon;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Component;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-
-/**
- * Created by panzhao on 2016/12/23.
- */
-@Component
-public class GeoCacheData {
-
-    static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
-
-    //每辆车缓存最后1000条gps
-    private static final int CACHE_SIZE = 1000;
-    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
-
-    //线路路段走向
-    private static ArrayListMultimap<String, LineString> sectionCacheMap;
-
-    //路段编码和名称对照
-    private static Map<String, String> sectionCode2Name;
-
-    //线路站点路由
-    private static ArrayListMultimap<String, StationRoute> stationCacheMap;
-
-    //线路_上下行_站点编码 ——> 站点
-    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<>();
-    //TimedEnableStationRoute
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    public static CircleQueue<GpsEntity> getGps(String nbbm) {
-        return gpsCacheMap.get(nbbm);
-    }
-
-    public static void putGps(GpsEntity gps) {
-        CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getNbbm());
-        if (queue == null) {
-            /*//第一个点从站内开始
-            if (gps.getInstation() == 0)
-                return;*/
-
-            queue = new CircleQueue<>(CACHE_SIZE);
-            gpsCacheMap.put(gps.getNbbm(), queue);
-        }
-        queue.add(gps);
-    }
-
-    public static void clear(String nbbm) {
-        try {
-            CircleQueue<GpsEntity> queue = gpsCacheMap.get(nbbm);
-            if (queue != null)
-                queue.clear();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
-
-    public static 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();
-    }
-
-    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);
-
-        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.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;
-        }
-
-        if(isNotEmpty(prevs)){
-            GpsEntity prev = prevs.getTail();
-            if(isOutStation(gps, prev))
-                outStation(gps, prev);
-
-
-            if(isInStation(gps, prev))
-                inStation(gps, prev);
-        }
-
-        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)){
-
-            //发车班次匹配
-            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);
-            //通知客户端
-            sendUtils.sendFcsj(sch);
-            //持久化
-            dayOfSchedule.save(sch);
-
-            //清理应发未发标记
-            LateAdjustHandle.remove(sch);
-
-            if(!gps.isService()){
-                //切换成营运状态
-                gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 0, "发车@系统");
-            }
-            //出站既出场
-            outStationAndOutPark(sch);
-            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())){
-                //发下一个班次
-                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())){
-                //发下一个班次
-                dayOfSchedule.addExecPlan(next);
-                outStation(gps, prev);
-            }
-        }
-    }
-
-    /**
-     * 是否是一个更合适的发车信号
-     * @param gps
-     * @param sch
-     * @return
-     */
-    private boolean outManyFit(GpsEntity gps, ScheduleRealInfo sch) {
-        if(StringUtils.isNotEmpty(sch.getZdsjActual()))
-            return false;
-
-        long t1 = sch.getFcsjActualTime();
-        long t2 = gps.getTimestamp();
-        long c = sch.getDfsjT();
-
-        /*if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
-            return true;
-        }*/
-        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){
-        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().equals(0))
-                    && (!limitPark || park.equals(schPrev.getQdzCode()))) {
-
-                schPrev.setFcsjActualAll(sch.getFcsjActualTime());
-                schPrev.setZdsjActualAll(sch.getFcsjActualTime());
-
-                sendUtils.refreshSch(schPrev);
-                dayOfSchedule.save(schPrev);
-
-                /*if(schPrev.getBcType().equals("out")){
-                    //出场时，切换成营运状态
-                    String deviceId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
-                    gpsStatusManager.changeServiceState(deviceId, schPrev.getXlDir(), 0, "出场@系统");
-                    //DirectivePushQueue.put6003(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), "出场@系统");
-                    //directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
-                }*/
-            }
-        }
-    }
-
-    /**
-     * 进站
-     * @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())){
-
-            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(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());
-            }
-            else{
-                logger.info(sch.getClZbh() + " 到终点，无下一班");
-            }
-
-            //通知客户端
-            sendUtils.sendZdsj(sch, lpNext, doneSum);
-            logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "到终点， 时间：" + sch.getZdsjActual());
-            //准备执行下一个班次
-            if (next != null) {
-                //将gps转换为下一个班次走向的站内信号
-                transformUpdown(gps, next);
-                //下发调度指令
-                DirectivePushQueue.put6002(next, doneSum, "到站@系统");
-
-                //套跑  -下发线路切换指令
-                if(!next.getXlBm().equals(sch.getXlBm())){
-                    gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
-                }
-            }
-            else if(sch.getBcType().equals("in")){
-                //进场，切换成非营运状态
-                gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, "进场@系统");
-            }
-        }
-        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){
-                        //直接跳到这个班次
-                        dayOfSchedule.addExecPlan(nearSch);
-                        //重新进站
-                        inStation(gps, prev);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 和当前进站信号最匹配的一个班次
-     * @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))
-                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().equals(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);
-
-            //进场，切换成非营运状态
-            gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, "进场@系统");
-        }
-    }
-
-    /**
-     * 发车漂移判定（这里出现的误判，由车辆到达中途站的时候补偿）
-     * @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());
-    }
-}
 \ 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.utils;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.entity.StationRoute;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Point;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Created by panzhao on 2016/12/23.
- */
-public class GeoUtils {
-
-    private final static double EARTHRADIUS = 6378137;
-
-    private static GeometryFactory geometryFactory = new GeometryFactory();
-    /**
-     * gps是否在路由上的某个站内
-     *
-     * @param gps
-     * @param srs
-     * @return
-     */
-    public static StationRoute gpsInStation(GpsEntity gps, List<StationRoute> srs) {
-        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-        double min = -1, distance;
-        StationRoute stationRoute = null;
-
-        for (StationRoute sr : srs) {
-            if (sr.getPolygon() == null) {
-                //圆形
-                distance = getDistance(sr.getPoint(), point);//sr.getPoint().distance(point);
-
-                if (distance > sr.getRadius())
-                    continue;
-
-                if (min > distance || min == -1) {
-                    min = distance;
-                    stationRoute = sr;
-                }
-            } else {
-                //多边形
-                /*if (sr.getPolygon().contains(point)) {
-                    stationRoute = sr;
-                    break;
-                }*/
-                com.bsth.util.Geo.Polygon polygon2 = GeoCacheData.convertPolygon(sr.getPolygon());
-                com.bsth.util.Geo.Point point2 = new com.bsth.util.Geo.Point(gps.getLon(), gps.getLat());
-                if(com.bsth.util.Geo.GeoUtils.isPointInPolygon(point2, polygon2)){
-                    stationRoute = sr;
-                    break;
-                }
-            }
-        }
-        return stationRoute;
-    }
-
-    public static double getDistance(Point p1, Point p2) {
-        double lng1 = getLoop(p1.getY(), -180, 180), lat1 = getRange(
-                p1.getX(), -74, 74);
-        double lng2 = getLoop(p2.getY(), -180, 180), lat2 = getRange(
-                p2.getX(), -74, 74);
-
-        double x1, x2, y1, y2;
-        x1 = degreeToRad(lng1);
-        y1 = degreeToRad(lat1);
-        x2 = degreeToRad(lng2);
-        y2 = degreeToRad(lat2);
-        return EARTHRADIUS
-                * Math.acos((Math.sin(y1) * Math.sin(y2) + Math.cos(y1)
-                * Math.cos(y2) * Math.cos(x2 - x1)));
-    }
-
-    private static double getLoop(double v, double a, double b) {
-        while (v > b) {
-            v -= b - a;
-        }
-        while (v < a) {
-            v += b - a;
-        }
-        return v;
-    }
-
-    private static double getRange(double v, double a, double b) {
-        v = Math.min(Math.max(v, a), b);
-        return v;
-    }
-
-    private static double degreeToRad(double degree) {
-        return Math.PI * degree / 180;
-    }
-
-    /**
-     * 计算点 到 线的距离
-     * @param line
-     * @param p
-     * @return
-     */
-    public static double getDistanceFromLine(LineString line, Point p){
-        Point s = line.getStartPoint();
-        Point e = line.getEndPoint();
-        return getDistanceFromLine(s, e, p);
-    }
-
-    public static double getDistanceFromLine(Point s, Point e, Point p){
-        double d1 = getDistance(s, p);
-        double d2 = getDistance(p, e);
-        double d3 = getDistance(s, e);
-        double distance = 0;
-
-        double alpha = Math.acos((d1*d1 + d3*d3 - d2*d2)/(2*d1*d3));
-        double beta = Math.acos((d2*d2 + d3*d3 - d1*d1)/(2*d2*d3));
-
-        if(alpha>Math.PI/2) {
-            distance = d1;
-        }
-        else if(beta > Math.PI/2) {
-            distance = d2;
-        }
-        else {
-            distance = Math.sin(alpha) * d1;
-        }
-        return distance;
-    }
-
-
-    /**
-     * gps 是否在某个停车场内
-     * @param gps
-     * @return
-    public static String gpsInCarpark(GpsEntity gps){
-        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-
-        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
-        Set<String> codes = carparkMap.keySet();
-        Polygon polygon;
-        for(String code : codes){
-            polygon = carparkMap.get(code);
-            if(point.within(polygon)){
-                return code;
-            }
-        }
-        return null;
-    }*/
-
-    /**
-     * gps 是否在某个停车场内
-     * @param gps
-     * @return
-     */
-    public static String gpsInCarpark(GpsEntity gps){
-        com.bsth.util.Geo.Point point = new com.bsth.util.Geo.Point(gps.getLon(), gps.getLat());
-        Map<String, com.bsth.util.Geo.Polygon> carparkMap = GeoCacheData.tccMap2;
-        com.bsth.util.Geo.Polygon polygon;
-        Set<String> codes = carparkMap.keySet();
-        for(String code : codes){
-            polygon = carparkMap.get(code);
-            if(com.bsth.util.Geo.GeoUtils.isPointInPolygon(point, polygon)){
-                return code;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 是否是有效的连续点
-     * @param prevGps
-     * @param gps
-     * @return
-     */
-    public static boolean overdue(GpsEntity prevGps, GpsEntity gps) {
-        return gps.getTimestamp() - prevGps.getTimestamp() < 120000;
-    }
-
-    /**
-     * 计算2条直线的最短距离
-     * @param p1
-     * @param p2
-     * @param p3
-     * @param p4
-     * @return
-     */
-    public static double getDistanceLineToLine(Point p1, Point p2, Point p3, Point p4){
-        double distance;
-        double x1 = p1.getX(); //A点坐标（x1,y1,z1）
-        double y1 = p1.getY();
-        double z1 = 0;
-        double x2 = p2.getX(); //B点坐标（x2,y2,z2）
-        double y2 = p2.getY();
-        double z2 = 0;
-        double x3 = p3.getX(); //C点坐标（x3,y3,z3）
-        double y3 = p3.getY();
-        double z3 = 0;
-        double x4 = p4.getX(); //D点坐标（x4,y4,z4）
-        double y4 = p4.getY();
-        double z4 = 0;
-
-        double a = (x2-x1)*(x2-x1)+(y2-y1)*(y2-y1)+(z2-z1)*(z2-z1);
-        double b = -((x2-x1)*(x4-x3)+(y2-y1)*(y4-y3)+(z2-z1)*(z4-z3));
-        double c = -((x1-x2)*(x1-x3)+(y1-y2)*(y1-y3)+(z1-z2)*(z1-z3));
-
-        double d = -((x2-x1)*(x4-x3)+(y2-y1)*(y4-y3)+(z2-z1)*(z4-z3));
-        double e = (x4-x3)*(x4-x3)+(y4-y3)*(y4-y3)+(z4-z3)*(z4-z3);
-        double f = -((x1-x3)*(x4-x3)+(y1-y3)*(y4-y3)+(z1-z3)*(z4-z3));
-
-        //平行
-        if ((a*e-b*d)==0&&(b*d-a*e)==0)
-        {
-            double d1 = getDistance(p1, p3);
-            double d2 = getDistance(p1, p4);
-            distance = (d1<d2)?d1:d2;
-            return distance;
-        }
-
-        double s = (b*f-e*c)/(a*e-b*d);
-        double t = (a*f-d*c)/(b*d-a*e);
-
-        //说明P点落在线段AB上,Q点落在线段CD上
-        if(0<=s&&s<=1&&0<=t&&t<=1)
-        {
-            //2条线段的公垂线段PQ;
-            //P点坐标
-            double X = x1+s*(x2-x1);
-            double Y = y1+s*(y2-y1);
-            double Z = z1+s*(z2-z1);
-            //Q点坐标
-            double U = x3+t*(x4-x3);
-            double V = y3+t*(y4-y3);
-            double W = z3+t*(z4-z3);
-            Point p = geometryFactory.createPoint(new Coordinate(X, Y, Z));
-            Point q = geometryFactory.createPoint(new Coordinate(U, V, W));
-            distance = getDistance(p, q);
-        }
-        else
-        {
-            double d1 = getDistanceFromLine(p3,p4,p1);
-            double d2 = getDistanceFromLine(p3,p4,p2);
-            double d3 = getDistanceFromLine(p1,p2,p3);
-            double d4 = getDistanceFromLine(p1,p2,p4);
-            distance = (d1<d2)?d1:d2;
-            distance = (distance<d3)?distance:d3;
-            distance = (distance<d4)?distance:d4;
-        }
-
-        return distance;
-    }
-
-    /**
-     * 计算点 到 线的垂直交点
-     * @param lp1
-     * @param lp2
-     * @param p
-     * @return
-     */
-    public static Point perpendularPoint(Point lp1, Point lp2, Point p){
-        double a = lp1.getX() - lp2.getX(), b = lp2.getY() - lp1.getY(), c = lp1.getY() * lp2.getX() - lp2.getY() * lp1.getX();
-        double lon = (Math.pow(b, 2) * p.getY() - a * b * p.getX() - a * c) / (Math.pow(a, 2) + Math.pow(b, 2));
-        double lat = (Math.pow(a, 2) * p.getX() - a * b * p.getY() - b * c) / (Math.pow(a, 2) + Math.pow(b, 2));
-
-        return geometryFactory.createPoint(new Coordinate(lat, lon));
-    }
-}
-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.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);
-
-                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数据
-     */
-    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);
-                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