Merge branch 'minhang' into qingpu

潘钊
2 parents f2304992 612f7eea
Showing 54 changed files with 2824 additions and 1281 deletions
pom.xml
src/main/java/com/bsth/controller/BaseController2.java
src/main/java/com/bsth/controller/BusIntervalController.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/YlbController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/schedule/RerunController.java
src/main/java/com/bsth/controller/schedule/TTInfoController.java
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/controller/schedule/core/RerunController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/arrival/AnalyseData.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
@@ -225,6 +225,12 @@
 			<artifactId>spring-boot-devtools</artifactId>
 			<optional>true</optional>
 		</dependency>-->
+		<dependency>
+			<groupId>com.vividsolutions</groupId>
+			<artifactId>jts</artifactId>
+			<version>1.13</version>
+		</dependency>
+
 	</dependencies>
  
     <dependencyManagement>
@@ -187,9 +187,11 @@ public class BaseController2&lt;T, ID extends Serializable&gt; {
         }
  
         System.out.println(outputfile.getName());
+        System.out.println(outputfile.getAbsolutePath());
+
         String filePath = outputfile.getAbsolutePath();
-        String fp[] = filePath.split(File.separator);
-        String fileName = fp[fp.length - 1];
+//        String fp[] = filePath.split(File.separator);
+//        String fileName = fp[fp.length - 1];
  
         // TODO：使用ktr获取导出数据
  
