Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into minhang

娄高锋
2 parents 2ec8a447 c8d5078d
Showing 66 changed files with 2187 additions and 845 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/data/BasicData.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
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/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
src/main/java/com/bsth/data/gpsdata/arrival/utils/CircleQueue.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/ScheduleSignalState.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;
@@ -319,8 +321,34 @@ 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>>();
+		String xlts="";
+		String zsgs="";
+		String jh="";
+		Float j=0f;
+		Float sj=0f;
+		Float qz=0f;
+		Float ccl=0f;
+		Float bcjh=0f;
+		String bcsj="";
+		Float bczxl=0f;
+		String gs="";
+		String zhgs="";
+		
 		for (Turnoutrate l : turnoutrate) {
 			Map<String, Object> m = new HashMap<String, Object>();
+			
+			xlts +=l.getGsgs()==""?0:String.valueOf(l.getGsgs());
+			zsgs +=l.getFgsgs()==""?0:String.valueOf(l.getFgsgs());
+			jh +=l.getXl()==""?0:String.valueOf(l.getXl());
+			sj +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
+			ccl +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
+			bcjh +=l.getCchqz()==""?0f:Float.valueOf(l.getCchqz());
+			bcsj +=l.getChl()==""?0:String.valueOf(l.getChl());
+			bczxl +=l.getBcjh()==""?0f:Float.valueOf(l.getBcjh());
+			gs +=l.getBcsj()==""?0:String.valueOf(l.getBcsj());
+			zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());
+			
+			
 			m.put("rq", l.getRq());
 			m.put("gs", l.getGs());
 			m.put("zhgs", l.getZhgs());
@@ -330,10 +358,27 @@ public class ExportController {
 			m.put("cchqz", l.getCchqz());
 			m.put("chl", l.getChl());
 			m.put("bcjh", l.getBcjh());
-			m.put("bcsj", l.getBbzxl());
+			m.put("bcsj", l.getBcsj());
 			m.put("bbzxl", l.getBbzxl());
 			m.put("sm", l.getSm());
 			resList.add(m);
+			
+			
+			
+			m=new HashMap<String,Object>();
+			m.put("total_xlts", xlts);
+			m.put("total_zhgs", zsgs);
+			m.put("total_jh", jh);
+			m.put("total_sj", sj);
+			m.put("total_qz", ccl);
+			m.put("total_ccl", bcjh);
+			m.put("total_bcjh",bcsj);
+			m.put("total_bcsj", bczxl);
+			m.put("total_bczxl", bczxl);
+			m.put("total_gs", zhgs);
+			
+
+			map1 = m;
 		}
  
 		try {
@@ -347,7 +392,7 @@ public class ExportController {
 		return resList;
 	}
  
-	//营运线路出车率统计表
+	//班次执行率统计表
 	@RequestMapping(value = "/executionrateExport", method = RequestMethod.POST)
 	public List<Map<String, Object>> executionrateExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
@@ -356,8 +401,33 @@ 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>>();
+		String xlts="";
+		String zsgs="";
+		String jh="";
+		Float sj=0f;
+		Float ccl=0f;
+		Float bcjh=0f;
+		String bcsj="";
+		Float bczxl=0f;
+		String gs="";
+		String zhgs="";
+		
+		Map<String, Object> m = new HashMap<String, Object>();
+
 		for (Executionrate l : executionrate) {
-			Map<String, Object> m = new HashMap<String, Object>();
+			
+			xlts +=l.getGsgs()==""?0:String.valueOf(l.getGsgs());
+			zsgs +=l.getFgsgs()==""?0:String.valueOf(l.getFgsgs());
+			jh +=l.getXl()==""?0:String.valueOf(l.getXl());
+			sj +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
+			ccl +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
+			bcsj +=l.getChl()==""?0:String.valueOf(l.getChl());
+			bczxl +=l.getBcjh()==""?0f:Float.valueOf(l.getBcjh());
+			gs +=l.getBcsj()==""?0:String.valueOf(l.getBcsj());
+			zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());
+			
+			
+			
 			m.put("rq", l.getRq());
 			m.put("gs", l.getGs());
 			m.put("zhgs", l.getZhgs());
@@ -366,10 +436,24 @@ public class ExportController {
 			m.put("cchsj", l.getCchsj());
 			m.put("chl", l.getChl());
 			m.put("bcjh", l.getBcjh());
-			m.put("bcsj", l.getBbzxl());
+			m.put("bcsj", l.getBcsj());
 			m.put("bbzxl", l.getBbzxl());
 			m.put("sm", l.getSm());
 			resList.add(m);
+			
+			
+		    m=new HashMap<String,Object>();
+			m.put("total_gs", xlts);
+			m.put("total_zhgs", zsgs);
+			m.put("total_xlts", jh);
+			m.put("total_jh", sj);
+			m.put("total_sj", ccl);
+			m.put("total_ccl",bcsj);
+			m.put("total_bcjh", bczxl);
+			m.put("total_bcsj", gs);
+			m.put("total_bczxl", zhgs);
+			
+			map1 = m;
 		}
  
 		try {
@@ -393,8 +477,28 @@ 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;
+		Double bcjh=0.0;
+		String bcsj="";
+		Integer bczxl=0;
+		String  gs="";
+		String zhgs="";
+		Map<String, Object> m ;
 		for (Allline l : allline) {
-			Map<String, Object> m = new HashMap<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: Double.valueOf(l.getCchsj());
+			
+			bcsj +=l.getChl()==""? 0:String.valueOf(l.getChl());
+			bczxl +=l.getBcjh()==""?0: Integer.valueOf(l.getBcjh());
+			gs +=l.getBcsj()==""?0: String.valueOf(l.getBcsj());
+			zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());
+			
 			m.put("rq", l.getRq());
 			m.put("gs", l.getGs());
 			m.put("zhgs", l.getZhgs());
@@ -403,10 +507,22 @@ public class ExportController {
 			m.put("cchsj", l.getCchsj());
 			m.put("chl", l.getChl());
 			m.put("bcjh", l.getBcjh());
-			m.put("bcsj", l.getBbzxl());
+			m.put("bcsj", l.getBcsj());
 			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);
+			map1 = m;
+			
 		}
  
 		try {
@@ -422,6 +538,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);
+    }
+}
@@ -26,12 +26,12 @@ import java.util.concurrent.TimeUnit;
  */
 @Component
 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 +39,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 +71,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);
@@ -90,6 +84,10 @@ public class BasicData implements CommandLineRunner {
         Application.mainServices.scheduleWithFixedDelay(dataLoader, 2, 2, TimeUnit.HOURS);
     }
  
