Merge branch 'minhang' into qingpu

潘钊
2 parents 0e0673d2 112c42c9
Showing 60 changed files with 2487 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/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/arrival/entity/StationRoute.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/OfflineSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/ReverseSignalHandle.java
@@ -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);
@@ -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());
@@ -86,7 +86,7 @@ public class GpsEntity {
 	private StationRoute station;
  
 	/** 状态 */
-	private String signalState;
+	private String signalState = "normal";
  
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -2,7 +2,6 @@ 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.arrival.GpsRealAnalyse;
@@ -26,7 +25,6 @@ import org.springframework.stereotype.Component;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
  
 /**
  * @author PanZhao
@@ -67,12 +65,23 @@ public class GpsRealData implements CommandLineRunner {
  
     @Override
     public void run(String... arg0) throws Exception {
-        logger.info("gpsDataLoader,40,6");
-        Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 40, 6, TimeUnit.SECONDS);
+        logger.info("gpsDataLoader,20,5");
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
     }
  
     public void put(GpsEntity gps) {
-        gpsMap.put(gps.getDeviceId(), 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());
     }
  
     /**
@@ -197,6 +206,8 @@ public class GpsRealData implements CommandLineRunner {
                             gps.setNbbm(nbbm);
                         //有更新的点位
                         updateList.add(gps);
+                        //实时GPS数据集
+                        gpsRealData.put(gps);
                     }
                     //分析数据
                     gpsRealAnalyse.analyse(updateList);
+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;
+    }
+}
@@ -29,8 +29,8 @@ public class GeoCacheData {
  
     static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
  
-    //每辆车缓存最后500条gps
-    private static final int CACHE_SIZE = 500;
+    //每辆车缓存最后1000条gps
+    private static final int CACHE_SIZE = 1000;
     private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
  
     //线路路段走向
@@ -75,7 +75,7 @@ public class GeoCacheData {
         }
     }
  
-    public static StationRoute getRouteCode(GpsEntity gps){
+    public static StationRoute getRouteCode(GpsEntity gps) {
         return routeCodeMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo());
     }
  
@@ -94,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);
     }
@@ -191,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.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.
@@ -14,64 +19,71 @@ public abstract class SignalHandle {
         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;
-    }
+     * @return protected boolean isAbnormal(GpsEntity gps) {
+    return gps.getLat() == 0 || gps.getLon() == 0;
+    }*/
  
     /**
      * 连续异常信号个数统计
      *
      * @param prevs
-     * @return
+     * @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 int abnormalCount(CircleQueue<GpsEntity> prevs) {
-        int count = 0;
  
-        if (!isNotEmpty(prevs))
-            return count;
-
-        GpsEntity[] array = (GpsEntity[]) prevs.getQueue();
-        GpsEntity gps;
-        for (int i = array.length - 1; i > 0; i--) {
-            gps = array[i];
-
-            if (isAbnormal(gps))
-                count++;
-            else
-                break;
+    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());
         }
-
-        return count;
     }
  
     /**
-     * 车辆运行轨迹（最近20分钟）
-     * 0：上行 1：下行 -1：未知
+     * 是否是从异常状态恢复的第一个信号
      *
      * @param gps
+     * @param prevs
      * @return
      */
-    protected int runTrack(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        int rs = -1, count = 0;
-
-        long et = gps.getTimestamp() - (1000 * 60 * 20);
-        Object[] array = prevs.getQueue();
-        GpsEntity prev;
-        for(Object obj : array){
-            prev = (GpsEntity) obj;
-            if(prev.getTimestamp() < et)
-                break;
-
+    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;
         }
-        //for()
-        return 0;
-    }
  
-}
+        return false;
+    }
+}
 \ No newline at end of file