@@ -22,6 +22,11 @@ public class BusIntervalController {
 	public List<Map<String,Object>> getDir(@RequestParam Map<String, Object> map){
 		return busIntervalService.getDir(map);
 	}
+
+	@RequestMapping(value = "/getLp", method = RequestMethod.GET)
+	public List<Map<String,Object>> getLp(@RequestParam Map<String, Object> map){
+		return busIntervalService.getLp(map);
+	}
  
 	@RequestMapping(value = "/interval", method = RequestMethod.GET)
 	public List<Map<String,Object>> interval(@RequestParam Map<String, Object> map){
@@ -65,10 +65,12 @@ public class ExportController {
 			i++;
 		}
  
+		
+		
 		try {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepassengerflow.xls",
+			ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepasswengerflow.xls",
 					path + "export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -189,7 +191,7 @@ public class ExportController {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
 			ee.excelReplace(listI, new Object[] { map }, path + "mould\\singledata.xls",
-					path + "export\\路单报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+					path + "export\\路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -203,8 +205,8 @@ public class ExportController {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
-		List<Vehicleloading> vehicleloading = formsService.vehicleloading(/*map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),*/map.get("line").toString(),
-				map.get("date").toString());
+		List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),map.get("line").toString(),
+				map.get("data").toString());
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		int i = 1;
 		for (Vehicleloading l : vehicleloading) {
@@ -214,8 +216,8 @@ public class ExportController {
 			m.put("gS", l.getgS());
 			m.put("xL", l.getxL());
 			m.put("clzbh", l.getClzbh());
-			m.put("hyl", l.getHyl());
 			m.put("jzl", l.getJzl());
+			m.put("hyl", l.getHyl());
 			m.put("ls", l.getLs());
 			m.put("jhlc", l.getJhlc());
 			m.put("unyyyl", l.getUnyyyl());
@@ -229,7 +231,7 @@ public class ExportController {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
 			ee.excelReplace(listI, new Object[] { map }, path + "mould\\vehicleloading.xls",
-					path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+					path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("dat").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -417,5 +419,9 @@ public class ExportController {
 		}
 		return resList;
 	}
+	
+	
+	
+	
  
 }
@@ -80,9 +80,9 @@ public class MCY_FormsController {
  
 	// 车辆加注
 	@RequestMapping(value = "/vehicleloading", method = RequestMethod.POST)
-	public List<Vehicleloading> vehicleloading(/*@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,*/
+	public List<Vehicleloading> vehicleloading(@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,
 			@RequestParam String line, @RequestParam String data) {
-		return formsService.vehicleloading(/*gsdmVehic, fgsdmVehic, */line, data);
+		return formsService.vehicleloading(gsdmVehic, fgsdmVehic, line, data);
 	}
  
 	// 运营服务阶段报表
 package com.bsth.controller.gps;
  
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.service.gps.GpsService;
 import com.google.common.base.Splitter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
  
 @RestController
 @RequestMapping("gps")
@@ -70,7 +69,7 @@ public class GpsController {
 		return gpsService.history(nbbmArray, st, et);
 	}
  
-	/*@RequestMapping(value = "/arrival/ram")
+	/*@RequestMapping(value = "/analyse/ram")
 	public List<ArrivalInfo> ramData(@RequestParam String nbbm) {
 		return ArrivalDataBuffer.allMap.get(nbbm);
 	}*/
@@ -84,4 +83,9 @@ public class GpsController {
 	public Map<String, Object> findBuffAeraByCode(@RequestParam String code,@RequestParam String type){
 		return gpsService.findBuffAeraByCode(code, type);
 	}
+
+	@RequestMapping(value = "/findRoadSpeed")
+	public Map<String, Object> findRoadSpeed(@RequestParam String lineCode){
+		return gpsService.findRoadSpeed(lineCode);
+	}
 }
@@ -3,7 +3,9 @@ package com.bsth.controller.oil;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -107,8 +109,16 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		try {
 		String rq=map.get("rq").toString();
 		if(!(rq=="")){
+			
 			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-			map.put("rq_eq", sdf.parse(rq));
+			  Calendar   calendar   =   new   GregorianCalendar(); 
+			  calendar.setTime(sdf.parse(rq)); 
+			  calendar.add(calendar.DATE,1);
+			  Date date=calendar.getTime();
+			map.put("rq_ge", rq);
+			map.put("rq_le", sdf.format(date));
+			System.out.println(rq);
+			System.out.println(sdf.format(date));
 		}
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
@@ -131,13 +131,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @Title: adjust @Description: TODO(调整人车) @param @param id
 	 * 班次ID @param @param nbbm 内部编码 @param @param jsy 驾驶员 @param @param spy
 	 * 售票员 @throws
-	 */
+
 	@RequestMapping(value = "/adjust", method = RequestMethod.POST)
 	public Map<String, Object> adjust(@RequestParam Long id, String nbbm, String jsy,
 			String spy, Integer revertLine, Integer borrowLine, String borrowTimeStr, String revertTimeStr) {
 		return scheduleRealInfoService.adjust(id, nbbm, jsy, spy, revertLine, borrowLine, borrowTimeStr, revertTimeStr);
 	}
-
+	 */
 	/**
 	 * 
 	 * @Title: realOutAdjust 
@@ -292,8 +292,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
  
 	@RequestMapping(value = "/queryUserInfo")
-	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line, @RequestParam String date) {
-		return scheduleRealInfoService.queryUserInfo(line, date);
+	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
+			@RequestParam String date,@RequestParam String state) {
+		return scheduleRealInfoService.queryUserInfo(line, date,state);
 	}
  
 	@RequestMapping(value = "/exportWaybill")
@@ -50,23 +50,28 @@ public class ReportController {
 	}
  
 	@RequestMapping(value = "/tbodyTime1", method = RequestMethod.GET)
-	public Map<String, Object> tbodyTime1(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime1(line, date);
+	public Map<String, Object> tbodyTime1(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime1(line, ttinfo);
 	}
  
 	@RequestMapping(value = "/tbodyTime2", method = RequestMethod.GET)
-	public Map<String, Object> tbodyTime2(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime2(line, date);
+	public Map<String, Object> tbodyTime2(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime2(line, ttinfo);
 	}
  
 	@RequestMapping(value = "/tbodyTime3", method = RequestMethod.GET)
-	public List<Map<String, Object>> tbodyTime3(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime3(line, date);
+	public List<Map<String, Object>> tbodyTime3(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime3(line, ttinfo);
 	}
  
 	@RequestMapping(value = "/tbodyTime5", method = RequestMethod.GET)
-	public List<Map<String, Object>> tbodyTime5(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime5(line, date);
+	public List<Map<String, Object>> tbodyTime5(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime5(line, ttinfo);
+	}
+	
+	@RequestMapping(value="/getTtinfo", method = RequestMethod.GET)
+	public List<Map<String,Object>> getTtinfo(@RequestParam Map<String, Object> map){
+		return service.getTtinfo(map);
 	}
  
 }
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.rule.RerunRule;
-import com.bsth.repository.schedule.RerunRuleRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * Created by xu on 16/10/20.
- */
-@RestController
-@RequestMapping("rms")
-public class RerunController extends BaseController<RerunRule, Long> {
-
-    @Autowired
-    private RerunRuleRepository rerunRuleRepository;
-
-    @Override
-    public RerunRule findById(@PathVariable("id") Long aLong) {
-        return rerunRuleRepository.findOneExtend(aLong);
-    }
-
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     * @param @param t
-     * @param @return    设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody RerunRule t){
-        return baseService.save(t);
-    }
-
-
-}
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController2;
-import com.bsth.entity.schedule.TTInfo;
-import com.bsth.repository.schedule.TTInfoDetailRepository;
-import com.bsth.repository.schedule.TTInfoRepository;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * Created by xu on 16/5/12.
- */
-@RestController
-@RequestMapping("tic")
-@EnableConfigurationProperties(DataToolsProperties.class)
-public class TTInfoController extends BaseController2<TTInfo, Long> {
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-    @Autowired
-    private TTInfoRepository ttInfoRepository;
-    @Autowired
-    private TTInfoDetailRepository ttInfoDetailRepository;
-
-    @Override
-    protected String getDataImportKtrClasspath() {
-        return dataToolsProperties.getTtinfoDatainputktr();
-    }
-
-    @Override
-    public TTInfo findById(@PathVariable("id") Long aLong) {
-        return ttInfoRepository.findOneExtend(aLong);
-    }
-
-    /**
-     * 验证。
-     * @param map
-     * @return
-     */
-    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
-    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
-        // 一般比较自编号是否重复
-        return baseService.validateEquale(map);
-    }
-
-    @Override
-    public Page<TTInfo> list(@RequestParam Map<String, Object> map, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size, @RequestParam(defaultValue = "id") String order, @RequestParam(defaultValue = "DESC") String direction) {
-        // 如果有isCancel键值，将其值变成boolean
-        if (map.get("isCancel_eq") != null)
-            map.put("isCancel_eq", new Boolean(map.get("isCancel_eq").toString()));
-
-        return super.list(map, page, size, order, direction);
-    }
-}
@@ -113,6 +113,9 @@ public class TTInfoDetailController extends BaseController2&lt;TTInfoDetail, Long&gt; 
                                 p1.put("stationName_eq", cell_con.trim());
                                 p1.put("stationMark_eq", "B");
  
+
+                                // TODO：这里要修改（起点站有启用撤销的标志的）
+
                                 List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
                                 if (CollectionUtils.isEmpty(stationRouteList)) {
                                     rtn.put("status", ResponseCode.ERROR);
+package com.bsth.controller.schedule.core;
+
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.rule.RerunRule;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/10/20.
+ */
+@RestController
+@RequestMapping("rms")
+public class RerunController extends BController<RerunRule, Long> {
+
+
+}
+package com.bsth.controller.schedule.core;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.TTInfo;
+import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.TTInfoService;
+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 java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/20.
+ */
+@RestController(value = "tTInfoController_ec")
+@RequestMapping(value = "tic_ec")
+public class TTInfoController extends BController<TTInfo, Long> {
+    @Autowired
+    private TTInfoService ttInfoService;
+
+    @RequestMapping(value = "/validate_name", method = RequestMethod.GET)
+    public Map<String, Object> validate_name(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 名字重复验证
+            TTInfo ttInfo = new TTInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    param.get("name_eq"),
+                    param.get("rule_days_eq"),
+                    param.get("special_days_eq")
+            );
+            ttInfoService.validate_name(ttInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_n_d", method = RequestMethod.GET)
+    public Map<String, Object> validate_n_d(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 常规有效日重复验证
+            TTInfo ttInfo = new TTInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    param.get("name_eq"),
+                    param.get("rule_days_eq"),
+                    param.get("special_days_eq")
+            );
+            ttInfoService.validate_n_d(ttInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_s_d", method = RequestMethod.GET)
+    public Map<String, Object> validate_s_d(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 特殊有效日重复判定
+            TTInfo ttInfo = new TTInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    param.get("name_eq"),
+                    param.get("rule_days_eq"),
+                    param.get("special_days_eq")
+            );
+            ttInfoService.validate_s_d(ttInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+}
+
+//
+//@Autowired
+//private DataToolsProperties dataToolsProperties;
+//@Autowired
+//private TTInfoRepository ttInfoRepository;
+//@Autowired
+//private TTInfoDetailRepository ttInfoDetailRepository;
+//
+//    @Override
+//    protected String getDataImportKtrClasspath() {
+//        return dataToolsProperties.getTtinfoDatainputktr();
+//    }
+//
+//    @Override
+//    public TTInfo findById(@PathVariable("id") Long aLong) {
+//        return ttInfoRepository.findOneExtend(aLong);
+//    }
+//
+//    /**
+//     * 验证。
+//     * @param map
+//     * @return
+//     */
+//    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
+//    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
+//        // 一般比较自编号是否重复
+//        return baseService.validateEquale(map);
+//    }
+//
+//    @Override
+//    public Page<TTInfo> list(@RequestParam Map<String, Object> map, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size, @RequestParam(defaultValue = "id") String order, @RequestParam(defaultValue = "DESC") String direction) {
+//        // 如果有isCancel键值，将其值变成boolean
+//        if (map.get("isCancel_eq") != null)
+//            map.put("isCancel_eq", new Boolean(map.get("isCancel_eq").toString()));
+//
+//        return super.list(map, page, size, order, direction);
+//    }
 \ No newline at end of file
 package com.bsth.data;
  
 import com.bsth.Application;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.entity.*;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.*;
@@ -57,7 +58,7 @@ public class BasicData implements CommandLineRunner {
     public static Map<String, String> lineCode2NameMap;
  
     //线路编码_站点编码 == 0|1  上下行
-    public static Map<String, Integer> lineStationUpDownMap;
+    //public static Map<String, Integer> lineStationUpDownMap;
  
     //停车场
     public static List<String> parkCodeList;
@@ -86,7 +87,7 @@ public class BasicData implements CommandLineRunner {
  
     @Override
     public void run(String... arg0) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(dataLoader, 0, 1, TimeUnit.HOURS);
+        Application.mainServices.scheduleWithFixedDelay(dataLoader, 2, 2, TimeUnit.HOURS);
     }
  
  
@@ -117,6 +118,9 @@ public class BasicData implements CommandLineRunner {
         @Autowired
         BusinessRepository businessRepository;
  
+        @Autowired
+        GeoCacheData geoCacheData;
+
  
         @Override
         public void run() {
@@ -138,11 +142,13 @@ public class BasicData implements CommandLineRunner {
                 //车辆和线路映射信息
                 loadNbbm2LineInfo();
                 //站点路由信息
-                loadStationRouteInfo();
+                //loadStationRouteInfo();
                 //人员信息
                 loadPersonnelInfo();
                 //公司信息
                 loadBusinessInfo();
+
+                geoCacheData.loadData();
                 logger.info("加载基础数据成功！，");
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
@@ -151,7 +157,7 @@ public class BasicData implements CommandLineRunner {
         }
  
  
-        private void loadStationRouteInfo() {
+/*        private void loadStationRouteInfo() {
             Iterator<StationRoute> iterator = stationRouteRepository.findAllEffective().iterator();
  
             Map<String, String> sePointMap = new HashMap<>();
@@ -172,7 +178,7 @@ public class BasicData implements CommandLineRunner {
             }
             lineStationUpDownMap = map;
             lineSEPointMap = sePointMap;
-        }
+        }*/
  
         /**
          * loadBusinessInfo
@@ -280,7 +286,7 @@ public class BasicData implements CommandLineRunner {
                 /**
                  * 加载运管处的站点及序号
                  * 上行从1开始，下行顺序续编
-                 */
+
                 List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
                 if(ygcLines != null && ygcLines.size() > 0){
                     int size = ygcLines.size();
@@ -299,7 +305,7 @@ public class BasicData implements CommandLineRunner {
                         key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
                         tempStationName2YgcNumber.put(key,num++);
                     }
-                }
+                }*/
             }
  
             lineId2CodeMap = biMap;
 package com.bsth.data;
  
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-
 import com.bsth.entity.Line;
 import com.bsth.entity.realcontrol.D80ReplyTemp;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.oplog.normal.OpLogger;
 import com.bsth.service.LineService;
 import com.bsth.service.realcontrol.LineConfigService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
  
 /**
  * 
@@ -92,7 +87,7 @@ public class LineConfigData implements CommandLineRunner {
 		//出场时间类型
 		conf.setOutConfig(1);
 		//进场时间类型
-		conf.setInConfig(1);
+		//conf.setInConfig(1);
 		//短语模板
 		conf.setPhraseTemps("");
 		//调度指令模板 
 package com.bsth.data.arrival;
  
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
  
-import com.bsth.data.BasicData;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
  
 /**
  * 
@@ -98,14 +96,15 @@ public class AnalyseData {
 	}
  
 	private boolean effective(ArrivalEntity arr){
-		//停车场
+		/*//停车场
 		if(BasicData.parkCodeList.contains(arr.getStopNo())){
 			arr.setTcc(true);
 			return true;
 		}
-		
+
 		Integer upDown = BasicData.lineStationUpDownMap.get(arr.getLineCode() + "_" + arr.getStopNo());
-		
-		return arr.getUpDown() == upDown || BasicData.parkCodeList.contains(arr.getStopNo());
+
+		return arr.getUpDown() == upDown || BasicData.parkCodeList.contains(arr.getStopNo());*/
+		return false;
 	}
 }
@@ -70,7 +70,7 @@ public class ForecastRealServer implements CommandLineRunner {
 /*	public void forecast(String nbbm){
 		logger.info("预测，" + nbbm);
 		//当前执行班次
-		ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+		ScheduleRealInfo sch = dayOfSchedule.execPlanMap().get(nbbm);
 		if(null == sch)
 			return;
  
@@ -86,7 +86,7 @@ public class ForecastRealServer implements CommandLineRunner {
 			//终点站
 			String eStation = null;
 			//当前执行班次
-			ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+			ScheduleRealInfo sch = dayOfSchedule.execPlanMap().get(nbbm);
 			if(null != sch)
 				eStation = sch.getZdzCode();
  
 package com.bsth.data.gpsdata;
  
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 /**
  * 
  * @ClassName: GpsRealData
@@ -58,21 +61,32 @@ public class GpsEntity {
 	/** 预计到达终点时间 */
 	private Float expectStopTime;
  
-	/** 设备是否在线 */
+	/** 设备是否在线
 	private boolean online;
-	
+	 */
 	/** 当前执行班次ID */
 	private Long schId;
  
 	/** 是否异常数据 */
 	private boolean abnormal;
-	
-	private int valid;
+/*
+	private int valid;*/
  
 	private int version;
  
-	/** 是否起终点站 */
+	/** 是否起终点站
 	private boolean sEPoint;
+	 */
+
+	/** 0： 站外 1：站内 2：场内 */
+	private int instation;
+
+	/** 站点信息，站内时有值 */
+	@JsonIgnore
+	private StationRoute station;
+
+	/** 状态 */
+	private String signalState;
  
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -178,14 +192,6 @@ public class GpsEntity {
 		this.stationName = stationName;
 	}
  
-	public boolean isOnline() {
-		return online;
-	}
-
-	public void setOnline(boolean online) {
-		this.online = online;
-	}
-
 	public long getArrTime() {
 		return arrTime;
 	}
@@ -218,35 +224,44 @@ public class GpsEntity {
 		this.schId = schId;
 	}
  
-	public boolean isAbnormal() {
-		return abnormal;
+
+	public int getVersion() {
+		return version;
 	}
  
-	public void setAbnormal(boolean abnormal) {
-		this.abnormal = abnormal;
+	public void setVersion(int version) {
+		this.version = version;
 	}
  
-	public int getValid() {
-		return valid;
+	public StationRoute getStation() {
+		return station;
 	}
  
-	public void setValid(int valid) {
-		this.valid = valid;
+	public void setStation(StationRoute station) {
+		this.station = station;
 	}
  
-	public int getVersion() {
-		return version;
+	public boolean isAbnormal() {
+		return abnormal;
 	}
  
-	public void setVersion(int version) {
-		this.version = version;
+	public void setAbnormal(boolean abnormal) {
+		this.abnormal = abnormal;
+	}
+
+	public String getSignalState() {
+		return signalState;
+	}
+
+	public void setSignalState(String signalState) {
+		this.signalState = signalState;
 	}
  
-	public boolean issEPoint() {
-		return sEPoint;
+	public int getInstation() {
+		return instation;
 	}
  
-	public void setsEPoint(boolean sEPoint) {
-		this.sEPoint = sEPoint;
+	public void setInstation(int instation) {
+		this.instation = instation;
 	}
 }
@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
+import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
+import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.util.ConfigUtil;
@@ -27,263 +29,187 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
  
 /**
- *
+ * @author PanZhao
  * @ClassName: GpsRealData
  * @Description: TODO(实时GPS数据集合)
- * @author PanZhao
  * @date 2016年8月12日 下午2:04:41
- *
  */
 @Component
-public class GpsRealData implements CommandLineRunner{
-
-	static Logger logger = LoggerFactory.getLogger(GpsRealData.class);
-
-	private static Map<String, GpsEntity> gpsMap;
-
-	//按线路分组设备号
-	private static TreeMultimap<String, String> lineCode2Devices;
-
-	// 网关数据接口地址
-	private static String url;
-
-	@Autowired
-	GpsDataLoader gpsDataLoader;
-
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-
-	@Autowired
-	ForecastRealServer forecastRealServer;
-	/**
-	 * 构造函数
-	 */
-	public GpsRealData(){
-		gpsMap = new HashMap<>();
-		lineCode2Devices = TreeMultimap.create();
-		url = ConfigUtil.get("http.gps.real.url");
-	}
-
-	@Override
-	public void run(String... arg0) throws Exception {
-		logger.info("gpsDataLoader,20,6");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
-	}
-
-	public GpsEntity add(GpsEntity gps) {
-		String device = gps.getDeviceId();
-		GpsEntity old = gpsMap.get(device);
-
-		if(!StringUtils.isEmpty(gps.getStopNo())){
-			//定时定距数据附带站点编码改变
-			if(null == old || !gps.getStopNo().equals(old.getStopNo())){
-				gps.setArrTime(gps.getTimestamp());
-				//预测到达终点时间
-				forecastRealServer.forecast(gps.getNbbm(), gps);
-			}
-			else{
-				gps.setArrTime(old.getArrTime());
-				//不预测， 重新计算终点时间
-				gps.setExpectStopTime(forecastRealServer.expectStopTime(gps.getNbbm()));
-			}
-		}
-
-		gpsMap.put(device, gps);
-		if(StringUtils.isNotBlank(gps.getLineId()))
-			lineCode2Devices.put(gps.getLineId(), device);
-		return gps;
-	}
-
-	/**
-	 *
-	 * @Title: get @Description: TODO(设备号获取GPS)
-	 */
-	public GpsEntity get(String deviceId) {
-		return gpsMap.get(deviceId);
-	}
-
-	/**
-	 *
-	 * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
-	 */
-	public List<GpsEntity> getByLine(String lineCode) {
-		NavigableSet<String> set = lineCode2Devices.get(lineCode);
-
-		List<GpsEntity> rs = new ArrayList<>();
-		GpsEntity gps;
-		ScheduleRealInfo sch;
-		for(String device : set){
-			gps = gpsMap.get(device);
-			//过滤异常GPS数据
-			if(gps.isAbnormal())
-				continue;
-
-			sch = dayOfSchedule.execPlamMap().get(gps.getNbbm());
-			if(null != sch)
-				gps.setSchId(sch.getId());
-			rs.add(gps);
-		}
-
-		return rs;
-	}
-
-	public List<GpsEntity> get(List<String> pArray){
-		List<GpsEntity> list = new ArrayList<>();
-
-		for(String code : pArray)
-			list.addAll(getByLine(code));
-		return list;
-	}
-
-	public Set<String> allDevices(){
-		return gpsMap.keySet();
-	}
-
-	public GpsEntity findByDeviceId(String deviceId) {
-		return gpsMap.get(deviceId);
-	}
-
-	public Collection<GpsEntity> all(){
-		return gpsMap.values();
-	}
-
-	public void remove(String device){
-		gpsMap.remove(device);
-	}
-	@Component
-	public static class GpsDataLoader extends Thread{
-
-		Logger logger = LoggerFactory.getLogger(GpsDataLoader.class);
-
-		@Autowired
-		GpsRealData gpsRealData;
-
-		@Override
-		public void run() {
-			try{
-				load();
-			}catch(Exception e){
-				logger.error("", e);
-			}
-		}
-
-		public void load() throws Exception {
-			List<GpsEntity> list = new ArrayList<>();
-			CloseableHttpClient httpClient = null;
-			CloseableHttpResponse response = null;
-			try {
-				httpClient = HttpClients.createDefault();
-				HttpGet get = new HttpGet(url);
-
-				response = httpClient.execute(get);
-
-				HttpEntity entity = response.getEntity();
-				if (null != entity) {
-					// 返回数据量比较大，建议以流的形式读取
-					BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
-					StringBuffer stringBuffer = new StringBuffer();
-					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;
-					for(GpsEntity gps : list){
-						//没有设备号
-						if(StringUtils.isBlank(gps.getDeviceId()))
-							continue;
-
-						nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
-						if(StringUtils.isBlank(nbbm))
-							gps.setAbnormal(true);//标记为异常数据
-						else
-							gps.setNbbm(nbbm);
-
-						gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
-						gpsRealData.add(gps);
-
-						//纠正走向
-						correctUpdown(gps);
-						/*if(issEPoint(gps))
-							continue;
-
-						//如果走向未知，尝试根据站点纠正走向
-						if(gps.getUpDown() == -1){
-							updown=stationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-							if(updown != null)
-								gps.setUpDown(updown);
-						}
-						//如果站点编码和走向相反（即上行站点ID，走向为下行），尝试根据站点纠正走向
-						updown=stationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-						if(updown != null && !gps.getUpDown().equals(updown)){
-							gps.setUpDown(updown);
-						}*/
-					}
-				} else
-					logger.error("result is null");
-			} catch(Exception e){
-				logger.error("", e);
-			}
-			finally {
-				if (null != httpClient)
-					httpClient.close();
-				if(null != response)
-					response.close();
-			}
-		}
-
-		/**
-		 * 是否是起终点
-		 * @param gps
-		 * @return
-		 */
-		public boolean isSEPoint(GpsEntity gps){
-			String key = gps.getLineId()+"_"+gps.getUpDown()+"_"
-					,stationCode;
-
-			if(BasicData.lineSEPointMap.containsKey(key+"B")){
-				stationCode = BasicData.lineSEPointMap.get(key+"B");
-				if(gps.getStopNo().equals(stationCode)){
-					gps.setsEPoint(true);
-					return true;
-				}
-			}
-
-			if(BasicData.lineSEPointMap.containsKey(key+"E")){
-				stationCode = BasicData.lineSEPointMap.get(key+"E");
-				if(gps.getStopNo().equals(stationCode)){
-					gps.setsEPoint(true);
-					return true;
-				}
-			}
-			return false;
-		}
-
-		/**
-		 * 纠正上下行
-		 * @param gps
-		 */
-		public void correctUpdown(GpsEntity gps){
-			Integer updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-			if(updown != null && !updown.equals(gps.getUpDown()))
-				gps.setUpDown(updown);
-			/*//如果走向未知，尝试根据站点纠正走向
-			if(gps.getUpDown() == -1){
-
-			}*/
-
-			if(isSEPoint(gps))
-				return;
-
-			/*//如果站点编码和走向相反（即上行站点ID，走向为下行），尝试根据站点纠正走向
-			updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-			if(updown != null && !gps.getUpDown().equals(updown)){
-				gps.setUpDown(updown);
-			}*/
-		}
-	}
-}
+public class GpsRealData implements CommandLineRunner {
+
+    static Logger logger = LoggerFactory.getLogger(GpsRealData.class);
+
+    private static Map<String, GpsEntity> gpsMap;
+
+    //按线路分组设备号
+    private static TreeMultimap<String, String> lineCode2Devices;
+
+    // 网关数据接口地址
+    private static String url;
+
+    @Autowired
+    GpsDataLoader gpsDataLoader;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    ForecastRealServer forecastRealServer;
+
+    /**
+     * 构造函数
+     */
+    public GpsRealData() {
+        gpsMap = new HashMap<>();
+        lineCode2Devices = TreeMultimap.create();
+        url = ConfigUtil.get("http.gps.real.url");
+    }
+
+    @Override
+    public void run(String... arg0) throws Exception {
+        logger.info("gpsDataLoader,40,6");
+        Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 40, 6, TimeUnit.SECONDS);
+    }
+
+    public void put(GpsEntity gps) {
+        gpsMap.put(gps.getDeviceId(), gps);
+    }
+
+    /**
+     * @Title: get @Description: TODO(设备号获取GPS)
+     */
+    public GpsEntity get(String deviceId) {
+        return gpsMap.get(deviceId);
+    }
+
+    /**
+     * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
+     */
+    public List<GpsEntity> getByLine(String lineCode) {
+        NavigableSet<String> set = lineCode2Devices.get(lineCode);
+
+        List<GpsEntity> rs = new ArrayList<>();
+        GpsEntity gps;
+        ScheduleRealInfo sch;
+        for (String device : set) {
+            gps = gpsMap.get(device);
+            //过滤异常GPS数据
+            if (gps.isAbnormal())
+                continue;
+
+            sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
+            if (null != sch)
+                gps.setSchId(sch.getId());
+            rs.add(gps);
+        }
+
+        return rs;
+    }
+
+    public List<GpsEntity> get(List<String> pArray) {
+        List<GpsEntity> list = new ArrayList<>();
+
+        for (String code : pArray)
+            list.addAll(getByLine(code));
+        return list;
+    }
+
+    public Set<String> allDevices() {
+        return gpsMap.keySet();
+    }
+
+    public GpsEntity findByDeviceId(String deviceId) {
+        return gpsMap.get(deviceId);
+    }
+
+    public Collection<GpsEntity> all() {
+        return gpsMap.values();
+    }
+
+    public void remove(String device) {
+        gpsMap.remove(device);
+    }
+
+    @Component
+    public static class GpsDataLoader extends Thread {
+
+        Logger logger = LoggerFactory.getLogger(GpsDataLoader.class);
+
+        @Autowired
+        GpsRealData gpsRealData;
+
+        @Autowired
+        GpsRealAnalyse gpsRealAnalyse;
+
+        @Override
+        public void run() {
+            try {
+                //如果正在恢复数据
+                if (GpsDataRecovery.run)
+                    return;
+
+                load();
+            } catch (Exception e) {
+                logger.error("", e);
+            }
+        }
+
+        public void load() 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);
+
+                response = httpClient.execute(get);
+
+                HttpEntity entity = response.getEntity();
+                if (null != entity) {
+                    BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                    StringBuffer stringBuffer = new StringBuffer();
+                    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 = gpsMap.get(gps.getDeviceId());
+                        if (old != null &&
+                                old.getTimestamp() == gps.getTimestamp())
+                            continue;
+
+                        nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+                        if (StringUtils.isBlank(nbbm))
+                            gps.setAbnormal(true);//标记为异常数据
+                        else
+                            gps.setNbbm(nbbm);
+                        //有更新的点位
+                        updateList.add(gps);
+                    }
+                    //分析数据
+                    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();
+            }
+        }
+    }
+}
 \ 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.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);
+
+    //每辆车缓存最后500条gps
+    private static final int CACHE_SIZE = 500;
+    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
+
+    //线路路段走向
+    private static ArrayListMultimap<String, LineString> sectionCacheMap;
+
+    //线路站点路由
+    private static ArrayListMultimap<String, StationRoute> stationCacheMap;
+
+    //线路_上下行_站点编码 ——> 站点
+    private static Map<String, StationRoute> routeCodeMap;
+
+    //停车场
+    public static Map<String, Polygon> tccMap;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    public static CircleQueue<GpsEntity> getGps(String nbbm) {
+        return gpsCacheMap.get(nbbm);
+    }
+
+    public static void putGps(GpsEntity gps) {
+        CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getNbbm());
+        if (queue == null) {
+            /*//第一个点从站内开始
+            if (gps.getInstation() == 0)
+                return;*/
+
+            queue = new CircleQueue<>(CACHE_SIZE);
+            gpsCacheMap.put(gps.getNbbm(), queue);
+        }
+        queue.add(gps);
+    }
+
+    public static void clear(String nbbm) {
+        try {
+            CircleQueue<GpsEntity> queue = gpsCacheMap.get(nbbm);
+            if (queue != null)
+                queue.clear();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    public static StationRoute getRouteCode(GpsEntity gps){
+        return routeCodeMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo());
+    }
+
+    public static List<StationRoute> getStationRoute(String lineCode, int directions) {
+        return stationCacheMap.get(lineCode + "_" + directions);
+    }
+
+    public static StationRoute getStation(String lineCode, int directions, String code) {
+        List<StationRoute> list = getStationRoute(lineCode, directions);
+
+        for (StationRoute sr : list) {
+            if (sr.getCode().equals(code)) {
+                return sr;
+            }
+        }
+        return null;
+    }
+
+    public static Polygon getTccPolygon(String code) {
+        return tccMap.get(code);
+    }
+
+    public void loadData() {
+        final GeometryFactory geometryFactory = new GeometryFactory();
+        //加载站点路由
+        String sql = "select r.LINE_CODE,r.DIRECTIONS,r.STATION_CODE,r.STATION_MARK,s.SHAPES_TYPE,s.G_LONX,s.G_LATY,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID,s.RADIUS, r.STATION_ROUTE_CODE,s.STATION_NAME from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id where r.destroy=0 order by r.station_route_code";
+        List<StationRoute> routeList = jdbcTemplate.query(sql, new RowMapper<StationRoute>() {
+            @Override
+            public StationRoute mapRow(ResultSet rs, int rowNum) throws SQLException {
+                StationRoute sRoute = new StationRoute();
+                sRoute.setCode(rs.getString("STATION_CODE"));
+                sRoute.setLineCode(rs.getString("LINE_CODE"));
+                sRoute.setDirections(rs.getInt("DIRECTIONS"));
+                sRoute.setPoint(geometryFactory.createPoint(new Coordinate(rs.getFloat("G_LATY"), rs.getFloat("G_LONX"))));
+                sRoute.setRadius(rs.getFloat("RADIUS"));
+                sRoute.setRouteSort(rs.getInt("STATION_ROUTE_CODE"));
+                sRoute.setMark(rs.getString("STATION_MARK"));
+                sRoute.setName(rs.getString("STATION_NAME"));
+
+                String shapesType = rs.getString("SHAPES_TYPE");
+                //多边形电子围栏
+                if (StringUtils.isNotEmpty(shapesType) && shapesType.equals("d")) {
+                    sRoute.setPolygon(geometryFactory.createPolygon(parsePolygon(rs.getString("G_POLYGON_GRID"))));
+                }
+                return sRoute;
+            }
+        });
+        //按线路和走向分组
+        if (routeList.size() > 0) {
+            ArrayListMultimap<String, StationRoute> tempMap = ArrayListMultimap.create();
+            Map<String, StationRoute> codeMap = new HashMap<>(routeList.size());
+            for (StationRoute sr : routeList) {
+                tempMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
+                //站点编码 ——> 和路由顺序对照
+                codeMap.put(sr.getLineCode() + "_" + sr.getDirections() + "_" + sr.getCode(), sr);
+            }
+
+            StationRouteComp srCom = new StationRouteComp();
+            //连接路由
+            Set<String> set = tempMap.keySet();
+            for (String key : set) {
+                Collections.sort(tempMap.get(key), srCom);
+                connectStationRoute(tempMap.get(key));
+            }
+
+            stationCacheMap = tempMap;
+            routeCodeMap = codeMap;
+        }
+
+        //加载停车场数据
+        sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null";
+        List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
+        Map<String, Polygon> tccTempMap = new HashMap<>();
+
+        Polygon polygon;
+        for (Map<String, Object> tMap : tccList) {
+
+            try {
+                polygon = geometryFactory.createPolygon(parsePolygon(tMap.get("G_PARK_POINT").toString()));
+                tccTempMap.put(tMap.get("PARK_CODE").toString()
+                        , polygon);
+            } catch (Exception e) {
+                logger.error("停车场：" + tMap.get("PARK_CODE"), e);
+            }
+        }
+
+        if (tccTempMap.size() > 0)
+            tccMap = tccTempMap;
+    }
+
+    private void connectStationRoute(List<StationRoute> list) {
+        int size = list.size();
+        StationRoute sr = null;
+        for (int i = 0; i < size; i++) {
+            sr = list.get(i);
+            //上一个
+            if (i > 0)
+                sr.setPrve(list.get(i - 1));
+            //下一个
+            if (i < size - 1)
+                sr.setNext(list.get(i + 1));
+        }
+    }
+
+    public Coordinate[] parsePolygon(String polygonStr) {
+        String[] coords = polygonStr.substring(9, polygonStr.length() - 2).split(","), temps;
+
+        Coordinate[] cds = new Coordinate[coords.length];
+        int len = coords.length;
+        for (int i = 0; i < len; i++) {
+            temps = coords[i].split(" ");
+            cds[i] = new Coordinate(Float.parseFloat(temps[1]), Float.parseFloat(temps[0]));
+        }
+        return cds;
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.arrival;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.handlers.*;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * gps 实时数据分析
+ * Created by panzhao on 2016/12/27.
+ */
+@Component
+public class GpsRealAnalyse {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    OfflineSignalHandle offlineSignalHandle;
+    @Autowired
+    CorrectSignalHandle correctSignalHandle;
+    @Autowired
+    StationInsideHandle stationInsideHandle;
+    @Autowired
+    InOutStationSignalHandle inOutStationSignalHandle;
+    @Autowired
+    ReverseSignalHandle reverseSignalHandle;
+
+    //50个线程
+    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
+
+    public void analyse(List<GpsEntity> list) {
+        CountDownLatch count = new CountDownLatch(list.size());
+
+        for(GpsEntity gps : list)
+            threadPool.execute(new SignalHandleThread(gps, count));
+
+        try {
+            //等待子线程结束
+            count.await();
+        } catch (InterruptedException e) {
+            logger.error("", e);
+        }
+    }
+
+    public class SignalHandleThread implements Runnable {
+
+        GpsEntity gps;
+        CountDownLatch count;
+
+        SignalHandleThread(GpsEntity gps, CountDownLatch count) {
+            this.gps = gps;
+            this.count = count;
+        }
+
+        @Override
+        public void run() {
+
+            try {
+                CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
+                //掉线处理
+                offlineSignalHandle.handle(gps, prevs);
+                //状态处理
+                if(!correctSignalHandle.handle(gps, prevs))
+                    return;
+                //场，站内外判断
+                stationInsideHandle.handle(gps, prevs);
+                //反向处理
+                reverseSignalHandle.handle(gps, prevs);
+                //进出站动作处理
+                inOutStationSignalHandle.handle(gps, prevs);
+                GeoCacheData.putGps(gps);
+
+            } catch (Exception e) {
+                logger.error("", e);
+            } finally {
+                count.countDown();
+            }
+        }
+    }
+}
+package com.bsth.data.gpsdata.arrival;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+
+/**
+ * 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;
+    }
+
+    /**
+     * 是不是异常信号
+     *
+     * @param gps
+     * @return
+     */
+    protected boolean isAbnormal(GpsEntity gps) {
+        return gps.getLat() == 0 || gps.getLon() == 0;
+    }
+
+    /**
+     * 连续异常信号个数统计
+     *
+     * @param prevs
+     * @return
+     */
+    protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
+        int count = 0;
+
+        if (!isNotEmpty(prevs))
+            return count;
+
+        GpsEntity[] array = (GpsEntity[]) prevs.getQueue();
+        GpsEntity gps;
+        for (int i = array.length - 1; i > 0; i--) {
+            gps = array[i];
+
+            if (isAbnormal(gps))
+                count++;
+            else
+                break;
+        }
+
+        return count;
+    }
+
+    /**
+     * 车辆运行轨迹（最近20分钟）
+     * 0：上行 1：下行 -1：未知
+     *
+     * @param gps
+     * @return
+     */
+    protected int runTrack(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        int rs = -1, count = 0;
+
+        long et = gps.getTimestamp() - (1000 * 60 * 20);
+        Object[] array = prevs.getQueue();
+        GpsEntity prev;
+        for(Object obj : array){
+            prev = (GpsEntity) obj;
+            if(prev.getTimestamp() < et)
+                break;
+
+
+        }
+        //for()
+        return 0;
+    }
+
+}
+package com.bsth.data.gpsdata.arrival.entity;
+
+/** 路由反转
+ * Created by panzhao on 2016/12/28.
+ */
+public class RouteReverse {
+
+    //反转个数
+    private int count;
+
+    //详细 1,2,3,2,1
+    private String detail;
+
+    //掉头站点
+    private String turned;
+
+    //开始时间
+    private long st;
+
+    //掉头时间
+    private long zt;
+
+    //结束时间
+    private long et;
+
+    //是否闭合
+    private boolean close;
+
+    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 long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    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;
+    }
+}
+package com.bsth.data.gpsdata.arrival.entity;
+
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+public class StationRoute {
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 上下行
+     */
+    private int directions;
+
+    /**
+     * 站点编码
+     */
+    private String code;
+
+    /**
+     * 路由顺序
+     */
+    private int routeSort;
+
+    /**
+     * 站点位置
+     */
+    private Point point;
+
+    /**
+     * 圆形半径
+     */
+    private Float radius;
+
+    /**
+     * 多边形电子围栏
+     */
+    private Polygon polygon;
+
+    /**
+     * 站点标记
+     */
+    private String mark;
+
+    /**
+     * 下一站
+     */
+    private StationRoute next;
+
+    /**
+     * 上一站
+     */
+    private StationRoute prve;
+
+    private String name;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public int getRouteSort() {
+        return routeSort;
+    }
+
+    public void setRouteSort(int routeSort) {
+        this.routeSort = routeSort;
+    }
+
+    public Point getPoint() {
+        return point;
+    }
+
+    public void setPoint(Point point) {
+        this.point = point;
+    }
+
+    public Float getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Float radius) {
+        this.radius = radius;
+    }
+
+    public Polygon getPolygon() {
+        return polygon;
+    }
+
+    public void setPolygon(Polygon polygon) {
+        this.polygon = polygon;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getDirections() {
+        return directions;
+    }
+
+    public void setDirections(int directions) {
+        this.directions = directions;
+    }
+
+    public StationRoute getNext() {
+        return next;
+    }
+
+    public void setNext(StationRoute next) {
+        this.next = next;
+    }
+
+    public StationRoute getPrve() {
+        return prve;
+    }
+
+    public void setPrve(StationRoute prve) {
+        this.prve = prve;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public void setMark(String mark) {
+        this.mark = mark;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
+
+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.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+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;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        Object 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;
+
+        int updown = Integer.parseInt(sch.getXlDir());
+        //走向
+        if(gps.getUpDown() != updown){
+            gps.setUpDown(updown);
+            gps.setState(0);
+        }
+
+
+        return true;
+    }
+}
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.directive.DirectiveService;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.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
+    DirectiveService directiveService;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+
+        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;
+        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() > 0 && gps.getInstation() > 0
+                && !prev.getStopNo().equals(gps.getStopNo()))
+            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();
+
+
+        //if(sch.getFcsjActual() != )
+
+        //起点发车
+        if(qdzCode != null && prev.getStopNo().equals(qdzCode)
+                && !willDepart(gps, prev, sch)){
+
+            sch.setFcsjActualAll(gps.getTimestamp());
+            //通知客户端
+            sendUtils.sendFcsj(sch);
+            //持久化
+            dayOfSchedule.save(sch);
+
+            //出站既出场
+            outStationAndOutPark(sch);
+            logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
+        }
+    }
+
+    private void outStationAndOutPark(ScheduleRealInfo sch){
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (config != null && config.getOutConfig() == 2) {
+            //出站既出场
+            ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+            if (schPrev != null && schPrev.getBcType().equals("out")) {
+                schPrev.setFcsjActualAll(sch.getFcsjActual());
+                schPrev.setZdsjActualAll(sch.getFcsjActual());
+            }
+        }
+    }
+
+    /**
+     * 进站
+     * @param gps 当前点
+     * @param prev 上一个点
+     */
+    private void inStation(GpsEntity gps, GpsEntity prev){
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+        String zdzCode = sch.getZdzCode();
+
+        if(zdzCode != null && gps.getStopNo().equals(zdzCode)){
+
+            sch.setZdsjActualAll(gps.getTimestamp());
+            //已完成班次数
+            int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
+            ScheduleRealInfo next = dayOfSchedule.next(sch);
+            //通知客户端
+            sendUtils.sendZdsj(sch, next, doneSum);
+            //持久化
+            dayOfSchedule.save(sch);
+            //下发调度指令
+            //directiveService.send60Dispatch(next, doneSum, "到站@系统");
+
+            //准备执行下一个班次
+            if (next != null) {
+                next.setQdzArrDatesj(sch.getZdsjActual());
+                dayOfSchedule.addExecPlan(next);
+
+                //进站既进场
+                inStationAndInPark(sch, next);
+
+                //将gps转换为下一个班次走向的站内信号
+                int updown = Integer.parseInt(next.getXlDir());
+                List<StationRoute> srs = GeoCacheData.getStationRoute(next.getXlBm(), updown);
+                StationRoute station = GeoUtils.gpsInStation(gps, srs);
+                if (station != null) {
+                    gps.setUpDown(updown);
+                    gps.setStopNo(station.getCode());
+                }
+            }
+        }
+       /* //如果出场班次计划终点时间5分钟后还未完成，检查一下车辆轨迹，是否已经在执行线路上班次
+        else if(sch.getBcType().equals("out")
+                && sch.getZdsj() != null
+                && gps.getTimestamp() - sch.getZdsjT() >= 1000 * 60 * 5){
+            logger.info("出场班次计划终点时间5分钟后还未完成");
+
+        }*/
+    }
+
+    /**
+     * 进站既进场
+     * @param sch
+     */
+    private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next){
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (next.getBcType().equals("in") &&
+                config != null && config.getOutConfig() == 2) {
+            next.setFcsjActualAll(sch.getZdsjActual());
+            next.setZdsjActualAll(sch.getZdsjActual());
+        }
+    }
+
+    /**
+     * 发车漂移判定（这里出现的误判，由车辆到达中途站的时候补偿）
+     * @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;
+    }
+}
+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{
+
+    //断开3分钟，标记为重连信号
+    private final static int OFFLINE_TIME = 1000 * 60 * 3;
+
+    //断开70分钟，之前的信号不再有参考价值
+    private final static int CLEAR_TIME = 1000 * 60 * 70;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //异常信号不管
+        if(isAbnormal(gps)){
+            return true;
+        }
+
+        if(isNotEmpty(prevs)){
+            GpsEntity prev = prevs.getTail();
+            int space = (int) (gps.getTimestamp() - prev.getTimestamp());
+            if(space > OFFLINE_TIME)
+                gps.setSignalState("reconnection");
+
+            if(space > CLEAR_TIME){
+                //清理缓存的信号
+                GeoCacheData.clear(gps.getNbbm());
+            }
+        }
+        return true;
+    }
+}
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.alibaba.fastjson.JSON;
+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.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 路由反向信号处理
+ * Created by panzhao on 2016/12/28.
+ */
+@Component
+public class ReverseSignalHandle extends SignalHandle {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        if (!isNotEmpty(prevs))
+            return false;
+
+        GpsEntity prev = prevs.getTail();
+
+        if (isReverse(gps, prev)) {
+            RouteReverse reverse = reverseSearch(prevs, gps);
+
+            if (reverse.getCount() >= 2) {
+                //切换到下一个班次
+                ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+                if (sch.getBcType().equals("out") && sch.getZdsjT() != null && sch.getZdsjT() > gps.getTimestamp()) {
+                    return false;
+                }
+                dayOfSchedule.addExecPlan(dayOfSchedule.next(sch));
+
+                if (reverse.isClose()) {
+                    logger.info("区间掉头，车辆：" + gps.getNbbm() + " -" + JSON.toJSONString(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 = "";
+        String turned = null;
+
+        //当前站点
+        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()))
+                break;
+
+            if (prev.getInstation() == 1) {
+                sr = GeoCacheData.getRouteCode(prev);
+
+                if (sr.getRouteSort() > curr.getRouteSort()) {
+                    path += (curr.getCode() + ",");
+                    count++;
+                } else if (sr.getRouteSort() < curr.getRouteSort()) {
+                    path += (curr.getCode() + ",");
+                    //掉头点
+                    if (turned == null)
+                        turned = prev.getStopNo();
+
+                    //路径闭合
+                    if (sr.getCode().equals(gps.getStopNo())) {
+                        routeReverse.setClose(true);
+                        path += sr.getCode();
+                        break;
+                    }
+                }
+
+                curr = sr;
+            }
+        }
+
+        routeReverse.setCount(count);
+        routeReverse.setDetail(path);
+        routeReverse.setTurned(turned);
+        return routeReverse;
+    }
+
+    /**
+     * 是否反向
+     *
+     * @param gps
+     * @param prev
+     * @return
+     */
+    public boolean isReverse(GpsEntity gps, GpsEntity prev) {
+        if (gps.getInstation() == 1
+                &&
+                gps.getUpDown().equals(prev.getUpDown())
+                && !gps.getStopNo().equals(prev.getStopNo())) {
+
+            StationRoute currStation = GeoCacheData.getRouteCode(gps);
+            StationRoute prevStation = GeoCacheData.getRouteCode(prev);
+
+            if (currStation == null || prevStation == null)
+                return false;
+
+            if (currStation.getRouteSort() < prevStation.getRouteSort())
+                return true;
+        }
+        return false;
+    }
+}
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 站内站外判定
+ * Created by panzhao on 2016/12/27.
+ */
+@Component
+public class StationInsideHandle extends SignalHandle {
+
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //是否在场内
+        String parkCode = GeoUtils.gpsInCarpark(gps);
+        if (parkCode != null) {
+            gps.setInstation(2);
+            gps.setStopNo(parkCode);
+        }
+
+        //是否在站内
+        List<StationRoute> srs = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+        if (station != null) {
+            gps.setInstation(1);
+            gps.setStopNo(station.getCode());
+            gps.setStation(station);
+        }
+
+        //在场，站外
+        if(gps.getInstation() == 0 && isNotEmpty(prevs)){
+            //继承上一个点的站点编码
+            GpsEntity prev = prevs.getTail();
+            gps.setStopNo(prev.getStopNo());
+        }
+
+        return true;
+    }
+}
+package com.bsth.data.gpsdata.arrival.utils;
+
+import java.util.Arrays;
+
+/**
+ * 循环队列
+ * Created by panzhao on 2016/12/23.
+ */
+public class CircleQueue<T> {
+
+    /**
+     * (循环队列)数组的容量
+     */
+    public int capacity;
+
+    /**
+     * 数组：保存循环队列的元素
+     */
+    public Object[] elementData;
+
+    /**
+     * 头
+     */
+    public int head = 0;
+
+    /**
+     * 尾
+     */
+    public int tail = 0;
+
+    /**
+     * 以指定长度的数组来创建循环队列
+     *
+     * @param initSize
+     */
+    public CircleQueue(final int initSize) {
+        capacity = initSize;
+        elementData = new Object[capacity];
+    }
+
+    /**
+     * 获取循环队列的大小
+     */
+    public int size() {
+        if (isEmpty()) {
+            return 0;
+        } else if (isFull()) {
+            return capacity;
+        } else {
+            return tail + 1;
+        }
+    }
+
+    /**
+     * 插入队尾一个元素
+     */
+    public void add(final T element) {
+        if (isEmpty()) {
+            elementData[0] = element;
+        } else if (isFull()) {
+            elementData[head] = element;
+            head++;
+            tail++;
+            head = head == capacity ? 0 : head;
+            tail = tail == capacity ? 0 : tail;
+        } else {
+            elementData[tail + 1] = element;
+            tail++;
+        }
+    }
+
+    public boolean isEmpty() {
+        return tail == head && tail == 0 && elementData[tail] == null;
+    }
+
+    public boolean isFull() {
+        return head != 0 && head - tail == 1 || head == 0 && tail == capacity - 1;
+    }
+
+    public void clear() {
+        Arrays.fill(elementData, null);
+        head = 0;
+        tail = 0;
+    }
+
+    /**
+     * @return 取 循环队列里的值（先进的index=0）
+     */
+    public Object[] getQueue() {
+        final Object[] elementDataSort;
+        final Object[] elementDataCopy = elementData.clone();
+        if (isEmpty()) {
+            elementDataSort = new Object[0];
+        } else if (isFull()) {
+            elementDataSort = new Object[capacity];
+            int indexMax = capacity;
+            int indexSort = 0;
+            for (int i = head; i < indexMax;) {
+                elementDataSort[indexSort] = elementDataCopy[i];
+                indexSort++;
+                i++;
+                if (i == capacity) {
+                    i = 0;
+                    indexMax = head;
+                }
+            }
+        } else {
+            elementDataSort = new Object[tail];
+            for (int i = 0; i < tail; i++) {
+                elementDataSort[i] = elementDataCopy[i];
+            }
+        }
+        return elementDataSort;
+    }
+
+    /**
+     * 取最后一个值
+     * @return
+     */
+    public T getTail(){
+        return elementData[tail] == null?null:(T)elementData[tail];
+    }
+}
 \ 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.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+public class GeoUtils {
+
+    private final static double EARTHRADIUS = 6378137;
+
+    private static GeometryFactory geometryFactory = new GeometryFactory();
+    /**
+     * gps是否在路由上的某个站内
+     *
+     * @param gps
+     * @param srs
+     * @return
+     */
+    public static StationRoute gpsInStation(GpsEntity gps, List<StationRoute> srs) {
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+        double min = -1, distance, distance2;
+        StationRoute stationRoute = null;
+
+        for (StationRoute sr : srs) {
+            if (sr.getPolygon() == null) {
+                //圆形
+                distance = getDistance(sr.getPoint(), point);//sr.getPoint().distance(point);
+
+                if (distance > sr.getRadius())
+                    continue;
+
+                if (min > distance || min == -1) {
+                    min = distance;
+                    stationRoute = sr;
+                }
+            } else {
+                //多边形
+                if (sr.getPolygon().contains(point)) {
+                    stationRoute = sr;
+                    break;
+                }
+            }
+        }
+        return stationRoute;
+    }
+
+    public static double getDistance(Point p1, Point p2) {
+        double lng1 = getLoop(p1.getY(), -180, 180), lat1 = getRange(
+                p1.getX(), -74, 74);
+        double lng2 = getLoop(p2.getY(), -180, 180), lat2 = getRange(
+                p2.getX(), -74, 74);
+
+        double x1, x2, y1, y2;
+        x1 = degreeToRad(lng1);
+        y1 = degreeToRad(lat1);
+        x2 = degreeToRad(lng2);
+        y2 = degreeToRad(lat2);
+        return EARTHRADIUS
+                * Math.acos((Math.sin(y1) * Math.sin(y2) + Math.cos(y1)
+                * Math.cos(y2) * Math.cos(x2 - x1)));
+    }
+
+    private static double getLoop(double v, double a, double b) {
+        while (v > b) {
+            v -= b - a;
+        }
+        while (v < a) {
+            v += b - a;
+        }
+        return v;
+    }
+
+    private static double getRange(double v, double a, double b) {
+        v = Math.min(Math.max(v, a), b);
+        return v;
+    }
+
+    private static double degreeToRad(double degree) {
+        return Math.PI * degree / 180;
+    }
+
+
+    /**
+     * gps 是否在某个停车场内
+     * @param gps
+     * @return
+     */
+    public static String gpsInCarpark(GpsEntity gps){
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
+        Set<String> codes = carparkMap.keySet();
+        Polygon polygon;
+        for(String code : codes){
+            polygon = carparkMap.get(code);
+            if(point.within(polygon)){
+                return code;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 是否是有效的连续点
+     * @param prevGps
+     * @param gps
+     * @return
+     */
+    public static boolean overdue(GpsEntity prevGps, GpsEntity gps) {
+        return gps.getTimestamp() - prevGps.getTimestamp() < 120000;
+    }
+}
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+
+import java.util.Comparator;
+
+/**
+ * Created by panzhao on 2016/12/24.
+ */
+public class StationRouteComp implements Comparator<StationRoute>{
+    @Override
+    public int compare(StationRoute s1, StationRoute s2) {
+        return s1.getRouteSort() - s2.getRouteSort();
+    }
+}
+package com.bsth.data.gpsdata.recovery;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.handlers.*;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.util.db.DBUtils_MS;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Component;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * gps数据恢复
+ * Created by panzhao on 2016/12/24.
+ */
+@Component
+public class GpsDataRecovery implements ApplicationContextAware{
+
+    static Logger logger = LoggerFactory.getLogger(GpsDataRecovery.class);
+
+    public static boolean run;
+
+    static ExecutorService threadPool = Executors.newFixedThreadPool(10);
+
+    static OfflineSignalHandle offlineSignalHandle;
+    static CorrectSignalHandle correctSignalHandle;
+    static StationInsideHandle stationInsideHandle;
+    static InOutStationSignalHandle inOutStationSignalHandle;
+    static ReverseSignalHandle reverseSignalHandle;
+
+    public void recovery() {
+        List<GpsEntity> list = loadData();
+
+        //按车辆分组数据
+        ArrayListMultimap<String, GpsEntity> listMap = ArrayListMultimap.create();
+        for (GpsEntity gps : list) {
+            if(gps.getNbbm() != null)
+                listMap.put(gps.getNbbm(), gps);
+        }
+
+
+        Set<String> keys = listMap.keySet();
+
+        CountDownLatch count = new CountDownLatch(keys.size());
+        GpsComp comp = new GpsComp();
+        for (String nbbm : keys) {
+            Collections.sort(listMap.get(nbbm), comp);
+            threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
+        }
+
+        try {
+            count.await();
+            run = false;
+            logger.info("数据恢复完成....");
+        } catch (InterruptedException e) {
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 加载当天的gps数据
+     *
+     * @return
+     */
+    public List<GpsEntity> loadData() {
+        Calendar calendar = Calendar.getInstance();
+        int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
+
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=" + dayOfYear;
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
+
+        List<GpsEntity> list =
+                jdbcTemplate.query(sql, new RowMapper<GpsEntity>() {
+                    @Override
+                    public GpsEntity mapRow(ResultSet rs, int rowNum) throws SQLException {
+                        GpsEntity gps = new GpsEntity();
+
+                        gps.setDeviceId(rs.getString("DEVICE_ID"));
+                        gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
+                        gps.setSpeed(rs.getFloat("SPEED_GPS"));
+                        gps.setLat(rs.getFloat("LAT"));
+                        gps.setLon(rs.getFloat("LON"));
+                        gps.setLineId(rs.getString("LINE_ID"));
+                        gps.setTimestamp(rs.getLong("TS"));
+                        gps.setUpDown(getUpOrDown(rs.getLong("SERVICE_STATE")));
+                        return gps;
+                    }
+                });
+        return list;
+    }
+
+    /**
+     * 王通 2016/6/29 9:23:24 获取车辆线路上下行
+     *
+     * @return -1无效 0上行 1下行
+     */
+    public static int getUpOrDown(long serviceState) {
+        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+                || (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
+            return -1;
+        return (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        offlineSignalHandle = applicationContext.getBean(OfflineSignalHandle.class);
+        correctSignalHandle = applicationContext.getBean(CorrectSignalHandle.class);
+        stationInsideHandle = applicationContext.getBean(StationInsideHandle.class);
+        inOutStationSignalHandle = applicationContext.getBean(InOutStationSignalHandle.class);
+        reverseSignalHandle = applicationContext.getBean(ReverseSignalHandle.class);
+    }
+
+    public static class GpsComp implements Comparator<GpsEntity>{
+
+        @Override
+        public int compare(GpsEntity g1, GpsEntity g2) {
+            return g1.getTimestamp().compareTo(g2.getTimestamp());
+        }
+    }
+
+    public static class RecoveryThread implements Runnable{
+        List<GpsEntity> list;
+        CountDownLatch count;
+
+        RecoveryThread(List<GpsEntity> list, CountDownLatch count){
+            this.list = list;
+            this.count = count;
+        }
+        @Override
+        public void run() {
+            try {
+                //循环gps恢复数据
+                CircleQueue<GpsEntity> prevs;
+
+                for(GpsEntity gps : list){
+                    prevs = GeoCacheData.getGps(gps.getNbbm());
+                    //掉线处理
+                    offlineSignalHandle.handle(gps, prevs);
+                    //状态处理
+                    if(!correctSignalHandle.handle(gps, prevs))
+                        continue;
+                    //场，站内外判断
+                    stationInsideHandle.handle(gps, prevs);
+                    //反向处理
+                    reverseSignalHandle.handle(gps, prevs);
+                    //进出站动作处理
+                    inOutStationSignalHandle.handle(gps, prevs);
+                    GeoCacheData.putGps(gps);
+                }
+            }catch (Exception e){
+                logger.error("", e);
+            }
+            finally {
+                count.countDown();
+            }
+        }
+    }
+}
 \ No newline at end of file
 package com.bsth.data.pilot80;
  
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsEntity;
@@ -23,6 +14,14 @@ import com.bsth.repository.directive.D80Repository;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
  
 /**
  * 
@@ -180,7 +179,7 @@ public class PilotReport {
 				return;
  
 			LineConfig conf = lineConfigData.get(sch.getXlBm());
-			if(conf.getInConfig() == 1){
+			if(conf.getOutConfig() == 1){
 				//为相关班次写入进场时间
 				sch.setZdsjActualAll(d80.getTimestamp());
  
@@ -3,9 +3,11 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.FirstScheduleCheckThread;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.thread.ScheduleLateThread;
 import com.bsth.data.schedule.thread.SchedulePstThread;
 import com.bsth.data.schedule.thread.ScheduleRefreshThread;
@@ -35,484 +37,538 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
  
 /**
- * 
+ * @author PanZhao
  * @ClassName: DayOfSchedule
  * @Description: TODO(当日实际排班)
- * @author PanZhao
  * @date 2016年8月15日 上午10:16:12
- *
  */
 @Component
 public class DayOfSchedule implements CommandLineRunner {
  
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	// 按车辆分组的班次数据
-	private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
-
-	// 班次主键映射
-	private static Map<Long, ScheduleRealInfo> id2SchedulMap;
-
-	// 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
-	private static TreeMultimap<String, String> nbbm2SEStationMap;
-	
-	//车辆 ——> 当前执行班次
-	private static Map<String, ScheduleRealInfo> carExecutePlanMap;
-
-	// 持久化缓冲区
-	public static LinkedList<ScheduleRealInfo> pstBuffer;
-
-	// 排序器
-	private static ScheduleComparator.FCSJ schFCSJComparator;
-
-	@Autowired
-	LineConfigData lineConfigData;
-
-	@Autowired
-	ScheduleRealInfoRepository schRepository;
-
-	@Autowired
-	SchedulePlanInfoService schPlanService;
-
-	@Autowired
-	SchAttrCalculator schAttrCalculator;
-
-	@Autowired
-	SendUtils sendUtils;
-	
-	@Autowired
-	GpsRealData gpsRealData;
-
-	/** 线路当前使用的排班的日期 */
-	public static Map<String, String> currSchDateMap;
-
-	static {
-		nbbmScheduleMap = ArrayListMultimap.create();
-		id2SchedulMap = new HashMap<>();
-		pstBuffer = new LinkedList<>();
-		schFCSJComparator = new ScheduleComparator.FCSJ();
-		currSchDateMap = new HashMap<>();
-		nbbm2SEStationMap = TreeMultimap.create();
-		carExecutePlanMap = new HashMap<>();
-	}
-
-	@Autowired
-	ScheduleRefreshThread scheduleRefreshThread;
-	
-	@Autowired
-	SchedulePstThread schedulePstThread;
-	
-	@Autowired
-	FirstScheduleCheckThread firstScheduleCheckThread;
-	
-	@Autowired
-	ScheduleLateThread scheduleLateThread;
-
-	@Autowired
-	SubmitToTrafficManage submitToTrafficManage;
-
-	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
-				,fmtHHmm = DateTimeFormat.forPattern("HH:mm");
-
-	@Override
-	public void run(String... arg0) throws Exception {
-		//翻班线程
-		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
-		//入库
-//		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
-		//首班出场指令补发器
-//		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
-		//班次误点扫描
-//		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
-
-		//每天凌晨2点20提交数据到运管处
-		long diff = (DateUtils.getTimestamp() + 1000*60*140) - System.currentTimeMillis();
-		if(diff < 0)
-			diff+=(1000*60*60*24);
-
-		logger.info(diff/1000/60 + "分钟之后提交到运管处");
-		//Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
-	}
-
-	public Map<String, String> getCurrSchDate() {
-		return currSchDateMap;
-	}
-
-	/**
-	 * 
-	 * @Title: calcSchDateB
-	 * @Description: TODO(计算线路当前应该使用的排班日期)
-	 */
-	public String calcSchDate(String lineCode) {
-		LineConfig conf = lineConfigData.get(lineCode);
-		long ct = System.currentTimeMillis();
-		
-		String schDate = fmtyyyyMMdd.print(ct);
-		// 小于当天起始运营时间,则取前一天的排班
-		if (ct < conf.getCurrStartTime())
-			schDate = DateUtils.subtractDay(schDate, 1);
-
-		return schDate;
-	}
-
-	/**
-	 * @Title: reloadSch
-	 * @Title: reloadSch
-	 * @Description: TODO(重新载入排班)
-	 * @param @param
-	 *            lineCode 线路编码
-	 * @param @param
-	 *            schDate 班次日期 yyyy-MM-dd
-	 * @param @param
-	 *            forcePlan 强制从计划调度重新抓取
-	 */
-	public int reloadSch(String lineCode, String schDate, boolean forcePlan) {
-		try {
-			List<ScheduleRealInfo> list;
-
-			if (forcePlan)
-				removeRealSch(lineCode, schDate);
-			else
-				clearRAMData(lineCode);
-
-			if (existRealSch(lineCode, schDate))
-				list = loadRealSch(lineCode, schDate);// 从实际排班表加载
-			else {
-				list = loadPlanSch(lineCode, schDate);// 从计划排班表加载
-				// 写入数据库
-				batchSave(list);
-			}
-
-			//更新线路和班次日期对照
-			currSchDateMap.put(lineCode, schDate);
-			//添加到缓存
-			putAll(list);
-			
-			Set<String> cars = searchAllCars(list);
-			//计算“起点站应到”时间
-			for(String nbbm : cars)
-				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
-			
-			//是否是出站即出场
-			LineConfig conf = lineConfigData.get(lineCode);
-			if(conf.getOutConfig() == 2){
-				for(String nbbm : cars)
-					schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
-			}
-			
-			// 页面 翻班通知
-			sendUtils.shiftSchedule(lineCode);
-		} catch (Exception e) {
-			logger.error("", e);
-			return -1;
-		}
+    Logger logger = LoggerFactory.getLogger(this.getClass());
  
-		return 0;
-	}
-
-	/**
-	 * 
-	 * @Title: searchAllCars 
-	 * @Description: TODO(搜索班次集合中的车辆) 
-	 */
-	private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
-		Set<String> cars = new HashSet<>();
-		for(ScheduleRealInfo sch : list)
-			cars.add(sch.getClZbh());
-		
-		return cars;
-	}
-
-	private void putAll(List<ScheduleRealInfo> list) {
-		for (ScheduleRealInfo sch : list) 
-			put(sch);
-	}
-
-	/**
-	 * @Title: removeRealSch
-	 * @Description: TODO(清除实际排班，包括数据库和内存数据)
-	 * @param @param
-	 *            lineCode 线路编码
-	 * @param @param
-	 *            schDate 班次日期 yyyy-MM-dd
-	 */
-	public void removeRealSch(String lineCode, String schDate) throws Exception {
-		try {
-			// 清理数据库数据
-			schRepository.deleteByLineCodeAndDate(lineCode + "", schDate);
-
-			// 清理内存数据
-			clearRAMData(lineCode + "");
-		} catch (Exception e) {
-			logger.error("removeRealSch error, " + lineCode + " -" + schDate, e);
-			throw e;
-		}
-	}
-
-	/**
-	 * 
-	 * @Title: clearRAMData
-	 * @Description: TODO(清理内存数据)
-	 */
-	public void clearRAMData(String lineCode) {
-		int count = 0;
-		List<ScheduleRealInfo> remList = new ArrayList<>();
-		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
-		for (ScheduleRealInfo sch : schs) {
-			if (sch.getXlBm().equals(lineCode))
-				remList.add(sch);
-		}
-		
-		for(ScheduleRealInfo sch : remList){
-			if(null != sch){
-				nbbmScheduleMap.remove(sch.getClZbh(), sch);
-				id2SchedulMap.remove(sch.getId());
-				count ++;
-			}
-		}
-		
-		logger.info(lineCode + "排班清理 " + count);
-	}
-
-	/**
-	 * @Title: existRealSch
-	 * @Description: TODO(实际排班是否已存在)
-	 */
-	public boolean existRealSch(String lineCode, String schDate) {
-		int count = schRepository.countByLineCodeAndDate(lineCode, schDate);
-		return count > 0;
-	}
-
-	/**
-	 * @Title: loadRealSch
-	 * @Description: TODO(从实际排班表加载数据)
-	 */
-	public List<ScheduleRealInfo> loadRealSch(String lineCode, String schDate) {
-		return schRepository.findByLineCodeAndDate(lineCode, schDate);
-	}
-
-	/**
-	 * @Title: loadPlanSch
-	 * @Description: TODO(从计划排班表加载数据)
-	 */
-	public List<ScheduleRealInfo> loadPlanSch(String lineCode, String schDate) {
-		logger.info("从计划排班表恢复排班，lineCode: " + lineCode + ", schDate: " + schDate);
-		List<ScheduleRealInfo> realList = new ArrayList<>();
-
-		try {
-			Map<String, Object> data = new HashMap<>();
-
-			data.put("scheduleDate_eq", fmtyyyyMMdd.parseDateTime(schDate).toDate());
-			data.put("xlBm_eq", lineCode);
-
-			// 查询计划排班
-			List<SchedulePlanInfo> planItr = cleanSchPlanItr(schPlanService.list(data).iterator());
-
-			// 转换为实际排班
-			realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
-
-			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
-			String fcsj;
-			for (ScheduleRealInfo sch : realList) {
-				sch.setScheduleDateStr(fmtyyyyMMdd.print(sch.getScheduleDate().getTime()));
-				sch.setRealExecDate(sch.getScheduleDateStr());
-
-				if(StringUtils.isEmpty(sch.getFcsj()))
-					sch.setFcsj("00:00");
-
-				fcsj=sch.getFcsj().trim();
-				//处理一下发车时间格式没有:号的问题
-				if(fcsj.indexOf(":") == -1 && fcsj.length() >= 4){
-					sch.setFcsj(fcsj.substring(0, 2) + ":" + fcsj.substring(2, 4));
-				}
-
-				try {
-					sdf.parse(sch.getFcsj());
-				} catch (ParseException e) {
-					//发车时间仍然校验不过的，直接写成00:00
-					sch.setFcsj("00:00");
-				}
-				sch.setDfsj(sch.getFcsj());
-
-				// 计划终点时间
-				if (sch.getBcsj() != null) {
-					sch.setZdsj(fmtHHmm.print(fmtHHmm.parseMillis(sch.getFcsj()) + (sch.getBcsj() * 60 * 1000)));
-					sch.setLate(false);
-				}
-				//计划里程为0，设置NULL
-				if(sch.getJhlc() != null && sch.getJhlc() == 0)
-					sch.setJhlc(null);
-			}
-		} catch (Exception e) {
-			logger.error("", e);
-		}
-		return realList;
-	}
-
-	/**
-	 * @Title: batchSave
-	 * @Description: TODO(批量入库)
-	 */
-	private void batchSave(List<ScheduleRealInfo> list) {
-		// 查询数据库最大ID
-		Long id = schRepository.getMaxId();
-		if (null == id)
-			id = 0L;
-		id++;
-
-		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
-		for (ScheduleRealInfo item : list) {
-			item.setSpId(item.getId());// 保留原始的计划ID
-			item.setId(id++);// 设置ID
-			item.setScheduleDateStr(sdfyyyyMMdd.format(item.getScheduleDate()));
-		}
+    // 按车辆分组的班次数据
+    private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
  
-		// 入库
-		new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
-	}
+    // 班次主键映射
+    private static Map<Long, ScheduleRealInfo> id2SchedulMap;
  
-	private List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
-		List<SchedulePlanInfo> list = new ArrayList<>();
+    // 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
+    private static TreeMultimap<String, String> nbbm2SEStationMap;
  
-		SchedulePlanInfo sp;
-		while (itrab.hasNext()) {
-			sp = itrab.next();
-			sp.setSchedulePlan(null);
-			list.add(sp);
-		}
-		return list;
-	}
-
-	/**
-	 * 
-	 * @Title: findByLineCode
-	 * @Description: TODO(lineCode 获取班次)
-	 */
-	public List<ScheduleRealInfo> findByLineCode(String lineCode) {
-		List<ScheduleRealInfo> rs = new ArrayList<>();
+    //车辆 ——> 当前执行班次
+    private static Map<String, ScheduleRealInfo> carExecutePlanMap;
  
-		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
-		for (ScheduleRealInfo sch : schs) {
-			if (sch.getXlBm().equals(lineCode))
-				rs.add(sch);
-		}
-		return rs;
-	}
-	
-	/**
-	 * 
-	 * @Title: findCarByLineCode 
-	 * @Description: TODO(线路下运营的车辆) 
-	 */
-	public Set<String> findCarByLineCode(String lineCode){
-		Set<String> rs = new HashSet<>();
-
-		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
-		for (ScheduleRealInfo sch : schs) {
-			if (sch.getXlBm().equals(lineCode))
-				rs.add(sch.getClZbh());
-		}
-		
-		return rs;
-	}
-
-	public List<ScheduleRealInfo> findByNbbm(String nbbm) {
-		return nbbmScheduleMap.get(nbbm);
-	}
-
-	/**
-	 * 
-	 * @Title: findByLineAndUpDown
-	 * @Description: TODO(lineCode 和走向获取班次)
-	 */
-	public List<ScheduleRealInfo> findByLineAndUpDown(String lineCode, Integer upDown) {
-		List<ScheduleRealInfo> list = findByLineCode(lineCode), rs = new ArrayList<>();
-
-		for (ScheduleRealInfo sch : list) {
-			if (sch.getXlDir().equals(upDown + ""))
-				rs.add(sch);
-		}
-		return rs;
-	}
+    // 持久化缓冲区
+    public static LinkedList<ScheduleRealInfo> pstBuffer;
  
-	public ScheduleRealInfo get(long id) {
-		return id2SchedulMap.get(id);
-	}
+    // 排序器
+    private static ScheduleComparator.FCSJ schFCSJComparator;
  
-	public Set<String> getSEStationList(String nbbm) {
-		return nbbm2SEStationMap.get(nbbm);
-	}
+    @Autowired
+    LineConfigData lineConfigData;
  
-	/**
-	 * 
-	 * @Title: next
-	 * @Description: TODO(下一个班次)
-	 */
-	public ScheduleRealInfo next(ScheduleRealInfo sch) {
+    @Autowired
+    ScheduleRealInfoRepository schRepository;
+
+    @Autowired
+    SchedulePlanInfoService schPlanService;
+
+    @Autowired
+    SchAttrCalculator schAttrCalculator;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    GpsRealData gpsRealData;
+
+    /**
+     * 线路当前使用的排班的日期
+     */
+    public static Map<String, String> currSchDateMap;
+
+    static {
+        nbbmScheduleMap = ArrayListMultimap.create();
+        id2SchedulMap = new HashMap<>();
+        pstBuffer = new LinkedList<>();
+        schFCSJComparator = new ScheduleComparator.FCSJ();
+        currSchDateMap = new HashMap<>();
+        nbbm2SEStationMap = TreeMultimap.create();
+        carExecutePlanMap = new HashMap<>();
+    }
+
+    @Autowired
+    ScheduleRefreshThread scheduleRefreshThread;
+
+    @Autowired
+    SchedulePstThread schedulePstThread;
+
+    @Autowired
+    FirstScheduleCheckThread firstScheduleCheckThread;
+
+    @Autowired
+    ScheduleLateThread scheduleLateThread;
+
+    @Autowired
+    SubmitToTrafficManage submitToTrafficManage;
+
+    @Autowired
+    LineConfigData lineConfigs;
+
+    @Autowired
+    BasicData.BasicDataLoader dataLoader;
+
+    @Autowired
+    GpsDataRecovery gpsDataRecovery;
+
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd"), fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    @Override
+    public void run(String... arg0) throws Exception {
+        //加载基础数据
+        dataLoader.loadAllData();
+        //从数据库恢复排班
+        dataRecovery();
+
+        //翻班线程
+//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        //入库
+//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+        //首班出场指令补发器
+//		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
+        //班次误点扫描
+        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+
+        //每天凌晨2点20提交数据到运管处
+        long diff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
+        if (diff < 0)
+            diff += (1000 * 60 * 60 * 24);
+
+        logger.info(diff / 1000 / 60 + "分钟之后提交到运管处");
+        //Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+    }
+
+    //数据恢复
+    private void dataRecovery() {
+        GpsDataRecovery.run = true;
+
+        Collection<LineConfig> confs = lineConfigs.getAll();
+        String lineCode, currSchDate;
+        for (LineConfig conf : confs) {
+            lineCode = conf.getLine().getLineCode();
+            currSchDate = calcSchDate(lineCode);
+            //加载班次数据
+            reloadSch(lineCode, currSchDate, false);
+        }
+
+        //恢复gps数据
+        gpsDataRecovery.recovery();
+    }
+
+    public Map<String, String> getCurrSchDate() {
+        return currSchDateMap;
+    }
+
+    /**
+     * @Title: calcSchDateB
+     * @Description: TODO(计算线路当前应该使用的排班日期)
+     */
+    public String calcSchDate(String lineCode) {
+        LineConfig conf = lineConfigData.get(lineCode);
+        long ct = System.currentTimeMillis();
+
+        String schDate = fmtyyyyMMdd.print(ct);
+        // 小于当天起始运营时间,则取前一天的排班
+        if (ct < conf.getCurrStartTime())
+            schDate = DateUtils.subtractDay(schDate, 1);
+
+        return schDate;
+    }
+
+    /**
+     * @param @param lineCode 线路编码
+     * @param @param schDate 班次日期 yyyy-MM-dd
+     * @param @param forcePlan 强制从计划调度重新抓取
+     * @Title: reloadSch
+     * @Title: reloadSch
+     * @Description: TODO(重新载入排班)
+     */
+    public int reloadSch(String lineCode, String schDate, boolean forcePlan) {
+        try {
+            List<ScheduleRealInfo> list;
+
+            if (forcePlan)
+                removeRealSch(lineCode, schDate);
+            else
+                clearRAMData(lineCode);
+
+            if (existRealSch(lineCode, schDate))
+                list = loadRealSch(lineCode, schDate);// 从实际排班表加载
+            else {
+                list = loadPlanSch(lineCode, schDate);// 从计划排班表加载
+                // 写入数据库
+                batchSave(list);
+            }
+
+            //更新线路和班次日期对照
+            currSchDateMap.put(lineCode, schDate);
+            //添加到缓存
+            putAll(list);
+
+            Set<String> cars = searchAllCars(list);
+            for (String nbbm : cars) {
+                //计算“起点站应到”时间
+                schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
+                //车辆 ——> 要执行的班次对照
+                reCalcExecPlan(nbbm);
+            }
+
+            //是否是出站即出场
+            LineConfig conf = lineConfigData.get(lineCode);
+            if (conf.getOutConfig() == 2) {
+                for (String nbbm : cars)
+                    schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
+            }
+
+            // 页面 翻班通知
+            sendUtils.shiftSchedule(lineCode);
+        } catch (Exception e) {
+            logger.error("", e);
+            return -1;
+        }
+
+        return 0;
+    }
+
+    /**
+     * @Title: searchAllCars
+     * @Description: TODO(搜索班次集合中的车辆)
+     */
+    private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
+        Set<String> cars = new HashSet<>();
+        for (ScheduleRealInfo sch : list)
+            cars.add(sch.getClZbh());
+
+        return cars;
+    }
+
+    private void putAll(List<ScheduleRealInfo> list) {
+        for (ScheduleRealInfo sch : list)
+            put(sch);
+    }
+
+    /**
+     * @param @param lineCode 线路编码
+     * @param @param schDate 班次日期 yyyy-MM-dd
+     * @Title: removeRealSch
+     * @Description: TODO(清除实际排班，包括数据库和内存数据)
+     */
+    public void removeRealSch(String lineCode, String schDate) throws Exception {
+        try {
+            // 清理数据库数据
+            schRepository.deleteByLineCodeAndDate(lineCode + "", schDate);
+
+            // 清理内存数据
+            clearRAMData(lineCode + "");
+        } catch (Exception e) {
+            logger.error("removeRealSch error, " + lineCode + " -" + schDate, e);
+            throw e;
+        }
+    }
+
+    /**
+     * @Title: clearRAMData
+     * @Description: TODO(清理内存数据)
+     */
+    public void clearRAMData(String lineCode) {
+        int count = 0;
+        List<ScheduleRealInfo> remList = new ArrayList<>();
+        Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+        for (ScheduleRealInfo sch : schs) {
+            if (sch.getXlBm().equals(lineCode))
+                remList.add(sch);
+        }
+
+        for (ScheduleRealInfo sch : remList) {
+            if (null != sch) {
+                nbbmScheduleMap.remove(sch.getClZbh(), sch);
+                id2SchedulMap.remove(sch.getId());
+                count++;
+            }
+        }
+
+        logger.info(lineCode + "排班清理 " + count);
+    }
+
+    /**
+     * @Title: existRealSch
+     * @Description: TODO(实际排班是否已存在)
+     */
+    public boolean existRealSch(String lineCode, String schDate) {
+        int count = schRepository.countByLineCodeAndDate(lineCode, schDate);
+        return count > 0;
+    }
+
+    /**
+     * @Title: loadRealSch
+     * @Description: TODO(从实际排班表加载数据)
+     */
+    public List<ScheduleRealInfo> loadRealSch(String lineCode, String schDate) {
+        return schRepository.findByLineCodeAndDate(lineCode, schDate);
+    }
+
+    /**
+     * @Title: loadPlanSch
+     * @Description: TODO(从计划排班表加载数据)
+     */
+    public List<ScheduleRealInfo> loadPlanSch(String lineCode, String schDate) {
+        logger.info("从计划排班表恢复排班，lineCode: " + lineCode + ", schDate: " + schDate);
+        List<ScheduleRealInfo> realList = new ArrayList<>();
+
+        try {
+            Map<String, Object> data = new HashMap<>();
+
+            data.put("scheduleDate_eq", fmtyyyyMMdd.parseDateTime(schDate).toDate());
+            data.put("xlBm_eq", lineCode);
+
+            // 查询计划排班
+            List<SchedulePlanInfo> planItr = cleanSchPlanItr(schPlanService.list(data).iterator());
+
+            // 转换为实际排班
+            realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
+
+            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+            String fcsj;
+            for (ScheduleRealInfo sch : realList) {
+                sch.setScheduleDateStr(fmtyyyyMMdd.print(sch.getScheduleDate().getTime()));
+                sch.setRealExecDate(sch.getScheduleDateStr());
+
+                if (StringUtils.isEmpty(sch.getFcsj()))
+                    sch.setFcsj("00:00");
+
+                fcsj = sch.getFcsj().trim();
+                //处理一下发车时间格式没有:号的问题
+                if (fcsj.indexOf(":") == -1 && fcsj.length() >= 4) {
+                    sch.setFcsj(fcsj.substring(0, 2) + ":" + fcsj.substring(2, 4));
+                }
+
+                try {
+                    sdf.parse(sch.getFcsj());
+                } catch (ParseException e) {
+                    //发车时间仍然校验不过的，直接写成00:00
+                    sch.setFcsj("00:00");
+                }
+                sch.setDfsj(sch.getFcsj());
+
+                // 计划终点时间
+                if (sch.getBcsj() != null) {
+                    sch.setZdsj(fmtHHmm.print(fmtHHmm.parseMillis(sch.getFcsj()) + (sch.getBcsj() * 60 * 1000)));
+                    sch.setLate(false);
+                }
+                //计划里程为0，设置NULL
+                if (sch.getJhlc() != null && sch.getJhlc() == 0)
+                    sch.setJhlc(null);
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return realList;
+    }
+
+    /**
+     * @Title: batchSave
+     * @Description: TODO(批量入库)
+     */
+    private void batchSave(List<ScheduleRealInfo> list) {
+        // 查询数据库最大ID
+        Long id = schRepository.getMaxId();
+        if (null == id)
+            id = 0L;
+        id++;
+
+        SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+        for (ScheduleRealInfo item : list) {
+            item.setSpId(item.getId());// 保留原始的计划ID
+            item.setId(id++);// 设置ID
+            item.setScheduleDateStr(sdfyyyyMMdd.format(item.getScheduleDate()));
+        }
+
+        // 入库
+        new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
+    }
+
+    private List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
+        List<SchedulePlanInfo> list = new ArrayList<>();
+
+        SchedulePlanInfo sp;
+        while (itrab.hasNext()) {
+            sp = itrab.next();
+            sp.setSchedulePlan(null);
+            list.add(sp);
+        }
+        return list;
+    }
+
+    /**
+     * @Title: findByLineCode
+     * @Description: TODO(lineCode 获取班次)
+     */
+    public List<ScheduleRealInfo> findByLineCode(String lineCode) {
+        List<ScheduleRealInfo> rs = new ArrayList<>();
+
+        Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+        for (ScheduleRealInfo sch : schs) {
+            if (sch.getXlBm().equals(lineCode))
+                rs.add(sch);
+        }
+        return rs;
+    }
+
+    /**
+     * @Title: findCarByLineCode
+     * @Description: TODO(线路下运营的车辆)
+     */
+    public Set<String> findCarByLineCode(String lineCode) {
+        Set<String> rs = new HashSet<>();
+
+        Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+        for (ScheduleRealInfo sch : schs) {
+            if (sch.getXlBm().equals(lineCode))
+                rs.add(sch.getClZbh());
+        }
+
+        return rs;
+    }
+
+    public List<ScheduleRealInfo> findByNbbm(String nbbm) {
+        return nbbmScheduleMap.get(nbbm);
+    }
+
+    /**
+     * @Title: findByLineAndUpDown
+     * @Description: TODO(lineCode 和走向获取班次)
+     */
+    public List<ScheduleRealInfo> findByLineAndUpDown(String lineCode, Integer upDown) {
+        List<ScheduleRealInfo> list = findByLineCode(lineCode), rs = new ArrayList<>();
+
+        for (ScheduleRealInfo sch : list) {
+            if (sch.getXlDir().equals(upDown + ""))
+                rs.add(sch);
+        }
+        return rs;
+    }
+
+    public ScheduleRealInfo get(long id) {
+        return id2SchedulMap.get(id);
+    }
+
+    public Set<String> getSEStationList(String nbbm) {
+        return nbbm2SEStationMap.get(nbbm);
+    }
+
+    /**
+     * @Title: next
+     * @Description: TODO(下一个班次)
+     */
+    public ScheduleRealInfo next(ScheduleRealInfo sch) {
+
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        int outConfig = -1;
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (config != null)
+            outConfig = config.getOutConfig();
+
+        boolean flag = false;
+        ScheduleRealInfo next = null;
+        for (ScheduleRealInfo temp : list) {
+            if (temp.getId() == sch.getId()) {
+                flag = true;
+                continue;
+            }
+            //忽略烂班
+            if (temp.isDestroy())
+                continue;
+
+            //出站既出场，忽略出场班次
+            if (outConfig == 2 && temp.getBcType().equals("out"))
+                continue;
+
+            if (flag) {
+                next = temp;
+                break;
+            }
+        }
+        return next;
+    }
+
+    /**
+     * 上一个班次
+     *
+     * @param sch
+     * @return
+     */
+    public ScheduleRealInfo prev(ScheduleRealInfo sch) {
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+
+        //boolean flag = false;
+        ScheduleRealInfo prev = null;
+        int size = list.size();
+
+        for (int i = 0; i < size; i++) {
+            if (list.get(i).isDestroy())
+                continue;
+
+            if (list.get(i).getId().equals(sch.getId())) {
+                return prev;
+            }
+            prev = list.get(i);
+        }
+        return prev;
+    }
+
+    public void put(ScheduleRealInfo sch) {
+        schAttrCalculator
+                .calcRealDate(sch)
+                .calcAllTimeByFcsj(sch);
+
+        String nbbm = sch.getClZbh();
+        nbbmScheduleMap.put(nbbm, sch);
+        nbbm2SEStationMap.put(nbbm, sch.getQdzCode());
+        nbbm2SEStationMap.put(nbbm, sch.getZdzCode());
+
+        //主键索引
+        id2SchedulMap.put(sch.getId(), sch);
+        //跨24点的，再save一次
+        if (!sch.getRealExecDate().equals(sch.getScheduleDateStr()))
+            save(sch);
+    }
+
+    public void delete(ScheduleRealInfo sch) {
+        //ScheduleRealInfo sch = id2SchedulMap.get(id);
+        if (!sch.isSflj())
+            return;
+
+        nbbmScheduleMap.remove(sch.getClZbh(), sch);
+        id2SchedulMap.remove(sch.getId());
+        //return sch;
+    }
  
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		
-		boolean flag = false;
-		ScheduleRealInfo next = null;
-		for(ScheduleRealInfo temp : list){
-			if(temp.getId() == sch.getId()){
-				flag = true;
-				continue;
-			}
-			//忽略烂班
-			if(temp.isDestroy())
-				continue;
-			
-			if(flag){
-				next = temp;
-				break;
-			}
-		}
-		return next;
-	}
-
-	public void put(ScheduleRealInfo sch) {
-		schAttrCalculator
-			.calcRealDate(sch)
-			.calcAllTimeByFcsj(sch);
-
-		String nbbm = sch.getClZbh();
-		nbbmScheduleMap.put(nbbm, sch);
-		nbbm2SEStationMap.put(nbbm, sch.getQdzCode());
-		nbbm2SEStationMap.put(nbbm, sch.getZdzCode());
-		
-		//主键索引
-		id2SchedulMap.put(sch.getId(), sch);
-		//跨24点的，再save一次
-		if(!sch.getRealExecDate().equals(sch.getScheduleDateStr()))
-			save(sch);
-	}
-	
-	public void delete(ScheduleRealInfo sch) {
-		//ScheduleRealInfo sch = id2SchedulMap.get(id);
-		if(!sch.isSflj())
-			return;
-		
-		nbbmScheduleMap.remove(sch.getClZbh(), sch);
-		id2SchedulMap.remove(sch.getId());
-		//return sch;
-	}
-	
 //	public void calcQdzTimePlan(String nbbm){
 //		schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
 //	}
-	
-	public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm){
-		return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
-	}
-
-	/**
-	 * 
-	 * @Title: nextAll
-	 * @Description: TODO(之后的所有班次)
-	 */
+
+    public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm) {
+        return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
+    }
+
+    /**
+     *
+     * @Title: nextAll
+     * @Description: TODO(之后的所有班次)
+     */
 /*	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
 		// 排序
 		Collections.sort(list, schFCSJComparator);
  
@@ -527,181 +583,229 @@ public class DayOfSchedule implements CommandLineRunner {
 		return rs;
 	}*/
  
-	/**
-	 * 
-	 * @Title: doneSum
-	 * @Description: TODO(已完成班次总数)
-	 */
-	public int doneSum(String clZbh) {
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(clZbh);
-		int rs = 0;
-		
-		for(ScheduleRealInfo sch : list){
-			if(sch.getStatus() == 2 && !sch.isDestroy())
-				rs ++;
-		}
-		return rs;
-	}
-	
-	/**
-	 * 
-	 * @Title: prveNotExecNum 
-	 * @Description: TODO(班次之前未执行班次数量) 
-	 */
-	public int prveNotExecNum(ScheduleRealInfo sch){
-		int n = 0;
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		for(ScheduleRealInfo s : list){
-			if(s.getFcsjActual() == null && !s.isDestroy())
-				n ++;
-			
-			if(s.getId().equals(sch.getId()))
-				break;
-		}
-		return n;
-	}
-
-	/**
-	 * 
-	 * @Title: validEndTime
-	 * @Description: TODO(是否是有效的到达时间)
-	 */
-	public boolean validEndTime(ScheduleRealInfo sch, Long ts) {
-		if(sch.getFcsjActualTime() != null && sch.getFcsjActualTime() > ts)
-			return false;
-		
-		return validTime(sch, ts);
-	}
-
-	/**
-	 * 
-	 * @Title: validStartTime 
-	 * @Description: TODO(是否是合适的发车时间) 
-	 */
-	public boolean validStartTime(ScheduleRealInfo sch, Long ts) {
-		if(sch.getZdsjActualTime() != null && sch.getZdsjActualTime() < ts)
-			return false;
-		
-		return validTime(sch, ts);
-	}
-	
-	public boolean validTime(ScheduleRealInfo sch, Long ts){
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		int ci = list.indexOf(sch);
-		ScheduleRealInfo prve, next;
-		if(ci > 0){
-			//之前班次实际时间不能大于该时间
-			for(int i = ci - 1; i >= 0; i --){
-				prve = list.get(i);
-				if(prve.getZdsjActualTime() != null && prve.getZdsjActualTime() > ts )
-					return false;
-				
-				if(prve.getFcsjActualTime() != null && prve.getFcsjActualTime() > ts)
-					return false;
-			}
-		}
-		
-		if(ci < list.size() - 1){
-			//之后班次实际时间不能小于该时间
-			for(int i = ci + 1; i < list.size(); i ++){
-				next = list.get(i);
-				if(next.getFcsjActualTime() != null && next.getFcsjActualTime() < ts)
-					return false;
-				
-				if(next.getZdsjActualTime() != null && next.getZdsjActualTime() < ts)
-					return false;
-			}
-		}
-		return true;
-	}
-	
-	public void save(ScheduleRealInfo sch){
-		//schRepository.save(sch);
-		pstBuffer.add(sch);
-	}
-	
-	
-	/**
-	 * 
-	 * @Title: nextByBcType 
-	 * @Description: TODO(获取下一个指定班次类型的班次) 
-	 */
-	public ScheduleRealInfo nextByBcType(String nbbm, String bcType){
-		List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
-		
-		Collections.sort(list, schFCSJComparator);
-		ScheduleRealInfo sch = null;
-		for(ScheduleRealInfo temp : list){
-			if(temp.getFcsjActual() == null)
-				sch = temp;
-		}
-		
-		return sch;
-	}
-	
-	public List<ScheduleRealInfo> findByBcType(String nbbm, String bcType){
-		List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm)
-				,outList = new ArrayList<>();
-	
-		for(ScheduleRealInfo sch : all){
-			if(sch.getBcType().equals(bcType))
-				outList.add(sch);
-		}
-		return outList;
-	}
-	
-	public Set<String> allCar(){
-		return nbbmScheduleMap.keySet();
-	}
-	
-	public Collection<ScheduleRealInfo> findAll(){
-		return nbbmScheduleMap.values();
-	}
-	
-	public void addExecPlan(ScheduleRealInfo sch){
-		carExecutePlanMap.put(sch.getClZbh(), sch);
-	}
-	
-	public void removeExecPlan(String clzbh){
-		carExecutePlanMap.remove(clzbh);
-	}
-	
-	public Map<String, ScheduleRealInfo> execPlamMap(){
-		return carExecutePlanMap;
-	}
-	
-	/**
-	 * @Title: changeCar 
-	 * @Description: TODO(班次换车) 返回有更新的班次
-	 * @param @param sch	
-	 * @param @param newClZbh    新的车辆自编号 
-	 */
-	public List<ScheduleRealInfo> changeCar(ScheduleRealInfo sch , String newClZbh){
-		List<ScheduleRealInfo> ups = new ArrayList<>();
-		String oldClzbh = sch.getClZbh();
-		if(oldClzbh.equals(newClZbh))
-			return ups;
-		
-		
-		//变更相关映射信息
-		nbbmScheduleMap.remove(sch.getClZbh(), sch);
-		
-		sch.setClZbh(newClZbh);
-		nbbmScheduleMap.put(newClZbh, sch);
-		nbbm2SEStationMap.put(newClZbh, sch.getQdzCode());
-		nbbm2SEStationMap.put(newClZbh, sch.getZdzCode());
-		
-		//重新计算班次应到时间
-		ups.addAll(updateQdzTimePlan(oldClzbh));
-		ups.addAll(updateQdzTimePlan(newClZbh));
-		return ups;
-	}
-
-	/**
-	 * 
-	 * @Title: linkToSchPlan 
-	 * @Description: TODO(车辆关联到班次) 
-	 */
+    /**
+     * @Title: doneSum
+     * @Description: TODO(已完成班次总数)
+     */
+    public int doneSum(String clZbh) {
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(clZbh);
+        int rs = 0;
+
+        for (ScheduleRealInfo sch : list) {
+            if (sch.getStatus() == 2 && !sch.isDestroy())
+                rs++;
+        }
+        return rs;
+    }
+
+    /**
+     * @Title: prveNotExecNum
+     * @Description: TODO(班次之前未执行班次数量)
+     */
+    public int prveNotExecNum(ScheduleRealInfo sch) {
+        int n = 0;
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        for (ScheduleRealInfo s : list) {
+            if (s.getFcsjActual() == null && !s.isDestroy())
+                n++;
+
+            if (s.getId().equals(sch.getId()))
+                break;
+        }
+        return n;
+    }
+
+    /**
+     * @Title: validEndTime
+     * @Description: TODO(是否是有效的到达时间)
+     */
+    public boolean validEndTime(ScheduleRealInfo sch, Long ts) {
+        if (sch.getFcsjActualTime() != null && sch.getFcsjActualTime() > ts)
+            return false;
+
+        return validTime(sch, ts);
+    }
+
+    /**
+     * @Title: validStartTime
+     * @Description: TODO(是否是合适的发车时间)
+     */
+    public boolean validStartTime(ScheduleRealInfo sch, Long ts) {
+        if (sch.getZdsjActualTime() != null && sch.getZdsjActualTime() < ts)
+            return false;
+
+        return validTime(sch, ts);
+    }
+
+    public boolean validTime(ScheduleRealInfo sch, Long ts) {
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        int ci = list.indexOf(sch);
+        ScheduleRealInfo prve, next;
+        if (ci > 0) {
+            //之前班次实际时间不能大于该时间
+            for (int i = ci - 1; i >= 0; i--) {
+                prve = list.get(i);
+                if (prve.getZdsjActualTime() != null && prve.getZdsjActualTime() > ts)
+                    return false;
+
+                if (prve.getFcsjActualTime() != null && prve.getFcsjActualTime() > ts)
+                    return false;
+            }
+        }
+
+        if (ci < list.size() - 1) {
+            //之后班次实际时间不能小于该时间
+            for (int i = ci + 1; i < list.size(); i++) {
+                next = list.get(i);
+                if (next.getFcsjActualTime() != null && next.getFcsjActualTime() < ts)
+                    return false;
+
+                if (next.getZdsjActualTime() != null && next.getZdsjActualTime() < ts)
+                    return false;
+            }
+        }
+        return true;
+    }
+
+    public void save(ScheduleRealInfo sch) {
+        //schRepository.save(sch);
+        pstBuffer.add(sch);
+    }
+
+
+    /**
+     * @Title: nextByBcType
+     * @Description: TODO(获取下一个指定班次类型的班次)
+     */
+    public ScheduleRealInfo nextByBcType(String nbbm, String bcType) {
+        List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
+
+        Collections.sort(list, schFCSJComparator);
+        ScheduleRealInfo sch = null;
+        for (ScheduleRealInfo temp : list) {
+            if (temp.getFcsjActual() == null)
+                sch = temp;
+        }
+
+        return sch;
+    }
+
+    public List<ScheduleRealInfo> findByBcType(String nbbm, String bcType) {
+        List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm), outList = new ArrayList<>();
+
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getBcType().equals(bcType))
+                outList.add(sch);
+        }
+        return outList;
+    }
+
+    public Set<String> allCar() {
+        return nbbmScheduleMap.keySet();
+    }
+
+    public Collection<ScheduleRealInfo> findAll() {
+        return nbbmScheduleMap.values();
+    }
+
+    public void addExecPlan(ScheduleRealInfo sch) {
+        if(sch != null)
+            carExecutePlanMap.put(sch.getClZbh(), sch);
+    }
+
+    public void removeExecPlan(String clzbh) {
+        carExecutePlanMap.remove(clzbh);
+    }
+
+    public Map<String, ScheduleRealInfo> execPlanMap() {
+        return carExecutePlanMap;
+    }
+
+    /**
+     * 车辆当前执行的班次
+     *
+     * @param nbbm
+     * @return
+     */
+    public ScheduleRealInfo executeCurr(String nbbm) {
+        return carExecutePlanMap.get(nbbm);
+    }
+
+    /**
+     * @param @param sch
+     * @param @param newClZbh    新的车辆自编号
+     * @Title: changeCar
+     * @Description: TODO(班次换车) 返回有更新的班次
+     */
+    public List<ScheduleRealInfo> changeCar(ScheduleRealInfo sch, String newClZbh) {
+        List<ScheduleRealInfo> ups = new ArrayList<>();
+        String oldClzbh = sch.getClZbh();
+        if (oldClzbh.equals(newClZbh))
+            return ups;
+
+
+        //变更相关映射信息
+        nbbmScheduleMap.remove(sch.getClZbh(), sch);
+
+        sch.setClZbh(newClZbh);
+        nbbmScheduleMap.put(newClZbh, sch);
+        nbbm2SEStationMap.put(newClZbh, sch.getQdzCode());
+        nbbm2SEStationMap.put(newClZbh, sch.getZdzCode());
+
+        //重新计算班次应到时间
+        ups.addAll(updateQdzTimePlan(oldClzbh));
+        ups.addAll(updateQdzTimePlan(newClZbh));
+
+        //重新计算车辆当前执行班次
+        reCalcExecPlan(newClZbh);
+        reCalcExecPlan(sch.getClZbh());
+        return ups;
+    }
+
+    public void reCalcExecPlan(String nbbm){
+        carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(nbbmScheduleMap.get(nbbm)));
+    }
+
+    /**
+     * 是否在执行首班出场
+     * @param nbbm
+     * @return
+     */
+    public boolean isExecFirstOut(String nbbm, long time){
+        try {
+            List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
+            ScheduleRealInfo second = list.get(2),
+                    first = executeCurr(nbbm);
+
+            if(first.getBcType().equals("out")
+                && first.getDfsjT() < second.getDfsjT()
+                && doneSum(nbbm) == 0 && second.getDfsjT() > time)
+                return true;
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+
+        return false;
+    }
+
+    /**
+     * 获取班次的计划停站时间
+     * @param sch
+     * @return
+
+    public int stopTimePlan(Object task) {
+
+        ScheduleRealInfo sch = prev((ScheduleRealInfo) task);
+
+        sch.getzdsj
+        return -1;
+    }*/
+
+    /**
+     *
+     * @Title: linkToSchPlan
+     * @Description: TODO(车辆关联到班次)
+     */
 /*	public void linkToSchPlan(String nbbm) {
 		//当前GPS状态
 		GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
@@ -215,4 +215,30 @@ public class SchAttrCalculator {
 		if(sch.getZdsjActualTime() == null && sch.getZdsjActual() != null)
 			sch.setZdsjActualAll(sch.getZdsjActual());
 	}
+
+	/**
+	 * 计算当前要执行的班次
+	 * @param list
+	 * @return
+	 */
+	public ScheduleRealInfo calcCurrentExecSch(List<ScheduleRealInfo> list){
+		String lineCode = list.get(0).getXlBm();
+		LineConfig conf = lineConfigData.get(lineCode);
+		int outConfig = -1;
+		if(conf != null)
+			outConfig = conf.getOutConfig();
+
+		for(ScheduleRealInfo sch : list){
+			//如果是出站既出场，忽略出场班次
+			if(outConfig == 2 && sch.getBcType().equals("out"))
+				continue;
+
+			//已执行
+			if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+				continue;
+
+			return sch;
+		}
+		return null;
+	}
 }
 package com.bsth.data.schedule.thread;
  
-import java.util.Collection;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.arrival.ArrivalData_GPS;
@@ -15,6 +7,13 @@ import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.LineConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.Set;
  
 /**
  * 
@@ -57,6 +56,7 @@ public class ScheduleRefreshThread extends Thread{
 				currSchDate = dayOfSchedule.calcSchDate(lineCode);
  
 				if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
+
 					logger.info(lineCode + "开始翻班， " + currSchDate);
 					//清除进出站数据
 					arrivalData.clearRAMData(lineCode);
@@ -23,7 +23,7 @@ import java.util.Date;
  
 @Entity
 @Table(name = "bsth_c_cars")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class Cars extends BEntity implements Serializable {
  
 	/** 主键Id */
@@ -24,7 +24,7 @@ import java.util.Date;
  
 @Entity
 @Table(name = "bsth_c_line")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class Line implements Serializable {
  
 	@Id
@@ -21,7 +21,7 @@ import javax.persistence.*;
  
 @Entity
 @Table(name = "bsth_c_personnel")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class Personnel extends BEntity {
  
     /** 主键Id */
 package com.bsth.entity.mcy_forms;
  
-import java.util.Date;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 package com.bsth.entity.realcontrol;
  
+import com.bsth.entity.Line;
+
+import javax.persistence.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
  
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.NamedEntityGraphs;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import com.bsth.entity.Line;
-import com.bsth.util.DateUtils;
-
 /**
  * 
  * @ClassName: LineConfig
@@ -59,9 +47,6 @@ public class LineConfig {
 	/** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 2：出站即出场 */
 	private int outConfig;
  
-	/** 进场时间设置 0：真实进场（设备进入缓冲区时间） 1：请求进场时间  2：出站即出场*/
-	private int inConfig;
-
 	/** 短语模板 , 号分隔多个 */
 	private String phraseTemps;
  
@@ -111,14 +96,6 @@ public class LineConfig {
 		this.outConfig = outConfig;
 	}
  
-	public int getInConfig() {
-		return inConfig;
-	}
-
-	public void setInConfig(int inConfig) {
-		this.inConfig = inConfig;
-	}
-
 	public String getPhraseTemps() {
 		return phraseTemps;
 	}
+package com.bsth.entity.realcontrol;
+
+/**
+ * 班次类型
+ * Created by panzhao on 2016/12/23.
+ */
+public enum ScheduleType {
+
+    normal, //正常班次
+    out,    //出场
+    in,     //进场
+    region, //区间
+    venting,//直放
+    major   //放站
+}
@@ -19,7 +19,7 @@ import java.util.Date;
                 @NamedAttributeNode("cl")
         })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class CarConfigInfo extends BEntity implements Serializable {
  
     /** 主健Id */
@@ -22,7 +22,7 @@ import java.io.Serializable;
             @NamedAttributeNode("xl")
     })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class EmployeeConfigInfo extends BEntity implements Serializable {
  
     /** 主键Id */
@@ -15,7 +15,7 @@ import javax.persistence.*;
                 @NamedAttributeNode("xl")
         })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class GuideboardInfo extends BEntity {
  
     /** 主键Id */
 package com.bsth.entity.schedule;
  
 import com.bsth.entity.Line;
-import com.bsth.entity.sys.SysUser;
  
 import javax.persistence.*;
 import java.util.Date;
@@ -18,7 +17,7 @@ import java.util.Date;
                 @NamedAttributeNode("updateBy")
         })
 })
-public class TTInfo {
+public class TTInfo extends BEntity {
  
     /** 主键Id */
     @Id
@@ -50,9 +49,9 @@ public class TTInfo {
  
     // TODO：还有很多判定条件，这里先不放
  
-    /** 路牌数 */
+    /** 路牌数（这两个字段暂时不用） */
     private int lpCount;
-    /** 圈数 */
+    /** 圈数（这两个字段暂时不倒） */
     private int loopCount;
  
     // TODO：原系统里的分别在，圈后圈进场，意思不知道，再议
@@ -62,19 +61,25 @@ public class TTInfo {
     /** 特殊有效日期（格式：2001-01-01，多个用逗号隔开） */
     private String special_days;
  
-    /** 操作人员关联 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 更新人员关联 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    // 创建日期
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    // 修改日期
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
+    public TTInfo() {}
+    public TTInfo(Object id, Object xlid, Object name, Object nds, Object sds) {
+        if (id != null) {
+            this.id = Long.parseLong(id.toString());
+        }
+        if (xlid != null) {
+            this.xl = new Line();
+            this.xl.setId(Integer.valueOf(xlid.toString()));
+        }
+        if (name != null) {
+            this.name = String.valueOf(name);
+        }
+        if (nds != null) {
+            this.rule_days = String.valueOf(nds);
+        }
+        if (sds != null) {
+            this.special_days = String.valueOf(sds);
+        }
+    }
  
     public Long getId() {
         return id;
@@ -164,38 +169,6 @@ public class TTInfo {
         this.special_days = special_days;
     }
  
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
@@ -3,10 +3,8 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
-import com.bsth.entity.sys.SysUser;
  
 import javax.persistence.*;
-import java.util.Date;
  
 /**
  * 时刻表明细
@@ -23,7 +21,7 @@ import java.util.Date;
                 @NamedAttributeNode("tcc")
         })
 })
-public class TTInfoDetail {
+public class TTInfoDetail extends BEntity {
  
     /** 主健Id */
     @Id
@@ -85,20 +83,6 @@ public class TTInfoDetail {
     /** 备注 */
     private String remark;
  
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public Long getId() {
         return id;
     }
@@ -235,38 +219,6 @@ public class TTInfoDetail {
         this.remark = remark;
     }
  
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public CarPark getTcc() {
         return tcc;
     }
 package com.bsth.entity.schedule.rule;
  
 import com.bsth.entity.Line;
-import com.bsth.entity.schedule.CarConfigInfo;
-import com.bsth.entity.schedule.EmployeeConfigInfo;
-import com.bsth.entity.schedule.GuideboardInfo;
-import com.bsth.entity.schedule.TTInfo;
-import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.schedule.*;
  
 import javax.persistence.*;
-import java.util.Date;
  
 /**
  * 套跑规则。
@@ -41,7 +36,7 @@ import java.util.Date;
 })
  
  
-public class RerunRule {
+public class RerunRule extends BEntity {
     /** 主键Id */
     @Id
     @GeneratedValue
@@ -84,19 +79,6 @@ public class RerunRule {
     @Column(nullable = false)
     private Boolean isCancel = false;
  
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public Long getId() {
         return id;
     }
@@ -177,34 +159,6 @@ public class RerunRule {
         this.useEmployeeConfig = useEmployeeConfig;
     }
  
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
@@ -213,7 +167,4 @@ public class RerunRule {
         this.isCancel = isCancel;
     }
  
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
@@ -9,7 +9,7 @@ import java.util.Set;
  
 @Entity
 @Table(name = "bsth_c_sys_user")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class SysUser {
  
 	@Id
@@ -24,6 +24,9 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
  
+	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
+	List<ScheduleRealInfo> queryUserInfo3(String line,String date);
+	
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
 	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
  
@@ -8,6 +8,8 @@ public interface BusIntervalService {
  
 	List<Map<String, Object>> getDir(Map<String, Object> map);
  
+	List<Map<String, Object>> getLp(Map<String, Object> map);
+	
 	List<Map<String, Object>> interval(Map<String, Object> map);
  
 	Map<String, Object> timeAndSpeed(Map<String, Object> map);
@@ -30,7 +30,7 @@ public interface FormsService {
  
 	public List<Singledata> singledata(Map<String, Object> map);
  
-	public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line,String data);
+	public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line,String data);
  
 	public List<Operationservice> operationservice(Map<String, Object> map);