+    public static String getStationNameByCode(String code, String prefix){
+        String name = stationCode2NameMap.get(code);
+        return name != null? name: stationCode2NameMap.get(prefix + code);
+    }
  
     @Component
     public static class BasicDataLoader extends Thread {
@@ -114,7 +112,7 @@ public class BasicData implements CommandLineRunner {
  
         @Autowired
         PersonnelRepository personnelRepository;
-        
+
         @Autowired
         BusinessRepository businessRepository;
  
@@ -156,47 +154,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 +198,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 +241,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 +251,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 ForecastRealServer implements CommandLineRunner {
 			//终点站
 			String eStation = null;
 			//当前执行班次
-			ScheduleRealInfo sch = dayOfSchedule.execPlanMap().get(nbbm);
+			ScheduleRealInfo sch = dayOfSchedule.executeCurr(nbbm);
 			if(null != sch)
 				eStation = sch.getZdzCode();
  
@@ -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,42 @@ 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, 30, TimeUnit.SECONDS);
     }
  
     public void put(GpsEntity gps) {
-        gpsMap.put(gps.getDeviceId(), gps);
+        String device = gps.getDeviceId();
+        GpsEntity old = gpsMap.get(device);
+
+        try {
+            if (!StringUtils.isEmpty(gps.getStopNo())) {
+                //站点编码改变
+                if (null == old || !gps.getStopNo().equals(old.getStopNo())) {
+                    gps.setArrTime(gps.getTimestamp());
+                    //预测到达终点时间
+                    forecastRealServer.forecast(gps.getNbbm(), gps);
+                } else {
+                    gps.setArrTime(old.getArrTime());
+                    //不预测， 重新计算终点时间
+                    gps.setExpectStopTime(forecastRealServer.expectStopTime(gps.getNbbm()));
+                }
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+
+        //刷新对照
+        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.getStationNameByCode(gps.getStopNo(), gps.getLineId() + "_" + gps.getUpDown() + "_");
     }
  
     /**
@@ -94,7 +122,7 @@ public class GpsRealData implements CommandLineRunner {
         for (String device : set) {
             gps = gpsMap.get(device);
             //过滤异常GPS数据
-            if (gps.isAbnormal())
+            if (gps == null || gps.isAbnormal())
                 continue;
  
             sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
+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.GpsRealData;
 import com.bsth.data.gpsdata.arrival.handlers.*;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import org.slf4j.Logger;
@@ -33,6 +34,9 @@ public class GpsRealAnalyse {
     @Autowired
     ReverseSignalHandle reverseSignalHandle;
  
+    @Autowired
+    GpsRealData gpsRealData;
+
     //50个线程
     static ExecutorService threadPool = Executors.newFixedThreadPool(50);
  
@@ -45,6 +49,10 @@ public class GpsRealAnalyse {
         try {
             //等待子线程结束
             count.await();
+
+            //加入实时gps对照
+            for(GpsEntity gps: list)
+                gpsRealData.put(gps);
         } catch (InterruptedException e) {
             logger.error("", e);
         }
 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.handlers;
-
-import com.bsth.data.LineConfigData;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.SignalHandle;
-import com.bsth.data.gpsdata.arrival.entity.StationRoute;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.directive.DirectiveService;
-import com.bsth.websocket.handler.SendUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 进出站动作处理
- * Created by panzhao on 2016/12/27.
- */
-@Component
-public class InOutStationSignalHandle extends SignalHandle{
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Autowired
-    LineConfigData lineConfigData;
-
-    @Autowired
-    SendUtils sendUtils;
-
-    @Autowired
-    DirectiveService directiveService;
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-
-        if(isNotEmpty(prevs)){
-            GpsEntity prev = prevs.getTail();
-            if(isOutStation(gps, prev))
-                outStation(gps, prev);
-
-
-            if(isInStation(gps, prev))
-                inStation(gps, prev);
-        }
-
-        return true;
-    }
-
-    private boolean isOutStation(GpsEntity gps, GpsEntity prev){
-        //从站内到站外
-        if(prev.getInstation() > 0 && gps.getInstation() == 0)
-            return true;
-
-        //从站内到另一个站内
-        if(prev.getInstation() > 0 && gps.getInstation() > 0
-                && !prev.getStopNo().equals(gps.getStopNo()))
-            return true;
-        return false;
-    }
-
-    private boolean isInStation(GpsEntity gps, GpsEntity prev){
-        //从站外到站内
-        if(prev.getInstation() == 0 && gps.getInstation() > 0
-                /*&& !prev.getStopNo().equals(gps.getStopNo())*/){
-            return true;
-        }
-
-        //从站内到另一个站内
-        if(prev.getInstation() > 0 && gps.getInstation() > 0
-                && !prev.getStopNo().equals(gps.getStopNo()))
-            return true;
-        return false;
-    }
-
-    /**
-     * 出站
-     * @param gps 当前点
-     * @param prev 上一个点
-     */
-    private void outStation(GpsEntity gps, GpsEntity prev) {
-        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-        String qdzCode = sch.getQdzCode();
-
-
-        //if(sch.getFcsjActual() != )
-
-        //起点发车
-        if(qdzCode != null && prev.getStopNo().equals(qdzCode)
-                && !willDepart(gps, prev, sch)){
-
-            sch.setFcsjActualAll(gps.getTimestamp());
-            //通知客户端
-            sendUtils.sendFcsj(sch);
-            //持久化
-            dayOfSchedule.save(sch);
-
-            //出站既出场
-            outStationAndOutPark(sch);
-            logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
-        }
-    }
-
-    private void outStationAndOutPark(ScheduleRealInfo sch){
-        LineConfig config = lineConfigData.get(sch.getXlBm());
-        if (config != null && config.getOutConfig() == 2) {
-            //出站既出场
-            ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-            if (schPrev != null && schPrev.getBcType().equals("out")) {
-                schPrev.setFcsjActualAll(sch.getFcsjActual());
-                schPrev.setZdsjActualAll(sch.getFcsjActual());
-            }
-        }
-    }
-
-    /**
-     * 进站
-     * @param gps 当前点
-     * @param prev 上一个点
-     */
-    private void inStation(GpsEntity gps, GpsEntity prev){
-        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-        String zdzCode = sch.getZdzCode();
-
-        if(zdzCode != null && gps.getStopNo().equals(zdzCode)){
-
-            sch.setZdsjActualAll(gps.getTimestamp());
-            //已完成班次数
-            int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
-            ScheduleRealInfo next = dayOfSchedule.next(sch);
-            //通知客户端
-            sendUtils.sendZdsj(sch, next, doneSum);
-            //持久化
-            dayOfSchedule.save(sch);
-            //下发调度指令
-            //directiveService.send60Dispatch(next, doneSum, "到站@系统");
-
-            //准备执行下一个班次
-            if (next != null) {
-                next.setQdzArrDatesj(sch.getZdsjActual());
-                dayOfSchedule.addExecPlan(next);
-
-                //进站既进场
-                inStationAndInPark(sch, next);
-
-                //将gps转换为下一个班次走向的站内信号
-                int updown = Integer.parseInt(next.getXlDir());
-                List<StationRoute> srs = GeoCacheData.getStationRoute(next.getXlBm(), updown);
-                StationRoute station = GeoUtils.gpsInStation(gps, srs);
-                if (station != null) {
-                    gps.setUpDown(updown);
-                    gps.setStopNo(station.getCode());
-                }
-            }
-        }
-       /* //如果出场班次计划终点时间5分钟后还未完成，检查一下车辆轨迹，是否已经在执行线路上班次
-        else if(sch.getBcType().equals("out")
-                && sch.getZdsj() != null
-                && gps.getTimestamp() - sch.getZdsjT() >= 1000 * 60 * 5){
-            logger.info("出场班次计划终点时间5分钟后还未完成");
-
-        }*/
-    }
-
-    /**
-     * 进站既进场
-     * @param sch
-     */
-    private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next){
-        LineConfig config = lineConfigData.get(sch.getXlBm());
-        if (next.getBcType().equals("in") &&
-                config != null && config.getOutConfig() == 2) {
-            next.setFcsjActualAll(sch.getZdsjActual());
-            next.setZdsjActualAll(sch.getZdsjActual());
-        }
-    }
-
-    /**
-     * 发车漂移判定（这里出现的误判，由车辆到达中途站的时候补偿）
-     * @param gps
-     * @param prev
-     * @param task
-     * @return
-     */
-    private boolean willDepart(GpsEntity gps, GpsEntity prev, Object task){
-
-/*        ScheduleRealInfo sch = (ScheduleRealInfo) task;
-        ScheduleRealInfo prevTask = dayOfSchedule.prev(sch);
-        if(prevTask == null || prevTask.getBcType().equals("out"))
-            return false;
-
-        //计划停站时间
-        int stopTimePlan = (int) (sch.getDfsjT() - prevTask.getZdsjT());
-
-        if(stopTimePlan < 1000 * 60 * 10)
-            return false;
-
-        //实际停站时间
-        if(prevTask.getZdsjActual() != null){
-            int actualTime = (int) (gps.getTimestamp() - prevTask.getZdsjActualTime());
-
-            if(actualTime < stopTimePlan * 0.8){
-                logger.info("漂移判定");
-
-                return true;
-            }
-        }*/
-        return false;
-    }
-}
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
+import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.directive.DirectiveService;
+import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 进出站动作处理
+ * Created by panzhao on 2016/12/27.
+ */
+@Component
+public class InOutStationSignalHandle extends SignalHandle{
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    LineConfigData lineConfigData;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    DirectiveService directiveService;
+
+    @Autowired
+    ScheduleSignalState scheduleSignalState;
+
+    @Autowired
+    SignalSchPlanMatcher signalSchPlanMatcher;
+
+    private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //忽略漂移信号
+        if(isDriftSignal(gps))
+            return false;
+
+        //从异常状态恢复的第一个信号
+        if(abnormalRecovery(gps, prevs)){
+            //回溯一下之前的轨迹
+            scheduleSignalState.signalRetrospect(gps);
+        }
+
+        if(isNotEmpty(prevs)){
+            GpsEntity prev = prevs.getTail();
+            if(isOutStation(gps, prev))
+                outStation(gps, prev);
+
+
+            if(isInStation(gps, prev))
+                inStation(gps, prev);
+        }
+
+        return true;
+    }
+
+    private boolean isOutStation(GpsEntity gps, GpsEntity prev){
+        //从站内到站外
+        if(prev.getInstation() > 0 && gps.getInstation() == 0)
+            return true;
+
+        //从站内到另一个站内
+        if(prev.getInstation() > 0 && gps.getInstation() > 0
+                && !prev.getStopNo().equals(gps.getStopNo()))
+            return true;
+        return false;
+    }
+
+    private boolean isInStation(GpsEntity gps, GpsEntity prev){
+        //从站外到站内
+        if(prev.getInstation() == 0 && gps.getInstation() > 0
+                /*&& !prev.getStopNo().equals(gps.getStopNo())*/){
+            return true;
+        }
+
+        //从站内到另一个站内
+        if(prev.getInstation() > 0 && gps.getInstation() > 0
+                && !prev.getStopNo().equals(gps.getStopNo()))
+            return true;
+        return false;
+    }
+
+    /**
+     * 出站
+     * @param gps 当前点
+     * @param prev 上一个点
+     */
+    private void outStation(GpsEntity gps, GpsEntity prev) {
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+        String qdzCode = sch.getQdzCode();
+
+        //首班出场最多提前1.2小时
+        if(dayOfSchedule.isFirstOut(sch) && sch.getDfsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+            return;
+
+        //起点发车
+        if(qdzCode != null && prev.getStopNo().equals(qdzCode)
+                && !willDepart(gps, prev, sch)){
+
+            //发车班次匹配
+            signalSchPlanMatcher.outMatch(gps, sch);
+            sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+            //实发时间不覆盖
+            if(StringUtils.isNotEmpty(sch.getFcsjActual()))
+                return;
+
+            //实发时间
+            sch.setFcsjActualAll(gps.getTimestamp());
+            //通知客户端
+            sendUtils.sendFcsj(sch);
+            //持久化
+            dayOfSchedule.save(sch);
+
+            //出站既出场
+            outStationAndOutPark(sch);
+            logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
+        }
+        else if(sch.getBcType().equals("out")){
+            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            if(prev.getStopNo().equals(next.getQdzCode())){
+                //发下一个班次
+                dayOfSchedule.addExecPlan(next);
+                outStation(gps, prev);
+            }
+        }
+    }
+
+
+    private void outStationAndOutPark(ScheduleRealInfo sch){
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (config != null && config.getOutConfig() == 2) {
+            //出站既出场
+            ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+            if (schPrev != null && schPrev.getBcType().equals("out")) {
+                schPrev.setFcsjActualAll(sch.getFcsjActualTime());
+                schPrev.setZdsjActualAll(sch.getFcsjActualTime());
+
+                sendUtils.refreshSch(schPrev);
+            }
+        }
+    }
+
+    /**
+     * 进站
+     * @param gps 当前点
+     * @param prev 上一个点
+     */
+    private void inStation(GpsEntity gps, GpsEntity prev){
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+        if(gps.getStopNo().equals(sch.getZdzCode())){
+
+            //实达时间不覆盖
+            if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+                return;
+
+            sch.setZdsjActualAll(gps.getTimestamp());
+            //已完成班次数
+            int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
+            ScheduleRealInfo next = dayOfSchedule.next(sch);
+            //通知客户端
+            sendUtils.sendZdsj(sch, next, doneSum);
+            //持久化
+            dayOfSchedule.save(sch);
+            //下发调度指令
+            //directiveService.send60Dispatch(next, doneSum, "到站@系统");
+
+            //准备执行下一个班次
+            if (next != null) {
+                next.setQdzArrDatesj(sch.getZdsjActual());
+                dayOfSchedule.addExecPlan(next);
+                //进站既进场
+                inStationAndInPark(sch, next);
+                //将gps转换为下一个班次走向的站内信号
+                transformUpdown(gps, sch);
+            }
+        }
+        else if(sch.getFcsjActual() == null){
+            //有进站，但班次没有实发，向前追溯一下信号
+            scheduleSignalState.signalRetrospect(gps, sch);
+        }
+    }
+
+    /**
+     * 进站既进场
+     * @param sch
+     */
+    private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next){
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (next.getBcType().equals("in") &&
+                config != null && config.getOutConfig() == 2) {
+            next.setFcsjActualAll(sch.getZdsjActualTime());
+            next.setZdsjActualAll(sch.getZdsjActualTime());
+
+            sendUtils.refreshSch(next);
+        }
+    }
+
+    /**
+     * 发车漂移判定（这里出现的误判，由车辆到达中途站的时候补偿）
+     * @param gps
+     * @param prev
+     * @param task
+     * @return
+     */
+    private boolean willDepart(GpsEntity gps, GpsEntity prev, Object task){
+
+        /*ScheduleRealInfo sch = (ScheduleRealInfo) task;
+        ScheduleRealInfo prevTask = dayOfSchedule.prev(sch);
+        if(prevTask == null || prevTask.getBcType().equals("out"))
+            return false;
+
+        //计划停站时间
+        int stopTimePlan = (int) (sch.getDfsjT() - prevTask.getZdsjT());
+
+        if(stopTimePlan < 1000 * 60 * 10)
+            return false;
+
+        //实际停站时间
+        if(prevTask.getZdsjActual() != null){
+            int actualTime = (int) (gps.getTimestamp() - prevTask.getZdsjActualTime());
+
+            if(actualTime < stopTimePlan * 0.8){
+                logger.info("漂移判定");
+
+                return true;
+            }
+        }*/
+        return false;
+    }
+}
 \ No newline at end of file