@@ -5,6 +5,7 @@ package com.bsth.data.gpsdata.arrival.entity;
  */
 public class RouteReverse {
  
+    private String nbbm;
     //反转个数
     private int count;
  
@@ -14,18 +15,18 @@ public class RouteReverse {
     //掉头站点
     private String turned;
  
-    //开始时间
-    private long st;
-
     //掉头时间
     private long zt;
  
-    //结束时间
-    private long et;
+    //检测时间
+    private long ct;
  
     //是否闭合
     private boolean close;
  
+    //信号不明确
+    private boolean vague;
+
     public int getCount() {
         return count;
     }
@@ -50,22 +51,6 @@ public class RouteReverse {
         this.turned = turned;
     }
  
-    public long getSt() {
-        return st;
-    }
-
-    public void setSt(long st) {
-        this.st = st;
-    }
-
-    public long getEt() {
-        return et;
-    }
-
-    public void setEt(long et) {
-        this.et = et;
-    }
-
     public boolean isClose() {
         return close;
     }
@@ -81,4 +66,28 @@ public class RouteReverse {
     public void setZt(long zt) {
         this.zt = zt;
     }
-}
+
+    public long getCt() {
+        return ct;
+    }
+
+    public void setCt(long ct) {
+        this.ct = ct;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public boolean isVague() {
+        return vague;
+    }
+
+    public void setVague(boolean vague) {
+        this.vague = vague;
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.arrival.entity;
+
+/**
+ * 班次信号异常（漂移 或 断线）
+ * Created by panzhao on 2016/12/31.
+ */
+public class SignalAbnormal {
+
+    private Long et;
+
+    /** drift or reconnection */
+    private String abnormalType;
+
+    private Long st;
+
+    private String nearPoint;
+
+    private String destCode;
+
+    private Long ct;
+
+    //0: 发车  1：到站
+    private int outOrIn;
+
+    public Long getEt() {
+        return et;
+    }
+
+    public void setEt(Long et) {
+        this.et = et;
+    }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
+
+    public Long getSt() {
+        return st;
+    }
+
+    public void setSt(Long st) {
+        this.st = st;
+    }
+
+    public String getNearPoint() {
+        return nearPoint;
+    }
+
+    public void setNearPoint(String nearPoint) {
+        this.nearPoint = nearPoint;
+    }
+
+    public Long getCt() {
+        return ct;
+    }
+
+    public void setCt(Long ct) {
+        this.ct = ct;
+    }
+
+    public int getOutOrIn() {
+        return outOrIn;
+    }
+
+    public void setOutOrIn(int outOrIn) {
+        this.outOrIn = outOrIn;
+    }
+
+    public String getDestCode() {
+        return destCode;
+    }
+
+    public void setDestCode(String destCode) {
+        this.destCode = destCode;
+    }
+}
+package com.bsth.data.gpsdata.arrival.entity;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+/**
+ * 信号状态
+ * Created by panzhao on 2016/12/30.
+ */
+public class SignalState {
+
+    private String type;
+
+    private Long st;
+
+    //private Long checkTime;
+
+    private Long schId;
+
+    private String lineCode;
+
+    private String text;
+
+    private RouteReverse reverse;
+
+    private SignalAbnormal signalAbnormal;
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    /**
+     * 记录区间调头
+     *
+     * @param sch
+     * @param reverse
+     * @return
+     */
+    public static SignalState reverseSignalSTate(ScheduleRealInfo sch, RouteReverse reverse) {
+        if(reverse.isVague())
+            return null;
+
+        SignalState state = new SignalState();
+        state.setSchId(sch.getId());
+        state.setType("route_reverse");
+        //state.setCheckTime(System.currentTimeMillis());
+
+        String stationName = BasicData.stationCode2NameMap.get(sch.getXlBm() + "_" + sch.getXlDir() + "_" + reverse.getTurned());
+        state.setText(fmtHHmm.print(reverse.getZt()) + " 从 " + stationName + " 站掉头");
+        state.setSt(sch.getFcsjActualTime());
+        state.setLineCode(sch.getXlBm());
+        state.setReverse(reverse);
+        return state;
+    }
+
+    public static SignalState abnormalSignalSTate(ScheduleRealInfo sch, SignalAbnormal signalAbnormal) {
+        SignalState state = new SignalState();
+        state.setSchId(sch.getId());
+        state.setType("abnormal_signal");
+        //state.setCheckTime(signalAbnormal.getCt());
+        state.setLineCode(sch.getXlBm());
+
+        String text = (fmtHHmm.print(signalAbnormal.getSt()) + " ~ " + fmtHHmm.print(signalAbnormal.getEt()));
+        String abnormType = signalAbnormal.getAbnormalType();
+        if (abnormType.equals("drift"))
+            text += "（GPS无效）";
+        else if (abnormType.equals("reconnection"))
+            text += "（信号丢失）";
+
+        state.setText(text);
+        state.setSignalAbnormal(signalAbnormal);
+        return state;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public long getSchId() {
+        return schId;
+    }
+
+    public void setSchId(long schId) {
+        this.schId = schId;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getSt() {
+        return st;
+    }
+
+    public void setSt(Long st) {
+        this.st = st;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public RouteReverse getReverse() {
+        return reverse;
+    }
+
+    public void setReverse(RouteReverse reverse) {
+        this.reverse = reverse;
+    }
+
+    public SignalAbnormal getSignalAbnormal() {
+        return signalAbnormal;
+    }
+
+    public void setSignalAbnormal(SignalAbnormal signalAbnormal) {
+        this.signalAbnormal = signalAbnormal;
+    }
+}
-package com.bsth.data.gpsdata.arrival.entity;
-
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-
-/**
- * Created by panzhao on 2016/12/23.
- */
-public class StationRoute {
-
-    /**
-     * 线路编码
-     */
-    private String lineCode;
-
-    /**
-     * 上下行
-     */
-    private int directions;
-
-    /**
-     * 站点编码
-     */
-    private String code;
-
-    /**
-     * 路由顺序
-     */
-    private int routeSort;
-
-    /**
-     * 站点位置
-     */
-    private Point point;
-
-    /**
-     * 圆形半径
-     */
-    private Float radius;
-
-    /**
-     * 多边形电子围栏
-     */
-    private Polygon polygon;
-
-    /**
-     * 站点标记
-     */
-    private String mark;
-
-    /**
-     * 下一站
-     */
-    private StationRoute next;
-
-    /**
-     * 上一站
-     */
-    private StationRoute prve;
-
-    private String name;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public int getRouteSort() {
-        return routeSort;
-    }
-
-    public void setRouteSort(int routeSort) {
-        this.routeSort = routeSort;
-    }
-
-    public Point getPoint() {
-        return point;
-    }
-
-    public void setPoint(Point point) {
-        this.point = point;
-    }
-
-    public Float getRadius() {
-        return radius;
-    }
-
-    public void setRadius(Float radius) {
-        this.radius = radius;
-    }
-
-    public Polygon getPolygon() {
-        return polygon;
-    }
-
-    public void setPolygon(Polygon polygon) {
-        this.polygon = polygon;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public int getDirections() {
-        return directions;
-    }
-
-    public void setDirections(int directions) {
-        this.directions = directions;
-    }
-
-    public StationRoute getNext() {
-        return next;
-    }
-
-    public void setNext(StationRoute next) {
-        this.next = next;
-    }
-
-    public StationRoute getPrve() {
-        return prve;
-    }
-
-    public void setPrve(StationRoute prve) {
-        this.prve = prve;
-    }
-
-    public String getMark() {
-        return mark;
-    }
-
-    public void setMark(String mark) {
-        this.mark = mark;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
-
+package com.bsth.data.gpsdata.arrival.entity;
+
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+public class StationRoute {
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 上下行
+     */
+    private int directions;
+
+    /**
+     * 站点编码
+     */
+    private String code;
+
+    /**
+     * 路由顺序
+     */
+    private int routeSort;
+
+    /**
+     * 站点位置
+     */
+    private Point point;
+
+    /**
+     * 圆形半径
+     */
+    private Float radius;
+
+    /**
+     * 多边形电子围栏
+     */
+    private Polygon polygon;
+
+    /**
+     * 站点标记
+     */
+    private String mark;
+
+    /**
+     * 下一站
+     */
+    private StationRoute next;
+
+    /**
+     * 上一站
+     */
+    private StationRoute prve;
+
+    private String name;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public int getRouteSort() {
+        return routeSort;
+    }
+
+    public void setRouteSort(int routeSort) {
+        this.routeSort = routeSort;
+    }
+
+    public Point getPoint() {
+        return point;
+    }
+
+    public void setPoint(Point point) {
+        this.point = point;
+    }
+
+    public Float getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Float radius) {
+        this.radius = radius;
+    }
+
+    public Polygon getPolygon() {
+        return polygon;
+    }
+
+    public void setPolygon(Polygon polygon) {
+        this.polygon = polygon;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getDirections() {
+        return directions;
+    }
+
+    public void setDirections(int directions) {
+        this.directions = directions;
+    }
+
+    public StationRoute getNext() {
+        return next;
+    }
+
+    public void setNext(StationRoute next) {
+        this.next = next;
+    }
+
+    public StationRoute getPrve() {
+        return prve;
+    }
+
+    public void setPrve(StationRoute prve) {
+        this.prve = prve;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public void setMark(String mark) {
+        this.mark = mark;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
+
-package com.bsth.data.gpsdata.arrival.handlers;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.SignalHandle;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ChildTaskPlan;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 信号状态纠正
- * Created by panzhao on 2016/12/27.
- */
-@Component
-public class CorrectSignalHandle extends SignalHandle {
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        Object task = dayOfSchedule.executeCurr(gps.getNbbm());
-        if(task == null)
-            return false;
-        ScheduleRealInfo sch;
-
-        //子任务
-        if(task.getClass().isAssignableFrom(ChildTaskPlan.class)){
-            ChildTaskPlan childTask = (ChildTaskPlan) task;
-            sch = childTask.getSchedule();
-        }
-        else
-            sch = (ScheduleRealInfo) task;
-
-        int updown = Integer.parseInt(sch.getXlDir());
-        //走向
-        if(gps.getUpDown() != updown){
-            gps.setUpDown(updown);
-            gps.setState(0);
-        }
-
-
-        return true;
-    }
-}
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.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;
+    }
+}
@@ -2,23 +2,21 @@ package com.bsth.data.gpsdata.arrival.handlers;
  
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.SignalHandle;
-import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.bsth.data.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;
  
-import java.util.List;
-
 /**
  * 进出站动作处理
  * Created by panzhao on 2016/12/27.
@@ -40,8 +38,25 @@ public class InOutStationSignalHandle extends SignalHandle{
     @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();
@@ -91,13 +106,23 @@ public class InOutStationSignalHandle extends SignalHandle{
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         String qdzCode = sch.getQdzCode();
  
-
-        //if(sch.getFcsjActual() != )
+        //首班出场最多提前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);
@@ -108,16 +133,27 @@ public class InOutStationSignalHandle extends SignalHandle{
             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.getFcsjActual());
-                schPrev.setZdsjActualAll(sch.getFcsjActual());
+                schPrev.setFcsjActualAll(sch.getFcsjActualTime());
+                schPrev.setZdsjActualAll(sch.getFcsjActualTime());
+
+                sendUtils.refreshSch(schPrev);
             }
         }
     }
@@ -129,9 +165,12 @@ public class InOutStationSignalHandle extends SignalHandle{
      */
     private void inStation(GpsEntity gps, GpsEntity prev){
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-        String zdzCode = sch.getZdzCode();
  
-        if(zdzCode != null && gps.getStopNo().equals(zdzCode)){
+        if(gps.getStopNo().equals(sch.getZdzCode())){
+
+            //实达时间不覆盖
+            if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+                return;
  
             sch.setZdsjActualAll(gps.getTimestamp());
             //已完成班次数
@@ -142,33 +181,22 @@ public class InOutStationSignalHandle extends SignalHandle{
             //持久化
             dayOfSchedule.save(sch);
             //下发调度指令
-            //directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            directiveService.send60Dispatch(next, doneSum, "到站@系统");
  
             //准备执行下一个班次
             if (next != null) {
                 next.setQdzArrDatesj(sch.getZdsjActual());
                 dayOfSchedule.addExecPlan(next);
-
                 //进站既进场
                 inStationAndInPark(sch, next);
-
                 //将gps转换为下一个班次走向的站内信号
-                int updown = Integer.parseInt(next.getXlDir());
-                List<StationRoute> srs = GeoCacheData.getStationRoute(next.getXlBm(), updown);
-                StationRoute station = GeoUtils.gpsInStation(gps, srs);
-                if (station != null) {
-                    gps.setUpDown(updown);
-                    gps.setStopNo(station.getCode());
-                }
+                transformUpdown(gps, sch);
             }
         }
-       /* //如果出场班次计划终点时间5分钟后还未完成，检查一下车辆轨迹，是否已经在执行线路上班次
-        else if(sch.getBcType().equals("out")
-                && sch.getZdsj() != null
-                && gps.getTimestamp() - sch.getZdsjT() >= 1000 * 60 * 5){
-            logger.info("出场班次计划终点时间5分钟后还未完成");
-
-        }*/
+        else if(sch.getFcsjActual() == null){
+            //有进站，但班次没有实发，向前追溯一下信号
+            scheduleSignalState.signalRetrospect(gps, sch);
+        }
     }
  
     /**
@@ -179,8 +207,10 @@ public class InOutStationSignalHandle extends SignalHandle{
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (next.getBcType().equals("in") &&
                 config != null && config.getOutConfig() == 2) {
-            next.setFcsjActualAll(sch.getZdsjActual());
-            next.setZdsjActualAll(sch.getZdsjActual());
+            next.setFcsjActualAll(sch.getZdsjActualTime());
+            next.setZdsjActualAll(sch.getZdsjActualTime());
+
+            sendUtils.refreshSch(next);
         }
     }
  
@@ -193,7 +223,7 @@ public class InOutStationSignalHandle extends SignalHandle{
      */
     private boolean willDepart(GpsEntity gps, GpsEntity prev, Object task){
  
-/*        ScheduleRealInfo sch = (ScheduleRealInfo) task;
+        /*ScheduleRealInfo sch = (ScheduleRealInfo) task;
         ScheduleRealInfo prevTask = dayOfSchedule.prev(sch);
         if(prevTask == null || prevTask.getBcType().equals("out"))
             return false;
@@ -13,16 +13,17 @@ import org.springframework.stereotype.Component;
 @Component
 public class OfflineSignalHandle extends SignalHandle{
  
-    //断开3分钟，标记为重连信号
-    private final static int OFFLINE_TIME = 1000 * 60 * 3;
+    //断开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(isAbnormal(gps)){
+        //漂移信号不管
+        if(isDriftSignal(gps)){
+            gps.setSignalState("drift");
             return true;
         }
  
@@ -39,4 +40,4 @@ public class OfflineSignalHandle extends SignalHandle{
         }
         return true;
     }
 -}
+}
 \ No newline at end of file
 package com.bsth.data.gpsdata.arrival.handlers;
  
-import com.alibaba.fastjson.JSON;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.entity.RouteReverse;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
 import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +25,9 @@ public class ReverseSignalHandle extends SignalHandle {
     @Autowired
     DayOfSchedule dayOfSchedule;
  
+    @Autowired
+    ScheduleSignalState scheduleSignalState;
+
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
         if (!isNotEmpty(prevs))
@@ -36,17 +38,10 @@ public class ReverseSignalHandle extends SignalHandle {
         if (isReverse(gps, prev)) {
             RouteReverse reverse = reverseSearch(prevs, gps);
  
-            if (reverse.getCount() >= 2) {
-                //切换到下一个班次
-                ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-                if (sch.getBcType().equals("out") && sch.getZdsjT() != null && sch.getZdsjT() > gps.getTimestamp()) {
-                    return false;
-                }
-                dayOfSchedule.addExecPlan(dayOfSchedule.next(sch));
-
-                if (reverse.isClose()) {
-                    logger.info("区间掉头，车辆：" + gps.getNbbm() + " -" + JSON.toJSONString(reverse));
-                }
+            if (reverse.getCount() >= 4
+                    && reverse.isClose()
+                    && !GeoCacheData.isEndStation(gps.getLineId(), gps.getUpDown(), reverse.getTurned())) {
+                scheduleSignalState.reverseAnalyse(reverse);
             }
         }
         return false;
@@ -63,7 +58,8 @@ public class ReverseSignalHandle extends SignalHandle {
         RouteReverse routeReverse = new RouteReverse();
         int count = 0;
         String path = "";
-        String turned = null;
+        long zt = 0L;
+        boolean half = false;
  
         //当前站点
         StationRoute curr = GeoCacheData.getRouteCode(gps), sr;
@@ -72,22 +68,29 @@ public class ReverseSignalHandle extends SignalHandle {
         for (int i = array.length - 1; i > 0; i--) {
             prev = (GpsEntity) array[i];
  
-            if(!prev.getUpDown().equals(gps.getUpDown()))
+            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()) {
-                    path += (curr.getCode() + ",");
-                    //掉头点
-                    if (turned == null)
-                        turned = prev.getStopNo();
+                    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();
@@ -99,9 +102,11 @@ public class ReverseSignalHandle extends SignalHandle {
             }
         }
  
+        routeReverse.setZt(zt);
         routeReverse.setCount(count);
         routeReverse.setDetail(path);
-        routeReverse.setTurned(turned);
+        routeReverse.setCt(gps.getTimestamp());
+        routeReverse.setNbbm(gps.getNbbm());
         return routeReverse;
     }
  
@@ -129,4 +134,4 @@ public class ReverseSignalHandle extends SignalHandle {
         }
         return false;
     }
 -}
+}
 \ No newline at end of file
-package com.bsth.data.gpsdata.arrival.handlers;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.SignalHandle;
-import com.bsth.data.gpsdata.arrival.entity.StationRoute;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 站内站外判定
- * Created by panzhao on 2016/12/27.
- */
-@Component
-public class StationInsideHandle extends SignalHandle {
-
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //是否在场内
-        String parkCode = GeoUtils.gpsInCarpark(gps);
-        if (parkCode != null) {
-            gps.setInstation(2);
-            gps.setStopNo(parkCode);
-        }
-
-        //是否在站内
-        List<StationRoute> srs = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
-        StationRoute station = GeoUtils.gpsInStation(gps, srs);
-        if (station != null) {
-            gps.setInstation(1);
-            gps.setStopNo(station.getCode());
-            gps.setStation(station);
-        }
-
-        //在场，站外
-        if(gps.getInstation() == 0 && isNotEmpty(prevs)){
-            //继承上一个点的站点编码
-            GpsEntity prev = prevs.getTail();
-            gps.setStopNo(prev.getStopNo());
-        }
-
-        return true;
-    }
-}
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 站内站外判定
+ * Created by panzhao on 2016/12/27.
+ */
+@Component
+public class StationInsideHandle extends SignalHandle {
+
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //是否在场内
+        String parkCode = GeoUtils.gpsInCarpark(gps);
+        if (parkCode != null) {
+            gps.setInstation(2);
+            gps.setStopNo(parkCode);
+        }
+
+        //是否在站内
+        List<StationRoute> srs = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+        if (station != null) {
+            gps.setInstation(1);
+            gps.setStopNo(station.getCode());
+            gps.setStation(station);
+        }
+
+        //在场，站外
+        if(gps.getInstation() == 0 && isNotEmpty(prevs)){
+            //继承上一个点的站点编码
+            GpsEntity prev = prevs.getTail();
+            gps.setStopNo(prev.getStopNo());
+        }
+
+        return true;
+    }
+}
-package com.bsth.data.gpsdata.arrival.utils;
-
-import java.util.Arrays;
-
-/**
- * 循环队列
- * Created by panzhao on 2016/12/23.
- */
-public class CircleQueue<T> {
-
-    /**
-     * (循环队列)数组的容量
-     */
-    public int capacity;
-
-    /**
-     * 数组：保存循环队列的元素
-     */
-    public Object[] elementData;
-
-    /**
-     * 头
-     */
-    public int head = 0;
-
-    /**
-     * 尾
-     */
-    public int tail = 0;
-
-    /**
-     * 以指定长度的数组来创建循环队列
-     *
-     * @param initSize
-     */
-    public CircleQueue(final int initSize) {
-        capacity = initSize;
-        elementData = new Object[capacity];
-    }
-
-    /**
-     * 获取循环队列的大小
-     */
-    public int size() {
-        if (isEmpty()) {
-            return 0;
-        } else if (isFull()) {
-            return capacity;
-        } else {
-            return tail + 1;
-        }
-    }
-
-    /**
-     * 插入队尾一个元素
-     */
-    public void add(final T element) {
-        if (isEmpty()) {
-            elementData[0] = element;
-        } else if (isFull()) {
-            elementData[head] = element;
-            head++;
-            tail++;
-            head = head == capacity ? 0 : head;
-            tail = tail == capacity ? 0 : tail;
-        } else {
-            elementData[tail + 1] = element;
-            tail++;
-        }
-    }
-
-    public boolean isEmpty() {
-        return tail == head && tail == 0 && elementData[tail] == null;
-    }
-
-    public boolean isFull() {
-        return head != 0 && head - tail == 1 || head == 0 && tail == capacity - 1;
-    }
-
-    public void clear() {
-        Arrays.fill(elementData, null);
-        head = 0;
-        tail = 0;
-    }
-
-    /**
-     * @return 取 循环队列里的值（先进的index=0）
-     */
-    public Object[] getQueue() {
-        final Object[] elementDataSort;
-        final Object[] elementDataCopy = elementData.clone();
-        if (isEmpty()) {
-            elementDataSort = new Object[0];
-        } else if (isFull()) {
-            elementDataSort = new Object[capacity];
-            int indexMax = capacity;
-            int indexSort = 0;
-            for (int i = head; i < indexMax;) {
-                elementDataSort[indexSort] = elementDataCopy[i];
-                indexSort++;
-                i++;
-                if (i == capacity) {
-                    i = 0;
-                    indexMax = head;
-                }
-            }
-        } else {
-            elementDataSort = new Object[tail];
-            for (int i = 0; i < tail; i++) {
-                elementDataSort[i] = elementDataCopy[i];
-            }
-        }
-        return elementDataSort;
-    }
-
-    /**
-     * 取最后一个值
-     * @return
-     */
-    public T getTail(){
-        return elementData[tail] == null?null:(T)elementData[tail];
-    }
+package com.bsth.data.gpsdata.arrival.utils;
+
+import java.util.Arrays;
+
+/**
+ * 循环队列
+ * Created by panzhao on 2016/12/23.
+ */
+public class CircleQueue<T> {
+
+    /**
+     * (循环队列)数组的容量
+     */
+    public int capacity;
+
+    /**
+     * 数组：保存循环队列的元素
+     */
+    public Object[] elementData;
+
+    /**
+     * 头
+     */
+    public int head = 0;
+
+    /**
+     * 尾
+     */
+    public int tail = 0;
+
+    /**
+     * 以指定长度的数组来创建循环队列
+     *
+     * @param initSize
+     */
+    public CircleQueue(final int initSize) {
+        capacity = initSize;
+        elementData = new Object[capacity];
+    }
+
+    /**
+     * 获取循环队列的大小
+     */
+    public int size() {
+        if (isEmpty()) {
+            return 0;
+        } else if (isFull()) {
+            return capacity;
+        } else {
+            return tail + 1;
+        }
+    }
+
+    /**
+     * 插入队尾一个元素
+     */
+    public void add(final T element) {
+        if (isEmpty()) {
+            elementData[0] = element;
+        } else if (isFull()) {
+            elementData[head] = element;
+            head++;
+            tail++;
+            head = head == capacity ? 0 : head;
+            tail = tail == capacity ? 0 : tail;
+        } else {
+            elementData[tail + 1] = element;
+            tail++;
+        }
+    }
+
+    public boolean isEmpty() {
+        return tail == head && tail == 0 && elementData[tail] == null;
+    }
+
+    public boolean isFull() {
+        return head != 0 && head - tail == 1 || head == 0 && tail == capacity - 1;
+    }
+
+    public void clear() {
+        Arrays.fill(elementData, null);
+        head = 0;
+        tail = 0;
+    }
+
+    /**
+     * @return 取 循环队列里的值（先进的index=0）
+     */
+    public Object[] getQueue() {
+        final Object[] elementDataSort;
+        final Object[] elementDataCopy = elementData.clone();
+        if (isEmpty()) {
+            elementDataSort = new Object[0];
+        } else if (isFull()) {
+            elementDataSort = new Object[capacity];
+            int indexMax = capacity;
+            int indexSort = 0;
+            for (int i = head; i < indexMax;) {
+                elementDataSort[indexSort] = elementDataCopy[i];
+                indexSort++;
+                i++;
+                if (i == capacity) {
+                    i = 0;
+                    indexMax = head;
+                }
+            }
+        } else {
+            elementDataSort = new Object[tail + 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];
+    }
 }
 \ No newline at end of file
-package com.bsth.data.gpsdata.arrival.utils;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.entity.StationRoute;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Created by panzhao on 2016/12/23.
- */
-public class GeoUtils {
-
-    private final static double EARTHRADIUS = 6378137;
-
-    private static GeometryFactory geometryFactory = new GeometryFactory();
-    /**
-     * gps是否在路由上的某个站内
-     *
-     * @param gps
-     * @param srs
-     * @return
-     */
-    public static StationRoute gpsInStation(GpsEntity gps, List<StationRoute> srs) {
-        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-        double min = -1, distance, distance2;
-        StationRoute stationRoute = null;
-
-        for (StationRoute sr : srs) {
-            if (sr.getPolygon() == null) {
-                //圆形
-                distance = getDistance(sr.getPoint(), point);//sr.getPoint().distance(point);
-
-                if (distance > sr.getRadius())
-                    continue;
-
-                if (min > distance || min == -1) {
-                    min = distance;
-                    stationRoute = sr;
-                }
-            } else {
-                //多边形
-                if (sr.getPolygon().contains(point)) {
-                    stationRoute = sr;
-                    break;
-                }
-            }
-        }
-        return stationRoute;
-    }
-
-    public static double getDistance(Point p1, Point p2) {
-        double lng1 = getLoop(p1.getY(), -180, 180), lat1 = getRange(
-                p1.getX(), -74, 74);
-        double lng2 = getLoop(p2.getY(), -180, 180), lat2 = getRange(
-                p2.getX(), -74, 74);
-
-        double x1, x2, y1, y2;
-        x1 = degreeToRad(lng1);
-        y1 = degreeToRad(lat1);
-        x2 = degreeToRad(lng2);
-        y2 = degreeToRad(lat2);
-        return EARTHRADIUS
-                * Math.acos((Math.sin(y1) * Math.sin(y2) + Math.cos(y1)
-                * Math.cos(y2) * Math.cos(x2 - x1)));
-    }
-
-    private static double getLoop(double v, double a, double b) {
-        while (v > b) {
-            v -= b - a;
-        }
-        while (v < a) {
-            v += b - a;
-        }
-        return v;
-    }
-
-    private static double getRange(double v, double a, double b) {
-        v = Math.min(Math.max(v, a), b);
-        return v;
-    }
-
-    private static double degreeToRad(double degree) {
-        return Math.PI * degree / 180;
-    }
-
-
-    /**
-     * gps 是否在某个停车场内
-     * @param gps
-     * @return
-     */
-    public static String gpsInCarpark(GpsEntity gps){
-        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-
-        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
-        Set<String> codes = carparkMap.keySet();
-        Polygon polygon;
-        for(String code : codes){
-            polygon = carparkMap.get(code);
-            if(point.within(polygon)){
-                return code;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 是否是有效的连续点
-     * @param prevGps
-     * @param gps
-     * @return
-     */
-    public static boolean overdue(GpsEntity prevGps, GpsEntity gps) {
-        return gps.getTimestamp() - prevGps.getTimestamp() < 120000;
-    }
-}
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+public class GeoUtils {
+
+    private final static double EARTHRADIUS = 6378137;
+
+    private static GeometryFactory geometryFactory = new GeometryFactory();
+    /**
+     * gps是否在路由上的某个站内
+     *
+     * @param gps
+     * @param srs
+     * @return
+     */
+    public static StationRoute gpsInStation(GpsEntity gps, List<StationRoute> srs) {
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+        double min = -1, distance, distance2;
+        StationRoute stationRoute = null;
+
+        for (StationRoute sr : srs) {
+            if (sr.getPolygon() == null) {
+                //圆形
+                distance = getDistance(sr.getPoint(), point);//sr.getPoint().distance(point);
+
+                if (distance > sr.getRadius())
+                    continue;
+
+                if (min > distance || min == -1) {
+                    min = distance;
+                    stationRoute = sr;
+                }
+            } else {
+                //多边形
+                if (sr.getPolygon().contains(point)) {
+                    stationRoute = sr;
+                    break;
+                }
+            }
+        }
+        return stationRoute;
+    }
+
+    public static double getDistance(Point p1, Point p2) {
+        double lng1 = getLoop(p1.getY(), -180, 180), lat1 = getRange(
+                p1.getX(), -74, 74);
+        double lng2 = getLoop(p2.getY(), -180, 180), lat2 = getRange(
+                p2.getX(), -74, 74);
+
+        double x1, x2, y1, y2;
+        x1 = degreeToRad(lng1);
+        y1 = degreeToRad(lat1);
+        x2 = degreeToRad(lng2);
+        y2 = degreeToRad(lat2);
+        return EARTHRADIUS
+                * Math.acos((Math.sin(y1) * Math.sin(y2) + Math.cos(y1)
+                * Math.cos(y2) * Math.cos(x2 - x1)));
+    }
+
+    private static double getLoop(double v, double a, double b) {
+        while (v > b) {
+            v -= b - a;
+        }
+        while (v < a) {
+            v += b - a;
+        }
+        return v;
+    }
+
+    private static double getRange(double v, double a, double b) {
+        v = Math.min(Math.max(v, a), b);
+        return v;
+    }
+
+    private static double degreeToRad(double degree) {
+        return Math.PI * degree / 180;
+    }
+
+
+    /**
+     * gps 是否在某个停车场内
+     * @param gps
+     * @return
+     */
+    public static String gpsInCarpark(GpsEntity gps){
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
+        Set<String> codes = carparkMap.keySet();
+        Polygon polygon;
+        for(String code : codes){
+            polygon = carparkMap.get(code);
+            if(point.within(polygon)){
+                return code;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 是否是有效的连续点
+     * @param prevGps
+     * @param gps
+     * @return
+     */
+    public static boolean overdue(GpsEntity prevGps, GpsEntity gps) {
+        return gps.getTimestamp() - prevGps.getTimestamp() < 120000;
+    }
+}
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.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.arrival.utils;
-
-import com.bsth.data.gpsdata.arrival.entity.StationRoute;
-
-import java.util.Comparator;
-
-/**
- * Created by panzhao on 2016/12/24.
- */
-public class StationRouteComp implements Comparator<StationRoute>{
-    @Override
-    public int compare(StationRoute s1, StationRoute s2) {
-        return s1.getRouteSort() - s2.getRouteSort();
-    }
-}
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+
+import java.util.Comparator;
+
+/**
+ * Created by panzhao on 2016/12/24.
+ */
+public class StationRouteComp implements Comparator<StationRoute>{
+    @Override
+    public int compare(StationRoute s1, StationRoute s2) {
+        return s1.getRouteSort() - s2.getRouteSort();
+    }
+}
@@ -28,7 +28,7 @@ import java.util.concurrent.Executors;
  * Created by panzhao on 2016/12/24.
  */
 @Component
-public class GpsDataRecovery implements ApplicationContextAware{
+public class GpsDataRecovery implements ApplicationContextAware {
  
     static Logger logger = LoggerFactory.getLogger(GpsDataRecovery.class);
  
@@ -48,7 +48,7 @@ public class GpsDataRecovery implements ApplicationContextAware{
         //按车辆分组数据
         ArrayListMultimap<String, GpsEntity> listMap = ArrayListMultimap.create();
         for (GpsEntity gps : list) {
-            if(gps.getNbbm() != null)
+            if (gps.getNbbm() != null)
                 listMap.put(gps.getNbbm(), gps);
         }
  
@@ -60,6 +60,8 @@ public class GpsDataRecovery implements ApplicationContextAware{
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
+            /*if(nbbm.equals("YT-CD008"))
+                new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
  
         try {
@@ -124,7 +126,7 @@ public class GpsDataRecovery implements ApplicationContextAware{
         reverseSignalHandle = applicationContext.getBean(ReverseSignalHandle.class);
     }
  
-    public static class GpsComp implements Comparator<GpsEntity>{
+    public static class GpsComp implements Comparator<GpsEntity> {
  
         @Override
         public int compare(GpsEntity g1, GpsEntity g2) {
@@ -132,26 +134,28 @@ public class GpsDataRecovery implements ApplicationContextAware{
         }
     }
  
-    public static class RecoveryThread implements Runnable{
+    public static class RecoveryThread implements Runnable {
         List<GpsEntity> list;
         CountDownLatch count;
  
-        RecoveryThread(List<GpsEntity> list, CountDownLatch count){
+        RecoveryThread(List<GpsEntity> list, CountDownLatch count) {
             this.list = list;
             this.count = count;
         }
+
         @Override
         public void run() {
             try {
                 //循环gps恢复数据
                 CircleQueue<GpsEntity> prevs;
  
-                for(GpsEntity gps : list){
+                for (GpsEntity gps : list) {
+
                     prevs = GeoCacheData.getGps(gps.getNbbm());
                     //掉线处理
                     offlineSignalHandle.handle(gps, prevs);
                     //状态处理
-                    if(!correctSignalHandle.handle(gps, prevs))
+                    if (!correctSignalHandle.handle(gps, prevs))
                         continue;
                     //场，站内外判断
                     stationInsideHandle.handle(gps, prevs);
@@ -160,11 +164,12 @@ public class GpsDataRecovery implements ApplicationContextAware{
                     //进出站动作处理
                     inOutStationSignalHandle.handle(gps, prevs);
                     GeoCacheData.putGps(gps);
+
+                    //Thread.sleep(50);
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 logger.error("", e);
-            }
-            finally {
+            } finally {
                 count.countDown();
             }
         }
@@ -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,19 +116,14 @@ public class DayOfSchedule implements CommandLineRunner {
     LineConfigData lineConfigs;
  
     @Autowired
-    BasicData.BasicDataLoader dataLoader;
-
-    @Autowired
     GpsDataRecovery gpsDataRecovery;
  
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd"), fmtHHmm = DateTimeFormat.forPattern("HH:mm");
  
     @Override
     public void run(String... arg0) throws Exception {
-        //加载基础数据
-        dataLoader.loadAllData();
         //从数据库恢复排班
-        dataRecovery();
+        //dataRecovery();
  
         //翻班线程
 //        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
@@ -138,7 +132,7 @@ public class DayOfSchedule implements CommandLineRunner {
         //首班出场指令补发器
 //		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();
@@ -224,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;
@@ -503,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
@@ -527,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)
@@ -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()));
+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;
@@ -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;
+	}
 }
@@ -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;
 	}
+	
 }
@@ -180,6 +180,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
  
  
 		} catch (Exception e) {
+			
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
@@ -313,6 +314,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
+		String companyName = "", subCompanyName = "";
+		
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			Map<String, List <ScheduleRealInfo>> listMap = new HashMap<String, List <ScheduleRealInfo>>();
@@ -323,6 +326,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			int jhzgf = 0, sjzgf = 0, jhwgf = 0, sjwgf = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
 //				schedule.setFcsjAll(schedule.getFcsj());
+				if(companyName.length() == 0 && schedule.getGsName() != null)
+					companyName = schedule.getGsName();
+				if(subCompanyName.length() == 0 && schedule.getFgsName() != null)
+					subCompanyName = schedule.getFgsName();
  
 				//早晚高峰时段执行率
 				if(schedule.getFcsjT() >= zgfBegin && schedule.getFcsjT() <= zgfEnd){
@@ -424,6 +431,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
  
 			}
  
+			tempMap.put("company", companyName);
+			tempMap.put("subCompany", subCompanyName);
 			tempMap.put("date", date);
 			tempMap.put("line", key);
 			tempMap.put("jhbc", jhbc);
@@ -509,6 +518,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setBcType(rs.getString("bc_type"));
+					schedule.setGsName(rs.getString("gs_name"));
+					schedule.setFgsName(rs.getString("fgs_name"));
 					schedule.setBcs(rs.getInt("bcs"));
 					schedule.setFcno(rs.getInt("fcno"));
 					schedule.setFcsj(rs.getString("fcsj"));
@@ -588,6 +599,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				}
 			}
 		}
+		String companyName = "", subCompanyName = "";
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			List<Integer> fcsj = new ArrayList<Integer>();
@@ -595,6 +607,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			int jhbc = 0;
 			int sjbc = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				if(companyName.length() == 0 && schedule.getGsName() != null)
+					companyName = schedule.getGsName();
+				if(subCompanyName.length() == 0 && schedule.getFgsName() != null)
+					subCompanyName = schedule.getFgsName();
+				
 				tempMap.put("date", schedule.getScheduleDateStr());
 				tempMap.put("bcsj", schedule.getBcsj());
 				if(schedule.getFcsjActual() != null){
@@ -654,6 +671,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				tempMap.put("zmys", "/");
 				tempMap.put("pjys", "/");
 			}
+			tempMap.put("company", companyName);
+			tempMap.put("subCompany", subCompanyName);
 			String[] split = key.split("/");
 			tempMap.put("line", split[0]);
 			tempMap.put("qdz", split[1]);
 package com.bsth.websocket.handler;
  
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.gpsdata.arrival.entity.SignalState;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
  
 @Component
 public class SendUtils{
@@ -40,7 +35,7 @@ public class SendUtils{
 	 */
 	public void sendFcsj(ScheduleRealInfo sch) {
 		//处理出站即出场的班次
-		connectOutSchTime(sch);
+		//connectOutSchTime(sch);
  
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "faChe");
@@ -86,7 +81,7 @@ public class SendUtils{
 	 */
 	public void sendZdsj(ScheduleRealInfo sch, ScheduleRealInfo nextSch, int finish) {
 		//处理进站即进场的班次
-		connectInSchTime(sch);
+		//connectInSchTime(sch);
  
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "zhongDian");
@@ -103,12 +98,30 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
+
+	/**
+	 * 推送班次信号状态
+	 * @param state
+	 */
+	public void sendSignalState(SignalState state){
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "signal_state");
+		map.put("data", state);
+
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessageToLine(state.getLineCode(), mapper.writeValueAsString(map));
+		} catch (Exception e) {
+			logger.error("", e);
+		}
+	}
  
 	/**
 	 * 
 	 * @Title: shiftSchedule 
 	 * @Description: TODO(线路翻班通知) 
-	 */
+
 	public void shiftSchedule(String lineCode){
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "systemNotice");
@@ -124,7 +137,7 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
-	
+	 */
 	/**
 	 * 
 	 * @Title: sendDirectiveToPage 
@@ -157,39 +170,4 @@ public class SendUtils{
 		list.add(sch);
 		refreshSch(list);
 	}
-	
-	
-	//出站即出场
-	public void connectOutSchTime(ScheduleRealInfo sch){
-		try{
-			ScheduleRealInfo twins = sch.getTwinsSch();
-			if(twins != null
-					&& lineConfigData.get(sch.getXlBm()).getOutConfig() == 2
-					&& twins.getBcType().equals("out")){
-				
-				twins.setFcsjActualAll(sch.getFcsjActualTime());
-				//刷新关联的出场班次
-				//refreshSch(twins);
-			}
-		}catch(Exception e){
-			logger.error("", e);
-		}
-	}
-	
-	//进站即出场
-	public void connectInSchTime(ScheduleRealInfo sch){
-		try{
-			ScheduleRealInfo twins = sch.getTwinsSch();
-			if(twins != null
-					&& lineConfigData.get(sch.getXlBm()).getOutConfig() == 2
-					&& twins.getBcType().equals("in")){
-				
-				twins.setZdsjActualAll(sch.getZdsjActualTime());
-				//刷新关联的出场班次
-				//refreshSch(twins);
-			}
-		}catch(Exception e){
-			logger.error("", e);
-		}
-	}
 }
@@ -82,7 +82,9 @@
                                          <option value="-1">无效</option>
                                      </select>
 								</td>
-								<td></td>
+								<td>
+									<input class="form-control" type="date" name="date" />
+								</td>
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
@@ -237,8 +239,20 @@ $(function(){
 		    		initPagination = false;
 		    		return;
 		    	}	
+		    	var cells = $('tr.filter')[0].cells
+				,params = {}
+				,name;
+			$.each(cells, function(i, cell){
+				var items = $('input,select', cell);
+				for(var j = 0, item; item = items[j++];){
+					name = $(item).attr('name');
+					if(name){
+						params[name] = $(item).val();
+					}
+				}
+			});
 		    	page = num - 1;
-		    	jsDoQuery(null, false);
+		    	jsDoQuery(params, false);
 		    }
 		});
 	}
@@ -82,7 +82,9 @@
                                          <option value="-1">无效</option>
                                      </select>
 								</td>
-								<td></td>
+								<td>
+									<input class="form-control" type="date" name="date" />
+								</td>
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
@@ -242,7 +244,20 @@ $(function(){
  
  
 		    	page = num - 1;
-		    	jsDoQuery(null, false);
+		    	
+		    	var cells = $('tr.filter')[0].cells
+				,params = {}
+				,name;
+				$.each(cells, function(i, cell){
+					var items = $('input,select', cell);
+					for(var j = 0, item; item = items[j++];){
+						name = $(item).attr('name');
+						if(name){
+							params[name] = $(item).val();
+						}
+					}
+				});
+		    	jsDoQuery(params, false);
 		    }
 		});
 	}
@@ -72,6 +72,7 @@
 									<input type="text" class="form-control form-filter input-sm" name="nbbm">
 								</td>
 								<td>
+									<input class="form-control" type="date" name="date" />
 								</td>
 								<td></td>
 								<td>
@@ -238,7 +239,19 @@ $(function(){
 		    		return;
 		    	}	
 		    	page = num - 1;
-		    	jsDoQuery(null, false);
+		    	var cells = $('tr.filter')[0].cells
+				,params = {}
+				,name;
+				$.each(cells, function(i, cell){
+					var items = $('input,select', cell);
+					for(var j = 0, item; item = items[j++];){
+						name = $(item).attr('name');
+						if(name){
+							params[name] = $(item).val();
+						}
+					}
+				});
+		    	jsDoQuery(params, false);
 		    }
 		});
 	}
@@ -133,7 +133,7 @@
  
 		$("#query").on("click",function(){
 			var line = $("#line").val();
-			var xlName = $("#line").text();
+			var xlName = $("#select2-line-container").html();
 			var date = $("#date").val();
 			var code = $("#code").val();
 			$(".hidden").removeClass("hidden");
@@ -49,7 +49,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="筛选"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
                     </div>
 				</form>
 			</div>
@@ -26,7 +26,15 @@
 	<div class="col-md-12">
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
-				<form class="form-inline" action="">
+				<form class="form-inline" action="">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_daily">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdmDaily" style="width: 140px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_daily">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdmDaily" style="width: 140px;"></select>
+					</div>
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -64,15 +72,15 @@
 								<td>班次</td>
 							</tr>
 						</thead>
-						<tbody class="dailyInfo">
+						<tbody id="tbody">
  
 						</tbody>
 						<tr>
 							<td colspan="3">小计</td>
 							<td><span id="total_zgl">&nbsp;</span></td>
-							<td><span id="total_ksgl">&nbsp;</span></td>
+							<td><span id="total_ks">&nbsp;</span></td>
 							<td><span id="total_yh">&nbsp;</span></td>
-							<td><span id="total_bcs">&nbsp;</span></td>
+							<td><span id="total_bc">&nbsp;</span></td>
 						</tr>
 					</table>
 				</div>
@@ -82,7 +90,9 @@
 </div>
  
 <script>
-	$(function(){
+	$(function(){
+		var reqCodeMap = {"0xA1": '请求恢复运营', "0xA2": '申请调档', "0xA3": '出场请求', "0xA5": '进场请求', "0xA7": '加油请求', "0x50": '车辆故障', "0x70": '路阻报告', "0x60": '事故报告', "0x11": '扣证纠纷', "0x12" : '报警'};
+
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
@@ -92,6 +102,42 @@
 			locale : 'zh-cn'
 		});
  
+		var obj = [];
+		$.get('/user/companyData', function(result){
+			obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			
+			if(obj.length ==0){
+				 $("#gsdmDiv_daily").css('display','none');
+				 $('#gsdmDiv_daily').css('display','none');
+			}else if(obj.length ==1){
+				 $("#fgsdmDiv_daily").css('display','none');
+				if(obj[0].children.length == 1  || obj[0].children.length ==0)
+					$('#fgsdmDiv_daily').css('display','none');
+			}
+			$('#gsdmDaily').html(options);
+			updateCompany();
+		});
+
+		$("#gsdmDaily").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdmDaily').val();
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdmDaily').html(options);
+		}
+
+		
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
  
@@ -101,50 +147,82 @@
 			initPinYinSelect2('#line',data,'');
  
 		})
-		var line;
-		var date;
-		$("#query").on("click",function(){
-			line = $("#line").val();
-			var lineName=$("#select2-line-container").html();
-			date = $("#date").val();
-			$get('/realSchedule/dailyInfo',{line:line,date:date,type:'query'},function(result){
-			    $("#form_line").text(lineName);
-			    $("#form_date").text(date);
-			    var total_zgl = 0,total_ksgl = 0,total_yh = 0,total_bcs = 0;
-			    $.each(result, function(i, obj) {
-                    total_zgl = Number(obj.zgl)+Number(total_zgl);
-                    total_ksgl = Number(obj.ksgl)+Number(total_ksgl);
-                    total_yh = Number(0)+Number(total_yh);
-                    total_bcs = Number(obj.bcs)+Number(total_bcs);
-                });
-                $("#total_zgl").text(total_zgl.toFixed(2));
-                $("#total_ksgl").text(total_ksgl.toFixed(2));
-                $("#total_yh").text(total_yh.toFixed(2));
-                $("#total_bcs").text(total_bcs);
-                
-				// 把数据填充到模版中
-				var tbodyHtml = template('dailyInfo',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms .dailyInfo').html(tbodyHtml);
-			});
+
+	var line;
+	var date;
+	var gsdmDaily;
+	var fgsdmDaily;
+	$("#query").on("click",function(){
+		
+		line = $("#line").val();
+		var lineName=$("#select2-line-container").html();
+		date = $("#date").val();
+		gsdmDaily=$("#gsdmDaily").val();
+		fgsdmDaily = $("#fgsdmDaily").val();
+		
+		$post('/mcy_forms/daily',{gsdmDaily:gsdmDaily,fgsdmDaily:fgsdmDaily, line:line,date:date,type:'query'},function(result){
+			 $("#form_line").text(lineName);
+			 $("#form_date").text(date);
+			// 把数据填充到模版中
+			var tbodyHtml = template('dailyInfo',{list:result});
+			// 把渲染好的模版html文本追加到表格中
+			$('#tbody').html(tbodyHtml);
+		    line = $("#line").val();
+		  
+		    startDate = $("#startDate").val();
+		    endDate = $("#endDate").val();
+		    $("#sDate").text(startDate);
+	        $("#eDate").text(endDate);
+	        
+	        var total_zgl = 0,total_ks = 0;
+	        var total_yh = 0,total_bc = 0;
+	       
+	        $.each(result, function(i, obj) {
+	        	total_zgl +=Number(obj.zlc);
+	        	total_ks +=Number(obj.jzl1);
+	        	total_yh += Number(obj.yh);
+	        	total_bc += Number(obj.bc);
+		    	
+            });
+            $("#total_zgl").text(total_zgl.toFixed(2));
+            $("#total_ks").text(total_ks.toFixed(2));
+            $("#total_yh").text(total_yh.toFixed(2));
+            $("#total_bc").text(total_bc.toFixed(2));
+	         
+	        var temp = {};
+	        var today_account = 0;
+	        
+	        temp["line"] = $("#line").text(); 	        
+	        $.each(result, function(i, obj) {
+	            if(moment(obj.schedule_date_str).format("YYYY-MM-DD") == moment(obj.startDate).format("YYYY-MM-DD")){
+	                today_account++;
+	            } 
+                obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
+            });  
+		})
+	});
+	
+	$("#export").on("click",function(){
+		line = $("#line").val();
+		date = $("#date").val();
+		gsdmDaily=$("#gsdmDaily").val();
+		fgsdmDaily = $("#fgsdmDaily").val();
+		$post('/mcy_export/dailyExport',{gsdmDaily:gsdmDaily,fgsdmDaily:fgsdmDaily,line:line,date:date,type:'export'},function(result){
+			window.open("/downloadFile/download?fileName=班次日报表"+moment(date).format("YYYYMMDD"));
 		});
-		$("#export").on("click",function(){
-			$get('/realSchedule/dailyInfo',{line:line,date:date,type:'export'},function(result){
-				window.open("/downloadFile/download?fileName=班次日报"+moment(date).format("YYYYMMDD"));
-			});
-		});
-	});
+	});
+});
 </script>
 <script type="text/html" id="dailyInfo">
 	{{each list as obj i}}
 		<tr>
-			<td>{{obj.clZbh}}</td>
-			<td>{{obj.jGh}}</td>
+			<td>{{obj.zbh}}</td>
+			<td>{{obj.jgh}}</td>
 			<td>{{obj.jName}}</td>
-			<td>{{obj.zgl}}</td>
-			<td>{{obj.ksgl}}</td>
-			<td>0</td>
-			<td>{{obj.bcs}}</td>
+			<td>{{obj.zlc}}</td>
+			<td>{{obj.jzl1}}</td>
+			<td>{{obj.yh}}</td>
+			<td>{{obj.bc}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -97,6 +97,7 @@
  
 <script>
 	$(function(){
+		$('#export').attr('disabled', "true");
  
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
@@ -186,11 +187,22 @@
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
  
+				if(result.length == 0)
+					$("#export").attr('disabled',"true");
+				else
+					$("#export").removeAttr("disabled");
 			});
 		}
  
 		$("#export").on("click",function(){
-			$get('/pcpc/firstAndLastBus',{line:line,date:date,type:'export'},function(result){
+			var params = {};
+			params['company'] = company;
+			params['subCompany'] = subCompany;
+			params['line'] = line;
+			params['line'] = line;
+			params['date'] = date;
+			params['type'] = "export";
+			$get('/pcpc/firstAndLastBus', params, function(result){
 				window.open("/downloadFile/download?fileName=线路首末班"+moment(date).format("YYYYMMDD"));
 			});
 		});
@@ -41,7 +41,7 @@
 					</div>
 					<div class="form-group">
 						<input class="btn btn-default" type="button" id="query" value="筛选"/>
-						<input class="btn btn-default" type="button" id="export" value="导出"/>
+<!-- 						<input class="btn btn-default" type="button" id="export" value="导出"/> -->
 					</div>
 				</form>
 			</div>
@@ -80,6 +80,7 @@
  
 <script>
 	$(function(){
+		$('#export').attr('disabled', "true");
  
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
@@ -168,11 +169,21 @@
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
  
+				if(result.length == 0)
+					$("#export").attr('disabled',"true");
+				else
+					$("#export").removeAttr("disabled");
 			});
 		}
  
 		$("#export").on("click",function(){
-			$get('/pcpc/queryPeopleCar',{line:line,date:date,type:'export'},function(result){
+			var params = {};
+			params['company'] = company;
+			params['subCompany'] = subCompany;
+			params['line'] = line;
+			params['date'] = date;
+			params['type'] = "export";
+			$get('/pcpc/queryPeopleCar', params, function(result){
 				window.open("/downloadFile/download?fileName=计划车辆班次人员"+moment(date).format("YYYYMMDD"));
 			});
 		});
@@ -65,18 +65,21 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr class="hidden">
-								<th width="10%">线路</th>
-								<th width="10%">起点站名</th>
-								<th width="8%">计发时间</th>
-								<th width="8%">计划运送时间(分)</th>
-								<th width="8%">计划完成次数</th>
-								<th width="8%">完成次数</th>
-								<th width="8%">最早发车时间</th>
-								<th width="8%">最晚发车时间</th>
-								<th width="8%">平均发车时间</th>
-								<th width="8%">最慢运送时间(分)</th>
-								<th width="8%">最快运送时间(分)</th>
-								<th width="8%">平均运送时间(分)</th>
+								<th style="display: none;"></th>
+								<th width="8%">公司</th>
+								<th width="8%">分公司</th>
+								<th width="8%">线路</th>
+								<th width="8%">起点站名</th>
+								<th width="6%">计发时间</th>
+								<th width="6%">计划运送时间(分)</th>
+								<th width="6%">计划完成次数</th>
+								<th width="6%">完成次数</th>
+								<th width="6%">最早发车时间</th>
+								<th width="6%">最晚发车时间</th>
+								<th width="6%">平均发车时间</th>
+								<th width="6%">最慢运送时间(分)</th>
+								<th width="6%">最快运送时间(分)</th>
+								<th width="6%">平均运送时间(分)</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -95,6 +98,7 @@
 <script>
 	$(function(){
 		var page = 0, initPagination;
+		$('#export').attr('disabled', "true");
  
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
@@ -200,6 +204,11 @@
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
  
+				if(result.dataList.length == 0)
+					$("#export").attr('disabled',"true");
+				else
+					$("#export").removeAttr("disabled");
+				
 				if(pagination && result.dataList.length > 0){
 					//重新分页
 					initPagination = true;
@@ -213,7 +222,16 @@
 		}
  
 		$("#export").on("click",function(){
-			$get('/pcpc/scheduleAnaly',{page:'',line:line,startDate:startDate,endDate:endDate,model:model,type:'export'},function(result){
+			var params = {};
+			params['page'] = page;
+			params['line'] = line;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
+			params['model'] = model;
+			params['company'] = company;
+			params['subCompany'] = subCompany;
+			params['type'] = "export";
+			$get('/pcpc/scheduleAnaly', params, function(result){
 				window.open("/downloadFile/download?fileName=时刻表分析"+moment(startDate).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
 			});
 		});
@@ -289,6 +307,9 @@
 <script type="text/html" id="list_scheduleAnaly">
 	{{each list as obj i}}
 		<tr>
+			<th style="display: none;"></th>
+			<td>{{obj.company}}</td>
+			<td>{{obj.subCompany}}</td>
 			<td>{{obj.line}}</td>
 			<td>{{obj.qdz}}</td>
 			<td>{{obj.jhfc}}</td>
@@ -305,7 +326,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -37,7 +37,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
                     </div>
 				</form>
 			</div>