Merge branch 'minhang' into pudong

潘钊
2 parents 88a1c131 112c42c9
Showing 54 changed files with 2584 additions and 1107 deletions
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/realcontrol/SignalStateController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/SignalStateData.java
src/main/java/com/bsth/data/gpsdata/analyse/GpsAnalyse.java
src/main/java/com/bsth/data/gpsdata/analyse/components/GpsArrival.java
src/main/java/com/bsth/data/gpsdata/analyse/components/GpsStateCorrective.java
src/main/java/com/bsth/data/gpsdata/analyse/GeoCacheData.java → src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/RouteReverse.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/SignalAbnormal.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/SignalState.java
src/main/java/com/bsth/data/gpsdata/analyse/StationRoute.java → src/main/java/com/bsth/data/gpsdata/arrival/entity/StationRoute.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
@@ -13,8 +13,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.bsth.data.BasicData;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Executionrate;
 import com.bsth.entity.mcy_forms.Linepasswengerflow;
 import com.bsth.entity.mcy_forms.Operationservice;
@@ -231,7 +233,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("dat").toString())) + ".xls");
+					path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("data").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -319,8 +321,31 @@ public class ExportController {
 		List<Turnoutrate> turnoutrate = formsService.turnoutrate(map);
 		Map<String, Object> map1 = new HashMap<String, Object>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		/*Float xlts=0f;
+		Float jh=0f;
+		Float sj=0f;
+		Float qz=0f;
+		Float ccl=0f;
+		Float bcjh=0f;
+		Float bcsj=0f;
+		Float bczxl=0f;
+		Float gs=0f;
+		Float zhgs=0f;*/
+		
 		for (Turnoutrate l : turnoutrate) {
 			Map<String, Object> m = new HashMap<String, Object>();
+			
+		/*	xlts +=l.getGs()==""?0f:Float.valueOf(l.getGs());
+			jh +=l.getZhgs()==""?0f:Float.valueOf(l.getZhgs());
+			sj +=l.getXl()==""?0f:Float.valueOf(l.getXl());
+			ccl +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
+			bcjh +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
+			bcsj +=l.getChl()==""?0f:Float.valueOf(l.getChl());
+			bczxl +=l.getBcjh()==""?0f:Float.valueOf(l.getBcjh());
+			gs +=l.getBbzxl()==""?0f:Float.valueOf(l.getBbzxl());
+			zhgs +=l.getBbzxl()==""?0f:Float.valueOf(l.getBbzxl());
+			
+			*/
 			m.put("rq", l.getRq());
 			m.put("gs", l.getGs());
 			m.put("zhgs", l.getZhgs());
@@ -334,6 +359,19 @@ public class ExportController {
 			m.put("bbzxl", l.getBbzxl());
 			m.put("sm", l.getSm());
 			resList.add(m);
+			
+			/*m=new HashMap<String,Object>();
+			m.put("total_xlts", jh);
+			m.put("total_jh", jh);
+			m.put("total_sj", sj);
+			m.put("total_qz", qz);
+			m.put("total_ccl", ccl);
+			m.put("total_bcjh", bcjh);
+			m.put("total_bcsj", bcsj);
+			m.put("total_bczxl", bczxl);
+			m.put("total_gs", gs);
+			m.put("total_zhgs", zhgs);
+			*/
 		}
 		try {
@@ -356,8 +394,29 @@ public class ExportController {
 		List<Executionrate> executionrate = formsService.executionrate(map);
 		Map<String, Object> map1 = new HashMap<String, Object>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+	/*	Float xlts=0f;
+		Float jh=0f;
+		Float sj=0f;
+		Float ccl=0f;
+		Float bcjh=0f;
+		Float bcsj=0f;
+		Float bczxl=0f;
+		Float gs=0f;
+		Float zhgs=0f;*/
+		
 		for (Executionrate l : executionrate) {
 			Map<String, Object> m = new HashMap<String, Object>();
+		/*	xlts +=l.getGs()==""?0f:Float.valueOf(l.getGs());
+			jh +=l.getZhgs()==""?0f:Float.valueOf(l.getZhgs());
+			sj +=l.getXl()==""?0f:Float.valueOf(l.getXl());
+			ccl +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
+			bcjh +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
+			bcsj +=l.getChl()==""?0f:Float.valueOf(l.getChl());
+			bczxl +=l.getBcjh()==""?0f:Float.valueOf(l.getBcjh());
+			gs +=l.getBbzxl()==""?0f:Float.valueOf(l.getBbzxl());
+			zhgs +=l.getBbzxl()==""?0f:Float.valueOf(l.getBbzxl());
+			
+			*/
 			m.put("rq", l.getRq());
 			m.put("gs", l.getGs());
 			m.put("zhgs", l.getZhgs());
@@ -370,6 +429,19 @@ public class ExportController {
 			m.put("bbzxl", l.getBbzxl());
 			m.put("sm", l.getSm());
 			resList.add(m);
+			
+			
+		/*	m=new HashMap<String,Object>();
+			m.put("total_xlts", jh);
+			m.put("total_jh", jh);
+			m.put("total_sj", sj);
+			m.put("total_ccl", ccl);
+			m.put("total_bcjh", bcjh);
+			m.put("total_bcsj", bcsj);
+			m.put("total_bczxl", bczxl);
+			m.put("total_gs", gs);
+			m.put("total_zhgs", zhgs);*/
+			
 		}
 		try {
@@ -393,12 +465,31 @@ public class ExportController {
 		List<Allline> allline = formsService.allline(map);
 		Map<String, Object> map1 = new HashMap<String, Object>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+	/*	Integer jh=0;
+		Integer  sj=0;
+		Integer  ccl=0;
+		Integer bcjh=0;
+		Float bcsj=0f;
+		Integer bczxl=0;
+		Integer  gs=0;
+		Float zhgs=0f;
+		*/
 		for (Allline l : allline) {
 			Map<String, Object> m = new HashMap<String, Object>();
+			
+			/*jh +=l.getGsgs()=="" ? 0: Integer.valueOf(l.getGsgs());
+			sj +=l.getFgsgs()==""?0: Integer.valueOf(l.getFgsgs());
+			ccl +=l.getCchjh()==""?0: Integer.valueOf(l.getCchjh());
+			bcjh +=l.getCchsj()==""?0: Integer.valueOf(l.getCchsj());
+			bcsj +=l.getChl()==""?0f:Float.valueOf(l.getChl());
+			bczxl +=l.getBcjh()==""?0: Integer.valueOf(l.getBcjh());
+			gs +=l.getBbzxl()==""?0: Integer.valueOf(l.getBbzxl());
+			zhgs +=l.getBbzxl()==""?0f:Float.valueOf(l.getBbzxl());
+			*/
 			m.put("rq", l.getRq());
-			m.put("gs", l.getGs());
-			m.put("zhgs", l.getZhgs());
-			m.put("xl", l.getXl());
+			m.put("gs", l.getGsgs());
+			m.put("zhgs", l.getFgsgs());
+			//m.put("xl", l.getXl());
 			m.put("cchjh", l.getCchjh());
 			m.put("cchsj", l.getCchsj());
 			m.put("chl", l.getChl());
@@ -407,6 +498,17 @@ public class ExportController {
 			m.put("bbzxl", l.getBbzxl());
 			m.put("sm", l.getSm());
 			resList.add(m);
+			
+			/*m=new HashMap<String,Object>();
+			m.put("total_jh", jh);
+			m.put("total_sj", sj);
+			m.put("total_ccl", ccl);
+			m.put("total_bcjh", bcjh);
+			m.put("total_bcsj", bcsj);
+			m.put("total_bczxl", bczxl);
+			m.put("total_gs", gs);
+			m.put("total_zhgs", zhgs);
+			*/
 		}
 		try {
@@ -422,6 +524,56 @@ public class ExportController {
+	//班次日报表
+	@RequestMapping(value = "/dailyExport", method = RequestMethod.POST)
+		public List<Map<String, Object>> dailyExport(@RequestParam Map<String, Object> map) {
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Daily> allline = formsService.daily(map);
+		
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Float zgl=0f;
+		Float ks=0f;
+		Float yh=0f;
+		Float bc=0f;
+		Map<String, Object> m ;
+		for (Daily d : allline) {
+			m = new HashMap<String, Object>();
+			zgl +=d.getZlc()==""?0f:Float.valueOf(d.getZlc());
+			ks +=d.getJzl1()==""?0f:Float.valueOf(d.getJzl1());
+			yh +=d.getYh()==""?0f:Float.valueOf(d.getYh());
+			bc +=d.getBc()==""?0f:Float.valueOf(d.getBc());
+			m.put("zbh", d.getZbh());
+			m.put("jgh",d.getJgh());
+			m.put("jName", d.getjName());
+			m.put("zlc", d.getZlc());
+			m.put("jzl1", d.getJzl1());
+			m.put("yh", d.getYh());
+			m.put("bc", d.getBc());
+			
+			resList.add(m);
+			}
+			
+		m=new HashMap<String,Object>();
+		m.put("total_zgl", zgl);
+		m.put("total_ks", ks);
+		m.put("total_yh", yh);
+		m.put("total_bc", bc);
+		
+		m.put("line", BasicData.lineCode2NameMap.get(map.get("line").toString()));
+		m.put("date", map.get("date").toString());
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { m }, path + "mould\\daily.xls", path + "export\\班次日报表"
+					+ sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return resList;
+	}
+	
 }
@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Executionrate;
 import com.bsth.entity.mcy_forms.Linepasswengerflow;
 import com.bsth.entity.mcy_forms.Operationservice;
@@ -112,4 +113,12 @@ public class MCY_FormsController {
 		return formsService.allline(map);
 	}
+	
+	// 营运线路名称统计表
+		@RequestMapping(value = "/daily", method = RequestMethod.POST)
+	public List<Daily> daily(@RequestParam Map<String, Object> map) {
+
+		return formsService.daily(map);
+		}
+	
 }
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.gpsdata.SignalStateData;
+import com.bsth.data.gpsdata.arrival.entity.SignalState;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2016/12/30.
+ */
+@RestController
+@RequestMapping("signalState")
+public class SignalStateController {
+
+    @Autowired
+    SignalStateData signalStateData;
+
+    @RequestMapping("/multi")
+    public List<SignalState> findByMultiLine(@RequestParam String idx){
+        return signalStateData.get(idx);
+    }
+}
@@ -64,6 +64,11 @@ public class ReportController {
 		return service.tbodyTime3(line, ttinfo);
 	}
+	@RequestMapping(value = "/tbodyTime4", method = RequestMethod.GET)
+	public List<Map<String, Object>> tbodyTime4(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime4(line, ttinfo);
+	}
+	
 	@RequestMapping(value = "/tbodyTime5", method = RequestMethod.GET)
 	public List<Map<String, Object>> tbodyTime5(@RequestParam String line,@RequestParam String ttinfo) {
 		return service.tbodyTime5(line, ttinfo);
 package com.bsth.data;
 import com.bsth.Application;
-import com.bsth.data.gpsdata.analyse.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.entity.*;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.*;
@@ -13,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import java.util.*;
@@ -25,13 +26,14 @@ import java.util.concurrent.TimeUnit;
  * @date 2016年8月10日 下午3:27:45
  */
 @Component
+@Order(value = 1)
 public class BasicData implements CommandLineRunner {
-	
-	//公司代码和公司名对照(K: 公司编码，V:公司名)
-	public static Map<String, String> businessCodeNameMap;
-	
-	//分公司公司代码和分公司公司名对照(K: 公司编码+分公司编码，V:分公司公司名)
-	public static Map<String, String> businessFgsCodeNameMap;
+
+    //公司代码和公司名对照(K: 公司编码，V:公司名)
+    public static Map<String, String> businessCodeNameMap;
+
+    //分公司公司代码和分公司公司名对照(K: 公司编码+分公司编码，V:分公司公司名)
+    public static Map<String, String> businessFgsCodeNameMap;
     //设备号和车辆自编号 （K: 设备编码 ，V：车辆自编号）
     public static BiMap<String, String> deviceId2NbbmMap;
@@ -39,27 +41,21 @@ public class BasicData implements CommandLineRunner {
     //车辆自编号和公司代码对照 （K: 车辆自编号 ，V：公司代码）
     public static Map<String, String> nbbm2CompanyCodeMap;
-    //站点编码和名称对照，包括停车场 （K: 站点编码 ，V：站点名称）
+    //站点编码和名称对照，包括停车场 （K: lineCode_updown_stationCode ，V：站点名称）
     public static Map<String, String> stationCode2NameMap;
     //线路起终点对照（线路编码_上下行_起终点）  1024_0_B (1024上行起点)
-    public static Map<String, String> lineSEPointMap;
+    //public static Map<String, String> lineSEPointMap;
     //车辆和线路对照
     public static Map<String, Line> nbbm2LineMap;
-    //线路和用户对照 用于webSocket定向推送消息（用户进入线调时写入数据）
-    //public static TreeMultimap<String, String> lineCode2SocketUserMap = TreeMultimap.create();
-
     //线路ID和code 对照
     public static BiMap<Integer, String> lineId2CodeMap;
     //线路编码和名称对照
     public static Map<String, String> lineCode2NameMap;
-    //线路编码_站点编码 == 0|1  上下行
-    //public static Map<String, Integer> lineStationUpDownMap;
-
     //停车场
     public static List<String> parkCodeList;
@@ -77,7 +73,7 @@ public class BasicData implements CommandLineRunner {
     public static Map<String, String> allPerson;
     //站点名和运管处编号 对照
-    public static Map<String,Integer> stationName2YgcNumber;
+    public static Map<String, Integer> stationName2YgcNumber;
     static Logger logger = LoggerFactory.getLogger(BasicData.class);
@@ -87,7 +83,7 @@ public class BasicData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(dataLoader, 2, 2, TimeUnit.HOURS);
+        Application.mainServices.scheduleWithFixedDelay(dataLoader, 0, 2, TimeUnit.HOURS);
     }
@@ -114,7 +110,7 @@ public class BasicData implements CommandLineRunner {
         @Autowired
         PersonnelRepository personnelRepository;
-        
+
         @Autowired
         BusinessRepository businessRepository;
@@ -156,47 +152,24 @@ public class BasicData implements CommandLineRunner {
             return 0;
         }
-
-/*        private void loadStationRouteInfo() {
-            Iterator<StationRoute> iterator = stationRouteRepository.findAllEffective().iterator();
-
-            Map<String, String> sePointMap = new HashMap<>();
-            //lineSEPointMap
-            Map<String, Integer> map = new HashMap<>();
-
-            StationRoute route;
-            while (iterator.hasNext()) {
-                route = iterator.next();
-                map.put(route.getLineCode() + "_" + route.getStationCode(), route.getDirections());
-
-                if (route.getStationMark() != null &&
-                        (route.getStationMark().equals("B") || route.getStationMark().equals("E"))) {
-                    sePointMap.put(route.getLineCode() + "_"
-                            + route.getDirections()
-                            + "_" + route.getStationMark(), route.getStationCode());
-                }
-            }
-            lineStationUpDownMap = map;
-            lineSEPointMap = sePointMap;
-        }*/
-
         /**
          * loadBusinessInfo
          * (公司代码公司名对照)
          */
-        public void loadBusinessInfo(){
-        	Map<String, String> businessMap=new HashMap<String,String>();
-        	Map<String, String> businessFgsMap=new HashMap<String,String>();
-        	Iterator<Business> busIter=businessRepository.findAll().iterator();
-        	Business t;
-        	while(busIter.hasNext()){
-        		t=busIter.next();
-        		businessMap.put(t.getBusinessCode(), t.getBusinessName());
-        		businessFgsMap.put(t.getBusinessCode()+"_"+t.getUpCode(), t.getBusinessName());
-        	}
-        	businessCodeNameMap=businessMap;
-        	businessFgsCodeNameMap=businessFgsMap;
+        public void loadBusinessInfo() {
+            Map<String, String> businessMap = new HashMap<String, String>();
+            Map<String, String> businessFgsMap = new HashMap<String, String>();
+            Iterator<Business> busIter = businessRepository.findAll().iterator();
+            Business t;
+            while (busIter.hasNext()) {
+                t = busIter.next();
+                businessMap.put(t.getBusinessCode(), t.getBusinessName());
+                businessFgsMap.put(t.getBusinessCode() + "_" + t.getUpCode(), t.getBusinessName());
+            }
+            businessCodeNameMap = businessMap;
+            businessFgsCodeNameMap = businessFgsMap;
         }
+
         /**
          * @Title: loadDeviceInfo
          * @Description: TODO(加载设备相关信息)
@@ -223,13 +196,13 @@ public class BasicData implements CommandLineRunner {
          */
         public void loadStationInfo() {
             Map<String, String> stationCode2Name = new HashMap<>();
-            Iterator<Station> iterator = stationRepository.findAll().iterator();
-            //站点
-            Station station;
+            Iterator<StationRoute> iterator = stationRouteRepository.findAll().iterator();
+            StationRoute sroute;
             while (iterator.hasNext()) {
-                station = iterator.next();
-                stationCode2Name.put(station.getStationCod(), station.getStationName());
+                sroute = iterator.next();
+                stationCode2Name.put(sroute.getLineCode() + "_" + sroute.getDirections() + "_" + sroute.getStationCode(), sroute.getStationName());
             }
+
             //停车场
             Iterator<CarPark> iterator2 = carParkRepository.findAll().iterator();
@@ -266,7 +239,7 @@ public class BasicData implements CommandLineRunner {
          * @Title: loadLineInfo
          * @Description: TODO(加载线路相关信息)
          */
-        public void loadLineInfo(){
+        public void loadLineInfo() {
             Iterator<Line> iterator = lineRepository.findAll().iterator();
             Line line;
@@ -276,36 +249,36 @@ public class BasicData implements CommandLineRunner {
             Map<String, String> code2SHcode = new HashMap<String, String>();
             Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 line = iterator.next();
                 biMap.put(line.getId(), line.getLineCode());
                 code2name.put(line.getLineCode(), line.getName());
-                id2SHcode.put(line.getId(),line.getShanghaiLinecode());
+                id2SHcode.put(line.getId(), line.getShanghaiLinecode());
                 code2SHcode.put(line.getLineCode(), line.getShanghaiLinecode());
                 /**
                  * 加载运管处的站点及序号
                  * 上行从1开始，下行顺序续编
-                List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
-                if(ygcLines != null && ygcLines.size() > 0){
-                    int size = ygcLines.size();
-                    Object[] tempArray ;
-                    int num = 1;
-                    String key;
-                    String lineCode = "";
-                    for (int i = 0; i < size; i ++){
-                        tempArray = ygcLines.get(i);
-                        if(lineCode.equals("")){
-                            lineCode = tempArray[0]+"";
-                        }else if(!lineCode.equals(tempArray[0]+"")){
-                            num = 1;
-                            lineCode = tempArray[0]+"";
-                        }
-                        key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
-                        tempStationName2YgcNumber.put(key,num++);
-                    }
-                }*/
+                 List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
+                 if(ygcLines != null && ygcLines.size() > 0){
+                 int size = ygcLines.size();
+                 Object[] tempArray ;
+                 int num = 1;
+                 String key;
+                 String lineCode = "";
+                 for (int i = 0; i < size; i ++){
+                 tempArray = ygcLines.get(i);
+                 if(lineCode.equals("")){
+                 lineCode = tempArray[0]+"";
+                 }else if(!lineCode.equals(tempArray[0]+"")){
+                 num = 1;
+                 lineCode = tempArray[0]+"";
+                 }
+                 key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
+                 tempStationName2YgcNumber.put(key,num++);
+                 }
+                 }*/
             }
             lineId2CodeMap = biMap;
@@ -10,6 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import java.util.*;
@@ -23,6 +24,7 @@ import java.util.*;
  *
  */
 @Component
+@Order(value = 2)
 public class LineConfigData implements CommandLineRunner {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 package com.bsth.data.gpsdata;
-import com.bsth.data.gpsdata.analyse.StationRoute;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
@@ -78,15 +78,15 @@ public class GpsEntity {
 	private boolean sEPoint;
 	 */
-	/** 站内 */
-	private boolean instation;
+	/** 0： 站外 1：站内 2：场内 */
+	private int instation;
 	/** 站点信息，站内时有值 */
 	@JsonIgnore
 	private StationRoute station;
 	/** 状态 */
-	private String state2;
+	private String signalState = "normal";
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -233,14 +233,6 @@ public class GpsEntity {
 		this.version = version;
 	}
-	public boolean isInstation() {
-		return instation;
-	}
-
-	public void setInstation(boolean instation) {
-		this.instation = instation;
-	}
-
 	public StationRoute getStation() {
 		return station;
 	}
@@ -257,11 +249,19 @@ public class GpsEntity {
 		this.abnormal = abnormal;
 	}
-	public String getState2() {
-		return state2;
+	public String getSignalState() {
+		return signalState;
 	}
-	public void setState2(String state2) {
-		this.state2 = state2;
+	public void setSignalState(String signalState) {
+		this.signalState = signalState;
+	}
+
+	public int getInstation() {
+		return instation;
+	}
+
+	public void setInstation(int instation) {
+		this.instation = instation;
 	}
 }
@@ -2,11 +2,9 @@ package com.bsth.data.gpsdata;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
-import com.bsth.data.gpsdata.analyse.GeoCacheData;
-import com.bsth.data.gpsdata.analyse.GpsAnalyse;
+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;
@@ -27,262 +25,202 @@ import org.springframework.stereotype.Component;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 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, 40, 6, TimeUnit.SECONDS);
-	}
-
-	static final long CLEAR_DIFF = 1000 * 60 * 60 * 2;
-	public GpsEntity add(GpsEntity gps) {
-		String device = gps.getDeviceId();
-		GpsEntity old = gpsMap.get(device);
-
-		//断线2个小时，清除缓存数据
-		if(gps.getTimestamp() - old.getTimestamp() > CLEAR_DIFF && gps.getNbbm() != null)
-			GeoCacheData.clear(gps.getNbbm());
-
-		//分析gps
-		if(isAvailable(gps) && (old == null || old.getTimestamp() != gps.getTimestamp()))
-			GpsAnalyse.start(gps);
-
-		if(!StringUtils.isEmpty(gps.getStopNo())){
-			//定时定距数据附带站点编码改变
-			if(null == old || !gps.getStopNo().equals(old.getStopNo())){
-				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;
-	}
-
-	public boolean isAvailable(GpsEntity gps){
-		return StringUtils.isNotEmpty(gps.getLineId()) &&
-				dayOfSchedule.getCurrSchDate().containsKey(gps.getLineId());
-	}
-
-	/**
-	 *
-	 * @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;
-
-		@Override
-		public void run() {
-			try{
-				//如果正在恢复数据
-				if(GpsDataRecovery.run){
-					return;
-				}
-
-				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);
-					}
-				} 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(isSEPoint(gps))
-				return;
-		}*/
-	}
+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,5");
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
+    }
+
+    public void put(GpsEntity gps) {
+        String device = gps.getDeviceId();
+        gpsMap.put(device, gps);
+
+        if (StringUtils.isNotBlank(gps.getLineId())){
+            //站点名称
+            gps.setStationName(getStationName(gps));
+            lineCode2Devices.put(gps.getLineId(), device);
+        }
+    }
+
+    public String getStationName(GpsEntity gps){
+        return BasicData.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + gps.getStopNo());
+    }
+
+    /**
+     * @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);
+                        //实时GPS数据集
+                        gpsRealData.put(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;
+
+import com.bsth.data.gpsdata.arrival.entity.SignalState;
+import com.bsth.websocket.handler.SendUtils;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 信号状态数据
+ * Created by panzhao on 2016/12/30.
+ */
+@Component
+public class SignalStateData {
+
+    @Autowired
+    SendUtils sendUtils;
+
+    private static ArrayListMultimap<String, SignalState> listMultimap = ArrayListMultimap.create();
+
+    public void put(SignalState state){
+        listMultimap.put(state.getLineCode(), state);
+        //推送到客户端
+        sendUtils.sendSignalState(state);
+    }
+
+    public List<SignalState> get(String idx){
+        List<SignalState> rs = new ArrayList<>();
+        List<String> ids = Splitter.on(",").splitToList(idx);
+
+        for(String lineCode : ids){
+            rs.addAll(listMultimap.get(lineCode));
+        }
+        return rs;
+    }
+}
-package com.bsth.data.gpsdata.analyse;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.analyse.components.GpsArrival;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * 分析gps状态信息
- * Created by panzhao on 2016/12/23.
- */
-public class GpsAnalyse {
-
-    static Logger logger = LoggerFactory.getLogger(GpsAnalyse.class);
-
-    //线程池
-    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
-
-    public static void start(GpsEntity gps) {
-        threadPool.execute(new ArrivalMatchThread(gps));
-    }
-
-    public static class ArrivalMatchThread implements Runnable {
-
-        private GpsEntity gps;
-
-        public ArrivalMatchThread(GpsEntity gps) {
-            this.gps = gps;
-        }
-
-        @Override
-        public void run() {
-            GpsArrival.arrival(gps);
-        }
-    }
-}
 \ No newline at end of file
-package com.bsth.data.gpsdata.analyse.components;
-
-import com.bsth.data.LineConfigData;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.analyse.CircleQueue;
-import com.bsth.data.gpsdata.analyse.GeoCacheData;
-import com.bsth.data.gpsdata.analyse.StationRoute;
-import com.bsth.data.gpsdata.analyse.util.GeoUtils;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.directive.DirectiveService;
-import com.bsth.websocket.handler.SendUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * gps 到离站判断
- * Created by panzhao on 2016/12/24.
- */
-@Component
-public class GpsArrival implements ApplicationContextAware {
-
-    static Logger logger = LoggerFactory.getLogger(GpsArrival.class);
-
-    static DayOfSchedule dayOfSchedule;
-    static LineConfigData lineConfigData;
-    static SendUtils sendUtils;
-    static DirectiveService directiveService;
-
-    public static void arrival(GpsEntity gps) {
-
-        if (gps.getLat() == 0 || gps.getLon() == 0) {
-            //logger.error("无效的gps");
-            return;
-        }
-
-        Object task = DayOfSchedule.executeCurr(gps.getNbbm());
-        if (task == null)
-            return;
-        if (task.getClass().isAssignableFrom(ScheduleRealInfo.class)) {
-            ScheduleRealInfo sch = (ScheduleRealInfo) task;
-            //和班次同步走向
-            gps.setUpDown(Integer.parseInt(sch.getXlDir()));
-
-            //出场
-            if (sch.getBcType().equals("out")) {
-                outCarpark(gps, sch);
-            } else if (sch.getBcType().equals("normal"))
-                normalInOut(gps, sch);
-            else if (sch.getBcType().equals("in")) {
-                inCarpark(gps, sch);
-            }
-        }
-
-        GeoCacheData.putGps(gps);
-    }
-
-    /**
-     * 正常班次
-     *
-     * @param gps
-     * @param sch
-     */
-    private static void normalInOut(GpsEntity gps, ScheduleRealInfo sch) {
-        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
-        GpsEntity prev = null;
-        if (queue != null)
-            prev = queue.getTail();
-
-        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), gps.getUpDown());
-        StationRoute station = GeoUtils.gpsInStation(gps, srs);
-
-        if (station != null) {
-            //站内
-            gps.setStopNo(station.getCode());
-            gps.setInstation(true);
-            stationInside(gps, prev, sch);
-        } else {
-            //站外
-            stationOutside(gps, prev, sch);
-        }
-    }
-
-    /**
-     * GPS在站点内
-     *
-     * @param gps
-     * @param prev
-     * @param sch
-     */
-    private static void stationInside(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch) {
-        if (prev == null)
-            return;
-
-        if (gps.getStopNo().equals(sch.getZdzCode()) && sch.getZdsjActual() == null) {
-            //到终点站
-            arriveEnd(sch, gps);
-            return;
-        }
-
-        //上一个点在站外
-        if (!prev.isInstation())
-            return;
-        //超过 （待发时间 + 90%的单程运送时间） 并且超过下一个班次的待发时间，还在起点站。默认烂一圈
-        if (prev.getStopNo().equals(gps.getStopNo())) {
-            if (gps.getStopNo().equals(sch.getQdzCode())
-                    && gps.getTimestamp() > sch.getDfsjT() + (sch.getBcsj() * 60 * 1000 * 0.9)) {
-
-                ScheduleRealInfo next = dayOfSchedule.next(sch);
-                if(gps.getTimestamp() > next.getDfsjT())
-                    dayOfSchedule.addExecPlan(dayOfSchedule.next(next));
-            }
-            return;
-        }
-
-        //发车
-        if (prev.getStopNo().equals(sch.getQdzCode())) {
-            busWillDepart(sch, gps);
-            return;
-        }
-
-        if (gps.getUpDown() != prev.getUpDown())
-            return;
-
-        //中途站
-        StationRoute prevStation = GeoCacheData.getStation(prev.getLineId(), prev.getUpDown(), prev.getStopNo());
-        StationRoute currStation = GeoCacheData.getStation(gps.getLineId(), gps.getUpDown(), gps.getStopNo());
-        if (currStation.getRouteSort() < prevStation.getRouteSort()) {
-            //开始下一个班次
-            finishPlan(sch);
-
-            logger.info("路由反向。。。。。。:" + gps.getTimestamp());
-            //为班次补上实际时间
-        }
-    }
-
-    /**
-     * GPS在站点外
-     *
-     * @param gps
-     * @param prev
-     * @param sch
-     */
-    private static void stationOutside(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch) {
-        if (prev == null)
-            return;
-
-        gps.setStopNo(prev.getStopNo());
-        if (prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
-            //发车
-            busWillDepart(sch, gps);
-            return;
-        }
-    }
-
-    /**
-     * 公交车起点发出
-     */
-    final static long DRIFT_VAL_TIME = 1000 * 60 * 10;
-    //班次最大差值2小时
-    final static long MAX_DIFF = 1000 * 60 * 60 * 2;
-
-    private static void busWillDepart(ScheduleRealInfo sch, GpsEntity gps) {
-        //实发时间不覆盖
-        if (sch.getFcsjActual() == null && Math.abs(gps.getTimestamp() - sch.getDfsjT()) < MAX_DIFF) {
-
-            //提前10分钟以上发出，判断一下是否是漂移
-            /*if (sch.getDfsjT() - gps.getTimestamp() > DRIFT_VAL_TIME) {
-                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-                if (schPrev != null && schPrev.getZdsjActual() != null) {
-                    //计划停站时间
-                    long stopTimeJH = sch.getDfsjT() - schPrev.getZdsjT();
-                    //实际停站时间
-                    long actualStopTime = gps.getTimestamp() - schPrev.getZdsjActualTime();
-                    *//*
-                        没停够计划百分之30的，算漂移
-                        （这里出现的误判，由程序在车辆到中途站的时候进行补偿）
-                    *//*
-                    if (stopTimeJH * 0.3 > actualStopTime) {
-                        logger.info("漂移.... 车辆：" + gps.getNbbm() + " ts: " + gps.getTimestamp());
-                        return;
-                    }
-                }
-            }*/
-
-            LineConfig config = lineConfigData.get(sch.getXlBm());
-            if (config != null && config.getOutConfig() == 2) {
-                //出站既出场
-                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-                if (schPrev.getBcType().equals("out")) {
-                    schPrev.setFcsjActualAll(gps.getTimestamp());
-                    schPrev.setZdsjActualAll(gps.getTimestamp());
-                }
-            }
-
-            sch.setFcsjActualAll(gps.getTimestamp());
-            //通知客户端
-            sendUtils.sendFcsj(sch);
-            //持久化
-            dayOfSchedule.save(sch);
-            logger.info("（站外）班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
-        }
-    }
-
-    /**
-     * 公交车到达终点
-     *
-     * @param sch
-     * @param gps
-     */
-    private static void arriveEnd(ScheduleRealInfo sch, GpsEntity gps) {
-        if(Math.abs(gps.getTimestamp() - sch.getZdsjT()) >= MAX_DIFF)
-            return;
-
-        sch.setZdsjActualAll(gps.getTimestamp());
-        ScheduleRealInfo next = finishPlan(sch);
-        //已完成班次数
-        int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
-        //通知客户端
-        sendUtils.sendZdsj(sch, next, doneSum);
-        //持久化
-        dayOfSchedule.save(sch);
-        logger.info("班次：" + sch.getDfsj() + "到达终点， 时间：" + sch.getZdsjActual());
-
-        if (next == null)
-            return;
-
-        LineConfig config = lineConfigData.get(sch.getXlBm());
-        //进站既进场
-        if (next.getBcType().equals("in") &&
-                config != null && config.getOutConfig() == 2) {
-            next.setFcsjActualAll(gps.getTimestamp());
-            next.setZdsjActualAll(gps.getTimestamp());
-
-            finishPlan(next);
-        } else {
-            //下发调度指令
-            directiveService.send60Dispatch(next, doneSum, "到站@系统");
-
-            //套跑  -下发线路切换指令
-           /* if (!next.getXlBm().equals(sch.getXlBm()))
-                directiveService.lineChange(sch.getClZbh(), next.getXlBm(), "套跑@系统");*/
-        }
-
-        //将gps转换为下一个班次走向的站内信号
-        int updown = Integer.parseInt(next.getXlDir());
-        List<StationRoute> srs = GeoCacheData.getStationRoute(next.getXlBm(), updown);
-        StationRoute station = GeoUtils.gpsInStation(gps, srs);
-        if (station != null) {
-            gps.setUpDown(updown);
-            gps.setStopNo(station.getCode());
-        }
-    }
-
-    /**
-     * 出场班次
-     *
-     * @param gps
-     * @param sch
-     */
-    private static void outCarpark(GpsEntity gps, ScheduleRealInfo sch) {
-        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
-        GpsEntity prev = null;
-        if (queue != null)
-            prev = queue.getTail();
-
-        //是否在停车场内
-        String carpark = GeoUtils.gpsInCarpark(gps);
-        if (carpark != null && carpark.equals(sch.getQdzCode())) {
-            gps.setInstation(true);
-            gps.setStopNo(carpark);
-            return; // 还在场内
-        }
-
-        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), gps.getUpDown());
-        StationRoute station = GeoUtils.gpsInStation(gps, srs);
-        //线路上 站点内
-        if (station != null) {
-            gps.setInstation(true);
-            gps.setStopNo(station.getCode());
-
-            //上一个点附带的站点站标记
-            if (prev != null && prev.getStopNo() != null
-                    && prev.getStopNo().equals(sch.getZdzCode()))
-                return;
-
-            //到达终点
-            if (station.getCode().equals(sch.getZdzCode()))
-                arriveEnd(sch, gps);
-        }
-
-        //上一个点在场内
-        if (prev != null && prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
-            //当前点在场外
-            if (carpark == null) {
-                gps.setStopNo(prev.getStopNo());
-                //停车场发出
-                busWillDepart(sch, gps);
-                return;
-            }
-        }
-    }
-
-
-    /**
-     * 进场班次
-     *
-     * @param gps
-     * @param sch
-     */
-    private static void inCarpark(GpsEntity gps, ScheduleRealInfo sch) {
-        String carpark = GeoUtils.gpsInCarpark(gps);
-        if (carpark != null && carpark.equals(sch.getZdzCode())) {
-            //进场班次取第一个实际进场时间
-            if (sch.getZdsjActual() != null)
-                return;
-
-            //进场
-            arriveEnd(sch, gps);
-            return;
-        }
-
-        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
-        if (queue == null)
-            return;
-        //上一个gps
-        GpsEntity prev = queue.getTail();
-
-        if (carpark == null && prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
-            gps.setStopNo(prev.getStopNo());
-            //进场班次发出
-            busWillDepart(sch, gps);
-            return;
-        }
-    }
-
-    /**
-     * 完成班次 -返回下一个班次
-     *
-     * @param sch
-     */
-    private static ScheduleRealInfo finishPlan(ScheduleRealInfo sch) {
-        ScheduleRealInfo next = dayOfSchedule.next(sch);
-        if (next != null) {
-            next.setQdzArrDatesj(sch.getZdsjActual());
-            dayOfSchedule.addExecPlan(next);
-        }
-        return next;
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        dayOfSchedule = applicationContext.getBean(DayOfSchedule.class);
-        lineConfigData = applicationContext.getBean(LineConfigData.class);
-        sendUtils = applicationContext.getBean(SendUtils.class);
-        directiveService = applicationContext.getBean(DirectiveService.class);
-    }
-}
-package com.bsth.data.gpsdata.analyse.components;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-/**
- * GPS状态纠正
- * Created by panzhao on 2016/12/23.
- */
-@Component
-public class GpsStateCorrective implements ApplicationContextAware {
-
-    static Logger logger = LoggerFactory.getLogger(GpsStateCorrective.class);
-
-    static DayOfSchedule dayOfSchedule;
-
-    private static GeometryFactory geometryFactory = new GeometryFactory();
-
-    public static void correct(GpsEntity gps, ScheduleRealInfo sch){
-/*        int upDown = Integer.parseInt(sch.getXlDir());
-        gps.setUpDown(upDown);
-        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), upDown);
-
-        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-
-        //之前的点位
-        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
-        GpsEntity prev = null;
-        if(queue != null)
-            prev = queue.getTail();
-
-        //线路上，站点间
-        StationRoute station = GeoUtils.pointInStation(point, srs);
-        //在站内
-        if(station != null){
-            gps.setStopNo(station.getCode());
-            gps.setInstation(true);
-            gps.setStation(station);
-
-            if(prev != null && prev.getUpDown() == upDown){
-                StationRoute prevStation = GeoCacheData.getStation(prev.getLineId(), upDown, prev.getStopNo());
-
-                //倒着开？？
-                if(prevStation.getRouteSort() > station.getRouteSort()){
-                    reversalHandle(gps, prev, sch);
-                }
-            }
-        }
-        else{
-            if(prev != null)
-                gps.setStopNo(prev.getStopNo());
-        }
-
-        //是否在停车场内
-        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
-        Set<String> codes = carparkMap.keySet();
-        Polygon p;
-        for(String code : codes){
-            p = carparkMap.get(code);
-            //场内
-            if(p.contains(point)){
-                gps.setCarparkNo(code);
-                if(sch.getBcType().equals("out")){
-                    gps.setInstation(true);
-                    gps.setStopNo(code);
-                }
-            }
-        }*/
-    }
-
-    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("HH:mm");
-
-    private static void reversalHandle(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch){
-        /*if(sch.getBcType().equals("out") && gps.getTimestamp() < sch.getZdsjT())
-            return;
-
-        //先假设没到终点，直接开始了下一个班次
-        ScheduleRealInfo next = dayOfSchedule.next(sch);
-        String log = "倒着开？？？ nbbm: " + gps.getNbbm() + " 当前：" + gps.getStopNo() + " 上一站：" + prev.getStopNo() + " 当前班次：" + sch.getDfsj();
-        if(next != null){
-            dayOfSchedule.addExecPlan(next);
-
-            log += (" 下一个班次：" + next.getDfsj());
-        }
-
-        log += (" GPS时间：" + fmt.print(gps.getTimestamp()));
-
-        logger.info(log);*/
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        dayOfSchedule = applicationContext.getBean(DayOfSchedule.class);
-    }
-}
-package com.bsth.data.gpsdata.analyse;
+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;
@@ -26,8 +29,8 @@ public class GeoCacheData {
     static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
-    //每辆车缓存最后200条gps
-    private static final int CACHE_SIZE = 200;
+    //每辆车缓存最后1000条gps
+    private static final int CACHE_SIZE = 1000;
     private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
     //线路路段走向
@@ -36,6 +39,9 @@ public class GeoCacheData {
     //线路站点路由
     private static ArrayListMultimap<String, StationRoute> stationCacheMap;
+    //线路_上下行_站点编码 ——> 站点
+    private static Map<String, StationRoute> routeCodeMap;
+
     //停车场
     public static Map<String, Polygon> tccMap;
@@ -49,9 +55,9 @@ public class GeoCacheData {
     public static void putGps(GpsEntity gps) {
         CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getNbbm());
         if (queue == null) {
-            //第一个点从站内开始
-            if (!gps.isInstation())
-                return;
+            /*//第一个点从站内开始
+            if (gps.getInstation() == 0)
+                return;*/
             queue = new CircleQueue<>(CACHE_SIZE);
             gpsCacheMap.put(gps.getNbbm(), queue);
@@ -69,6 +75,10 @@ public class GeoCacheData {
         }
     }
+    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);
     }
@@ -84,6 +94,21 @@ public class GeoCacheData {
         return null;
     }
+    public static List<StationRoute> midwayStation(String lineCode, int directions, String sCode, String eCode) {
+        List<StationRoute> list = getStationRoute(lineCode, directions), rs = new ArrayList<>();
+
+        boolean flag = false;
+        for (StationRoute sr : list) {
+            if (flag)
+                rs.add(sr);
+            if (sr.getCode().equals(sCode))
+                flag = true;
+            else if (sr.getCode().equals(eCode))
+                break;
+        }
+        return rs;
+    }
+
     public static Polygon getTccPolygon(String code) {
         return tccMap.get(code);
     }
@@ -91,7 +116,7 @@ public class GeoCacheData {
     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 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";
+        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 {
@@ -103,6 +128,7 @@ public class GeoCacheData {
                 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");
                 //多边形电子围栏
@@ -115,8 +141,11 @@ public class GeoCacheData {
         //按线路和走向分组
         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();
@@ -128,6 +157,7 @@ public class GeoCacheData {
             }
             stationCacheMap = tempMap;
+            routeCodeMap = codeMap;
         }
         //加载停车场数据
@@ -176,4 +206,16 @@ public class GeoCacheData {
         }
         return cds;
     }
+
+    /**
+     * 是不是终点站
+     * @param lineId
+     * @param upDown
+     * @param stationCode
+     * @return
+     */
+    public static boolean isEndStation(String lineId, Integer upDown, String stationCode) {
+        StationRoute station = routeCodeMap.get(lineId + "_" + upDown + "_" + stationCode);
+        return station != null && station.getMark().equals("E");
+    }
 }
 \ No newline at end of file
+package com.bsth.data.gpsdata.arrival;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.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.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2016/12/27.
+ */
+public abstract class SignalHandle {
+
+    public abstract boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs);
+
+    protected boolean isNotEmpty(CircleQueue<GpsEntity> prevs) {
+        return prevs != null && prevs.size() > 0 && prevs.getTail() != null;
+    }
+
+    protected boolean isDriftSignal(GpsEntity gps) {
+        return gps.getLat() == 0 || gps.getLon() == 0;
+    }
+
+    /**
+     * 是不是异常信号
+     *
+     * @param gps
+     * @return protected boolean isAbnormal(GpsEntity gps) {
+    return gps.getLat() == 0 || gps.getLon() == 0;
+    }*/
+
+    /**
+     * 连续异常信号个数统计
+     *
+     * @param prevs
+     * @return protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
+     * int count = 0;
+     * <p>
+     * if (!isNotEmpty(prevs))
+     * return count;
+     * <p>
+     * GpsEntity[] array = (GpsEntity[]) prevs.getQueue();
+     * GpsEntity gps;
+     * for (int i = array.length - 1; i > 0; i--) {
+     * gps = array[i];
+     * <p>
+     * if (isAbnormal(gps))
+     * count++;
+     * else
+     * break;
+     * }
+     * <p>
+     * return count;
+     * }
+     */
+
+    protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
+        int updown = Integer.parseInt(sch.getXlDir());
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), updown);
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+        if (station != null) {
+            gps.setUpDown(updown);
+            gps.setStopNo(station.getCode());
+        }
+    }
+
+    /**
+     * 是否是从异常状态恢复的第一个信号
+     *
+     * @param gps
+     * @param prevs
+     * @return
+     */
+    protected boolean abnormalRecovery(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        if (prevs == null || prevs.size() == 0)
+            return false;
+
+        GpsEntity prev = prevs.getTail();
+        //从漂移状态恢复
+        if (isDriftSignal(prev)
+                && !isDriftSignal(gps)) {
+            return true;
+        }
+
+        return false;
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.arrival.entity;
+
+/** 路由反转
+ * Created by panzhao on 2016/12/28.
+ */
+public class RouteReverse {
+
+    private String nbbm;
+    //反转个数
+    private int count;
+
+    //详细 1,2,3,2,1
+    private String detail;
+
+    //掉头站点
+    private String turned;
+
+    //掉头时间
+    private long zt;
+
+    //检测时间
+    private long ct;
+
+    //是否闭合
+    private boolean close;
+
+    //信号不明确
+    private boolean vague;
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public String getTurned() {
+        return turned;
+    }
+
+    public void setTurned(String turned) {
+        this.turned = turned;
+    }
+
+    public boolean isClose() {
+        return close;
+    }
+
+    public void setClose(boolean close) {
+        this.close = close;
+    }
+
+    public long getZt() {
+        return zt;
+    }
+
+    public void setZt(long zt) {
+        this.zt = zt;
+    }
+
+    public long getCt() {
+        return ct;
+    }
+
+    public void setCt(long ct) {
+        this.ct = ct;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public boolean isVague() {
+        return vague;
+    }
+
+    public void setVague(boolean vague) {
+        this.vague = vague;
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.arrival.entity;
+
+/**
+ * 班次信号异常（漂移 或 断线）
+ * Created by panzhao on 2016/12/31.
+ */
+public class SignalAbnormal {
+
+    private Long et;
+
+    /** drift or reconnection */
+    private String abnormalType;
+
+    private Long st;
+
+    private String nearPoint;
+
+    private String destCode;
+
+    private Long ct;
+
+    //0: 发车  1：到站
+    private int outOrIn;
+
+    public Long getEt() {
+        return et;
+    }
+
+    public void setEt(Long et) {
+        this.et = et;
+    }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
+
+    public Long getSt() {
+        return st;
+    }
+
+    public void setSt(Long st) {
+        this.st = st;
+    }
+
+    public String getNearPoint() {
+        return nearPoint;
+    }
+
+    public void setNearPoint(String nearPoint) {
+        this.nearPoint = nearPoint;
+    }
+
+    public Long getCt() {
+        return ct;
+    }
+
+    public void setCt(Long ct) {
+        this.ct = ct;
+    }
+
+    public int getOutOrIn() {
+        return outOrIn;
+    }
+
+    public void setOutOrIn(int outOrIn) {
+        this.outOrIn = outOrIn;
+    }
+
+    public String getDestCode() {
+        return destCode;
+    }
+
+    public void setDestCode(String destCode) {
+        this.destCode = destCode;
+    }
+}
+package com.bsth.data.gpsdata.arrival.entity;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+/**
+ * 信号状态
+ * Created by panzhao on 2016/12/30.
+ */
+public class SignalState {
+
+    private String type;
+
+    private Long st;
+
+    //private Long checkTime;
+
+    private Long schId;
+
+    private String lineCode;
+
+    private String text;
+
+    private RouteReverse reverse;
+
+    private SignalAbnormal signalAbnormal;
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    /**
+     * 记录区间调头
+     *
+     * @param sch
+     * @param reverse
+     * @return
+     */
+    public static SignalState reverseSignalSTate(ScheduleRealInfo sch, RouteReverse reverse) {
+        if(reverse.isVague())
+            return null;
+
+        SignalState state = new SignalState();
+        state.setSchId(sch.getId());
+        state.setType("route_reverse");
+        //state.setCheckTime(System.currentTimeMillis());
+
+        String stationName = BasicData.stationCode2NameMap.get(sch.getXlBm() + "_" + sch.getXlDir() + "_" + reverse.getTurned());
+        state.setText(fmtHHmm.print(reverse.getZt()) + " 从 " + stationName + " 站掉头");
+        state.setSt(sch.getFcsjActualTime());
+        state.setLineCode(sch.getXlBm());
+        state.setReverse(reverse);
+        return state;
+    }
+
+    public static SignalState abnormalSignalSTate(ScheduleRealInfo sch, SignalAbnormal signalAbnormal) {
+        SignalState state = new SignalState();
+        state.setSchId(sch.getId());
+        state.setType("abnormal_signal");
+        //state.setCheckTime(signalAbnormal.getCt());
+        state.setLineCode(sch.getXlBm());
+
+        String text = (fmtHHmm.print(signalAbnormal.getSt()) + " ~ " + fmtHHmm.print(signalAbnormal.getEt()));
+        String abnormType = signalAbnormal.getAbnormalType();
+        if (abnormType.equals("drift"))
+            text += "（GPS无效）";
+        else if (abnormType.equals("reconnection"))
+            text += "（信号丢失）";
+
+        state.setText(text);
+        state.setSignalAbnormal(signalAbnormal);
+        return state;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public long getSchId() {
+        return schId;
+    }
+
+    public void setSchId(long schId) {
+        this.schId = schId;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getSt() {
+        return st;
+    }
+
+    public void setSt(Long st) {
+        this.st = st;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public RouteReverse getReverse() {
+        return reverse;
+    }
+
+    public void setReverse(RouteReverse reverse) {
+        this.reverse = reverse;
+    }
+
+    public SignalAbnormal getSignalAbnormal() {
+        return signalAbnormal;
+    }
+
+    public void setSignalAbnormal(SignalAbnormal signalAbnormal) {
+        this.signalAbnormal = signalAbnormal;
+    }
+}
-package com.bsth.data.gpsdata.analyse;
+package com.bsth.data.gpsdata.arrival.entity;
 import com.vividsolutions.jts.geom.Point;
 import com.vividsolutions.jts.geom.Polygon;
@@ -58,6 +58,8 @@ public class StationRoute {
      */
     private StationRoute prve;
+    private String name;
+
     public String getCode() {
         return code;
     }
@@ -137,5 +139,13 @@ public class StationRoute {
     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.SignalHandle;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
+import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
+import com.bsth.data.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.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 进出站动作处理
+ * Created by panzhao on 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;
+
+    @Autowired
+    ScheduleSignalState scheduleSignalState;
+
+    @Autowired
+    SignalSchPlanMatcher signalSchPlanMatcher;
+
+    private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //忽略漂移信号
+        if(isDriftSignal(gps))
+            return false;
+
+        //从异常状态恢复的第一个信号
+        if(abnormalRecovery(gps, prevs)){
+            //回溯一下之前的轨迹
+            scheduleSignalState.signalRetrospect(gps);
+        }
+
+        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();
+
+        //首班出场最多提前1.2小时
+        if(dayOfSchedule.isFirstOut(sch) && sch.getDfsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+            return;
+
+        //起点发车
+        if(qdzCode != null && prev.getStopNo().equals(qdzCode)
+                && !willDepart(gps, prev, sch)){
+
+            //发车班次匹配
+            signalSchPlanMatcher.outMatch(gps, sch);
+            sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+            //实发时间不覆盖
+            if(StringUtils.isNotEmpty(sch.getFcsjActual()))
+                return;
+
+            //实发时间
+            sch.setFcsjActualAll(gps.getTimestamp());
+            //通知客户端
+            sendUtils.sendFcsj(sch);
+            //持久化
+            dayOfSchedule.save(sch);
+
+            //出站既出场
+            outStationAndOutPark(sch);
+            logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
+        }
+        else if(sch.getBcType().equals("out")){
+            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            if(prev.getStopNo().equals(next.getQdzCode())){
+                //发下一个班次
+                dayOfSchedule.addExecPlan(next);
+                outStation(gps, prev);
+            }
+        }
+    }
+
+
+    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.getFcsjActualTime());
+                schPrev.setZdsjActualAll(sch.getFcsjActualTime());
+
+                sendUtils.refreshSch(schPrev);
+            }
+        }
+    }
+
+    /**
+     * 进站
+     * @param gps 当前点
+     * @param prev 上一个点
+     */
+    private void inStation(GpsEntity gps, GpsEntity prev){
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+        if(gps.getStopNo().equals(sch.getZdzCode())){
+
+            //实达时间不覆盖
+            if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+                return;
+
+            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转换为下一个班次走向的站内信号
+                transformUpdown(gps, sch);
+            }
+        }
+        else if(sch.getFcsjActual() == null){
+            //有进站，但班次没有实发，向前追溯一下信号
+            scheduleSignalState.signalRetrospect(gps, sch);
+        }
+    }
+
+    /**
+     * 进站既进场
+     * @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.getZdsjActualTime());
+            next.setZdsjActualAll(sch.getZdsjActualTime());
+
+            sendUtils.refreshSch(next);
+        }
+    }
+
+    /**
+     * 发车漂移判定（这里出现的误判，由车辆到达中途站的时候补偿）
+     * @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{
+
+    //断开2分钟，标记为重连信号
+    private final static int OFFLINE_TIME = 1000 * 60 * 2;
+
+    //断开70分钟，之前的信号不再有参考价值
+    private final static int CLEAR_TIME = 1000 * 60 * 70;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //漂移信号不管
+        if(isDriftSignal(gps)){
+            gps.setSignalState("drift");
+            return true;
+        }
+
+        if(isNotEmpty(prevs)){
+            GpsEntity prev = prevs.getTail();
+            int space = (int) (gps.getTimestamp() - prev.getTimestamp());
+            if(space > OFFLINE_TIME)
+                gps.setSignalState("reconnection");
+
+            if(space > CLEAR_TIME){
+                //清理缓存的信号
+                GeoCacheData.clear(gps.getNbbm());
+            }
+        }
+        return true;
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.entity.RouteReverse;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
+import com.bsth.data.schedule.DayOfSchedule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 路由反向信号处理
+ * Created by panzhao on 2016/12/28.
+ */
+@Component
+public class ReverseSignalHandle extends SignalHandle {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    ScheduleSignalState scheduleSignalState;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        if (!isNotEmpty(prevs))
+            return false;
+
+        GpsEntity prev = prevs.getTail();
+
+        if (isReverse(gps, prev)) {
+            RouteReverse reverse = reverseSearch(prevs, gps);
+
+            if (reverse.getCount() >= 4
+                    && reverse.isClose()
+                    && !GeoCacheData.isEndStation(gps.getLineId(), gps.getUpDown(), reverse.getTurned())) {
+                scheduleSignalState.reverseAnalyse(reverse);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 搜索路由反向详细
+     *
+     * @param prevs
+     * @param gps
+     * @return
+     */
+    public RouteReverse reverseSearch(CircleQueue<GpsEntity> prevs, GpsEntity gps) {
+        RouteReverse routeReverse = new RouteReverse();
+        int count = 0;
+        String path = "";
+        long zt = 0L;
+        boolean half = false;
+
+        //当前站点
+        StationRoute curr = GeoCacheData.getRouteCode(gps), sr;
+        GpsEntity prev;
+        Object[] array = prevs.getQueue();
+        for (int i = array.length - 1; i > 0; i--) {
+            prev = (GpsEntity) array[i];
+
+            if (!prev.getUpDown().equals(gps.getUpDown())
+                    || prev.getSignalState().equals("reconnection"))
+                break;
+
+            if (prev.getInstation() == 1) {
+                sr = GeoCacheData.getRouteCode(prev);
+
+                if (sr.getRouteSort() > curr.getRouteSort()) {
+                    if(half){
+                        routeReverse.setVague(true);
+                    }
+
+                    path += (curr.getCode() + ",");
+                    count++;
+                    zt = prev.getTimestamp();
+                } else if (sr.getRouteSort() < curr.getRouteSort()) {
+                    if (routeReverse.getTurned() == null) {
+                        routeReverse.setTurned(curr.getCode());
+                        half = true;
+                    }
+
+                    path += (curr.getCode() + ",");
+                    //掉头前当前站
+                    if (sr.getCode().equals(gps.getStopNo())) {
+                        routeReverse.setClose(true);
+                        path += sr.getCode();
+                        break;
+                    }
+                }
+
+                curr = sr;
+            }
+        }
+
+        routeReverse.setZt(zt);
+        routeReverse.setCount(count);
+        routeReverse.setDetail(path);
+        routeReverse.setCt(gps.getTimestamp());
+        routeReverse.setNbbm(gps.getNbbm());
+        return routeReverse;
+    }
+
+    /**
+     * 是否反向
+     *
+     * @param gps
+     * @param prev
+     * @return
+     */
+    public boolean isReverse(GpsEntity gps, GpsEntity prev) {
+        if (gps.getInstation() == 1
+                &&
+                gps.getUpDown().equals(prev.getUpDown())
+                && !gps.getStopNo().equals(prev.getStopNo())) {
+
+            StationRoute currStation = GeoCacheData.getRouteCode(gps);
+            StationRoute prevStation = GeoCacheData.getRouteCode(prev);
+
+            if (currStation == null || prevStation == null)
+                return false;
+
+            if (currStation.getRouteSort() < prevStation.getRouteSort())
+                return true;
+        }
+        return false;
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.entity.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.analyse;
+package com.bsth.data.gpsdata.arrival.utils;
 import java.util.Arrays;
@@ -19,12 +19,12 @@ public class CircleQueue&lt;T&gt; {
     public Object[] elementData;
     /**
-     * 队头(先进先出)
+     * 头
      */
     public int head = 0;
     /**
-     * 队尾
+     * 尾
      */
     public int tail = 0;
@@ -39,7 +39,7 @@ public class CircleQueue&lt;T&gt; {
     }
     /**
-     * 获取循环队列的大小(包含元素的个数)
+     * 获取循环队列的大小
      */
     public int size() {
         if (isEmpty()) {
@@ -87,10 +87,12 @@ public class CircleQueue&lt;T&gt; {
      * @return 取 循环队列里的值（先进的index=0）
      */
     public Object[] getQueue() {
-        final Object[] elementDataSort = new Object[capacity];
+        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;) {
@@ -103,13 +105,18 @@ public class CircleQueue&lt;T&gt; {
                 }
             }
         } else {
-            for (int i = 0; i < tail; i++) {
+            elementDataSort = new Object[tail + 1];
+            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];
     }
-package com.bsth.data.gpsdata.analyse.util;
+package com.bsth.data.gpsdata.arrival.utils;
 import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.analyse.GeoCacheData;
-import com.bsth.data.gpsdata.analyse.StationRoute;
+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;
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.SignalStateData;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.entity.RouteReverse;
+import com.bsth.data.gpsdata.arrival.entity.SignalAbnormal;
+import com.bsth.data.gpsdata.arrival.entity.SignalState;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 班次信号状态分析
+ * Created by panzhao on 2016/12/29.
+ */
+@Component
+public class ScheduleSignalState {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    LineConfigData lineConfigData;
+
+    @Autowired
+    SignalStateData signalStateData;
+
+    /**
+     * 路由反向分析
+     */
+    public void reverseAnalyse(RouteReverse reverse) {
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(reverse.getNbbm());
+
+        String bcType = sch.getBcType();
+
+        switch (bcType) {
+            case "out":
+                outReverseAnalyse(sch, reverse);
+                break;
+            case "normal":
+                normalReverseAnalyse(sch, reverse);
+                break;
+        }
+    }
+
+    /**
+     * 出场班次路由反向分析
+     *
+     * @param sch
+     */
+    private void outReverseAnalyse(ScheduleRealInfo sch, RouteReverse reverse) {
+        long t = reverse.getCt();
+        //出场班次终点时间前，允许反向轨迹
+        if (sch.getZdsjT() != null && sch.getZdsjT() > t) {
+            return;
+        }
+
+        int rt;
+        //从实发 到 当前时间 < 计划运送时间 * 0.9
+        if (sch.getFcsjActual() != null && sch.getBcsj() != null) {
+            rt = (int) (t - sch.getFcsjActualTime());
+            if (rt < sch.getBcsj() * 0.9)
+                return;
+        }
+
+        ScheduleRealInfo next = dayOfSchedule.next(sch);
+        if (next.getXlDir().equals(sch.getXlDir()))
+            return;
+
+        //时间足够下一个班次待发时间运行到当前站
+        int runTime = reverse.getCount() * 1500 * 60;
+        if (next.getDfsjT() + runTime < t) {
+            //跳到下一个班次
+            dayOfSchedule.addExecPlan(next);
+        }
+    }
+
+    /**
+     * 正常班次路由反向分析
+     *
+     * @param sch
+     * @param reverse
+     */
+    private void normalReverseAnalyse(ScheduleRealInfo sch, RouteReverse reverse) {
+        LineConfig conf = lineConfigData.get(sch.getXlBm());
+
+        if (conf.isReadReverse()) {
+            //跳下一个班次
+            ScheduleRealInfo next = dayOfSchedule.next(sch);
+            if (next != null)
+                dayOfSchedule.addExecPlan(next);
+
+            //记录信号状态
+            SignalState signalState = SignalState.reverseSignalSTate(sch, reverse);
+            signalStateData.put(signalState);
+        }
+    }
+
+    public void signalRetrospect(GpsEntity gps) {
+        signalRetrospect(gps, dayOfSchedule.executeCurr(gps.getNbbm()));
+    }
+
+    /**
+     * 信号追溯
+     *
+     * @param gps
+     * @param sch
+     */
+    public void signalRetrospect(GpsEntity gps, ScheduleRealInfo sch) {
+        //回放数据，是否有掉线或者漂移
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        if (queue == null || queue.size() == 0 /*|| gps.getInstation() == 0*/)
+            return;
+
+        //起始时间点
+        long st = 0;
+        ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+
+        if (prev != null) {
+            if (prev.getZdsjActual() != null)
+                st = prev.getZdsjActualTime();
+            else
+                st = (GeoCacheData.midwayStation(gps.getLineId(), gps.getUpDown(), sch.getQdzCode(), gps.getStopNo()).size() + 1) * (1000 * 60 * 5);
+        }
+
+        Object[] tempArray = queue.getQueue();
+        int len = tempArray.length;
+
+        Object[] array = new Object[len + 1];
+        System.arraycopy(tempArray, 0, array, 0, len);
+        array[len] = gps;
+
+        String gpsState = "";
+        GpsEntity tempGps, nearGps = null;
+        int i = len - 1;
+        for (; i >= 0; i--) {
+            tempGps = (GpsEntity) array[i];
+
+            gpsState = tempGps.getSignalState();
+            if (gpsState.equals("truncation"))
+                break;
+            else if (gpsState.equals("drift")) {
+                nearGps = (GpsEntity) array[i + 1];
+                break;
+            } else if (gpsState.equals("reconnection")) {
+                nearGps = tempGps;
+                break;
+            }
+
+            if (tempGps.getTimestamp() < st)
+                break;
+        }
+
+        if (nearGps != null && i > 0) {
+            createSignalAbnormal(gpsState, nearGps, i, array, sch);
+        }
+    }
+
+    private void createSignalAbnormal(String gpsState, GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
+        switch (gpsState) {
+            case "drift":
+                driftSignalAbnormal(nearGps, i, array, sch);
+                break;
+            case "reconnection":
+                offlineSignalAbnormal(nearGps, ((GpsEntity) array[i - 1]), sch);
+                break;
+        }
+    }
+
+    /**
+     * 掉线异常状态记录
+     *
+     * @param e
+     * @param s
+     */
+    private void offlineSignalAbnormal(GpsEntity e, GpsEntity s, ScheduleRealInfo sch) {
+        long st = s.getTimestamp(), et = e.getTimestamp();
+
+        //掉线超过10分钟才记录
+        if (et - st < (1000 * 60 * 10))
+            return;
+
+        SignalAbnormal signalAbnormal = new SignalAbnormal();
+        signalAbnormal.setSt(st);
+        signalAbnormal.setEt(et);
+        signalAbnormal.setAbnormalType("reconnection");
+        signalAbnormal.setDestCode(sch.getQdzCode());
+        signalAbnormal.setOutOrIn(0);
+
+        //截断GPS
+        e.setSignalState("truncation");
+
+        //记录信号状态
+        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
+        signalStateData.put(signalState);
+    }
+
+    /**
+     * 漂移异常状态记录
+     *
+     * @param nearGps
+     * @param i
+     * @param array
+     */
+    private void driftSignalAbnormal(GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
+        GpsEntity gps, s = null;
+        //找到漂移开始时间
+        for (; i >= 0; i--) {
+            gps = (GpsEntity) array[i];
+
+            if (!gps.getSignalState().equals("drift") || i == 0
+                    || gps.getSignalState().equals("truncation")) {
+                s = gps;
+                break;
+            }
+        }
+
+        long st = s.getTimestamp(), et = nearGps.getTimestamp();
+        if (et - st < (1000 * 60 * 3))
+            return;
+        /*if (s != null){
+            st = s.getTimestamp();
+            //漂移小于3分钟
+            if(et - st < (1000 * 60 * 3))
+                return;
+        }*/
+
+
+        SignalAbnormal signalAbnormal = new SignalAbnormal();
+        signalAbnormal.setSt(st);
+        signalAbnormal.setEt(et);
+        signalAbnormal.setAbnormalType("drift");
+        signalAbnormal.setDestCode(sch.getQdzCode());
+        signalAbnormal.setOutOrIn(0);
+
+        //截断GPS
+        nearGps.setSignalState("truncation");
+
+        //记录信号状态
+        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
+        signalStateData.put(signalState);
+    }
+}
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 班次匹配器
+ * Created by panzhao on 2016/12/31.
+ */
+@Component
+public class SignalSchPlanMatcher {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    /**
+     * 发车信号匹配
+     * @param outSigal
+     * @param sch
+     * @return
+     */
+    public void outMatch(GpsEntity outSigal, ScheduleRealInfo sch){
+        long t = outSigal.getTimestamp();
+        if(t < sch.getDfsjT())
+            return;
+
+        //下一个相同走向的班次
+        ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+        if(next == null || !next.getQdzCode().equals(sch.getQdzCode()))
+            return;
+
+        //晚于班次间隔百分之70，跳下一个班次
+        double s = (int) (next.getDfsjT() - sch.getDfsjT());
+        double r = (int) (t - sch.getDfsjT());
+        if(r / s > 0.7){
+            dayOfSchedule.addExecPlan(next);
+            outMatch(outSigal, next);
+        }
+    }
+}
-package com.bsth.data.gpsdata.analyse;
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import java.util.Comparator;
@@ -2,13 +2,19 @@ package com.bsth.data.gpsdata.recovery;
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.analyse.components.GpsArrival;
+import com.bsth.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;
@@ -18,42 +24,50 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 /**
- * 数据恢复
+ * gps数据恢复
  * Created by panzhao on 2016/12/24.
  */
-public class GpsDataRecovery {
+@Component
+public class GpsDataRecovery implements ApplicationContextAware {
     static Logger logger = LoggerFactory.getLogger(GpsDataRecovery.class);
     public static boolean run;
-    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
+    static ExecutorService threadPool = Executors.newFixedThreadPool(10);
-    private static CountDownLatch count;
+    static OfflineSignalHandle offlineSignalHandle;
+    static CorrectSignalHandle correctSignalHandle;
+    static StationInsideHandle stationInsideHandle;
+    static InOutStationSignalHandle inOutStationSignalHandle;
+    static ReverseSignalHandle reverseSignalHandle;
-    public static void recovery() {
+    public void recovery() {
         List<GpsEntity> list = loadData();
         //按车辆分组数据
         ArrayListMultimap<String, GpsEntity> listMap = ArrayListMultimap.create();
         for (GpsEntity gps : list) {
-            if(gps.getNbbm() != null)
+            if (gps.getNbbm() != null)
                 listMap.put(gps.getNbbm(), gps);
         }
-        count = new CountDownLatch(listMap.keySet().size());
         Set<String> keys = listMap.keySet();
+
+        CountDownLatch count = new CountDownLatch(keys.size());
+        GpsComp comp = new GpsComp();
         for (String nbbm : keys) {
-            threadPool.execute(new RecoveryDataThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("W9H-003"))
-                new RecoveryDataThread(listMap.get(nbbm), count).run();*/
+            Collections.sort(listMap.get(nbbm), comp);
+            threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
+            /*if(nbbm.equals("YT-CD008"))
+                new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
+
         try {
-            //等待子线程结束
             count.await();
-            logger.info("GPS 数据恢复完成....");
             run = false;
+            logger.info("数据恢复完成....");
         } catch (InterruptedException e) {
             logger.error("", e);
         }
@@ -64,7 +78,7 @@ public class GpsDataRecovery {
      *
      * @return
      */
-    public static List<GpsEntity> loadData() {
+    public List<GpsEntity> loadData() {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
@@ -103,12 +117,28 @@ public class GpsDataRecovery {
         return (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
     }
-    public static class RecoveryDataThread implements Runnable {
+    @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;
-        public RecoveryDataThread(List<GpsEntity> list, CountDownLatch count) {
+        RecoveryThread(List<GpsEntity> list, CountDownLatch count) {
             this.list = list;
             this.count = count;
         }
@@ -116,19 +146,26 @@ public class GpsDataRecovery {
         @Override
         public void run() {
             try {
-                //排序
-                Collections.sort(list, new GpsComp());
-                //依次跑完gps
-                //int i = 0;
-                for(GpsEntity gps : list){
-                  /* i++;
-                    if(i == 4527){
-                        System.out.println("aaa");
-                    }
-
-                    if(gps.getTimestamp() == 1482726071000L)
-                        System.out.println("bbb");*/
-                    GpsArrival.arrival(gps);
+                //循环gps恢复数据
+                CircleQueue<GpsEntity> prevs;
+
+                for (GpsEntity gps : list) {
+
+                    prevs = GeoCacheData.getGps(gps.getNbbm());
+                    //掉线处理
+                    offlineSignalHandle.handle(gps, prevs);
+                    //状态处理
+                    if (!correctSignalHandle.handle(gps, prevs))
+                        continue;
+                    //场，站内外判断
+                    stationInsideHandle.handle(gps, prevs);
+                    //反向处理
+                    reverseSignalHandle.handle(gps, prevs);
+                    //进出站动作处理
+                    inOutStationSignalHandle.handle(gps, prevs);
+                    GeoCacheData.putGps(gps);
+
+                    //Thread.sleep(50);
                 }
             } catch (Exception e) {
                 logger.error("", e);
@@ -137,12 +174,4 @@ public class GpsDataRecovery {
             }
         }
     }
-
-    public static class GpsComp implements Comparator<GpsEntity>{
-
-        @Override
-        public int compare(GpsEntity g1, GpsEntity g2) {
-            return (int) (g1.getTimestamp() - g2.getTimestamp());
-        }
-    }
 }
 \ No newline at end of file
@@ -2,8 +2,6 @@ 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;
@@ -29,12 +27,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 /**
  * @author PanZhao
@@ -43,6 +41,7 @@ import java.util.concurrent.TimeUnit;
  * @date 2016年8月15日 上午10:16:12
  */
 @Component
+@Order(value = 3)
 public class DayOfSchedule implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -117,25 +116,23 @@ public class DayOfSchedule implements CommandLineRunner {
     LineConfigData lineConfigs;
     @Autowired
-    BasicData.BasicDataLoader dataLoader;
+    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(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
-        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
         //首班出场指令补发器
 //		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
         //班次误点扫描
-        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
         //每天凌晨2点20提交数据到运管处
         long diff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
@@ -160,7 +157,7 @@ public class DayOfSchedule implements CommandLineRunner {
         }
         //恢复gps数据
-        GpsDataRecovery.recovery();
+        gpsDataRecovery.recovery();
     }
     public Map<String, String> getCurrSchDate() {
@@ -221,15 +218,8 @@ public class DayOfSchedule implements CommandLineRunner {
                 reCalcExecPlan(nbbm);
             }
-            //是否是出站即出场
-            LineConfig conf = lineConfigData.get(lineCode);
-            if (conf.getOutConfig() == 2) {
-                for (String nbbm : cars)
-                    schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
-            }
-
             // 页面 翻班通知
-            sendUtils.shiftSchedule(lineCode);
+            //sendUtils.shiftSchedule(lineCode);
         } catch (Exception e) {
             logger.error("", e);
             return -1;
@@ -500,6 +490,41 @@ public class DayOfSchedule implements CommandLineRunner {
     }
     /**
+     * 下一个相同走向的班次
+     * @param sch
+     * @return
+     */
+    public ScheduleRealInfo nextSame(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 && temp.getXlDir().equals(sch.getXlDir())) {
+                next = temp;
+                break;
+            }
+        }
+        return next;
+    }
+
+    /**
      * 上一个班次
      *
      * @param sch
@@ -524,6 +549,18 @@ public class DayOfSchedule implements CommandLineRunner {
         return prev;
     }
+    /**
+     * 是否是首班出场
+     * @param sch
+     * @return
+     */
+    public boolean isFirstOut(ScheduleRealInfo sch){
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        if(list.get(0).equals(sch) && sch.getBcType().equals("out"))
+            return true;
+        return false;
+    }
+
     public void put(ScheduleRealInfo sch) {
         schAttrCalculator
                 .calcRealDate(sch)
@@ -706,7 +743,8 @@ public class DayOfSchedule implements CommandLineRunner {
     }
     public void addExecPlan(ScheduleRealInfo sch) {
-        carExecutePlanMap.put(sch.getClZbh(), sch);
+        if(sch != null)
+            carExecutePlanMap.put(sch.getClZbh(), sch);
     }
     public void removeExecPlan(String clzbh) {
@@ -723,7 +761,7 @@ public class DayOfSchedule implements CommandLineRunner {
      * @param nbbm
      * @return
      */
-    public static ScheduleRealInfo executeCurr(String nbbm) {
+    public ScheduleRealInfo executeCurr(String nbbm) {
         return carExecutePlanMap.get(nbbm);
     }
@@ -763,6 +801,41 @@ public class DayOfSchedule implements CommandLineRunner {
     }
     /**
+     * 是否在执行首班出场
+     * @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(车辆关联到班次)
@@ -62,13 +62,13 @@ public class SchAttrCalculator {
 				sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()));
 			//實發時間
-			if(sch.getFcsjActual() != null &&
+			if(StringUtils.isNotEmpty(sch.getFcsjActual()) &&
 					sch.getFcsjActual().compareTo(conf.getStartOpt()) < 0){
 				sch.setFcsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsjActual()) + DAY_TIME);
 			}
 			//實際終點時間
-			if(sch.getZdsjActual() != null &&
+			if(StringUtils.isNotEmpty(sch.getZdsjActual()) &&
 					sch.getZdsjActual().compareTo(conf.getStartOpt()) < 0){
 				sch.setZdsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getZdsjActual()) + DAY_TIME);
 			}
@@ -162,34 +162,6 @@ public class SchAttrCalculator {
 		return updateList;
 	}
-	
-	/**
-	 * 
-	 * @Title: connectOutSchedule 
-	 * @Description: TODO(关联出场班次) 
-	 */
-	public void connectOutSchedule(List<ScheduleRealInfo> list){
-		Collections.sort(list, new ScheduleComparator.FCSJ());
-		
-		int len = list.size();
-		if(len == 0)
-			return;
-		
-		ScheduleRealInfo prve = list.get(0), curr;
-		for(int i = 1; i < len; i ++){
-			curr = list.get(i);
-			
-			//出站即出场关联
-			if(prve.getBcType().equals("out") && prve.getJhlc() == null)
-				curr.setTwinsSch(prve);
-			
-			//进站即进场关联
-			if(curr.getBcType().equals("in") && curr.getJhlc() == null)
-				prve.setTwinsSch(curr);
-			
-			prve = curr;
-		}
-	}
 	public SchAttrCalculator calcFcsjTime(ScheduleRealInfo sch) throws ParseException {
 		sch.setFcsjT(fmtyyyyMMddHHmm.parseMillis(sch.getRealExecDate() + sch.getFcsj()));
@@ -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;
+
+public class Daily {
+
+	private String rq;//日期
+	
+    public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	private String zbh;//车牌号
+	
+	private String jgh;//员工号
+	
+	private String jName;//驾驶员
+	
+	private String zlc;//里程
+	
+	private String jzl1;//空驶公里
+	
+	private String yh;//油耗
+	
+	private String bc;//班次
+
+	public String getZbh() {
+		return zbh;
+	}
+
+	public void setZbh(String zbh) {
+		this.zbh = zbh;
+	}
+
+	public String getJgh() {
+		return jgh;
+	}
+
+	public void setJgh(String jgh) {
+		this.jgh = jgh;
+	}
+
+	public String getjName() {
+		return jName;
+	}
+
+	public void setjName(String jName) {
+		this.jName = jName;
+	}
+
+	public String getZlc() {
+		return zlc;
+	}
+
+	public void setZlc(String zlc) {
+		this.zlc = zlc;
+	}
+
+	public String getJzl1() {
+		return jzl1;
+	}
+
+	public void setJzl1(String jzl1) {
+		this.jzl1 = jzl1;
+	}
+
+	public String getYh() {
+		return yh;
+	}
+
+	public void setYh(String yh) {
+		this.yh = yh;
+	}
+
+	public String getBc() {
+		return bc;
+	}
+
+	public void setBc(String bc) {
+		this.bc = bc;
+	}
+	
+	
+	
+
+	
+}
@@ -53,6 +53,9 @@ public class LineConfig {
 	/** 调度指令模板 */
 	private String schDirectiveTemp;
+	/** 识别区间调头 */
+	private boolean readReverse;
+
 	@OneToMany(cascade = CascadeType.ALL)
 	private Set<D80ReplyTemp> d80Temps = new HashSet<>();
@@ -140,4 +143,12 @@ public class LineConfig {
 	public void setD80Temps(Set<D80ReplyTemp> d80Temps) {
 		this.d80Temps = d80Temps;
 	}
+
+	public boolean isReadReverse() {
+		return readReverse;
+	}
+
+	public void setReadReverse(boolean readReverse) {
+		this.readReverse = readReverse;
+	}
 }
@@ -94,11 +94,6 @@ public class ScheduleRealInfo {
 	 * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
 	 */
 	private String bcType;
-	
-	/** 出站即出场 ， 关联的进出场班次  */
-	@JsonIgnore
-	@Transient
-	private ScheduleRealInfo twinsSch;
 	/** 创建人 */
 	@JsonIgnore
@@ -258,21 +253,6 @@ public class ScheduleRealInfo {
 		this.ccno = ccno;
 	}
-	public static DateTimeFormatter getFmtHHmm() {
-		return fmtHHmm;
-	}
-
-	public static void setFmtHHmm(DateTimeFormatter fmtHHmm) {
-		ScheduleRealInfo.fmtHHmm = fmtHHmm;
-	}
-
-	public static DateTimeFormatter getFmtyyyyMMddHHmm() {
-		return fmtyyyyMMddHHmm;
-	}
-
-	public static void setFmtyyyyMMddHHmm(DateTimeFormatter fmtyyyyMMddHHmm) {
-		ScheduleRealInfo.fmtyyyyMMddHHmm = fmtyyyyMMddHHmm;
-	}
 	/** ----------------
 	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@@ -804,13 +784,13 @@ public class ScheduleRealInfo {
 		this.opDirectiveState = opDirectiveState;
 	}
-	public ScheduleRealInfo getTwinsSch() {
+/*	public ScheduleRealInfo getTwinsSch() {
 		return twinsSch;
 	}
 	public void setTwinsSch(ScheduleRealInfo twinsSch) {
 		this.twinsSch = twinsSch;
-	}
+	}*/
 	public boolean isLate() {
 		return late;
@@ -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 */
@@ -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
@@ -71,7 +71,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and sflj != 0")
 	int findLjbc(String jName,String clZbh,String lpName);
-	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T') FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code = ?3",nativeQuery=true)
+	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id like %?1% and c.inside_code like %?3%",nativeQuery=true)
 	List<Object[]> account(String line,String date,String code);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') "
@@ -125,4 +125,4 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select new map(xlBm as xlBm) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm ORDER BY xlBm")
 	List<Map<String,Object>> setDDRBGroup(String date);
-}
+}
 \ No newline at end of file
@@ -46,23 +46,33 @@ public class OfflineServiceImpl implements OfflineService {
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
-		
+		Object date=map.get("date");
 		if(line!=null){
-			 if(line.toString()!="")
-				 sql +=" and line="+line;
+			sql +=" and line like'%"+line.toString()+"%'";
 		}
 		if(nbbm!=null){
-			if(nbbm.toString()!="")
-			sql +=" and vehicle like '%"+nbbm+"%'";
+			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
 		if(updown!=null){
-			if(updown.toString() !="")
-			sql +="and up_down ="+updown;
+			sql +="and up_down like '%"+updown.toString()+"%'";
+		}
+		if(date!=null){
+			if (date.toString().length()>0) {
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				try {
+					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
+					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
+					sql += " and timestamp >="+t1 +" and timestamp <="+t2;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
 		}
-		
 		sql +=" order by id limit ?,?";
 		try {
@@ -118,19 +128,32 @@ public class OfflineServiceImpl implements OfflineService {
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
+		Object date=map.get("date");
+
 		if(line!=null){
-			 if(line.toString()!="")
-				 sql +=" and line="+line;
+			sql +=" and line like'%"+line.toString()+"%'";
 		}
 		if(nbbm!=null){
-			if(nbbm.toString()!="")
-			sql +=" and vehicle like '%"+nbbm+"%'";
+			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
 		if(updown!=null){
-			if(updown.toString() !="")
-			sql +="and up_down ="+updown;
+			sql +="and up_down like '%"+updown.toString()+"%'";
+		}
+		if(date!=null){
+			if (date.toString().length()>0) {
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				try {
+					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
+					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
+					sql += " and timestamp >="+t1 +" and timestamp <="+t2;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
 		}
 		Connection conn = null;
@@ -36,23 +36,33 @@ public class OutboundServiceImpl implements OutboundService{
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
+		Object date=map.get("date");
-
 		if(line!=null){
-			 if(line.toString()!="")
-				 sql +=" and line="+line;
+				 sql +=" and line like'%"+line.toString()+"%'";
 		}
 		if(nbbm!=null){
-			if(nbbm.toString()!="")
-			sql +=" and vehicle like '%"+nbbm+"%'";
+			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
 		if(updown!=null){
-			if(updown.toString() !="")
-			sql +="and up_down ="+updown;
+			sql +="and up_down like '%"+updown.toString()+"%'";
+		}
+		if(date!=null){
+			if (date.toString().length()>0) {
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				try {
+					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
+					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
+					sql += " and timestamp >="+t1 +" and timestamp <="+t2;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
 		}
-		
 		sql +=" order by id limit ?,?";
@@ -102,20 +112,32 @@ public class OutboundServiceImpl implements OutboundService{
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
-		
+		Object date=map.get("date");
 		if(line!=null){
-			 if(line.toString()!="")
-				 sql +=" and line="+line;
+				 sql +=" and line like '%"+line.toString()+"%'";
+			
 		}
 		if(nbbm!=null){
-			if(nbbm.toString()!="")
-			sql +=" and vehicle like '%"+nbbm+"%'";
+			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
 		if(updown!=null){
-			if(updown.toString() !="")
-			sql +="and up_down ="+updown;
+			sql +=" and up_down like '%"+updown.toString()+"%'";
+		}
+		if(date!=null){
+			if (date.toString().length()>0) {
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				try {
+					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
+					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
+					sql += " and timestamp >="+t1 +" and timestamp <="+t2;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
 		}
 		Connection conn = null;
 		PreparedStatement ps = null;
@@ -214,7 +236,7 @@ public class OutboundServiceImpl implements OutboundService{
 			times=sdf.format(new Date());
 		}
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		String times1=times+" 00:00:01";
+		String times1=times+" 00:00:00";
 		String times2=times+" 23:59:59";
 		Connection conn = null;	
@@ -38,22 +38,34 @@ public class SpeedingServiceImpl implements SpeedingService {
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
-		
+		Object date=map.get("date");
 		if(line!=null){
-			 if(line.toString()!="")
-				 sql +=" and line="+line;
+			sql +=" and line like'%"+line.toString()+"%'";
 		}
 		if(nbbm!=null){
-			if(nbbm.toString()!="")
-			sql +=" and vehicle like '%"+nbbm+"%'";
+			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
 		if(updown!=null){
-			if(updown.toString() !="")
-			sql +="and up_down ="+updown;
+			sql +="and up_down like '%"+updown.toString()+"%'";
+		}
+		if(date!=null){
+			if (date.toString().length()>0) {
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				try {
+					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
+					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
+					sql += " and timestamp >="+t1 +" and timestamp <="+t2;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
 		}
+
 		sql +=" order by id limit ?,?";
@@ -103,19 +115,32 @@ public class SpeedingServiceImpl implements SpeedingService {
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
+		Object date=map.get("date");
+
 		if(line!=null){
-			 if(line.toString()!="")
-				 sql +=" and line="+line;
+			sql +=" and line like'%"+line.toString()+"%'";
 		}
 		if(nbbm!=null){
-			if(nbbm.toString()!="")
-			sql +=" and vehicle like '%"+nbbm+"%'";
+			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
 		if(updown!=null){
-			if(updown.toString() !="")
-			sql +="and up_down ="+updown;
+			sql +="and up_down like '%"+updown.toString()+"%'";
+		}
+		if(date!=null){
+			if (date.toString().length()>0) {
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				try {
+					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
+					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
+					sql += " and timestamp >="+t1 +" and timestamp <="+t2;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
 		}
 		Connection conn = null;
 		PreparedStatement ps = null;
@@ -2,6 +2,7 @@ package com.bsth.service.forms;
 import java.util.List;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Linepasswengerflow;
 import com.bsth.entity.mcy_forms.Operationservice;
 import com.bsth.entity.mcy_forms.Shifday;
@@ -28,6 +29,6 @@ public interface ExportService {
 	public void operationservice(String startDate, String endDate, String lpName,
 			List<Operationservice> resList);
-	
+
 }
@@ -5,6 +5,7 @@ import java.util.Map;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Executionrate;
 import com.bsth.entity.mcy_forms.Linepasswengerflow;
 import com.bsth.entity.mcy_forms.Operationservice;
@@ -39,4 +40,6 @@ public interface FormsService {
 	public List<Executionrate> executionrate(Map<String, Object> map);
 	public List<Allline> allline(Map<String, Object> map);
+	
+	public List<Daily> daily(Map<String, Object> map);
 }
@@ -25,6 +25,7 @@ import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Executionrate;
 import com.bsth.service.forms.CommonService;
 import com.bsth.service.forms.FormsService;
@@ -290,6 +291,7 @@ public class FormsServiceImpl implements FormsService {
 		List<Changetochange> list = jdbcTemplate.query(sql, new RowMapper<Changetochange>() {
+			
 			@Override
 			public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Changetochange chan = new Changetochange();
@@ -314,6 +316,7 @@ public class FormsServiceImpl implements FormsService {
 		return list;
 	}
+	
 	// 路单数据
 	@Override
 	public List<Singledata> singledata(Map<String, Object> map) {
@@ -706,4 +709,46 @@ public class FormsServiceImpl implements FormsService {
 		return list;
 	}
+
+	@Override
+	public List<Daily> daily(Map<String, Object> map) {
+
+		String sql ="select  r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
+				+ " from 	bsth_c_s_sp_info_real r  LEFT JOIN bsth_c_ylb y ON r.cl_zbh = y.nbbm "
+				+ " WHERE 1 = 1"
+		        + "  and r.xl_bm='" + map.get("line").toString() + "'"
+		        + "  and to_days(r.schedule_date)=to_days('"+map.get("date").toString()+"')"
+		        + "  AND r.gs_bm is not null";
+		  
+	if(map.get("gsdmDaily").toString()!=""){
+		sql+=" and r.gs_bm='"+map.get("gsdmDaily").toString()+"'";
+	}
+	if(map.get("fgsdmDaily").toString()!=""){
+		sql+=" and r.fgs_bm='"+map.get("fgsdmDaily").toString()+"'";
+	}
+		 sql += "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
+
+		List<Daily> list = jdbcTemplate.query(sql, new RowMapper<Daily>() {
+			@Override
+			public Daily mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Daily daily = new Daily();
+				daily.setRq(arg0.getString("schedule_date_str"));
+				daily.setZbh(arg0.getString("cl_zbh"));
+				daily.setJgh(arg0.getString("j_gh"));
+				daily.setjName(arg0.getString("j_name"));
+				daily.setYh(arg0.getString("YH"));
+				return daily;
+			}
+		});
+		
+		for(int i=0;i<list.size();i++){
+			Daily d=list.get(i);
+			Map<String, Object> maps = new HashMap<>();
+			maps = commonService.findKMBC2(d.getJgh(),d.getZbh(),d.getRq());
+			d.setJzl1(maps.get("ksgl").toString());
+			d.setZlc(maps.get("realMileage").toString());
+			d.setBc(maps.get("sjbc").toString());
+		}
+		return list;
+	}
 }
@@ -1102,7 +1102,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int jhbc = 0, sjbc = 0, kbc = 0, mbc = 0;
+			int jhbc = 0, sjbc = 0, wdfz = 0;
 			long jhdf = 0l, sjdf = 0l, wddf1 = 0l, wddf2 = 0l;
 			long jhfc = 0l, sjfc = 0l, wdfc1 = 0l, wdfc2 = 0l;
 			long jhys = 0l, sjys = 0l, yssjMax = 0l, yssjMin = 0l;
@@ -1127,10 +1127,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					yssj += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
 					if(schedule.getFcsjActualTime() - schedule.getFcsjT() < 0){
 						wdfc1 += schedule.getFcsjT() - schedule.getFcsjActualTime();
-						kbc++;
+//						kbc++;
 					} else if(schedule.getFcsjActualTime() - schedule.getFcsjT() > 0){
 						wdfc2 += schedule.getFcsjActualTime() - schedule.getFcsjT();
-						mbc++;
+//						mbc++;
 					}
 					if(schedule.getDfsj() != null){
@@ -1197,8 +1197,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				tempMap.put("pjys", "0分");
 				tempMap.put("pjtz", "0分");
 			}
-			tempMap.put("kbc", kbc);
-			tempMap.put("mbc", mbc);
+//			tempMap.put("kbc", kbc);
+//			tempMap.put("mbc", mbc);
+			if(!tempMap.get("jhfc").toString().equals("/") && !tempMap.get("sjfc").toString().equals("/")){
+				String[] temp1 = tempMap.get("jhfc").toString().split(":");
+				String[] temp2 = tempMap.get("sjfc").toString().split(":");
+				tempMap.put("wdfz", (Integer.valueOf(temp2[0])*60 + Integer.valueOf(temp2[1]))
+						- (Integer.valueOf(temp1[0])*60 + Integer.valueOf(temp1[1])));
+			}else{
+				tempMap.put("wdfz", "/");
+			}
 			tempMap.put("jhys", jhys);
 			tempMap.put("sjys", sjys);
 			tempMap.put("yssjMin", yssjMin);
@@ -20,7 +20,7 @@
 //import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 //import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 //import com.bsth.util.BatchSaveUtils;
-//import com.bsth.websocket.handler.RealControlSocketHandler;
+//import com.bsth.websocket.handlers.RealControlSocketHandler;
 //
 ///**
 // * 
@@ -1212,7 +1212,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("ljbc", ljbc);
 		map.put("sjbc", jhbc-cjbc+ljbc);
 		map.put("jcclc", jcclc);
-		map.put("zkslc", ksgl+jcclc);
+		map.put("zkslc", format.format(ksgl+jcclc));
 		return map;
 	}
@@ -1226,7 +1226,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			if(obj != null){
 				map = new HashMap<String,Object>();
 				map.put("xlName", xlName);
-				map.put("clZbh", code);
+				map.put("clZbh", obj[3]);
 				map.put("company", obj[0]);
 				map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1]+"")).toUpperCase());
 				map.put("requestTime", obj[2]);
@@ -24,6 +24,8 @@ public interface ReportService {
 	Map<String, Object> tbodyTime2(String line ,String ttinfo);
 	List<Map<String, Object>> tbodyTime3(String line ,String ttinfo);
+	
+	List<Map<String, Object>> tbodyTime4(String line ,String ttinfo);
 	List<Map<String, Object>> tbodyTime5(String line ,String ttinfo);
 	 List<Map<String, Object>> getTtinfo(Map<String, Object> map);
@@ -451,21 +451,36 @@ public class ReportServiceImpl implements ReportService{
 		System.out.println(609360%60);
 	}
 	@Override
-	public List<Map<String, Object>> tbodyTime3(String line, String date) {
+	public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
 		// TODO Auto-generated method stub
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
-		String sqlZd=" select qdz_name, count(cl_zbh) as cls ,  'zqc' as lx  from bsth_c_s_sp_info  where  "
-				+ " DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' and xl_bm='"+line+"'   and bc_type='normal' "
-				+ " and fcsj>'06:31' and fcsj<'08:00' group by qdz_name union "
-				+ " select qdz_name, count(cl_zbh) as cls ,  'wqc' as lx   from bsth_c_s_sp_info  "
-				+ " where  DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' and xl_bm='"+line+"'   "
-				+ " and bc_type='normal'  and fcsj>'16:01' and fcsj<'18:00' group by qdz_name union "
-				+ " select qdz_name, count(cl_zbh) as cls ,  'zqj' as lx  from bsth_c_s_sp_info  "
-				+ " where  DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' and xl_bm='"+line+"'   "
-				+ " and bc_type='region'  and fcsj>'06:31' and fcsj<'08:00' group by qdz_name union "
-				+ " select qdz_name, count(cl_zbh) as cls ,  'wqj' as lx from bsth_c_s_sp_info  "
-				+ " where  DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' and xl_bm='"+line+"'   "
-				+ " and bc_type='region'  and fcsj>'16:01' and fcsj<'18:00'group by qdz_name";
+		
+
+
+		String sqlZd=" select t.*,x.station_name as qdz_name from ("
+				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'zqc' as lx  "
+				+ " from bsth_c_s_ttinfo_detail  where "
+				+ " bc_type='normal' and ttinfo ='"+ttinfo+"'  "
+				+ " and fcsj>'06:31' and fcsj<'08:00'  group by  qdz,lp) t1"
+				+ " group by qdz "
+				+ " union "
+				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'wqc' as lx  "
+				+ " from bsth_c_s_ttinfo_detail  where "
+				+ " bc_type='normal' and ttinfo ='"+ttinfo+"'   "
+				+ " and fcsj>'16:01' and fcsj<'18:00' group by qdz,lp) t2"
+				+ " group by qdz "
+				+ " union "
+				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'zqj' as lx  "
+				+ " from bsth_c_s_ttinfo_detail  where "
+				+ " bc_type='region' and ttinfo ='"+ttinfo+"'  "
+				+ " and fcsj>'06:31' and fcsj<'08:00'  group by  qdz,lp) t3"
+				+ " group by qdz "
+				+ " union "
+				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'wqj' as lx  "
+				+ " from bsth_c_s_ttinfo_detail  where "
+				+ " bc_type='region' and ttinfo ='"+ttinfo+"'   "
+				+ " and fcsj>'16:01' and fcsj<'18:00' group by qdz,lp) t4"
+				+ " group by qdz ) t left join bsth_c_station  x on t.qdz=x.id";
 		List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
 				 new RowMapper<Map<String, Object>>(){
@@ -526,55 +541,238 @@ public class ReportServiceImpl implements ReportService{
 		}
 		return list;
 	}
+	
 	@Override
-	public List<Map<String, Object>> tbodyTime5(String line, String date) {
+	public List<Map<String, Object>> tbodyTime4(String line, String ttinfo) {
+		List<Map<String, Object>> list =new ArrayList<>();
 		// TODO Auto-generated method stub
-		String sql="select min(fcsj) as fcsj,'lx0' as lx from bsth_c_s_sp_info  where "
-				+ " DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' and xl_bm='"+line+"'"
-				+ " and bc_type='out' and xl_dir=0 union "
-				+ " select min(fcsj) as fcsj,'lx1' as lx from bsth_c_s_sp_info  where     "
-				+ " DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' and xl_bm='"+line+"'"
-				+ " and bc_type='out' and xl_dir=1";
-		List<Map<String, Object>> lists= jdbcTemplate.query(sql,
-				 new RowMapper<Map<String, Object>>(){
+		//最早营运时间 区分夜宵线
+		String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
+		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		
+		//查询全程
+		String sqlqc="select t.*,x.station_name as qdz_name from ( "
+				     + "(SELECT fcsj,qdz,2 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
+					 + " where ttinfo ='"+ttinfo+"' and bc_type='normal'  and fcsj <='"+minfcsj+"' ) "
+					 + " union "
+					 + " (SELECT fcsj,qdz,1 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
+					 + " where ttinfo ='"+ttinfo+"' and bc_type='normal'  and fcsj > '"+minfcsj+"') "
+					 		+ "order by  xl_dir,xh,fcsj ) t left join bsth_c_station  x on t.qdz=x.id";
+		List<Map<String, String>> qclist= jdbcTemplate.query(sqlqc,
+				 new RowMapper<Map<String, String>>(){
 			 @Override
-			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Map<String, Object> m=new HashMap<String,Object>();
-				 m.put("lx", rs.getString("lx"));
+			 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Map<String, String> m=new HashMap<String,String>();
+				 m.put("qdz_name", rs.getString("qdz_name"));
 				 m.put("fcsj", rs.getString("fcsj"));
+				 m.put("xl", rs.getString("xl_dir"));
 				 return m;
 			 }
+			 
 		});
+				
+		Map<String, Object> qcMap=new HashMap<String,Object>();
+		int num=0;
+		String sxfcsj="";
+		String xxfcsj="";
+		String sxzd="";
+		String xxzd="";
+		for (int i = 0; i < qclist.size(); i++) {
+			Map<String, String> map=qclist.get(i);
+			if(map.get("xl").equals("0")){
+				if(sxzd.equals("")){
+					sxzd=map.get("qdz_name").toString();
+					qcMap.put("sxzm", sxzd);
+					sxfcsj +=map.get("fcsj").toString()+"-";
+				}
+				if(!(qclist.get(i+1).get("xl").equals("0"))){
+					sxfcsj +=map.get("fcsj").toString();
+					qcMap.put("sxsj",sxfcsj);
+					qcMap.put("sxbc", i+1);
+					num=i+1;
+				}
+			}
+			if(map.get("xl").equals("1")){
+				if(xxzd.equals("")){
+					xxzd=map.get("qdz_name").toString();
+					xxfcsj+=map.get("fcsj").toString()+"-";
+					qcMap.put("xxzm", xxzd);
+				}
+			}
+		}
+		xxfcsj +=qclist.get(qclist.size()-1).get("fcsj").toString();
+		qcMap.put("xxsj", xxfcsj);
+		qcMap.put("xxbc", qclist.size()-num);
+		list.add(qcMap);
-		String sqlList="select * from bsth_c_s_sp_info where  "
-				+ "DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' and xl_bm='"+line+"'"
-						+ " and bc_type='normal' order by fcsj";
-		List<SchedulePlanInfo> list= jdbcTemplate.query(sqlList,
-				 new RowMapper<SchedulePlanInfo>(){
+		
+		//查询区间
+		String sqlqj="select t.*,x.station_name as qdz_name from ( "
+				+ "(SELECT fcsj,qdz,'1' as gf,xl_dir FROM bsth_c_s_ttinfo_detail  "
+				+ "where ttinfo ='"+ttinfo+"' and bc_type='region' and fcsj >='06:31'"
+				+ "and fcsj <'08:30')"
+				+ " union ( SELECT fcsj,qdz,'2' as gf,xl_dir FROM bsth_c_s_ttinfo_detail  "
+				+ "where ttinfo ='"+ttinfo+"' and bc_type='region' "
+				+ "and fcsj > '16:01' and fcsj < '18:00') order by  xl_dir,gf,fcsj ) t "
+				+ "left join bsth_c_station  x on t.qdz=x.id";
+		
+		List<Map<String, String>> qjlist= jdbcTemplate.query(sqlqj,
+				 new RowMapper<Map<String, String>>(){
 			 @Override
-			 public SchedulePlanInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 SchedulePlanInfo m=new SchedulePlanInfo();
-				 m.setBcsj(rs.getInt("bcsj"));
-				 m.setXlDir(rs.getString("xl_dir"));
-				 m.setFcsj(rs.getString("fcsj"));
+			 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Map<String, String> m=new HashMap<String,String>();
+				 m.put("qdz_name", rs.getString("qdz_name"));
+				 m.put("fcsj", rs.getString("fcsj"));
+				 m.put("xl", rs.getString("xl_dir"));
+				 m.put("gf", rs.getString("gf"));
 				 return m;
 			 }
 		});
-		//上下行最早发车时间  （用于与夜班线 跨零点的班次进行比较）
-		String lx0=""; 
-		String lx1="";
-		for (int x = 0; x < lists.size(); x++) {
-			if(lists.get(x).get("lx").equals("lx0")){
-				lx0=lists.get(x).get("fcsj")==null?"0:0":lists.get(x).get("fcsj").toString();
+		
+		Map<String, Object> qjzMap=new HashMap<String,Object>();
+		Map<String, Object> qjwMap=new HashMap<String,Object>();
+		int numqj=0;
+		String sxfcsjqj="";
+		String xxfcsjqj="";
+		String sxzdqj="";
+		String xxzdqj="";
+		for(int i=0;i<qjlist.size();i++){
+			Map<String, String> map=qjlist.get(i);
+			if(map.get("xl").toString().equals("0")){
+				if(map.get("gf").toString().equals("1")){
+					if(sxzdqj.equals("")){
+						sxzdqj =map.get("qdz_name").toString();
+						qjzMap.put("sxzm", sxzdqj);
+						sxfcsjqj +=map.get("fcsj").toString()+"-";
+					}
+					if(i<qjlist.size()-1){
+						if(!(qjlist.get(i+1).get("gf").equals("1"))){
+							sxfcsjqj +=map.get("fcsj").toString();
+							qjzMap.put("sxsj",sxfcsjqj);
+							qjzMap.put("sxbc", i+1);
+							numqj=i+1;
+							sxzdqj ="";
+							sxfcsjqj="";
+						}
+					}else{
+						qjzMap.put("sxsj",sxfcsjqj+"-"+map.get("fcsj").toString());
+						qjzMap.put("sxbc", i+1);
+						numqj=i+1;
+						sxzdqj ="";
+						sxfcsjqj="";
+					}
+				}
+				if(map.get("gf").toString().equals("2")){
+					if(sxzdqj.equals("")){
+						sxzdqj =map.get("qdz_name").toString();
+						qjwMap.put("sxzm", sxzdqj);
+						sxfcsjqj +=map.get("fcsj").toString()+"-";
+					}
+					if(i<qjlist.size()-1){
+						if(!(qjlist.get(i+1).get("xl").equals("0"))){
+							sxfcsjqj +=map.get("fcsj").toString();
+							qjwMap.put("sxsj",sxfcsjqj);
+							qjwMap.put("sxbc", i+1-numqj);
+							numqj=i+1;
+						}
+					}else{
+						qjwMap.put("sxsj",sxfcsjqj+"-"+map.get("fcsj").toString());
+						qjwMap.put("sxbc", i+1-numqj);
+						numqj=i+1;
+					}
+				}
+				
 			}else{
-				lx1=lists.get(x).get("fcsj")==null?"0:0":lists.get(x).get("fcsj").toString();
+				if(map.get("gf").toString().equals("1")){
+					if(xxzdqj.equals("")){
+						xxzdqj =map.get("qdz_name").toString();
+						qjzMap.put("xxzm", xxzdqj);
+						xxfcsjqj +=map.get("fcsj").toString()+"-";
+					}
+					if(i<qjlist.size()-1){
+						if(!(qjlist.get(i+1).get("gf").equals("1"))){
+							xxfcsjqj +=map.get("fcsj").toString();
+							qjzMap.put("xxsj",xxfcsjqj);
+							qjzMap.put("xxbc", i+1-numqj);
+							numqj=i+1;
+							xxzdqj ="";
+							xxfcsjqj="";
+						}
+					}else{
+						qjzMap.put("xxsj",xxfcsjqj+"-"+map.get("fcsj").toString());
+						qjzMap.put("xxbc", i+1-numqj);
+						numqj=i+1;
+						xxzdqj ="";
+						xxfcsjqj="";
+					}
+				}
+				if(map.get("gf").toString().equals("2")){
+					if(xxzdqj.equals("")){
+						xxzdqj =map.get("qdz_name").toString();
+						qjwMap.put("xxzm", xxzdqj);
+						xxfcsjqj +=map.get("fcsj").toString()+"-";
+					}
+					if(i<qjlist.size()){
+						if(i==qjlist.size()-1){
+							xxfcsjqj +=map.get("fcsj").toString();
+							qjwMap.put("xxsj",xxfcsjqj);
+							qjwMap.put("xxbc", i+1-numqj);
+							numqj=i+1;
+						}
+					}else{
+						qjwMap.put("xxsj",xxfcsjqj+"-"+xxfcsjqj);
+						qjwMap.put("xxbc", i+1-numqj);
+						numqj=i+1;
+					}
+				}
+				
+			
 			}
 		}
-		String[] lx0sj = lx0.split(":");
-		int sxFc=Integer.parseInt(lx0sj[0])*60+Integer.parseInt(lx0sj[1]);
-		String[] lx1sj = lx1.split(":");
-		int xxFc=Integer.parseInt(lx1sj[0])*60+Integer.parseInt(lx1sj[1]);
+		if(!qjzMap.isEmpty()){
+			list.add(qjzMap);
+		}
+		if(!qjwMap.isEmpty()){
+			list.add(qjwMap);
+
+		}
+		return list;
+	}
+	@Override
+	public List<Map<String, Object>> tbodyTime5(String line, String ttinfo) {
+		// TODO Auto-generated method stub
+		//最早营运时间 区分夜宵线
+				String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
+				String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+				String[] minSjs = minfcsj.split(":");
+				int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
+				//查询时间里程
+				String sqlPc=" (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,2 as xh FROM "
+						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"' and "
+						+ " fcsj <='"+minfcsj+"' and  bc_type = 'normal') "
+						+ " union "
+						+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,1 as xh FROM "
+						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
+						+ " fcsj >'"+minfcsj+"' and  bc_type ='normal') "
+						+ " order by xl_dir,  xh,fcsj";
+						
+				Map<String, Object> map=new HashMap<String,Object>();
+				List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
+						 new RowMapper<Map<String, Object>>(){
+					 @Override
+					 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+						 Map<String, Object> m=new HashMap<String,Object>();
+						 m.put("fcsj", rs.getString("fcsj"));
+						 m.put("yygl", rs.getString("jhlc")==null?"0":rs.getString("jhlc"));
+						 m.put("bcsj", rs.getString("bcsj"));
+						 m.put("bcType", rs.getString("bc_type"));
+						 m.put("lp", rs.getString("lp"));
+						 m.put("dir", rs.getString("xl_dir"));
+						 return m;
+					 }
+				});		
+	
 		//班次
 		int sj_0 = 6*60+31,sj_1 = 8*60+30,sj_2 = 16*60+1,sj_3 = 18*60;
@@ -587,17 +785,17 @@ public class ReportServiceImpl implements ReportService{
 		//车距 (发车时间的间距) i--MIN  a--MAX
 		int iC=999,aC=-1,iZg=999,aZg=-1,iZw=999,aZw=-1,iWg=999,aWg=-1,iJcZ=999,aJcZ=-1,iJcW=999,aJcW=-1; 
 		int iC1=999,aC1=-1,iZg1=999,aZg1=-1,iZw1=999,aZw1=-1,iWg1=999,aWg1=-1,iJc1Z=999,aJc1Z=-1,iJc1W=999,aJc1W=-1;
-//		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+		
 		for(int i=0;i<list.size();i++){
-			SchedulePlanInfo t=list.get(i);
-			String xlDir=t.getXlDir();
-			int bcsj=t.getBcsj();
-			String fcsj=t.getFcsj();
+			Map<String, Object> ttMap=list.get(i);
+			String xlDir=ttMap.get("dir").toString();
+			int bcsj=Integer.parseInt(ttMap.get("bcsj").toString());
+			String fcsj=ttMap.get("fcsj").toString();
 			String[] fcsjs=fcsj.split(":");
 			int fcsjNum=Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1]);
 			if(xlDir.equals("0")){
-				if(fcsjNum>=sxFc && fcsjNum<sj_0){
+				if(fcsjNum>=minSj && fcsjNum<sj_0){
 					ccsj0 +=bcsj;
 					if(aC<0){
 						cfc0 =fcsjNum;
@@ -672,7 +870,7 @@ public class ReportServiceImpl implements ReportService{
 						}
 						jcfc0W=fcsjNum;
 					}
-				}else if(fcsjNum<sxFc){
+				}else if(fcsjNum<minSj){
 					jcsj0 +=bcsj;
 					if(aJcZ<0){
 						jcfc0Z=fcsjNum;
@@ -690,7 +888,7 @@ public class ReportServiceImpl implements ReportService{
 			}else{
-				if(fcsjNum>=xxFc && fcsjNum<sj_0){
+				if(fcsjNum>=minSj && fcsjNum<sj_0){
 					ccsj1 +=bcsj;
 					if(aC1<0){
 						cfc1=fcsjNum;
@@ -762,7 +960,7 @@ public class ReportServiceImpl implements ReportService{
 						jcfc1W=fcsjNum;
 					}
-				}else if(fcsjNum<xxFc){
+				}else if(fcsjNum<minSj){
 					jcsj1 +=bcsj;
 					if(aJc1Z<0){
 						jcfc1Z=fcsjNum;
@@ -860,4 +1058,5 @@ public class ReportServiceImpl implements ReportService{
 		}
 		return list;
 	}
+	
 }