@@ -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
@@ -105,8 +105,8 @@ public class CircleQueue&lt;T&gt; {
                 }
             }
         } else {
-            elementDataSort = new Object[tail];
-            for (int i = 0; i < tail; i++) {
+            elementDataSort = new Object[tail + 1];
+            for (int i = 0; i <= tail; i++) {
                 elementDataSort[i] = elementDataCopy[i];
             }
         }
+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);
+            if(signalState != null)
+                signalStateData.put(signalState);
+        }
+    }
+
+    public void signalRetrospect(GpsEntity gps) {
+        signalRetrospect(gps, dayOfSchedule.executeCurr(gps.getNbbm()));
+    }
+
+    /**
+     * 信号追溯
+     *
+     * @param gps
+     * @param sch
+     */
+    public void signalRetrospect(GpsEntity gps, ScheduleRealInfo sch) {
+        //回放数据，是否有掉线或者漂移
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        if (queue == null || queue.size() == 0 /*|| gps.getInstation() == 0*/)
+            return;
+
+        //起始时间点
+        long st = 0;
+        ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+
+        if (prev != null) {
+            if (prev.getZdsjActual() != null)
+                st = prev.getZdsjActualTime();
+            else
+                st = (GeoCacheData.midwayStation(gps.getLineId(), gps.getUpDown(), sch.getQdzCode(), gps.getStopNo()).size() + 1) * (1000 * 60 * 5);
+        }
+
+        Object[] tempArray = queue.getQueue();
+        int len = tempArray.length;
+
+        Object[] array = new Object[len + 1];
+        System.arraycopy(tempArray, 0, array, 0, len);
+        array[len] = gps;
+
+        String gpsState = "";
+        GpsEntity tempGps, nearGps = null;
+        int i = len - 1;
+        for (; i >= 0; i--) {
+            tempGps = (GpsEntity) array[i];
+
+            gpsState = tempGps.getSignalState();
+            if (gpsState.equals("truncation"))
+                break;
+            else if (gpsState.equals("drift")) {
+                nearGps = (GpsEntity) array[i + 1];
+                break;
+            } else if (gpsState.equals("reconnection")) {
+                nearGps = tempGps;
+                break;
+            }
+
+            if (tempGps.getTimestamp() < st)
+                break;
+        }
+
+        if (nearGps != null && i > 0) {
+            createSignalAbnormal(gpsState, nearGps, i, array, sch);
+        }
+    }
+
+    private void createSignalAbnormal(String gpsState, GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
+        switch (gpsState) {
+            case "drift":
+                driftSignalAbnormal(nearGps, i, array, sch);
+                break;
+            case "reconnection":
+                offlineSignalAbnormal(nearGps, ((GpsEntity) array[i - 1]), sch);
+                break;
+        }
+    }
+
+    /**
+     * 掉线异常状态记录
+     *
+     * @param e
+     * @param s
+     */
+    private void offlineSignalAbnormal(GpsEntity e, GpsEntity s, ScheduleRealInfo sch) {
+        long st = s.getTimestamp(), et = e.getTimestamp();
+
+        //掉线超过10分钟才记录
+        if (et - st < (1000 * 60 * 10))
+            return;
+
+        SignalAbnormal signalAbnormal = new SignalAbnormal();
+        signalAbnormal.setSt(st);
+        signalAbnormal.setEt(et);
+        signalAbnormal.setAbnormalType("reconnection");
+        signalAbnormal.setDestCode(sch.getQdzCode());
+        signalAbnormal.setOutOrIn(0);
+
+        //截断GPS
+        e.setSignalState("truncation");
+
+        //记录信号状态
+        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
+        signalStateData.put(signalState);
+    }
+
+    /**
+     * 漂移异常状态记录
+     *
+     * @param nearGps
+     * @param i
+     * @param array
+     */
+    private void driftSignalAbnormal(GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
+        GpsEntity gps, s = null;
+        //找到漂移开始时间
+        for (; i >= 0; i--) {
+            gps = (GpsEntity) array[i];
+
+            if (!gps.getSignalState().equals("drift") || i == 0
+                    || gps.getSignalState().equals("truncation")) {
+                s = gps;
+                break;
+            }
+        }
+
+        long st = s.getTimestamp(), et = nearGps.getTimestamp();
+        if (et - st < (1000 * 60 * 3))
+            return;
+        /*if (s != null){
+            st = s.getTimestamp();
+            //漂移小于3分钟
+            if(et - st < (1000 * 60 * 3))
+                return;
+        }*/
+
+
+        SignalAbnormal signalAbnormal = new SignalAbnormal();
+        signalAbnormal.setSt(st);
+        signalAbnormal.setEt(et);
+        signalAbnormal.setAbnormalType("drift");
+        signalAbnormal.setDestCode(sch.getQdzCode());
+        signalAbnormal.setOutOrIn(0);
+
+        //截断GPS
+        nearGps.setSignalState("truncation");
+
+        //记录信号状态
+        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
+        signalStateData.put(signalState);
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.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);
+        }
+    }
+}
@@ -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();
             }
         }
@@ -29,6 +29,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.text.ParseException;
@@ -43,6 +44,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());
@@ -83,6 +85,9 @@ public class DayOfSchedule implements CommandLineRunner {
     @Autowired
     GpsRealData gpsRealData;
  
+    @Autowired
+    BasicData.BasicDataLoader basicDataLoader;
+
     /**
      * 线路当前使用的排班的日期
      */
@@ -117,28 +122,24 @@ 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();
+        basicDataLoader.loadAllData();
         //从数据库恢复排班
         dataRecovery();
  
         //翻班线程
-//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
-//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
         //首班出场指令补发器
 //		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
         //班次误点扫描
-        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
  
         //每天凌晨2点20提交数据到运管处
         long diff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
@@ -224,15 +225,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 +497,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 +556,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;
@@ -32,7 +32,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
  
 	//把sum(addMileage) 替换为0   数据表去掉了 add_mileage 字段
 	@Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,"
-			+ " 0 as ksgl,count(jName) as bcs) from ScheduleRealInfo s where"
+			+ "0 as ksgl,count(jName) as bcs) from ScheduleRealInfo s where"
 			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
  
@@ -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'),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)
+	@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)
 	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') "
@@ -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;
@@ -615,8 +616,8 @@ public class FormsServiceImpl implements FormsService {
 				tu.setRq(rq);
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
-				//tu.setXl(arg0.getString("xlgs"));这个是根据公司判断线路有几条
-				tu.setXl(arg0.getString("sxl"));
+				tu.setXl(arg0.getString("xlgs"));//这个是根据公司判断线路有几条
+				//tu.setXl(arg0.getString("sxl"));
 				tu.setXlmc(arg0.getString("sxl"));
 				tu.setCchjh(arg0.getString("jcl").toString());
 				tu.setCchsj(arg0.getString("scl").toString());
@@ -708,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;
+	}
 }
@@ -14,7 +14,6 @@ import com.bsth.repository.schedule.*;
 import com.bsth.service.TrafficManageService;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
-import com.bsth.webService.trafficManage.geotool.services.Internal;
 import com.bsth.webService.trafficManage.geotool.services.InternalPortType;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap;
@@ -105,7 +104,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
  
  
 	// 运管处接口
-	private InternalPortType portType = new Internal().getInternalHttpSoap11Endpoint();
+	private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint();
 	private WebServiceSoap ssop ;
 	{
 		try {
@@ -17,65 +17,66 @@ import javax.transaction.Transactional;
 import java.util.Map;
  
 @Service
-public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService{
+public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService {
  
 	/*@Autowired
-	ScheduleRealInfoServiceImpl scheduleRealInfoService;*/
-
-	@Autowired
-	ScheduleRealInfoRepository scheduleRealInfoRepository;
-	
-	@Autowired
-	ChildTaskPlanRepository childTaskPlanRepository;
-	
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-	
-	@Autowired
-	Arrival2Schedule arrival2Schedule;
-
-	@Autowired
-	JdbcTemplate jdbcTemplate;
-	
-	@Transactional
-	@Override
-	public Map<String, Object> save(ChildTaskPlan t) {
-		Map<String, Object> rs;
-		//保存起终点名称
-		Map<String, String> map = BasicData.stationCode2NameMap;
-		
-		t.setStartStationName(map.get(t.getStartStation()));
-		t.setEndStationName(map.get(t.getEndStation()));
-		//先持久化子任务
-		rs = super.save(t);
-		//再关联主任务
-		ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
-		sch.getcTasks().add(t);
-		dayOfSchedule.save(sch);
-		
-		rs.put("t", sch);
-		
-		if(sch.getZdsjActual() == null)
-			arrival2Schedule.removeExpect(sch.getClZbh());
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> delete(Long id) {
-		Map<String, Object> rs;
-		
-		ChildTaskPlan cPlan = childTaskPlanRepository.findOne(id);
-		//解除和主任务关联
-		ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
-		sch.getcTasks().remove(cPlan);
-		//删除关联表数据
-		jdbcTemplate.execute("delete from bsth_c_s_sp_info_real_c_tasks where bsth_c_s_sp_info_real="+sch.getId()+" and c_tasks="+cPlan.getId());
-
-		//删除子任务
-		rs = super.delete(id);
-		dayOfSchedule.save(sch);
-
-		rs.put("t", sch);
-		return rs;
-	}
+    ScheduleRealInfoServiceImpl scheduleRealInfoService;*/
+
+    @Autowired
+    ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+    @Autowired
+    ChildTaskPlanRepository childTaskPlanRepository;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    Arrival2Schedule arrival2Schedule;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Transactional
+    @Override
+    public Map<String, Object> save(ChildTaskPlan t) {
+        ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
+        Map<String, Object> rs;
+        //保存起终点名称
+        Map<String, String> map = BasicData.stationCode2NameMap;
+        String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+
+        t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
+        t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
+        //先持久化子任务
+        rs = super.save(t);
+        //再关联主任务
+        sch.getcTasks().add(t);
+        dayOfSchedule.save(sch);
+
+        rs.put("t", sch);
+
+        if (sch.getZdsjActual() == null)
+            arrival2Schedule.removeExpect(sch.getClZbh());
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> delete(Long id) {
+        Map<String, Object> rs;
+
+        ChildTaskPlan cPlan = childTaskPlanRepository.findOne(id);
+        //解除和主任务关联
+        ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
+        sch.getcTasks().remove(cPlan);
+        //删除关联表数据
+        jdbcTemplate.execute("delete from bsth_c_s_sp_info_real_c_tasks where bsth_c_s_sp_info_real=" + sch.getId() + " and c_tasks=" + cPlan.getId());
+
+        //删除子任务
+        rs = super.delete(id);
+        dayOfSchedule.save(sch);
+
+        rs.put("t", sch);
+        return rs;
+    }
 }
 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);
-		}
-	}
 }
@@ -7,13 +7,13 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password=
-#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+#spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
-#spring.datasource.password= root
+#spring.datasource.password= 123456
+spring.datasource.url= jdbc:mysql://localhost/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= root
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
  
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.168.117:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.password= root
 \ No newline at end of file
@@ -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}}
@@ -230,8 +230,7 @@
 											var total_bcjh = 0, total_bcsj = 0, total_bczxl = 0;
 											var total_gs = 0;
 											var total_zhgs = 0;
-											$
-													.each(
+											$.each(
 															result,
 															function(i, obj) {
 																total_gs += Number(obj.gsgs);
@@ -55,7 +55,7 @@
     padding: 0;
 }
  
-.line_schedule .schedule-wrap i.uk-icon-question-circle{
+.line_schedule .schedule-wrap .header-title i.uk-icon-question-circle{
     cursor: pointer;
     font-size: 14px;
     color: #cccaca;
@@ -528,6 +528,7 @@ div.drop-rail[data-type=&quot;car&quot;]:before {
  
 dl.relevance-active dd:nth-child(n+2) {
     background: #f1efef !important;
+    color: #333;
 }
  
 dl.relevance-active.intimity dd:nth-child(n+2) {
@@ -1022,4 +1023,27 @@ dd.fcsjActualCell div.last-sch-sunken span._badge{
 .ct_table>.ct_table_body dl.dl-last-sch:hover div.last-sch-sunken,
 .ct_table>.ct_table_body dl.dl-last-sch.context-menu-active div.last-sch-sunken{
     background: #f5fbff;
+}
+
+dd.fcsjActualCell{
+    position: relative;
+}
+
+i.signal_state_icon{
+    position: absolute;
+    right: 5px;
+    top: 7px;
+    box-shadow: 0px 0px 11px 0 rgba(0, 0, 0, 0.2), -1px 3px 8px 0 rgba(0, 0, 0, 0.19);
+    text-indent: 0;
+    border-radius: 15px;
+    cursor: pointer;
+}
+
+i.signal_state_icon.uk-icon-question-circle{
+    color: #e85252 !important;
+}
+
+i.signal_state_icon.uk-icon-reply{
+    color: #4134e3 !important;
+    box-shadow: none;
 }
 \ No newline at end of file
@@ -165,8 +165,8 @@ svg.line-chart g.item:nth-last-child(3)&gt;text {
 }
  
 svg.line-chart g.gps-wrap>rect {
-    width: 28px;
-    height: 24px;
+    width: 34px;
+    height: 18px;
     /*fill: #fff;*/
     rx: 4px;
     cursor: pointer;
@@ -188,7 +188,7 @@ svg.line-chart g.gps-wrap&gt;rect.hover {
  
 svg.line-chart g.gps-wrap>text {
     font-size: 13px;
-    transform: translate(3px, 17px);
+    transform: translate(2px, 14px);
     pointer-events: none;
 }
  
@@ -19,11 +19,12 @@
             </div>
             <div>
               <span class="field">速度：</span>{{speed}}</div>
-            <hr>
+            <div>
+                <span class="field">时间：</span>{{dateStr}}</div>
+            {{if expectStopTime!=null}}
             <div>
               预计 {{expectStopTime}} 分钟到达终点</div>
-            <!-- <hr> -->
-            <!-- <div class="subtitle">更新时间: 10:34.26</div> -->
+            {{/if}}
             <div class="tip_map_wrap"></div>
         </div>
       </div>
@@ -43,12 +44,15 @@
             <div>
               <span class="field">设备：</span>{{gps.deviceId}}
             </div>
-            <div>
+            <div style="color: #747272;">
+                {{gps.dateStr}}
+            </div>
+            <!--<div>
               <span class="field">进站时间：</span>?
             </div>
             <div>
               <span class="field">计划发出：</span>?
-            </div>
+            </div>-->
  
         </div>
         </div>
@@ -15,7 +15,7 @@
                 </div>
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
-                        <label class="uk-form-label" style="width: 75px;">放大站至</label>
+                        <label class="uk-form-label" style="width: 75px;">放站至</label>
                         <div class="uk-form-controls" style="margin-left: 75px;">
                             <select name="endStation">
                             </select>
@@ -53,11 +53,31 @@
  
             var remarks;
             function refreshDirectiveStr() {
+
+                var $qdz = $('[name=startStation]')
+                        , $zdz = $('[name=endStation]');
                 //指令内容
-                var qdzName = $('[name=startStation]').find("option:selected").text()
-                        , zdzName = $('[name=endStation]').find("option:selected").text();
-                remarks=' 由 ' + qdzName + ' 放站至 ' + zdzName;
-                $('[name=directiveStr]', modal).text('班次：'+sch.dfsj+remarks).trigger('input');
+                var qdzName = $qdz.find("option:selected").text()
+                        , zdzName = $zdz.find("option:selected").text();
+
+                //只修改起点
+                if(sch.qdzCode != $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 待客至 ' + qdzName + ' ，放站至 ' + zdzName;
+                }
+                //只修改终点
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 放站至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都改变
+                else if(sch.qdzCode != $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 放站至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都不改变
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 放站至 ' + zdzName;
+                }
+
+                $('[name=directiveStr]', modal).text('班次：' + sch.dfsj + remarks).trigger('input');
             }
  
             $('[name=startStation]', modal).on('change', function () {
@@ -6,7 +6,7 @@
             <div class="uk-grid">
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
-                        <label class="uk-form-label" style="width: 75px;">从</label>
+                        <label class="uk-form-label" style="width: 75px;">起点</label>
                         <div class="uk-form-controls" style="margin-left: 75px;">
                             <select name="startStation">
                             </select>
@@ -15,7 +15,7 @@
                 </div>
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
-                        <label class="uk-form-label" style="width: 75px;">直放至</label>
+                        <label class="uk-form-label" style="width: 75px;">终点</label>
                         <div class="uk-form-controls" style="margin-left: 75px;">
                             <select name="endStation">
                             </select>
@@ -53,12 +53,30 @@
  
             var remarks;
             function refreshDirectiveStr() {
+                var $qdz = $('[name=startStation]')
+                        , $zdz = $('[name=endStation]');
                 //指令内容
-                var qdzName = $('[name=startStation]').find("option:selected").text()
-                        , zdzName = $('[name=endStation]').find("option:selected").text();
+                var qdzName = $qdz.find("option:selected").text()
+                        , zdzName = $zdz.find("option:selected").text();
  
-                remarks=' 由 ' + qdzName + ' 直放至 ' + zdzName;
-                $('[name=directiveStr]', modal).text('班次：'+sch.dfsj+ remarks).trigger('input');
+                //只修改起点
+                if(sch.qdzCode != $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 待客至 ' + qdzName + ' ，直放至 ' + zdzName;
+                }
+                //只修改终点
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 直放至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都改变
+                else if(sch.qdzCode != $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 直放至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都不改变
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 直放至 ' + zdzName;
+                }
+
+                $('[name=directiveStr]', modal).text('班次：' + sch.dfsj + remarks).trigger('input');
             }
  
             $('[name=startStation]', modal).on('change', function () {
@@ -98,7 +116,7 @@
                 f.on('success.form.fv', function (e) {
                     e.preventDefault();
                     var data = $(this).serializeJSON();
-                   // notify_wait('准备下发指令')
+                    // notify_wait('准备下发指令')
                     //下发指令
                     $.post('/directive/phrase', {nbbm: sch.clZbh, text: data.directiveStr}, function (rs) {
                         if (rs == 0) {
@@ -128,7 +146,10 @@
  
             function changeBcType() {
                 //将班次类型调整为直放
-                gb_common.$post('/realSchedule/changeBcType/'+sch.id, {bcType: 'venting', remarks: remarks}, function(rs){
+                gb_common.$post('/realSchedule/changeBcType/' + sch.id, {
+                    bcType: 'venting',
+                    remarks: remarks
+                }, function (rs) {
                     UIkit.modal(modal).hide();
                     gb_schedule_table.updateSchedule(rs.t);
                     //触发父容器刷新事件
@@ -83,7 +83,7 @@
                                 <dd data-sort-val={{sch.dfsjT}} dbclick dbclick-type="dfsj" dbclick-val="{{sch.dfsj}}">
                                     {{sch.dfsj}}
                                 </dd>
-                                <dd class="
+                                <dd data-uk-observe class="
                                     {{if sch.status==-1}}
                                       tl-qrlb
                                     {{else if sch.status==2}}
@@ -130,7 +130,7 @@
     </script>
  
     <script id="line-schedule-sfsj-temp" type="text/html">
-        <dd class="
+        <dd data-uk-observe class="
     {{if status==-1}}
       tl-qrlb
     {{else if status==2}}
+<div class="uk-modal ct-form-modal" id="signal_state_config-modal">
+    <div class="uk-modal-dialog" style="width: 530px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>信号标记设置</h2></div>
+
+        <p style="border-bottom: 1px solid #efefef;color: grey;padding-bottom: 9px;">
+            <small>
+                <i class="uk-icon-question-circle"> </i>
+                设置项将会保存在本地客户端，清理缓存和更换电脑会重置.</small>
+        </p>
+        <form class="uk-form uk-form-horizontal">
+            <div class="uk-grid">
+                <div class="uk-width-2-3 uk-container-center">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">是否启用</label>
+                        <div class="uk-form-controls">
+                            <select name="enable">
+                                <option value="1">启用</option>
+                                <option value="0">禁用</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+                <button type="button" class="uk-button uk-modal-close">取消</button>
+                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+            </div>
+        </form>
+    </div>
+
+    <script>
+        (function() {
+            var modal = '#signal_state_config-modal';
+            var f = $('form', modal);
+
+            $(modal).on('init', function(e, data) {
+                var val = gb_signal_state.isEnable()?1:0;
+                $('[name=enable]', f).val(val);
+            });
+
+            f.formValidation(gb_form_validation_opts);
+            f.on('success.form.fv', function(e) {
+                e.preventDefault();
+                var data = $(this).serializeJSON();
+
+                if(data.enable=='1')
+                    gb_signal_state.enable();
+                else
+                    gb_signal_state.disable();
+
+                UIkit.modal(modal).hide();
+            });
+
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -3,7 +3,7 @@
 var gb_data_gps = (function() {
  
     //fixed time refresh delay
-    var delay = 1000 * 6;
+    var delay = 1000 * 60;
     //deviceId ——> gps
     var realData = {};
     //refresh after callback
@@ -51,8 +51,10 @@ var gb_data_gps = (function() {
             } else
                 addArr.push(this);
             //起终点 拼接方向标识
-            if(this.sEPoint)
-                this.stopNo=this.stopNo+'_'+this.upDown;
+            /*if(this.sEPoint)
+                this.stopNo=this.stopNo+'_'+this.upDown;*/
+            //时间格式化
+            this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
             realData[this.deviceId] = this;
         });
  
@@ -93,6 +93,11 @@
         "id": 3.1,
         "text": "TTS",
         "event": "tts_config"
+      },
+      {
+        "id": 3.2,
+        "text": "信号标记",
+        "event": "signal_state"
       }
     ]
   }
@@ -190,4 +190,6 @@ var gb_schedule_context_menu = (function() {
             }
         }
     });
+
+    return callbackHandler;
 })();
@@ -67,15 +67,23 @@ var gb_schedule_table_dbclick = (function() {
             'cancel': {
                 name: '取消',
                 icon: "delete"
-            },
-            'save': {
-                name: '保存',
-                icon: "edit"
             }
         }
     });
+    
+    var sfsjCellClick = function (elem) {
+        elem.dblclick(function () {
+
+            var id = $(this).parent().data('id'),
+                lineCode = $(this).parents('li.line_schedule').data('id');
+
+            var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
+            gb_schedule_context_menu.fcxxwt(sch);
+        });
+    };
  
     return {
-        init: init
+        init: init,
+        sfsjCellClick:sfsjCellClick
     };
 })();
@@ -22,7 +22,7 @@ var gb_line_layout = (function() {
     };
  
     //图例icon tootip
-    $(document).on('mouseenter', '.schedule-wrap i.uk-icon-question-circle', function() {
+    $(document).on('mouseenter', '.schedule-wrap .header-title i.uk-icon-question-circle', function() {
         $(this).qtip({
             show: {
                 ready: true,
@@ -108,6 +108,9 @@ var gb_schedule_table = (function () {
                 }
             });
         });
+
+        //双击
+        gb_schedule_table_dbclick.sfsjCellClick($('dd.fcsjActualCell'));
     }
  
     //重置序号
@@ -192,20 +195,20 @@ var gb_schedule_table = (function () {
         if (!isArray(schArr))
             schArr = [schArr];
  
-        var tMaps={};
+        var tMaps = {};
         $.each(schArr, function () {
             line2Schedule[this.xlBm][this.id] = this;
             updateDom(this);
             //线路_车辆 过滤重复数据
-            tMaps[this.xlBm+'_'+this.clZbh]=1;
+            tMaps[this.xlBm + '_' + this.clZbh] = 1;
         });
  
- /*       //重新标记末班
-        var ts=[];
-        for(var k in tMaps){
-            ts = k.split('_');
-            markerLastByNbbm(ts[0], ts[1]);
-        }*/
+        /*       //重新标记末班
+         var ts=[];
+         for(var k in tMaps){
+         ts = k.split('_');
+         markerLastByNbbm(ts[0], ts[1]);
+         }*/
     };
  
     //update dom
@@ -218,10 +221,10 @@ var gb_schedule_table = (function () {
         //车辆自编号
         $(dds[2]).replaceWith(temps['line-schedule-nbbm-temp'](sch));
         //if (sch.qdzArrDateJH)
-        $(dds[3]).text(sch.qdzArrDateJH?sch.qdzArrDateJH:'');
+        $(dds[3]).text(sch.qdzArrDateJH ? sch.qdzArrDateJH : '');
  
         //if (sch.qdzArrDateSJ)
-        $(dds[4]).text(sch.qdzArrDateSJ?sch.qdzArrDateSJ:'');
+        $(dds[4]).text(sch.qdzArrDateSJ ? sch.qdzArrDateSJ : '');
  
         //计发时间
         $(dds[5]).replaceWith(temps['line-schedule-fcsj-temp'](sch));
@@ -229,15 +232,19 @@ var gb_schedule_table = (function () {
  
         //实发时间
         calc_sch_real_shift(sch);
-        var sfsjDd = temps['line-schedule-sfsj-temp'](sch);
+        var sfsjDd = $(temps['line-schedule-sfsj-temp'](sch));
+        //双击
+        gb_schedule_table_dbclick.sfsjCellClick(sfsjDd);
         $(dds[7]).replaceWith(sfsjDd);
         if (sch.remarks)
             $(dds[8]).html('<span title="' + sch.remarks + '" data-uk-tooltip="{pos:\'top-left\'}">' + sch.remarks + '</span>');
         else
             $(dds[8]).html('');
  
+        //信号状态标记
+        gb_signal_state.marker_sch(sch);
         //班次是车辆的最后一班
-        if(dl.hasClass('dl-last-sch'))
+        if (dl.hasClass('dl-last-sch'))
             markerLastSch([sch]);
     };
  
@@ -418,13 +425,13 @@ var gb_schedule_table = (function () {
  
     //清除线路下指定班次的 末班标记
     var removeMarkers = function (lineCode, array) {
-        var idx=[];
+        var idx = [];
         $.each(array, function () {
             idx.push(this.id);
         });
  
-        $('dl.dl-last-sch','li.line_schedule[data-id=' + lineCode + ']').each(function () {
-            if($(this).hasClass('dl-last-sch') && idx.indexOf($(this).data('id'))){
+        $('dl.dl-last-sch', 'li.line_schedule[data-id=' + lineCode + ']').each(function () {
+            if ($(this).hasClass('dl-last-sch') && idx.indexOf($(this).data('id'))) {
                 $(this).removeClass('dl-last-sch').find('.last-sch-sunken').remove();
             }
         });
@@ -446,6 +453,7 @@ var gb_schedule_table = (function () {
             return car_yfwf_map[lineCode];
         },
         scroToDl: scroToDl,
-        reset_drag_active_all: reset_drag_active_all
+        reset_drag_active_all: reset_drag_active_all,
+        getDl: getDl
     };
 })();
 //主调和监控模式
 var operationMode = window.localStorage.getItem('operationMode');
-if(operationMode == 0){
+if (operationMode == 0) {
     $('body>.north').addClass('monitor');
     $(document).on('ajaxSend', interceptPOST);
 }
@@ -8,8 +8,8 @@ else
     $('body>.north').addClass('main');
  
 //拦截POST请求
-function interceptPOST(e, xhr, t){
-    if(t && (t.method == 'POST' || t.type == 'POST')){
+function interceptPOST(e, xhr, t) {
+    if (t && (t.method == 'POST' || t.type == 'POST')) {
         console.log(e, xhr, t);
         xhr.abort();
         notify_err('监控模式！');
@@ -18,54 +18,56 @@ function interceptPOST(e, xhr, t){
  
 /* main js  */
 var gb_main_ep = new EventProxy(),
-    res_load_ep = EventProxy.create('load_data_basic', 'load_tab', 'load_home_layout', 'load_home_line_panel', function() {
+    res_load_ep = EventProxy.create('load_data_basic', 'load_tab', 'load_home_layout', 'load_home_line_panel', function () {
         var eq = gb_main_ep;
         // basic data end
         eq.once('data-basic', g_emit('tab'));
         // tabs
-        eq.once('tab', function() {
+        eq.once('tab', function () {
             gb_tabs.init(
                 g_emit('home-layout')
             );
         });
         //home layout
-        eq.once('home-layout', function() {
+        eq.once('home-layout', function () {
             gb_home_layout.layout(
                 g_emit('home-line-panel')
             );
         });
         //home line panel
-        eq.once('home-line-panel', function() {
+        eq.once('home-line-panel', function () {
             gb_home_line_panel.init(g_emit('gps-time-refresh'));
         });
  
         //start fixed time refresh gps
-        eq.once('gps-time-refresh', function() {
+        eq.once('gps-time-refresh', function () {
             gb_data_gps.fixedTimeRefresh();
             g_emit('line-schedule-layout')();
         });
  
         //line schedule layout
-        eq.once('line-schedule-layout', function() {
+        eq.once('line-schedule-layout', function () {
             gb_line_layout.layout(g_emit('render-sch-table'));
         });
  
         //render schedule table
-        eq.once('render-sch-table', function() {
-            gb_schedule_table.show(function(){
-              //搜索框
-              gb_sch_search.init();
+        eq.once('render-sch-table', function () {
+            gb_schedule_table.show(function () {
+                //搜索框
+                gb_sch_search.init();
+                //加载信号状态
+                gb_signal_state.init();
             });
  
             //嵌入地图页面
-            $('li.map-panel','#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
-
+            $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
+            //弹出更新说明
             showUpdateDescription();
         });
  
         function g_emit(id) {
             console.log('g_emit [' + id + ']');
-            return function() {
+            return function () {
                 console.log('eq.emitLater(' + id + ')');
                 return eq.emitLater(id);
             };
@@ -73,17 +75,17 @@ var gb_main_ep = new EventProxy(),
     });
  
 //modal hide remove dom
-$(document).on('hide.uk.modal', '.uk-modal', function() {
+$(document).on('hide.uk.modal', '.uk-modal', function () {
     $(this).remove();
 });
  
 $(document).on('click', '.ct-bottom-drawer-close', function () {
-   $(this).parents('.ct-bottom-drawer').removeClass('open');
+    $(this).parents('.ct-bottom-drawer').removeClass('open');
 });
  
 function connectArr(arr, separator, transFun) {
     var rs = '';
-    $.each(arr, function(i, item) {
+    $.each(arr, function (i, item) {
         if (transFun)
             item = transFun(item);
         rs += (separator + item);
@@ -102,26 +104,26 @@ var gb_form_validation_opts = {
 };
  
  
-var notify_wait = function(t) {
+var notify_wait = function (t) {
     UIkit.notify("<i class='uk-icon-spinner uk-icon-spin'></i> " + t, {
         status: 'info'
     });
 };
  
-var notify_succ = function(t) {
+var notify_succ = function (t) {
     UIkit.notify("<i class='uk-icon-check'></i> " + t, {
         status: 'success'
     });
 };
  
-var notify_err = function(t) {
+var notify_err = function (t) {
     UIkit.notify("<i class='uk-icon-times'></i> " + t, {
         status: 'danger'
     });
 };
  
-var alt_confirm = function(content, succ, okBtn) {
-    var modalEl = UIkit.modal.confirm(content, function() {
+var alt_confirm = function (content, succ, okBtn) {
+    var modalEl = UIkit.modal.confirm(content, function () {
         succ && succ();
         modalEl.hide();
     }, {
@@ -129,15 +131,15 @@ var alt_confirm = function(content, succ, okBtn) {
             Ok: okBtn,
             Cancel: '取消'
         }
-        ,center: true
+        , center: true
     });
 };
  
-var isArray = function(obj) {
+var isArray = function (obj) {
     return Object.prototype.toString.call(obj) === '[object Array]';
 };
  
-var notify_err_form = function(t, form) {
+var notify_err_form = function (t, form) {
     $('.uk-alert-danger', form).remove();
     $('.uk-modal-footer', form).before('<div class="uk-alert uk-alert-danger" data-uk-alert="">' +
         '<a href="" class="uk-alert-close uk-close"></a>' +
@@ -147,29 +149,29 @@ var notify_err_form = function(t, form) {
     enable_submit_btn(form);
 };
  
-var enable_submit_btn = function(form) {
+var enable_submit_btn = function (form) {
     var subBtn = $('button[type=submit]', form);
     if (subBtn) {
         subBtn.removeClass('disabled').removeAttr('disabled');
     }
 }
  
-var disabled_submit_btn = function(form) {
+var disabled_submit_btn = function (form) {
     var subBtn = $('button[type=submit]', form);
     if (subBtn) {
-        subBtn.addClass('disabled').attr('disabled','disabled');
+        subBtn.addClass('disabled').attr('disabled', 'disabled');
     }
 };
  
-var show_modal = function(id, dom) {
+var show_modal = function (id, dom) {
     $(document.body).append(dom);
     return UIkit.modal(id, {
         bgclose: false
     }).show();
 };
  
-var open_modal = function(pageUrl, data, opt) {
-    $.get(pageUrl, function(dom) {
+var open_modal = function (pageUrl, data, opt) {
+    $.get(pageUrl, function (dom) {
         if (!$(dom).hasClass('uk-modal')) {
             alert('无效的dom片段！');
             return;
@@ -188,20 +190,20 @@ var open_modal = function(pageUrl, data, opt) {
  
 function showUpdateDescription() {
     //更新说明
-    var updateDescription={
+    var updateDescription = {
         date: '2016-12-20',
         text: '<h5>1、回场子任务开放使用。</h5>'
     };
  
     var storage = window.localStorage
-        ,key = 'update_' + updateDescription.date;
+        , key = 'update_' + updateDescription.date;
     var text = storage.getItem(key);
-    if(!text){
-        var modal = '<div class="uk-modal" id="update-description-modal">'+
-            '    <div class="uk-modal-dialog">'+
-            '    <a class="uk-modal-close uk-close"></a>'+
-            '     <div class="uk-modal-header">'+
-            '      <h2>'+updateDescription.date+' 更新说明</h2></div>'+updateDescription.text+
+    if (!text) {
+        var modal = '<div class="uk-modal" id="update-description-modal">' +
+            '    <div class="uk-modal-dialog">' +
+            '    <a class="uk-modal-close uk-close"></a>' +
+            '     <div class="uk-modal-header">' +
+            '      <h2>' + updateDescription.date + ' 更新说明</h2></div>' + updateDescription.text +
             '    </div>';
  
         show_modal('#update-description-modal', modal);
@@ -71,6 +71,9 @@ var gb_northToolbar = (function() {
     },
     gps_play_back: function () {
       gb_map_play_back.initParams();
+    },
+    signal_state: function () {
+      open_modal('/real_control_v2/fragments/north/nav/signal_state_config.html', {}, modal_opts);
     }
   }
 })();
+/**
+ * GPS信号状态
+ * @type {{}}
+ */
+var gb_signal_state = (function () {
+    var storage = window.localStorage;
+
+    $(document).on('click', 'i.signal_state_icon', function (e) {
+        e.stopPropagation();
+    });
+
+    var signal_state_data = {};
+    var enable = true;
+    //读取本地状态
+    var locStatus = storage.getItem("signal_state_enable");
+    if (locStatus && locStatus=='0')
+        enable = false;
+
+    var init = function () {
+        $.get('/signalState/multi', {idx: gb_data_basic.line_idx}, function (rs) {
+            //按班次ID分组
+            signal_state_data = gb_common.groupBy(rs, 'schId');
+
+            for (var schId in signal_state_data) {
+                multi_render(signal_state_data[schId]);
+            }
+        });
+    };
+
+    var multi_render = function (list) {
+        if (!enable)
+            return;
+
+        if (!list || list.length == 0)
+            return;
+        var line = list[0].lineCode
+            , schId = list[0].schId;
+
+        var sch = gb_schedule_table.findScheduleByLine(line)[schId];
+        var dl = gb_schedule_table.getDl(sch);
+        var icon = 'question-circle';
+        var t = '';
+        $.each(list, function () {
+            t += (this.text + '<br>');
+        });
+
+        if (list.length == 1 && list[0].type == 'route_reverse')
+            icon = 'reply';
+
+        var dd = $('dd.fcsjActualCell', dl);
+        var se = $('i.signal_state_icon', dd);
+        if (se && se.length > 0)
+            se.remove();
+
+        dd.append('<i data-uk-tooltip title="' + t + '" class="uk-icon-' + icon + ' signal_state_icon"></i>');
+    };
+
+    var put = function (obj) {
+        if (!signal_state_data[obj.schId]) {
+            signal_state_data[obj.schId] = [];
+        }
+
+        signal_state_data[obj.schId].push(obj);
+        multi_render(signal_state_data[obj.schId]);
+    };
+
+    var marker_sch = function (sch) {
+        var list = signal_state_data[sch.id];
+        if (list) {
+            multi_render(list);
+        }
+    };
+
+    var clearAll = function () {
+        $('.signal_state_icon').remove();
+    };
+
+    return {
+        init: init,
+        put: put,
+        marker_sch: marker_sch,
+        isEnable: function () {
+            return enable;
+        },
+        disable: function () {
+            enable = false;
+            storage.setItem("signal_state_enable", 0);
+
+            clearAll();
+        },
+        enable: function () {
+            enable = true;
+            storage.setItem("signal_state_enable", 1);
+            for (var schId in signal_state_data) {
+                multi_render(signal_state_data[schId]);
+            }
+        }
+    };
+})();
 \ No newline at end of file
 /* 线路模拟图 */
  
-var gb_svg_chart = (function() {
+var gb_svg_chart = (function () {
  
     //chart height
     var chart_height = 123;
@@ -11,22 +11,22 @@ var gb_svg_chart = (function() {
     //svg namespace
     var svgns = 'http://www.w3.org/2000/svg';
  
-    var calc_text_y = function(t) {
+    var calc_text_y = function (t) {
             return (chart_height - (chart_height / t_max_size * t.length)) / 2 + 5;
         },
-        cat_text = function(t) {
+        cat_text = function (t) {
             return t.length > t_max_size ? t.substr(0, t_max_size) : t;
         },
-        get_width = function(wrap) {
+        get_width = function (wrap) {
             return wrap.actual('outerWidth');
         },
-        get_height = function(wrap) {
+        get_height = function (wrap) {
             var h = wrap.actual('outerHeight');
             //隐藏元素取最外层的高度
             return h < 20 ? wrap.parent().actual('outerHeight') - 2 : h;
         }
  
-    var draw_line = function(lineCode, wrap) {
+    var draw_line = function (lineCode, wrap) {
  
         var data = gb_svg_data_convert.mergeRoute(gb_data_basic.stationRoutes(lineCode)),
             len = data.length;
@@ -36,22 +36,22 @@ var gb_svg_chart = (function() {
             //x scale
             ,
             xScale = d3.scale.linear().range([x_padd, w - x_padd]).domain([0, len - 1]),
-            cx = function(d, i) {
+            cx = function (d, i) {
                 return xScale(i);
             },
-            cy = function() {
+            cy = function () {
                 return (h - chart_height) / 2;
             },
-            ty = function(d) {
+            ty = function (d) {
                 return cy() + calc_text_y(cat_text(d.name[0]));
             }
             //line generator
             ,
             upLine = d3.svg.line().x(xScale).y(cy),
-            downLine = d3.svg.line().x(xScale).y(function() {
+            downLine = d3.svg.line().x(xScale).y(function () {
                 return cy() + chart_height
             }),
-            multi_text = function(d, i, that) {
+            multi_text = function (d, i, that) {
  
                 var dText = document.createElementNS(svgns, 'text'),
                     t = cat_text(d.name[1]);
@@ -82,14 +82,14 @@ var gb_svg_chart = (function() {
             'station_link': true
         };
         items.append('path').classed(p_clzz)
-            .attr('d', function(d, i) {
+            .attr('d', function (d, i) {
                 return i < len - 1 ? upLine([i, i + 1]) : '';
             });
  
         //down station link path
         p_clzz.down = true;
         items.append('path').classed(p_clzz)
-            .attr('d', function(d, i) {
+            .attr('d', function (d, i) {
                 return i < len - 1 ? downLine([i, i + 1]) : '';
             });
  
@@ -97,40 +97,44 @@ var gb_svg_chart = (function() {
         var c_clzz = {
             'station_circle': true
         };
-        items.select(function (d) {return d.type!=1?this:null;})
+        items.select(function (d) {
+            return d.type != 1 ? this : null;
+        })
             .append('circle').classed(c_clzz)
             .attr('cx', cx)
             .attr('cy', cy)
-            .attr('data-id', function(d) {
+            .attr('data-id', function (d) {
                 return d.id[0];
             });
  
         //down circle
         c_clzz.down = true;
-        items.select(function (d) {return d.type!=0?this:null;})
+        items.select(function (d) {
+            return d.type != 0 ? this : null;
+        })
             .append('circle').classed(c_clzz)
             .attr('cx', cx)
-            .attr('cy', function(d, i) {
+            .attr('cy', function (d, i) {
                 return cy(d, i) + chart_height;
             })
-            .attr('data-id', function(d) {
-                return d.type==1?d.id[0]:d.id[1];
+            .attr('data-id', function (d) {
+                return d.type == 1 ? d.id[0] : d.id[1];
             });
  
         //station name text
         items.append('text').classed({
-                'station_text': true,
-                'up': function(d) {
-                    return d.type == 3 ? true : false;
-                }
-            })
-            .text(function(d) {
+            'station_text': true,
+            'up': function (d) {
+                return d.type == 3 ? true : false;
+            }
+        })
+            .text(function (d) {
                 return cat_text(d.name[0]);
             })
-            .attr('title', function(d) {
+            .attr('title', function (d) {
                 return d.name[0];
             })
-            .attr('x', function(d, i) {
+            .attr('x', function (d, i) {
                 return d.type == 3 ? multi_text(d, i, this) : cx(d, i)
             })
             .attr('y', ty);
@@ -149,90 +153,95 @@ var gb_svg_chart = (function() {
     // ----- draw gps ------
     //gps 按线路站点分组后的下标映射
     var line_gps_index = {};
-    var get_circle = function(dataId, svg) {
+    var get_circle = function (dataId, svg) {
             try {
                 var circle = $('.station_circle[data-id=' + dataId + ']', svg);
                 if (circle.length == 0)
                     circle = null;
-            }catch (e){
+            } catch (e) {
                 console.log('get_circle error! station_circle data-id:' + dataId);
                 return null;
             }
             return circle;
         },
-        gx = function(gps, svg) {
-            var circle = get_circle(gps.stopNo, svg);
+        gx = function (gps, svg) {
+            var circle = get_circle(gps.stopNo + '_' + gps.upDown, svg);
             if (!circle) return -100;
  
             return circle.attr('cx') - 14;
         },
-        gy = function(gps, svg) {
-            var circle = get_circle(gps.stopNo, svg);
+        gy = function (gps, svg) {
+            var circle = get_circle(gps.stopNo + '_' + gps.upDown, svg);
             if (!circle) return -100;
  
             var cy = parseInt(circle.attr('cy')),
-                index = line_gps_index[gps.lineId][gps.stopNo][gps.deviceId];
+                index = line_gps_index[gps.lineId][gps.stopNo + '_' + gps.upDown][gps.deviceId];
  
-            return gps.upDown == 0 ? cy - 31 - (index * 28) : cy + 7 + (index * 28);
+            return gps.upDown == 0 ? cy - 25 - (index * 21) : cy + 7 + (index * 21);
         },
-        ups_gps = function(d) {
+        ups_gps = function (d) {
             return d.gpsUps;
         },
-        downs_gps = function(d) {
+        downs_gps = function (d) {
             return d.gpsDowns;
         },
-        gps_index_mapp = function(data) {
+        gps_index_mapp = function (data) {
             var rs = {};
-            var dataGroupStop = gb_common.groupBy(data, 'stopNo');
+            var dataGroupStop = gb_svg_data_convert.groupByStationAndUpdown(data);
             for (var stopNo in dataGroupStop) {
                 rs[stopNo] = {};
-                $.each(dataGroupStop[stopNo], function(i, gps) {
+                $.each(dataGroupStop[stopNo], function (i, gps) {
                     rs[stopNo][gps.deviceId] = i;
                 });
             }
             return rs;
         },
-        g_text = function(d) {
-            var len = (d.nbbm == false ? 0 : d.nbbm.length);
-            return len > 3 ? d.nbbm.substr(len - 3) : d.nbbm;
+        g_text = function (d) {
+            var len = (d.nbbm == false ? 0 : d.nbbm.length)
+                , t = len > 3 ? d.nbbm.substr(len - 3) : d.nbbm;
+
+            if (d.nbbm.indexOf('-') > 1) {
+                t = d.nbbm.substr(d.nbbm.indexOf('-') - 1, 1) + t;
+            }
+            return t;
         },
-        gps_key = function(d) {
+        gps_key = function (d) {
             return d.deviceId;
         },
-        gps_update_point = function(e, svg) {
-            e.transition().attr('x', function(d) {
-                    return gx(d, svg);
-                })
-                .attr('y', function(d) {
+        gps_update_point = function (e, svg) {
+            e.transition().attr('x', function (d) {
+                return gx(d, svg);
+            })
+                .attr('y', function (d) {
                     return gy(d, svg);
                 })
-                .attr('updown', function(d) {
+                .attr('updown', function (d) {
                     return d.upDown;
                 });
             //update tip position
             gb_svg_tooltip.update(e);
         },
-        rct_id = function(d) {
+        rct_id = function (d) {
             return 'rct_' + d.deviceId;
         },
-        tx_id = function(d) {
+        tx_id = function (d) {
             return 'tx_' + d.deviceId;
         }
  
-    var setGps = function(lineCode) {
+    var setGps = function (lineCode) {
         var svgs = $('.line-chart[data-code=' + lineCode + ']'),
             data = gb_data_gps.gpsByLineCode(lineCode);
  
-       var list=[];
+        var list = [];
         //过滤无站点字段的数据
-        $.each(data, function(){
-            if(!this.stopNo || this.stopNo=='')
+        $.each(data, function () {
+            if (!this.stopNo || this.stopNo == '')
                 return true;
             list.push(this);
         });
  
         line_gps_index[lineCode] = gps_index_mapp(list);
-        $.each(svgs, function() {
+        $.each(svgs, function () {
             //绘制gps
             draw_gps(this, list);
             //聚合gps
@@ -241,7 +250,7 @@ var gb_svg_chart = (function() {
  
     };
  
-    var draw_gps = function(svg, data) {
+    var draw_gps = function (svg, data) {
         //remove merge_hide class
         $('.merge_hide', svg).removeAttr('class');
  
@@ -256,22 +265,22 @@ var gb_svg_chart = (function() {
         gps_update_point(ts, svg);
     };
  
-    var marker_clusterer = function(svg, lineCode) {
-      //debugger
+    var marker_clusterer = function (svg, lineCode) {
+        //debugger
         var gpsArr, idxMapp = line_gps_index[lineCode];
-            //svgs = $('.line-chart[data-code=' + lineCode + ']');
+        //svgs = $('.line-chart[data-code=' + lineCode + ']');
         for (var stopNo in idxMapp) {
             gpsArr = gb_common.get_keys(idxMapp[stopNo]);
             //remove old merger point
             $('g[_id=' + 'merger_' + stopNo + ']', svg).remove();
             if (gpsArr.length <= 2)
-              continue;
+                continue;
  
             marker_clusterer_merge(svg, stopNo, gpsArr);
         }
     }
  
-    var marker_clusterer_merge = function(svg, stopNo, gpsArr) {
+    var marker_clusterer_merge = function (svg, stopNo, gpsArr) {
         //stop circle
         var circle = get_circle(stopNo, svg);
         if (!circle) return;
@@ -282,7 +291,7 @@ var gb_svg_chart = (function() {
  
         var svg = d3.select(svg);
         //hide old element
-        $.each(gpsArr, function(i, d) {
+        $.each(gpsArr, function (i, d) {
             $('rect[_id=rct_' + d + '],text[_id=tx_' + d + ']').attr('class', 'merge_hide');
         });
  
@@ -292,7 +301,7 @@ var gb_svg_chart = (function() {
             });
         //merge rect
         mergerG.append('rect').attr('x', x - 12)
-            .attr('y', function() {
+            .attr('y', function () {
                 return isDown ? y + 7 : y - 32;
             });
         //merge text
@@ -37,14 +37,15 @@ var gb_svg_map_util = (function () {
  
     var drawStationMarker = function (routeItem) {
         var station = routeItem.station,
+            name = routeItem.stationName,
             coord = TransGPS.wgsToBD(station.gLaty, station.gLonx);
  
         var marker = new BMap.Marker(new BMap.Point(coord.lng, coord.lat));
  
         //label
-        var offsetX = Math.abs(station.stationName.length / 2 * 12),
+        var offsetX = Math.abs(name.length / 2 * 12),
             offsetY = -20,
-            label = new BMap.Label(station.stationName, {
+            label = new BMap.Label(name, {
                 offset: new BMap.Size(-offsetX, offsetY)
             });
  
@@ -13,6 +13,7 @@ var gb_svg_tooltip = (function () {
         if (rect.attr('aria-describedby'))
             return;
         var gps = gb_data_gps.findOne($(this).attr('_id').split('_')[1]);
+        console.log('gps', gps);
         $(this).qtip({
             show: {
                 ready: true,
@@ -151,7 +152,7 @@ var gb_svg_tooltip = (function () {
     function searchByStop(list, stop) {
         var rs = [];
         $.each(list, function () {
-            if (this.stopNo == stop)
+            if ((this.stopNo + '_' + this.upDown) == stop)
                 rs.push(this);
         });
         return rs;
@@ -103,14 +103,30 @@ var gb_svg_data_convert = (function() {
     };
  
     var get_station_code=function (station) {
-        if(station.stationMark=='B' || station.stationMark=='E')
+        /*if(station.stationMark=='B' || station.stationMark=='E')
             return station.stationCode+'_'+station.directions;
         else
-            return station.stationCode;
+            return station.stationCode;*/
+        return station.stationCode+'_'+station.directions;
     };
  
     var nvl_get = function(list, index) {
         return list[index] == null ? {} : list[index];
     };
-    return {mergeRoute: mergeRoute};
+
+    var groupByStationAndUpdown = function (data) {
+        //gb_common.groupBy(data, 'stopNo')
+        var rs = {},
+            key;
+        $.each(data, function () {
+            key = this['stopNo'] + '_' + this['upDown'];
+            if (!rs[key])
+                rs[key] = [];
+
+            rs[key].push(this);
+        });
+
+        return rs;
+    };
+    return {mergeRoute: mergeRoute, groupByStationAndUpdown: groupByStationAndUpdown};
 })();
@@ -26,7 +26,7 @@ var gb_sch_websocket = (function () {
         var data = {
             operCode: 'register_line',
             idx: gb_data_basic.line_idx
-        }
+        };
         schSock.send(JSON.stringify(data));
         console.log('regListen....', data);
     }
@@ -45,21 +45,21 @@ var gb_sch_websocket = (function () {
     var calcUntreated = function (lineCode) {
         var size = $('li.line_schedule[data-id=' + lineCode + '] .sys-mailbox .sys-mail-item').length;
         $('#badge_untreated_num_' + lineCode).text(size);
-    }
+    };
  
     var calcUntreatedAll = function () {
         $('#main-tab-content li.line_schedule').each(function () {
             calcUntreated($(this).data('id'));
         });
-    }
+    };
  
  
     //80协议上报
     var report80 = function (msg) {
         msg.dateStr = moment(msg.timestamp).format('HH:mm');
         msg.text = gb_common.reqCode80[msg.data.requestCode];
-        if(!msg.text)
-            msg.text='（未知的请求码 '+msg.data.requestCode+'）';
+        if (!msg.text)
+            msg.text = '（未知的请求码 ' + msg.data.requestCode + '）';
  
         var $item = $(temps['sys-note-80-temp'](msg));
         findMailBox(msg.data.lineId).prepend($item);
@@ -68,7 +68,7 @@ var gb_sch_websocket = (function () {
         gb_tts.speak(ttsMsg, msg.data.lineId);
  
         calcUntreated(msg.data.lineId);
-    }
+    };
  
     var waitRemoves = [];
     //车辆发出
@@ -89,7 +89,7 @@ var gb_sch_websocket = (function () {
         gb_schedule_table.calc_yfwf_num(msg.t.xlBm);
  
         calcUntreated(msg.t.xlBm);
-    }
+    };
  
     //到达终点
     var zhongDian = function (msg) {
@@ -107,20 +107,20 @@ var gb_sch_websocket = (function () {
         gb_tts.speak(ttsMsg, msg.t.xlBm);
  
         calcUntreated(msg.t.xlBm);
-    }
+    };
  
     //服务器通知刷新班次
     var refreshSch = function (msg) {
         gb_schedule_table.updateSchedule(msg.ts);
         /*//重新计算应发未发
-        var idx={};
-        $.each(msg.ts, function(i, t){
-            if(idx[t.xlBm])
-                return true;
-            gb_schedule_table.calc_yfwf_num(t.xlBm);
-            idx[t.xlBm]=1;
-        });*/
-    }
+         var idx={};
+         $.each(msg.ts, function(i, t){
+         if(idx[t.xlBm])
+         return true;
+         gb_schedule_table.calc_yfwf_num(t.xlBm);
+         idx[t.xlBm]=1;
+         });*/
+    };
  
     //80消息确认
     var d80Confirm = function (msg) {
@@ -129,12 +129,17 @@ var gb_sch_websocket = (function () {
         calcUntreated(msg.lineId);
         //重新计算应发未发
         gb_schedule_table.calc_yfwf_num(msg.lineId);
-    }
+    };
  
     //指令状态改变
-    var directiveStatus = function(msg){
+    var directiveStatus = function (msg) {
         gb_schedule_table.updateSchedule(msg.t);
-    }
+    };
+
+    //班次信号状态
+    var signalState = function (msg) {
+        gb_signal_state.put(msg.data);
+    };
  
     var msgHandle = {
         report80: report80,
@@ -142,8 +147,9 @@ var gb_sch_websocket = (function () {
         zhongDian: zhongDian,
         refreshSch: refreshSch,
         d80Confirm: d80Confirm,
-        directive: directiveStatus
-    }
+        directive: directiveStatus,
+        signal_state: signalState
+    };
  
     function currentSecond() {
         return Date.parse(new Date()) / 1000;
@@ -167,15 +173,15 @@ var gb_sch_websocket = (function () {
         $(this).parents('.sys-note-42').remove();
  
         var size = $(this).parents('.sys-mailbox').find('.sys-mail-item').length
-            ,lineCode = $(this).parents('li.line_schedule').data('id');
+            , lineCode = $(this).parents('li.line_schedule').data('id');
  
         $('#badge_untreated_num_' + lineCode).text(size);
     });
  
     //42消息点击
     $(document).on('click', '.sys-mailbox .sys-note-42', function () {
-        var lineCode=$(this).parents('li.line_schedule').data('id')
-            ,id=$(this).data('id');
+        var lineCode = $(this).parents('li.line_schedule').data('id')
+            , id = $(this).data('id');
         var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
         var dl = gb_schedule_table.scroToDl(sch);
         //高亮
@@ -205,7 +211,7 @@ var gb_sch_websocket = (function () {
                 notify_succ(rs.msg);
             cb && cb();
         });
-    }
+    };
  
  
     //定时到离站信使清理掉
@@ -142,6 +142,8 @@
     <script src="/real_control_v2/assets/echarts-3/echarts.js"></script>
     <!-- Geolib -->
     <script src="/real_control_v2/geolib/geolib.js"></script>
+
+    <script src="/real_control_v2/js/signal_state/signal_state.js"></script>
 </body>
  
 </html>
@@ -148,10 +148,14 @@
                 var logs = [];
                 for (var i = 0; i <= ei; i++) {
                     trailArray.push(new BMap.Point(gpsArray[i].bd_lon, gpsArray[i].bd_lat));
-                    if(i > 0 && logs[logs.length - 1].road.ROAD_CODE == gpsArray[i].road.ROAD_CODE)
-                        logs.pop();
-
-                    logs.push(gpsArray[i]);
+                    try {
+                        if(i > 0 && logs[logs.length - 1].road.ROAD_CODE == gpsArray[i].road.ROAD_CODE)
+                            logs.pop();
+                    }
+                    catch (e){}
+
+                    if(gpsArray[i].road)
+                        logs.push(gpsArray[i]);
                 }
                 trailPolyline.setPath(trailArray);
  
@@ -302,6 +306,9 @@
             gb_ct_table.fixedHead(logWrap);
  
             function logWrite(gps, prve) {
+                if(!gps.road || !gps.road.ROAD_CODE)
+                    return;
+
                 var code = gps.road.ROAD_CODE;
                 if (!prve || code != prve.road.ROAD_CODE) {
                     logPanel.append('<dl data-code="' + code + '" ><dd>' + gps.timeStr + '</dd><dd>' + gps.speed + '</dd><dd>' + gps.road.ROAD_NAME + '</dd><dd>正常</dd></dl>');
@@ -394,7 +394,7 @@ var gb_map_baidu = (function(){
 		//线路名
 		gps.lineName = gb_data_basic.lineCode2NameAll()[gps.lineId];
 		//时间
-		gps.dateStr = moment(gps.timestamp).format('YYYY-MM-DD HH:mm:ss');
+		//gps.dateStr = moment(gps.timestamp).format('YYYY-MM-DD HH:mm:ss');
  
 		marker.infoWindow.setContent(gb_map_overlay_mge.map_gps_win_temp(gps));
 		map.openInfoWindow(marker.infoWindow, marker.point);