1、停车场即时首发站的班次做双休依赖

潘钊
1 parent dbb8dd28
Showing 45 changed files with 1347 additions and 235 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
src/main/java/com/bsth/service/realcontrol/buffer/ScheduleBuffer.java
src/main/java/com/bsth/service/realcontrol/buffer/SchedulePersistenceThread.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/BatchSaveUtils.java
src/main/java/com/bsth/vehicle/directive/buffer/DirectiveBuffer.java
src/main/java/com/bsth/vehicle/directive/entity/Directive60.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveService.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveServiceImpl.java
src/main/java/com/bsth/vehicle/directive/thread/FirstScheduleIssuedThread.java
src/main/java/com/bsth/vehicle/gpsdata/GpsArrivalStationThread_old.java
src/main/java/com/bsth/vehicle/gpsdata/GpsArrivalStationThread.java → src/main/java/com/bsth/vehicle/gpsdata/GpsArrivalThread.java
src/main/java/com/bsth/vehicle/gpsdata/arrival/MatchService.java
src/main/java/com/bsth/vehicle/gpsdata/arrival/ThreadPoolTask.java
 package com.bsth;
-import com.bsth.entity.Cars;
-import com.bsth.entity.Line;
-import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.security.SecurityMetadataSourceService;
 import com.bsth.service.realcontrol.buffer.GetSchedulePlanThread;
@@ -13,17 +10,15 @@ import com.bsth.vehicle.common.CommonRefreshThread;
 import com.bsth.vehicle.directive.service.DirectiveService;
 import com.bsth.vehicle.directive.thread.DirectivePersistenceThread;
 import com.bsth.vehicle.directive.thread.FirstScheduleIssuedThread;
-import com.bsth.vehicle.gpsdata.GpsArrivalStationThread;
+import com.bsth.vehicle.gpsdata.GpsArrivalThread;
 import com.bsth.vehicle.gpsdata.GpsRefreshThread;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -54,7 +49,7 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	SchedulePersistenceThread SchedulePersistenceThread;
 	@Autowired
-	GpsArrivalStationThread gpsArrivalStationThread;
+	GpsArrivalThread gpsArrivalStationThread;
 	@Autowired
 	FirstScheduleIssuedThread firstScheduleIssuedThread;
@@ -108,7 +103,7 @@ public class StartCommand implements CommandLineRunner{
 			 * 每15秒从数据库抓取到离站信息和班次匹配
 			 * （网关生成的到离站数据也是延迟批量入库，所以缩短该线程执行周期并不会提高 “实际到离站” 的实时性）
 			 */
-			scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 35, 1200, TimeUnit.SECONDS);
+			//scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 15, 20, TimeUnit.SECONDS);
 			/**
 			 * 首个调度指令下发（2分钟运行一次）
@@ -117,6 +112,62 @@ public class StartCommand implements CommandLineRunner{
 			 */
 			scheduler.scheduleWithFixedDelay(firstScheduleIssuedThread, 60 , 60 * 2, TimeUnit.SECONDS);
+			/**
+			 * ######### 测试  ###############
+			 */
+/*			new Timer().schedule(new TimerTask() {
+				
+				@Override
+				public void run() {
+					//根据班次模拟一份到离站数据
+					Set<String> set = ScheduleBuffer.vehSchListMap.keySet();
+					ArrivalInfo outArr, inArr;
+					List<ArrivalInfo> arrList = new ArrayList<>();
+					Date d = new Date();
+					for(String nbbm : set){
+						
+						for(ScheduleRealInfo sch : ScheduleBuffer.vehSchListMap.get(nbbm)){
+							//发出
+							outArr = new ArrivalInfo(CommonMapped.vehicDeviceBiMap.inverse().get(nbbm)
+									, sch.getFcsjT(), sch.getXlBm(), Integer.parseInt(sch.getXlDir()), sch.getQdzCode(), 1, d , 31);
+							
+							//到达
+							inArr = new ArrivalInfo(CommonMapped.vehicDeviceBiMap.inverse().get(nbbm)
+									, sch.getZdsjT(), sch.getXlBm(), Integer.parseInt(sch.getXlDir()), sch.getZdzCode(), 0, d , 31);
+							
+							arrList.add(outArr);
+							arrList.add(inArr);
+						}
+					}
+					try {
+						Connection conn = DBUtils_MS.getConnection();
+						String sql = "insert into bsth_c_arrival_info(device_id, line_id, stop_no, ts, up_down, in_out, weeks_year, create_date)"
+								+ " values(?, ?, ?, ? , ?, ?,?, now())";
+						
+						conn.setAutoCommit(false);
+						java.sql.PreparedStatement ps = conn.prepareStatement(sql);
+						
+						for(ArrivalInfo arr : arrList){
+							ps.setString(1, arr.getDeviceId());
+							ps.setString(2, arr.getLineCode());
+							ps.setString(3, arr.getStopNo());
+							ps.setLong(4, arr.getTs() == null? 0: arr.getTs());
+							ps.setInt(5, arr.getUpDown());
+							ps.setInt(6, arr.getInOut());
+							ps.setInt(7, arr.getWeeksYear());
+							
+							ps.addBatch();
+						}
+						
+						ps.executeBatch();
+						conn.commit();
+					} catch (SQLException e) {
+						e.printStackTrace();
+					}
+					
+					//new BatchSaveUtils<ArrivalInfo>().saveList(arrList, ArrivalInfo.class);
+				}
+			}, 5000);*/
 /*			//延迟一会
 			new Timer().schedule(new TimerTask() {
@@ -273,7 +273,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/lineCode/{lineCode}")
 	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
-		return ScheduleBuffer.schedulListMap.get(lineCode);
+		return ScheduleBuffer.realSchedulListMap.get(lineCode);
 	}
 	@RequestMapping(value = "/queryUserInfo")
@@ -10,6 +10,9 @@ import javax.persistence.NamedEntityGraph;
 import javax.persistence.NamedEntityGraphs;
 import javax.persistence.Table;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+
 /**
  * 
  * @ClassName: ChildTaskPlan
@@ -95,7 +98,8 @@ public class ChildTaskPlan {
 	/**
 	 * 主排班计划
 	 */
-	@ManyToOne
+	@JsonIgnore
+	@ManyToOne(fetch = FetchType.LAZY)
 	private ScheduleRealInfo schedule;
 	private String remarks;
 package com.bsth.entity.realcontrol;
 import com.bsth.entity.sys.SysUser;
+import com.bsth.vehicle.gpsdata.arrival.entity.RealTimeModel;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
@@ -9,12 +11,21 @@ import org.apache.commons.lang3.StringUtils;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 /**
  * 实际排班计划明细。
  */
 @Entity
 @Table(name = "bsth_c_s_sp_info_real")
+@NamedEntityGraphs({
+    @NamedEntityGraph(name = "scheduleRealInfo_cTasks", attributeNodes = {
+            @NamedAttributeNode("cTasks"),
+            @NamedAttributeNode("sjfcModel"),
+            @NamedAttributeNode("sjddModel")
+    })
+})
 public class ScheduleRealInfo {
 	/** 主键Id */
 	@Id
@@ -26,6 +37,7 @@ public class ScheduleRealInfo {
 	/** 排班计划日期 */
 	private Date scheduleDate;
+	private String scheduleDateStr;
 	/** 真实执行时间 yyyy-MM-dd */
 	private String realExecDate;
@@ -92,18 +104,31 @@ public class ScheduleRealInfo {
 	 * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
 	 */
 	private String bcType;
+	
+	/** 停车场既首发站  */
+	@Transient
+	private boolean parkIsFirstStation;
+	/** 首发站既停车场  */
+	@Transient
+	private boolean firstStationIsPark;
+	/** 与其共享发车时间的进出场班次  */
+	@JsonIgnore
+	@Transient
+	private ScheduleRealInfo twins;
 	/** 创建人 */
+	@JsonIgnore
 	@ManyToOne(fetch = FetchType.LAZY)
 	private SysUser createBy;
 	/** 修改人 */
+	@JsonIgnore
 	@ManyToOne(fetch = FetchType.LAZY)
 	private SysUser updateBy;
 	/** 创建日期 */
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 	private Date createDate;
 	/** 修改日期 */
-	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	@Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
 	/** 实际发车时间*/
@@ -154,6 +179,18 @@ public class ScheduleRealInfo {
 	/** 起点站实际到达时间 */
 	private String qdzArrDatesj;
+	/** 子任务 */
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+	private Set<ChildTaskPlan> cTasks = new HashSet<>();
+	
+	/** ---------------- */
+	/** 实际发出 */
+	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+	private RealTimeModel sjfcModel;
+	/** 实际到达 */
+	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+	private RealTimeModel sjddModel;
+	
 	public void addRemarks(String remark){
 		if(StringUtils.isBlank(remark))
 			return;
@@ -532,6 +569,12 @@ public class ScheduleRealInfo {
 				this.setZdsjT(zdDate.getTime());
 				this.setZdsj(sdfHHmm.format(zdDate));
 			}
+			
+			if(this.fcsjActual != null)
+				this.setFcsjActualAll(this.fcsjActual);
+			
+			if(this.zdsjActual != null)
+				this.setZdsjActualAll(this.zdsjActual);
 		}catch(Exception e){
 			e.printStackTrace();
 		}
@@ -582,7 +625,7 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjAll(String fcsj){
 		try {
-			this.fcsjT = sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(this.scheduleDate) + " " + fcsj).getTime();
+			this.fcsjT = sdfyyyyMMddHHmm.parse(this.realExecDate + " " + fcsj).getTime();
 			this.fcsj = fcsj;
 		} catch (ParseException e) {
 			e.printStackTrace();
@@ -603,13 +646,15 @@ public class ScheduleRealInfo {
 	/**
 	 * 
 	 * @Title: setFcsjActualAll 
-	 * @Description: TODO(设置实际发车时间) 
+	 * @Description: TODO(设置实际发车时间 字符串) 
 	 * @throws
 	 */
 	public void setFcsjActualAll(String fcsjActual){
 		try {
-			this.fcsjActualTime = sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(this.scheduleDate) + " " + fcsjActual).getTime();
+			this.fcsjActualTime = sdfyyyyMMddHHmm.parse(this.realExecDate + " " + fcsjActual).getTime();
 			this.fcsjActual = fcsjActual;
+			
+			this.synchroFcsj();
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
@@ -618,12 +663,29 @@ public class ScheduleRealInfo {
 	/**
 	 * 
 	 * @Title: setFcsjActualAll 
-	 * @Description: TODO(设置实际发车时间) 
+	 * @Description: TODO(设置实际发车时间 时间戳) 
 	 * @throws
 	 */
 	public void setFcsjActualAll(Long t){
 		this.fcsjActualTime = t;
 		this.fcsjActual = sdfHHmm.format(new Date(t));
+		
+		this.synchroFcsj();
+	}
+	
+	//和依赖班次同步发车时间
+	public void synchroFcsj(){
+		if(this.isFirstStationIsPark() || this.isParkIsFirstStation()){
+			ScheduleRealInfo twinsSch = this.twins;
+			if(null != twinsSch){
+				//有关联的出场班次
+				twinsSch.setFcsjActual(this.fcsjActual);
+				twinsSch.setFcsjActualTime(this.fcsjActualTime);
+				if(null != twinsSch.getSjfcModel())
+					twinsSch.getSjfcModel().setPersonTime(this.fcsjActualTime);
+				twinsSch.calcStatus();
+			}
+		}
 	}
 	/**
@@ -635,6 +697,8 @@ public class ScheduleRealInfo {
 	public void setZdsjActualAll(Long t){
 		this.zdsjActualTime = t;
 		this.zdsjActual = sdfHHmm.format(new Date(t));
+		
+		this.synchroZdsj();
 	}
 	/**
@@ -647,10 +711,25 @@ public class ScheduleRealInfo {
 		try {
 			this.zdsjActualTime = sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(this.scheduleDate) + " " + zdsjActual).getTime();
 			this.zdsjActual = zdsjActual;
+			
+			this.synchroZdsj();
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
 	}
+	
+	//和依赖的进场班次同步终点时间
+	public void synchroZdsj(){
+		if(this.isFirstStationIsPark()){
+			ScheduleRealInfo twinsSch = this.twins;
+			if(null != twinsSch && twinsSch.getBcType().equals("in")){
+				//有关联的进场班次
+				twinsSch.setFcsjActual(this.zdsjActual);
+				twinsSch.setFcsjActualTime(this.zdsjActualTime);
+				twinsSch.calcStatus();
+			}
+		}
+	}
 	public Long getSpId() {
 		return spId;
@@ -673,8 +752,15 @@ public class ScheduleRealInfo {
 			return;
 		this.status = 0;
-		if(StringUtils.isNotBlank(this.fcsjActual))
+		if(StringUtils.isNotBlank(this.fcsjActual)){
 			this.status = 1;
+			
+			//进出场班次并且没有终点时间的
+			if((this.bcType.equals("out") || this.bcType.equals("in"))
+					&& this.zdsj == null){
+				this.status = 2;
+			}
+		}
 		if(StringUtils.isNotBlank(this.zdsjActual))
 			this.status = 2;
 	}
@@ -690,4 +776,102 @@ public class ScheduleRealInfo {
 	public boolean isNotDestroy(){
 		return this.status != -1;
 	}
+
+	public RealTimeModel getSjfcModel() {
+		return sjfcModel;
+	}
+
+	public void setSjfcModel(RealTimeModel sjfcModel) {
+		this.sjfcModel = sjfcModel;
+	}
+
+	public RealTimeModel getSjddModel() {
+		return sjddModel;
+	}
+
+	public void setSjddModel(RealTimeModel sjddModel) {
+		this.sjddModel = sjddModel;
+	}
+
+	public Set<ChildTaskPlan> getcTasks() {
+		return cTasks;
+	}
+
+	public void setcTasks(Set<ChildTaskPlan> cTasks) {
+		this.cTasks = cTasks;
+	}
+
+	public String getScheduleDateStr() {
+		return scheduleDateStr;
+	}
+
+	public void setScheduleDateStr(String scheduleDateStr) {
+		this.scheduleDateStr = scheduleDateStr;
+	}
+
+	public boolean isParkIsFirstStation() {
+		return parkIsFirstStation;
+	}
+
+	public void setParkIsFirstStation(boolean parkIsFirstStation) {
+		this.parkIsFirstStation = parkIsFirstStation;
+	}
+
+	public ScheduleRealInfo getTwins() {
+		return twins;
+	}
+
+	public void setTwins(ScheduleRealInfo twins) {
+		this.twins = twins;
+	}
+
+	public boolean isFirstStationIsPark() {
+		return firstStationIsPark;
+	}
+
+	public void setFirstStationIsPark(boolean firstStationIsPark) {
+		this.firstStationIsPark = firstStationIsPark;
+	}
+	
+	
+	public boolean statusTostart(){
+		return this.getFcsjActual() == null
+				&& this.getSjfcModel().getTime() != null;
+	}
+	
+	public boolean statusToEnd(){
+		return this.getZdsjActual() == null
+				&& this.getSjddModel().getTime() != null;
+	}
+
+	public void revokeRealOutgo() {
+		//this.setStatus(0);
+		this.setFcsjActual(null);
+		this.setFcsjActualTime(null);
+		if(null != this.getSjfcModel())
+			this.getSjfcModel().resetNull();
+		this.calcStatus();
+	}
+
+	public boolean existDependent() {
+		return this.isFirstStationIsPark() || this.parkIsFirstStation;
+	}
+	
+	//清除实际终点时间
+	public void clearZdsjActual(){
+		this.setZdsjActual(null);
+		this.setZdsjActualTime(null);
+		if(null != this.getSjddModel())
+			this.getSjddModel().resetNull();
+		
+		//依赖班次
+		if(this.existDependent()){
+			ScheduleRealInfo twins = this.getTwins();
+			twins.setZdsjActual(null);
+			twins.setZdsjActualTime(null);
+			if(null != twins.getSjddModel())
+				twins.getSjddModel().resetNull();
+			
+		}
+	}
 }
@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -32,11 +33,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value = "select max(id) from ScheduleRealInfo")
 	Long getMaxId();
-	@Query(value = "select count(*) from ScheduleRealInfo s where s.scheduleDate = ?1")
-	int countByDate(Date date);
+	@Query(value = "select count(*) from ScheduleRealInfo s where s.scheduleDateStr = ?1")
+	int countByDate(String date);
-	@Query(value = "select s from ScheduleRealInfo s where s.scheduleDate = ?1")
-	List<ScheduleRealInfo> findByDate(Date date);
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value = "select s from ScheduleRealInfo s where s.scheduleDateStr = ?1")
+	List<ScheduleRealInfo> findByDate(String dateStr);
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.status = -1")
 	int findCjbc(String jName,String clZbh,String lpName);
@@ -63,18 +63,18 @@ public class GetSchedulePlanThread  extends Thread{
 	public void loaSchedule() throws ParseException{
 		List<ScheduleRealInfo>  realList = null;
 		String dateStr = sdfyyyyMMdd.format(new Date());
-		Date cDate = sdfyyyyMMdd.parse(dateStr);
+		//Date cDate = sdfyyyyMMdd.parse(dateStr);
 		//查询数据库是否有今日排班
-		int size = scheduleRealInfoRepository.countByDate(cDate);
+		int size = scheduleRealInfoRepository.countByDate(dateStr);
 		if(size > 0){
 			//从数据库恢复当日排班
-			realList = scheduleRealInfoRepository.findByDate(cDate);
+			realList = scheduleRealInfoRepository.findByDate(dateStr);
 			logger.info("从数据库恢复当日排班 " + realList.size());
 			//写入缓存
 			ScheduleBuffer.init(realList);
 		}
 		else{
-			List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(cDate);
+			List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(sdfyyyyMMdd.parse(dateStr));
 			for(SchedulePlanInfo sp : list){
 				sp.setSchedulePlan(null);
@@ -91,6 +91,7 @@ public class GetSchedulePlanThread  extends Thread{
 			for(ScheduleRealInfo item : realList){
 				item.setSpId(item.getId());
 				item.setId(id ++);//设置ID
+				item.setScheduleDateStr(sdfyyyyMMdd.format(item.getScheduleDate()));
 			}
 			//写入缓存
@@ -16,7 +16,6 @@ import org.slf4j.LoggerFactory;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.LinkedListMultimap;
 /**
  * 
@@ -33,7 +32,7 @@ public class ScheduleBuffer {
 	/**
 	 * 当天实际排班   K 线路编码 V 按时间升序的班次
 	 */
-	public static ArrayListMultimap<String, ScheduleRealInfo> schedulListMap;
+	public static ArrayListMultimap<String, ScheduleRealInfo> realSchedulListMap;
 	/**
 	 * K: 车辆自编号  V: 未完成班次链表
@@ -43,7 +42,7 @@ public class ScheduleBuffer {
 	/**
 	 * K: 车辆自编号  V: 班次链表
 	 */
-	public static ArrayListMultimap<String, ScheduleRealInfo> vehSchListMap;
+	public static ArrayListMultimap<String, ScheduleRealInfo> carSchListMap;
 	/*public static Map<String, LinkedList<ScheduleRealInfo>> vehSchLinkedMap;*/
@@ -63,8 +62,8 @@ public class ScheduleBuffer {
 	 */
 	public static LinkedList<ScheduleRealInfo> persistentList;
-	/** K: 线路编码_上下行  V: 班次平均间隔时间 */
-	public static Map<String , Long> schSpaceMap;
+	/** K: 线路编码_上下行  V: 班次平均间隔时间
+	public static Map<String , Long> schSpaceMap; */
 	/**
 	 * 线路是否托管  K：线路编码  V：0 托管  1 非托管
@@ -80,12 +79,12 @@ public class ScheduleBuffer {
 	}
 	public static void clear(){
-		schedulListMap = ArrayListMultimap.create();
+		realSchedulListMap = ArrayListMultimap.create();
 		pkSchedulMap = new HashMap<>();
 		persistentList = new LinkedList<>();
 		/*vehLinkedMap = new HashMap<>();
 		finishLinkedMap = LinkedListMultimap.create();*/
-		vehSchListMap = ArrayListMultimap.create();
+		carSchListMap = ArrayListMultimap.create();
 		trustMap = new HashMap<>();
 	}
@@ -106,24 +105,31 @@ public class ScheduleBuffer {
 			String zbh;
 			for(ScheduleRealInfo schedul : list){
-				schedulListMap.put(schedul.getXlBm(), schedul);
+				realSchedulListMap.put(schedul.getXlBm(), schedul);
 				pkSchedulMap.put(schedul.getId(), schedul);
 				//初始化车辆和班次列表对照
 				zbh = schedul.getClZbh();
-				vehSchListMap.put(zbh, schedul);
+				carSchListMap.put(zbh, schedul);
 			}
-			//计算计划发车真实时间
+			//计算真实计划发车时间
 			calcRealOutTime();
 			//计算起点应到时间
-			Set<String> codes = schedulListMap.keySet();
-			for(String code : codes)
-				calcArrDateQd(code);
+			Set<String> lineCodes = realSchedulListMap.keySet();
+			for(String lineCode : lineCodes)
+				calcArrDateQd(lineCode);
+			
+			//标记停车场既是起点站的班次
+			Set<String> cars = carSchListMap.keySet();
+			for(String nbbm : cars)
+				markParkIsFirstStation(nbbm);
+			
+			//markParkIsFirstStation
 			//计算班次平均间隔
-			calcAvgSpace();
+			//calcAvgSpace();
 		}catch(Exception e){
 			logger.error("缓存排班数据失败...", e);
@@ -134,12 +140,12 @@ public class ScheduleBuffer {
 	private static void calcRealOutTime() {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		Set<String> keys = vehSchListMap.keySet();
+		Set<String> keys = carSchListMap.keySet();
 		List<ScheduleRealInfo> list;
 		ScheduleRealInfo schedule;
 		for(String key : keys){
-			list = vehSchListMap.get(key);
+			list = carSchListMap.get(key);
 			//发车顺序号排序
 			Collections.sort(list, scheduleComparator);
@@ -154,17 +160,51 @@ public class ScheduleBuffer {
 			}
 		}
 	}
+	
+	/**
+	 * 
+	 * @Title: markParkIsFirstStation 
+	 * @Description: TODO(标记停车场即首发站的班次) 
+	 * @throws
+	 */
+	public static void markParkIsFirstStation(String nbbm){
+		List<ScheduleRealInfo> list = carSchListMap.get(nbbm);
+		
+		String type;
+		for(ScheduleRealInfo sch : list){
+			type = sch.getBcType();
+			if(!type.equals("out") && !type.equals("in"))
+				continue;
+			
+			for(ScheduleRealInfo sch2 : list){
+				
+				if(sch.getId() == sch2.getId())
+					continue;
+				
+				if(sch.getFcsjT().equals(sch2.getFcsjT())//出场，发车时间一致
+						|| sch.getFcsjT().equals(sch2.getZdsjT())//进场，上一班次站点时间为进场起点时间
+						){
+					sch.setParkIsFirstStation(true);
+					sch2.setFirstStationIsPark(true);
+					//做双休关联
+					sch2.setTwins(sch);
+					sch.setTwins(sch2);
+					break;
+				}
+			}
+		}
+	}
 	//计算平均间隔
-	public static void calcAvgSpace(){
+/*	public static void calcAvgSpace(){
 		schSpaceMap = new HashMap<>();
-		Set<String> set = schedulListMap.keySet();
+		Set<String> set = realSchedulListMap.keySet();
 		List<ScheduleRealInfo> list = null
 				,upList = null
 				,downList =  null;
 		for(String lineCode : set){
-			list = schedulListMap.get(lineCode);
+			list = realSchedulListMap.get(lineCode);
 			Long sumUp = 0L, sumDown = 0L;
 			upList = new ArrayList<>();
@@ -187,14 +227,14 @@ public class ScheduleBuffer {
 			schSpaceMap.put(lineCode + "_0", sumUp / upList.size());
 			schSpaceMap.put(lineCode + "_1", sumDown / downList.size());
 		}
-	}
+	}*/
 	public static int put(ScheduleRealInfo sch){
-		schedulListMap.put(sch.getXlBm(), sch);
+		realSchedulListMap.put(sch.getXlBm(), sch);
 		pkSchedulMap.put(sch.getId(), sch);
 		String zbh = sch.getClZbh();
-		vehSchListMap.put(zbh, sch);
+		carSchListMap.put(zbh, sch);
 		//List<ScheduleRealInfo> list = vehSchListMap.get(sch.getClZbh());
@@ -203,11 +243,11 @@ public class ScheduleBuffer {
 		vehLinkedMap.get(zbh).add(sch);*/
 		//重新排序
-		Collections.sort(schedulListMap.get(sch.getXlBm()), scheduleComparator);
+		Collections.sort(realSchedulListMap.get(sch.getXlBm()), scheduleComparator);
 		//Collections.sort(vehSchListMap.get(zbh), scheduleComparator);
 		//重新计算应到时间
-		calcArrDateQd(vehSchListMap.get(zbh));
+		calcArrDateQd(carSchListMap.get(zbh));
 		return 0;
 	}
@@ -236,7 +276,8 @@ public class ScheduleBuffer {
 		//下一个班次
 		ScheduleRealInfo next = getNext(sch);
-		next.setQdzArrDateSJ(sch.getZdsjActual());
+		if(next != null)
+			next.setQdzArrDateSJ(sch.getZdsjActual());
 		/*ScheduleRealInfo temp;
 		int len = list.size();
 		for(int i = 0; i < len; i ++){
@@ -253,7 +294,7 @@ public class ScheduleBuffer {
 	}
 	public static ScheduleRealInfo getNext(ScheduleRealInfo sch){
-		List<ScheduleRealInfo> list = vehSchListMap.get(sch.getClZbh());
+		List<ScheduleRealInfo> list = carSchListMap.get(sch.getClZbh());
 		boolean flag = false;
 		ScheduleRealInfo next = null;
@@ -293,7 +334,7 @@ public class ScheduleBuffer {
 	 * @throws
 	 */
 	public static int getFinishSchNo(String nbbm){
-		List<ScheduleRealInfo> list = vehSchListMap.get(nbbm);
+		List<ScheduleRealInfo> list = carSchListMap.get(nbbm);
 		int no = 0;
 		for(ScheduleRealInfo sch : list){
 			if(sch.getStatus() == 2)
@@ -311,7 +352,7 @@ public class ScheduleBuffer {
 	 * @throws
 	 */
 	public static ScheduleRealInfo findCurrent(String nbbm){
-		List<ScheduleRealInfo> list = ScheduleBuffer.vehSchListMap.get(nbbm);
+		List<ScheduleRealInfo> list = ScheduleBuffer.carSchListMap.get(nbbm);
 		int size = list.size();
 		ScheduleRealInfo sch;
@@ -332,7 +373,7 @@ public class ScheduleBuffer {
 	 * @throws
 	 */
 	public static List<ScheduleRealInfo> findNextList(ScheduleRealInfo sch){
-		List<ScheduleRealInfo> list = vehSchListMap.get(sch.getClZbh()),
+		List<ScheduleRealInfo> list = carSchListMap.get(sch.getClZbh()),
 					rs = null;
 		for(ScheduleRealInfo temp : list){
@@ -369,7 +410,7 @@ public class ScheduleBuffer {
 	 * @throws
 	 */
 	public static void calcArrDateQd(String lineCode){
-		List<ScheduleRealInfo> list = schedulListMap.get(lineCode);
+		List<ScheduleRealInfo> list = realSchedulListMap.get(lineCode);
 		//按车辆分组
 		ArrayListMultimap<String, ScheduleRealInfo> map = ArrayListMultimap.create();
 		for(ScheduleRealInfo sch : list){
@@ -388,7 +429,7 @@ public class ScheduleBuffer {
 	}
 	public static List<ScheduleRealInfo> findByLineAndUpDown(Integer lineCode, Integer upDown){
-		List<ScheduleRealInfo> list = schedulListMap.get(String.valueOf(lineCode))
+		List<ScheduleRealInfo> list = realSchedulListMap.get(String.valueOf(lineCode))
 				,subList = new ArrayList<>();
 		//按走向过滤
 		for(ScheduleRealInfo sch : list){
@@ -398,4 +439,12 @@ public class ScheduleBuffer {
 		}
 		return subList;
 	}
+	
+	public static ScheduleRealInfo getFirst(String nbbm){
+		List<ScheduleRealInfo> list = carSchListMap.get(nbbm);
+		if(list.size() > 0)
+			return list.get(0);
+		else
+			return null;
+	}
 }
@@ -34,6 +34,10 @@ public class SchedulePersistenceThread extends Thread {
 				break;
 			scheduleRepository.save(schedule);
+			if(schedule.existDependent()){
+				//关联班次也持久化
+				scheduleRepository.save(schedule.getTwins());
+			}
 		}
 	}
 }
@@ -2,25 +2,41 @@ package com.bsth.service.realcontrol.impl;
 import java.util.Map;
+import javax.transaction.Transactional;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ChildTaskPlanService;
+import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.vehicle.common.CommonMapped;
 @Service
 public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService{
+	@Autowired
+	ScheduleRealInfoServiceImpl scheduleRealInfoService;
+	@Transactional
 	@Override
 	public Map<String, Object> save(ChildTaskPlan t) {
+		Map<String, Object> rs;
 		//保存起终点名称
 		Map<String, String> map = CommonMapped.stationCodeMap;
 		t.setStartStationName(map.get(t.getStartStation()));
 		t.setEndStationName(map.get(t.getEndStation()));
-		return super.save(t);
+		
+		//rs = super.save(t);
+		
+		ScheduleRealInfo sch = ScheduleBuffer.findOne(t.getSchedule().getId());
+		sch.getcTasks().add(t);
+		rs = scheduleRealInfoService.save(sch);
+		
+		return rs;
 	}
 }
@@ -87,7 +87,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		Multimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
 		for (String lineCode : lineList) {
-			mMap.putAll(lineCode, ScheduleBuffer.schedulListMap.get(lineCode));
+			mMap.putAll(lineCode, ScheduleBuffer.realSchedulListMap.get(lineCode));
 		}
 		return mMap.asMap();
 	}
@@ -156,7 +156,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				String lineCode = first.getXlBm();
 				String upDown = first.getXlDir();
-				List<ScheduleRealInfo> schList = ScheduleBuffer.schedulListMap.get(lineCode),
+				List<ScheduleRealInfo> schList = ScheduleBuffer.realSchedulListMap.get(lineCode),
 						dirList = new ArrayList<>();
 				// 筛选走向
 				for (ScheduleRealInfo s : schList) {
@@ -463,19 +463,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public Map<String, Object> realOutAdjust(Long id, String fcsjActual, String remarks) {
 		Map<String, Object> rs = new HashMap<>();
+		List<ScheduleRealInfo> ts = new ArrayList<>();
 		try {
 			ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
-			sch.setFcsjActualTime(sdfMinute.parse(sch.getRealExecDate() + " " + fcsjActual).getTime());
-			sch.setFcsjActual(fcsjActual);
+			Long t = sdfMinute.parse(sch.getRealExecDate() + " " + fcsjActual).getTime();
+			/*sch.setFcsjActualTime(sdfMinute.parse(sch.getRealExecDate() + " " + fcsjActual).getTime());
+			sch.setFcsjActual(fcsjActual);*/
+			if(null != sch.getSjfcModel())
+				sch.getSjfcModel().setPersonTime(t);
+			
+			sch.setFcsjActualAll(t);
 			sch.addRemarks(remarks);
-			//改变状态
+			sch.calcStatus();
+			/*//改变状态
 			if(sch.getZdsjActual() == null)
-				sch.setStatus(1);
+				sch.setStatus(1);*/
 			ScheduleBuffer.persistentList.add(sch);
+			
+			ts.add(sch);
+			//关联班次
+			if(sch.existDependent())
+				ts.add(sch.getTwins());
+			
 			rs.put("status", ResponseCode.SUCCESS);
-			rs.put("t", sch);
+			//rs.put("t", sch);
+			rs.put("ts", ts);
 		} catch (Exception e) {
 			logger.error("", e);
 			rs.put("status", ResponseCode.ERROR);
@@ -497,7 +511,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				rs.put("status", ResponseCode.SUCCESS);
 				rs.put("t", sch);
-				// 将班次状态还原，并由子线程去匹配到离站
 			}
 		} catch (Exception e) {
 			logger.error("", e);
@@ -509,19 +522,26 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public Map<String, Object> revokeRealOutgo(Long id) {
 		Map<String, Object> rs = new HashMap<>();
+		List<ScheduleRealInfo> ts = new ArrayList<>();
+		
 		try {
 			ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
 			if (sch.getFcsjActual() == null) {
 				rs.put("status", ResponseCode.ERROR);
 				rs.put("msg", "无实发时间，无法撤销！");
 			} else {
-				sch.setStatus(0);
-				sch.setFcsjActual(null);
-				sch.setFcsjActualTime(null);
+				sch.revokeRealOutgo();
 				rs.put("status", ResponseCode.SUCCESS);
-				rs.put("t", sch);
+				
+				ts.add(sch);
+				if(sch.existDependent()){
+					//关联班次也撤销
+					sch.getTwins().revokeRealOutgo();
+					ts.add(sch.getTwins());
+				}
+					
+				rs.put("ts", ts);
-				// 将班次状态还原，并由子线程去匹配到离站
 			}
 		} catch (Exception e) {
 			logger.error("", e);
@@ -578,6 +598,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public Map<String, Object> schInfoFineTune(Map<String, String> map) {
 		Map<String, Object> rs = new HashMap<>();
+		List<ScheduleRealInfo> ts = new ArrayList<>();
 		try {
 			Long id = Long.parseLong(map.get("id"));
 			//班次类型
@@ -615,13 +636,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				sch.setFcsjAll(fcsj);
 				if(StringUtils.isNotBlank(fcsjActual)){
-					//调整实发
-					if(!fcsjActual.equals(sch.getFcsjActual()))
+					
+					if(!fcsjActual.equals(sch.getFcsjActual())){
+						//调整实发
 						sch.setFcsjActualAll(fcsjActual);
+						if(null != sch.getSjfcModel())
+							sch.getSjfcModel().setPersonTime(sch.getFcsjActualTime());
+					}
 				}
 				else{
-					sch.setFcsjActual(null);
+					/*sch.setFcsjActual(null);
 					sch.setFcsjActualTime(null);
+					if(null != sch.getSjfcModel())
+						sch.getSjfcModel().resetNull();*/
+					//撤销实发
+					revokeRealOutgo(sch.getId());
 				}
 				//实达时间
@@ -632,17 +661,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						//下一班次起点到达时间
 						ScheduleRealInfo next = ScheduleBuffer.getNext(sch);
 						next.setQdzArrDateSJ(zdsjActual);
-						rs.put("nextSch", next);
+						ts.add(next);
 					}
 				}
-				else /*if(StringUtils.isNotBlank(sch.getZdsjActual()))*/{
+				else {
 					//清除实达时间
-					sch.setZdsjActual(null);
+					sch.clearZdsjActual();
+					/*sch.setZdsjActual(null);
 					sch.setZdsjActualTime(null);
+					if(null != sch.getSjddModel())
+						sch.getSjddModel().resetNull();*/
+					
 					//清除下一班次起点到达时间
 					ScheduleRealInfo next = ScheduleBuffer.getNext(sch);
 					next.setQdzArrDateSJ(null);
-					rs.put("nextSch", next);
+					ts.add(next);
 				}
 				sch.setRemarks(remarks);
@@ -651,9 +684,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			//班次状态
 			sch.calcStatus();
 			ScheduleBuffer.persistentList.add(sch);
+			//页面需要更新的班次信息
+			ts.add(sch);
+			if(sch.existDependent())
+				ts.add(sch.getTwins());
 			rs.put("status", ResponseCode.SUCCESS);
-			rs.put("t", sch);
+			rs.put("ts", ts);
+			//rs.put("t", sch);
 		} catch (Exception e) {
 			logger.error("", e);
 			rs.put("status", ResponseCode.ERROR);
@@ -8,6 +8,10 @@ import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.List;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Transient;
@@ -138,6 +142,12 @@ public class BatchSaveUtils&lt;T&gt; {
 			//忽略 Transient 字段
 			if(field.getAnnotation(Transient.class) != null)
 				continue;
+			//忽略关联
+			if(field.getAnnotation(OneToMany.class) != null
+					|| field.getAnnotation(OneToOne.class) != null
+					|| field.getAnnotation(ManyToOne.class) != null
+					|| field.getAnnotation(ManyToMany.class) != null)
+				continue;
 			fs.add(field);
 		}
     	return fs;
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.directive.entity.Directive60;
@@ -25,6 +26,7 @@ import com.bsth.vehicle.directive.entity.LineChange;
 import com.bsth.vehicle.directive.repository.Directive60Repository;
 import com.bsth.vehicle.directive.repository.Directive80Repository;
 import com.bsth.vehicle.directive.repository.LineChangeRepository;
+import com.bsth.vehicle.directive.service.DirectiveService;
 import com.bsth.vehicle.directive.util.HttpUtils;
 import com.bsth.websocket.handler.RealControlSocketHandler;
 import com.google.common.collect.ArrayListMultimap;
@@ -49,6 +51,9 @@ public class DirectiveBuffer {
 	@Autowired
 	LineChangeRepository lineChangeRepository;
+	@Autowired
+	DirectiveService directiveService;
+	
 	/**
 	 * 等待入库的调度指令
@@ -123,7 +128,11 @@ public class DirectiveBuffer {
 		if(directive.isDispatch()){
 			//更新班次状态
-			directive.getSch().setDirectiveState(reply.getStatus() * 100);
+			ScheduleRealInfo sch = directive.getSch();
+			sch.setDirectiveState(reply.getStatus() * 100);
+			ScheduleBuffer.persistentList.add(sch);
+			//通知页面
+			directiveService.sendDirectiveToPage(sch);
 		}
 		transientList.add(directive);
 	}
@@ -59,12 +59,12 @@ public class Directive60 {
 	/**
 	 * 46上行
 	 */
-	private Short reply46;
+	private Short reply46 = -1;
 	/**
 	 * 47上行
 	 */
-	private Short reply47;
+	private Short reply47 = -1;
 	/**
 	 * 是否是调度指令
@@ -59,4 +59,12 @@ public interface DirectiveService extends BaseService&lt;Directive60, Integer&gt;{
 	 * @throws
 	 */
 	int upDownChange(String nbbm, Integer upDown);
+	
+	/**
+	 * 
+	 * @Title: sendDirectiveState 
+	 * @Description: TODO(向页面推送班次指令状态) 
+	 * @throws
+	 */
+	void sendDirectiveToPage(ScheduleRealInfo sch);
 }
@@ -111,7 +111,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 			directive.setSch(sch);
 			DirectiveBuffer.put(directive);
 			//通知页面，消息已发出
-			sendDirectiveState(sch);
+			sendDirectiveToPage(sch);
 		}else{
 			logger.error("send60Phrase error, code: " + code);
 		}
@@ -124,7 +124,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 	 * @Description: TODO(向页面推送班次指令状态) 
 	 * @throws
 	 */
-	public void sendDirectiveState(ScheduleRealInfo sch){
+	@Override
+	public void sendDirectiveToPage(ScheduleRealInfo sch){
 		JSONObject json = new JSONObject();
 		json.put("fn", "directive");
 		json.put("t", sch);
@@ -27,13 +27,13 @@ public class FirstScheduleIssuedThread extends Thread{
 	@Override
 	public void run() {
-		Set<String> keys = ScheduleBuffer.vehSchListMap.keySet();
+		Set<String> keys = ScheduleBuffer.carSchListMap.keySet();
 		List<ScheduleRealInfo> list;
 		Long t = System.currentTimeMillis();
 		ScheduleRealInfo sch;
 		for(String nbbm : keys){
-			list = ScheduleBuffer.vehSchListMap.get(nbbm);
+			list = ScheduleBuffer.carSchListMap.get(nbbm);
 			if(list.size() == 0)
 				continue;
@@ -64,7 +64,7 @@ public class GpsArrivalStationThread_old extends Thread{
 		System.out.println("开始...");
 		List<ScheduleRealInfo> schList;
 		for(String key : keySet){
-			schList = extractSched(ScheduleBuffer.vehSchListMap.get(key));
+			schList = extractSched(ScheduleBuffer.carSchListMap.get(key));
 			if(null != schList)
 				match(GpsArrivalDataBuffer.allMap.get(key), schList);
 		}
@@ -7,7 +7,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -17,13 +16,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import com.alibaba.fastjson.JSONObject;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.util.DateUtils;
 import com.bsth.util.db.DBUtils_MS;
-import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.directive.service.DirectiveService;
+import com.bsth.vehicle.gpsdata.arrival.MatchService;
 import com.bsth.vehicle.gpsdata.buffer.GpsArrivalDataBuffer;
 import com.bsth.vehicle.gpsdata.entity.ArrivalInfo;
 import com.bsth.websocket.handler.RealControlSocketHandler;
@@ -31,13 +28,13 @@ import com.bsth.websocket.handler.RealControlSocketHandler;
 /**
  * 
  * @ClassName: GpsArrivalStationThread 
- * @Description: TODO(GPS到离站) 
+ * @Description: TODO(定时从数据库加载到离站数据) 
  * @author PanZhao
  * @date 2016年6月27日 上午10:58:13 
  *
  */	
 @Component
-public class GpsArrivalStationThread extends Thread{
+public class GpsArrivalThread extends Thread{
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
@@ -60,8 +57,26 @@ public class GpsArrivalStationThread extends Thread{
 		}
 		//缓存
 		GpsArrivalDataBuffer.putAll(list);
+		
+		//有新到离站数据的线路
+		Set<String> newSet = new HashSet<>();
+		for(ArrivalInfo arr : list)
+			newSet.add(arr.getLineCode());
+		
+		//启动对应的匹配线程
+		for(String lineCode : newSet){
+			MatchService.addService(lineCode);
+		}
+		
+		
+		/*try {
+			Bootstrap bs = Bootstrap.instance();
+			bs.start();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}*/
-		//车辆
+		/*//车辆
 		Set<String> set = new HashSet<>();
 		for(ArrivalInfo arr : list)
 			set.add(CommonMapped.vehicDeviceBiMap.get(arr.getDeviceId()));
@@ -109,10 +124,10 @@ public class GpsArrivalStationThread extends Thread{
 			}catch(Exception e){
 				e.printStackTrace();
 			}
-		}
+		}*/
 	}
-	public ArrivalInfo[] match(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
+/*	public ArrivalInfo[] match(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
 		//进出分组
 		List<ArrivalInfo> in = new ArrayList<>(), out = new ArrayList<>();
 		for(ArrivalInfo arr : arrList){
@@ -134,7 +149,7 @@ public class GpsArrivalStationThread extends Thread{
 	}
 	public ArrivalInfo matchOut(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
-		Long space = /*ScheduleBuffer.schSpaceMap.get(sch.getXlBm() + "_" + sch.getXlDir())*/diff;
+		Long space = ScheduleBuffer.schSpaceMap.get(sch.getXlBm() + "_" + sch.getXlDir())diff;
 		for(ArrivalInfo arr : arrList){
 			if(arr.getStopNo().equals(sch.getQdzCode())
 					&& Math.abs((arr.getTs() - sch.getFcsjT())) < space){
@@ -148,7 +163,7 @@ public class GpsArrivalStationThread extends Thread{
 	}
 	public ArrivalInfo matchIn(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
-		Long space = /*ScheduleBuffer.schSpaceMap.get(sch.getXlBm() + "_" + sch.getXlDir())*/diff;
+		Long space = ScheduleBuffer.schSpaceMap.get(sch.getXlBm() + "_" + sch.getXlDir())diff;
 		for(ArrivalInfo arr : arrList){
 			if(arr.getStopNo().equals(sch.getZdzCode())
 					&& Math.abs((arr.getTs() - sch.getZdsjT())) < space){
@@ -158,7 +173,7 @@ public class GpsArrivalStationThread extends Thread{
 			}
 		}
 		return null;
-	}
+	}*/
 	/**
@@ -167,7 +182,7 @@ public class GpsArrivalStationThread extends Thread{
 	 * @param @param schedule    班次
 	 * @throws
 	 */
-	public void sendFcsj(ScheduleRealInfo schedule){
+/*	public void sendFcsj(ScheduleRealInfo schedule){
 		JSONObject json = new JSONObject();
 		json.put("fn", "faChe");
 		json.put("t", schedule);
@@ -175,12 +190,12 @@ public class GpsArrivalStationThread extends Thread{
 		socketHandler.sendMessageToLine(Integer.parseInt(schedule.getXlBm()), json.toJSONString());
 	}
-	/**
+	*//**
 	 * @Title: sendFcsj 
 	 * @Description: TODO(推送到达终点时间) 
 	 * @param @param schedule    班次
 	 * @throws
-	 */
+	 *//*
 	public void sendZdsj(ScheduleRealInfo schedule,ScheduleRealInfo nextSch, int finish){
 		JSONObject json = new JSONObject();
 		json.put("fn", "zhongDian");
@@ -190,7 +205,7 @@ public class GpsArrivalStationThread extends Thread{
 		json.put("dataStr", sdf.format(new Date()));
 		socketHandler.sendMessageToLine(Integer.parseInt(schedule.getXlBm()), json.toJSONString());
-	}
+	}*/
 	/**
 	 * @throws ParseException 
@@ -210,7 +225,7 @@ public class GpsArrivalStationThread extends Thread{
 			GpsArrivalDataBuffer.markTime = DateUtils.getTimesmorning() * 1000L;
 		}
-		String sql = "select * from bsth_c_arrival_info where weeks_year=? and create_date > ? order by ts";
+		String sql = "select * from bsth_c_arrival_info where weeks_year=? and ts > ? order by ts";
 		List<ArrivalInfo> list = new ArrayList<>();
 		Connection conn = null;
@@ -219,8 +234,8 @@ public class GpsArrivalStationThread extends Thread{
 		try {
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
-			ps.setInt(1, weeks_year/*28*/);
-			ps.setLong(2, GpsArrivalDataBuffer.markTime/*1467853749000L*/);
+			ps.setInt(1, weeks_year/*30*/);
+			ps.setLong(2, GpsArrivalDataBuffer.markTime/*1461361377000L*/);
 			Long t = System.currentTimeMillis();
 			rs = ps.executeQuery();
@@ -230,6 +245,7 @@ public class GpsArrivalStationThread extends Thread{
 						, rs.getInt("up_down"), rs.getString("stop_no"), rs.getInt("in_out"), rs.getDate("create_date"), rs.getInt("weeks_year")));
 			}
+			System.out.println("数量：" + list.size() + " ,markTime:" + GpsArrivalDataBuffer.markTime);
 			//重新打时间标记
 			GpsArrivalDataBuffer.markTime = t;
+package com.bsth.vehicle.gpsdata.arrival;
+
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class MatchService {
+
+	static MatchService bs;
+	static ThreadPoolExecutor pool = new ThreadPoolExecutor(2, 20, 1, TimeUnit.SECONDS,
+			new ArrayBlockingQueue<Runnable>(3));
+
+	/**
+	 * 
+	 * @Title: addService 
+	 * @Description: TODO(添加一个任务) 
+	 * @throws
+	 */
+	public static void addService(String lineCode) {
+		pool.execute(new ThreadPoolTask(lineCode));
+	}
+}
+package com.bsth.vehicle.gpsdata.arrival;
+
+import java.util.List;
+import java.util.Set;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
+import com.bsth.vehicle.gpsdata.arrival.match.ScheduleRealMatcher;
+import com.bsth.vehicle.gpsdata.buffer.GpsArrivalDataBuffer;
+import com.google.common.collect.ArrayListMultimap;
+
+public class ThreadPoolTask implements Runnable {
+
+	String lineCode;
+	
+	public ThreadPoolTask(String lineCode) {
+		this.lineCode = lineCode;
+	}
+	
+	@Override
+	public void run() {
+		List<ScheduleRealInfo> allList = ScheduleBuffer.realSchedulListMap.get(lineCode);
+		//按车辆分组班次
+		ArrayListMultimap<String, ScheduleRealInfo> alMap = ArrayListMultimap.create();
+		
+		for(ScheduleRealInfo sch : allList){
+			//停车场即起点站的进出场班次不参与匹配
+			if(!sch.isParkIsFirstStation())
+				alMap.put(sch.getClZbh(), sch);
+		}
+		
+		//开始匹配
+		ScheduleRealMatcher srMatcher;
+		Set<String> ks = alMap.keySet();
+		
+		for(String nbbm : ks){
+			
+			srMatcher = new ScheduleRealMatcher(alMap.get(nbbm), GpsArrivalDataBuffer.pops(nbbm));
+			
+			//在这里应用各种匹配规则
+			srMatcher
+				.timeClosest()
+				.matchEnd();
+			
+		}
+	}
+}
+package com.bsth.vehicle.gpsdata.arrival.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+
+/**
+ * 
+ * @ClassName: RealTimeModel
+ * @author PanZhao
+ * @date 2016年7月24日 下午5:00:26
+ *
+ */
+@Entity
+@Table(name = "bsth_s_real_time")
+public class RealTimeModel {
+
+	public RealTimeModel() {
+	}
+	
+	public RealTimeModel(String stationCode, int type) {
+		this.station = stationCode;
+		this.type = type;
+	}
+
+	@Id
+	@GeneratedValue
+	private Integer id;
+	
+	/** 站点编码 */
+	private String station;
+	
+	/** GPS时间 */
+	private Long gpsTime;
+
+	/** 0：GPS正常到离站，1：GPS信号丢失，通过定时定距预测 */
+	private Integer gpsStatus;
+
+	/** 如gpsStatus 为1 ，则表示预测的GPS点和站点直线距离 */
+	private Double distance;
+
+	/** GPS定时定距关联， 格式为：设备号_时间戳 */
+	private String gps;
+
+	/** 人工录入的实际时间 */
+	private Long personTime;
+
+	/** RFID 时间 */
+	private Long rfidTime;
+
+	/** 0: 进， 1：出 */
+	private int type;
+
+	/** 晚点时间 */
+	private Long late;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Long getGpsTime() {
+		return gpsTime;
+	}
+
+	public RealTimeModel setGpsTime(Long gpsTime) {
+		this.gpsTime = gpsTime;
+		return this;
+	}
+
+	public Integer getGpsStatus() {
+		return gpsStatus;
+	}
+
+	public void setGpsStatus(Integer gpsStatus) {
+		this.gpsStatus = gpsStatus;
+	}
+
+	public Double getDistance() {
+		return distance;
+	}
+
+	public void setDistance(Double distance) {
+		this.distance = distance;
+	}
+
+	public String getGps() {
+		return gps;
+	}
+
+	public void setGps(String gps) {
+		this.gps = gps;
+	}
+
+	public Long getPersonTime() {
+		return personTime;
+	}
+
+	public void setPersonTime(Long personTime) {
+		this.personTime = personTime;
+	}
+
+	public Long getRfidTime() {
+		return rfidTime;
+	}
+
+	public void setRfidTime(Long rfidTime) {
+		this.rfidTime = rfidTime;
+	}
+
+	public int getType() {
+		return type;
+	}
+
+	public void setType(int type) {
+		this.type = type;
+	}
+
+	public Long getLate() {
+		return late;
+	}
+
+	public void setLate(Long late) {
+		this.late = late;
+	}
+
+	public String getStation() {
+		return station;
+	}
+
+	public void setStation(String station) {
+		this.station = station;
+	}
+	
+	public Long getTime(){
+		//人工录入优先级最高
+		if(personTime != null)
+			return personTime;
+		
+		//GPS其次
+		if(gpsTime != null)
+			return gpsTime;
+		
+		return null;
+	}
+	
+	public void resetNull(){
+		this.setGpsTime(null);
+		this.setPersonTime(null);
+		this.setRfidTime(null);
+	}
+}
+package com.bsth.vehicle.gpsdata.arrival.match;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
+import com.bsth.vehicle.directive.service.DirectiveService;
+import com.bsth.vehicle.gpsdata.arrival.entity.RealTimeModel;
+import com.bsth.vehicle.gpsdata.entity.ArrivalInfo;
+import com.bsth.websocket.handler.RealControlSocketHandler;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * 
+ * @ClassName: ScheduleRealMatch 
+ * @author PanZhao
+ * @date 2016年7月24日 下午5:19:04 
+ *
+ */
+@Component
+public class ScheduleRealMatcher implements ApplicationContextAware{
+	
+	// Spring应用上下文环境  
+    private static ApplicationContext applicationContext;
+	
+	/** 班次列表 */
+	List<ScheduleRealInfo> schs;
+	
+	/** 到离站列表 */
+	List<ArrivalInfo> arrivals;
+	
+	/** 出站数据 */
+	List<ArrivalInfo> outArrivals = new ArrayList<>();
+	
+	/** 进站数据 */
+	List<ArrivalInfo> inArrivals = new ArrayList<>();
+	
+	 private static RealControlSocketHandler socketHandler;
+	
+	 private static DirectiveService directiveService;
+	
+	SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+	
+	//最大班次间隔
+	int maxBcsj = 0;
+	
+	public ScheduleRealMatcher(){}
+	
+	public ScheduleRealMatcher(List<ScheduleRealInfo> schs, List<ArrivalInfo> arrivals) {
+		this.schs = schs;
+		this.arrivals = arrivals;
+		//排序
+		Collections.sort(schs, new Comparator<ScheduleRealInfo>() {
+			@Override
+			public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
+				return (int) (s1.getFcsjT() - s2.getFcsjT());
+			}
+		});
+		
+		Collections.sort(arrivals, new Comparator<ArrivalInfo>() {
+
+			@Override
+			public int compare(ArrivalInfo a1, ArrivalInfo a2) {
+				return (int) (a1.getTs() - a2.getTs());
+			}
+		});
+		
+		//将进出数据拆分成2个集合
+		for(ArrivalInfo arr : arrivals){
+			if(arr.getInOut() == 0)
+				inArrivals.add(arr);
+			else if(arr.getInOut() == 1)
+				outArrivals.add(arr);
+		}
+		
+		for(ScheduleRealInfo sch : schs){
+			if(sch.getBcsj() != null && sch.getBcsj() > maxBcsj){
+				maxBcsj = sch.getBcsj();
+			}
+			
+			if(sch.getSjfcModel() == null)
+				sch.setSjfcModel(new RealTimeModel(sch.getQdzCode(), 1));
+			if(sch.getSjddModel() == null)
+				sch.setSjddModel(new RealTimeModel(sch.getZdzCode(), 0));
+		}
+	}
+
+	/**
+	 * 
+	 * @Title: timeClosest 
+	 * @Description: TODO(按照时间距离进行匹配) 
+	 * @throws
+	 */
+	public ScheduleRealMatcher timeClosest(){
+		TimeClosestGPS.match(schs, inArrivals, outArrivals, maxBcsj);
+		return this;
+	}
+	
+	/**
+	 * 
+	 * @Title: matchEnd 
+	 * @Description: TODO(匹配结束后做上发信使和下发调度指令) 
+	 * @throws
+	 */
+	public void matchEnd(){
+		
+		for(ScheduleRealInfo sch : schs){
+			//按 RealTimeModel 的优先级赋予班次实际时间
+			//起点发出
+			if(sch.statusTostart()){
+				
+				//设置班次的实际发车时间
+				sch.setFcsjActualAll(sch.getSjfcModel().getTime());
+				//班次状态改为正在执行
+				sch.calcStatus();
+				ScheduleBuffer.persistentList.add(sch);
+				
+				if(sch.isFirstStationIsPark()){
+					ScheduleBuffer.persistentList.add(sch.getTwins());
+					sendFcsj(sch.getTwins());//推送到页面
+				}
+				
+				sendFcsj(sch);//推送到页面
+			}
+			
+			//终点到达
+			if(sch.statusToEnd()){
+				
+				//设置班次的实际终点时间
+				sch.setZdsjActualAll(sch.getSjddModel().getTime());
+				//完成当前班次
+				ScheduleRealInfo nextSch = ScheduleBuffer.finishSch(sch);
+				
+				if(sch.isFirstStationIsPark()){
+					ScheduleBuffer.persistentList.add(sch.getTwins());
+					sendFcsj(sch.getTwins());//推送到页面
+				}
+				
+				int finish = ScheduleBuffer.getFinishSchNo(sch.getClZbh());
+				if(nextSch != null){
+					//发送下一班次的调度指令
+					directiveService.send60Dispatch(nextSch, finish);
+				}
+				
+				sendZdsj(sch, nextSch, finish);//推送到页面
+			}
+		}
+	}
+	
+	/**
+	 * @throws JsonProcessingException 
+	 * @throws NumberFormatException 
+	 * @Title: sendFcsj 
+	 * @Description: TODO(推送发车信息) 
+	 * @param @param schedule    班次
+	 * @throws
+	 */
+	public void sendFcsj(ScheduleRealInfo schedule) {
+		/*JSONObject json = new JSONObject();
+		json.put("fn", "faChe");
+		json.put("t", schedule);
+		json.put("dataStr", sdf.format(new Date()));*/
+		
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "faChe");
+		map.put("t", schedule);
+		map.put("dataStr", sdf.format(new Date()));
+		
+		ObjectMapper mapper = new ObjectMapper();  
+		
+		try{
+			socketHandler.sendMessageToLine(Integer.parseInt(schedule.getXlBm()), mapper.writeValueAsString(map));
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * @throws JsonProcessingException 
+	 * @throws NumberFormatException 
+	 * @Title: sendFcsj 
+	 * @Description: TODO(推送到达终点时间) 
+	 * @param @param schedule    班次
+	 * @throws
+	 */
+	public void sendZdsj(ScheduleRealInfo schedule,ScheduleRealInfo nextSch, int finish) {
+		/*JSONObject json = new JSONObject();
+		json.put("fn", "zhongDian");
+		json.put("t", schedule);
+		json.put("nt", nextSch);
+		json.put("finish", finish);
+		json.put("dataStr", sdf.format(new Date()));*/
+		
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "zhongDian");
+		map.put("t", schedule);
+		map.put("nt", nextSch);
+		map.put("finish", finish);
+		map.put("dataStr", sdf.format(new Date()));
+		
+		ObjectMapper mapper = new ObjectMapper();
+		
+		try{
+			socketHandler.sendMessageToLine(Integer.parseInt(schedule.getXlBm()), mapper.writeValueAsString(map));
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext arg0) throws BeansException {
+		applicationContext = arg0;
+		
+		socketHandler = applicationContext.getBean(RealControlSocketHandler.class);
+		directiveService = applicationContext.getBean(DirectiveService.class);
+	}
+}
+package com.bsth.vehicle.gpsdata.arrival.match;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.vehicle.gpsdata.arrival.entity.RealTimeModel;
+import com.bsth.vehicle.gpsdata.entity.ArrivalInfo;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+
+/**
+ * 
+ * @ClassName: TimeClosest
+ * @Description: TODO(按时间距离最近进行匹配)
+ * @author PanZhao
+ * @date 2016年7月24日 下午5:27:27
+ *
+ */
+public class TimeClosestGPS {
+	
+	static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+
+	public static void match(List<ScheduleRealInfo> schs,
+			List<ArrivalInfo> inList, List<ArrivalInfo> outList, int maxBcsj) {
+		
+		//班次ID 和 离站数据 一对一映射
+		BiMap<Long, String> outBiMap = HashBiMap.create();
+		//班次ID 和 到站数据 一对一映射
+		BiMap<Long, String> inBiMap = HashBiMap.create();
+		
+		Long spaceTime = maxBcsj * 60 * 1000 * 2L;
+		
+		RealTimeModel sjfcModel, sjddModel;
+		for(ScheduleRealInfo sch : schs){
+			
+			sjfcModel = sch.getSjfcModel();
+			sjddModel = sch.getSjddModel();
+			
+			//起点发出
+			for(ArrivalInfo outArr : outList){
+				if(sjfcModel.getStation().equals(outArr.getStopNo())
+						&& Math.abs(sch.getFcsjT() - outArr.getTs()) < spaceTime){
+					
+					//如果这个实际发车已经被之前班次关联
+					if(outBiMap.inverse().get(outArr.getId()) != null)
+						continue;
+					
+					//System.out.println("实际起点发出，计划时间：" + sch.getFcsj() + " -实际时间：" + sdf.format(new Date(outArr.getTs())) + " -" + outArr.getTs());
+					sjfcModel.setGpsTime(outArr.getTs());
+					outBiMap.put(sch.getId(), outArr.getId());
+				}
+			}
+			
+			//有些班次没有历时，也就没有计划终点时间
+			if(sch.getZdsjT() == null)
+				continue;
+			//终点到达
+			for(ArrivalInfo inArr : inList){
+				if(sjddModel.getStation().equals(inArr.getStopNo())
+						&& Math.abs(sch.getZdsjT() - inArr.getTs()) < spaceTime){
+					//如果这个实际发车已经被之前班次关联
+					if(inBiMap.inverse().get(inArr.getId()) != null)
+						continue;
+					
+					//System.out.println("实际到达终点，计划时间：" + sch.getZdsj() + " -实际时间：" + sdf.format(new Date(inArr.getTs())) + " -" + inArr.getTs());
+					sjddModel.setGpsTime(inArr.getTs());
+					inBiMap.put(sch.getId(), inArr.getId());
+				}
+			}
+		}
+	}
+}
 package com.bsth.vehicle.gpsdata.buffer;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -8,7 +9,7 @@ import java.util.Map;
 import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.gpsdata.entity.ArrivalInfo;
-import com.google.common.collect.LinkedListMultimap;
+import com.google.common.collect.ArrayListMultimap;
 /**
  * 
@@ -21,9 +22,10 @@ import com.google.common.collect.LinkedListMultimap;
 public class GpsArrivalDataBuffer {
 	/**
-	 * 车辆 时间戳排序的进出站链表
+	 * 车辆 时间戳排序的实际进出站
 	 */
-	public static LinkedListMultimap<String, ArrivalInfo> allMap;
+	public static ArrayListMultimap<String, ArrivalInfo> allMap;
+	
 	/**
 	 * 车辆 和 进出站链表索引
@@ -45,16 +47,15 @@ public class GpsArrivalDataBuffer {
 		List<ArrivalInfo> all = allMap.get(nbbm);
 		int size = all.size();
 		if(size == 0)
-			return null;
+			return new ArrayList<>(0);
 		List<ArrivalInfo> rs = all.subList(mark, size);
-
 		markMap.put(nbbm, size);
 		return rs;
 	}
 	static {
-		allMap = LinkedListMultimap.create();
+		allMap = ArrayListMultimap.create();
 		markMap = new HashMap<>();
 	}
@@ -143,7 +143,11 @@ public class GpsRealDataBuffer {
 				gpsData.setStationName(CommonMapped.stationCodeMap.get(gpsData.getStopNo()));
 				current = ScheduleBuffer.findCurrent(nbbm);
-				next = ScheduleBuffer.getNext(current);
+				if(null == current){
+					next = ScheduleBuffer.getFirst(nbbm);
+				}
+				else
+					next = ScheduleBuffer.getNext(current);
 				if(current != null)
 					gpsData.setCurrSchId(current.getId());
@@ -16,14 +16,20 @@ import javax.persistence.Transient;
 public class ArrivalInfo {
 	@Transient
-	static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm")
-		,sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+	static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss")
+		,sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	public ArrivalInfo(String deviceId, Long ts, String lineCode, Integer upDown, String stopNo, Integer inOut,
 			Date createDate, Integer weeksYear) {
 		this.deviceId = deviceId;
+		//gps是2014年的数据，临时将ts拉到今天
+		/*try {
+			this.ts = sdf2.parse("2016-07-25 " + sdf.format(new Date(ts))).getTime();
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}*/
 		this.ts = ts;
 		this.lineCode = lineCode;
@@ -162,4 +168,8 @@ public class ArrivalInfo {
 	public void setStopName(String stopName) {
 		this.stopName = stopName;
 	}
+	
+	public String getId(){
+		return this.deviceId + "_" + this.ts;
+	}
 }
@@ -139,7 +139,7 @@ public class GpsDataServiceImpl implements GpsDataService{
 		//如果是同一天
 		if(sDayOfYear == eDayOfYear){
-			weekCal.setTimeInMillis(st);
+			weekCal.setTimeInMillis(st * 1000);
 			list = findByTs(weekCal.get(Calendar.WEEK_OF_YEAR), sDayOfYear, st, et, devices);
 		}
 		else{
@@ -160,7 +160,7 @@ public class GpsDataServiceImpl implements GpsDataService{
 					tempEt = DateUtils.getTimesnight(sCal);
 				}
-				weekCal.setTimeInMillis(tempSt);
+				weekCal.setTimeInMillis(tempSt * 1000);
 				list.addAll(findByTs(weekCal.get(Calendar.WEEK_OF_YEAR), i, tempSt, tempEt, devices));
 				//加一天
 				sCal.add(Calendar.DATE, 1);
@@ -244,6 +244,7 @@ public class GpsDataServiceImpl implements GpsDataService{
 		return list;
 	}
+	//weekOfYear 算错了
 	public Map<String, ArrivalInfo> findArrivalByTs(int weekOfYear, Long st, Long et, String devicesInSql){
 		Map<String, ArrivalInfo> map = new HashMap<>();
@@ -275,4 +276,10 @@ public class GpsDataServiceImpl implements GpsDataService{
 		}
 		return map;
 	}
+	
+	public static void main(String[] args) {
+		Calendar weekCal = Calendar.getInstance();
+		weekCal.setTime(new Date());
+		System.out.println(weekCal.get(Calendar.WEEK_OF_YEAR));
+	}
 }
@@ -500,12 +500,18 @@ function refreshChildTasks(){
 	//主任务id
 	var id = $mainTab.find('tr._active').data('id');
-	$.get('/childTask/all', {'schedule.id_eq': id}, function(rs){
+	
+	var htmlStr = template('child_task_sub_table_temp', {list: _data.getSchedulById(id).cTasks});
+	
+	dictionaryUtils.transformDom(
+			$subTab.find('tbody').html(htmlStr).find('.nt-dictionary')
+	);
+/* 	$.get('/childTask/all', {'schedule.id_eq': id}, function(rs){
 		var htmlStr = template('child_task_sub_table_temp', {list: rs});
 		dictionaryUtils.transformDom(
 			$subTab.find('tbody').html(htmlStr).find('.nt-dictionary')
 		);
-	});
+	}); */
 }
 </script>
@@ -335,12 +335,15 @@ var childTaskCase = {
 };
 function childTaskSubmit(fs, layerIndex){
-	syncSubmit(fs, function(){
+	syncSubmit(fs, function(rs){
 		layer.msg('子任务添加成功');
 		setTimeout(function(){
 			layer.close(layerIndex);
 			//刷新子任务列表
-			refreshChildTasks();
+			if(rs.status == 'SUCCESS'){
+				_alone.refreshSchedule(rs.t);
+				refreshChildTasks();
+			}
 		}, 700);
 	});
 }
@@ -353,10 +356,11 @@ function syncSubmit(fs, cb){
 	if(fs.length == 0) return;
 	//备注
 	var remarks = $(fs[0]).parents('.custom-anim-modal').find('textarea[name=remarks]').val();
-	var i = 0, len = fs.length;
+	var i = 0, len = fs.length, cbRs;
 	(function(){
+		
 		if(i == len){
-			cb && cb();
+			cb && cb(cbRs);
 			return;
 		}
@@ -365,12 +369,15 @@ function syncSubmit(fs, cb){
 			,params = $(form).serializeJSON();
 		params.remarks = remarks;
-		$post('/childTask', params, function(){
+		$post('/childTask', params, function(rs){
+			console.log('item rs: ' ,rs);
 			$(form).parent().find('.task-item-close').replaceWith('<a class="task-item-success"><i class="fa fa-check-circle" ></i></a>');
 			i ++;
 			//做一层防护，防止缺心眼出现无限循环提交
 			if(i == 0)
 				return;
+			
+			cbRs = rs;
 			f();
 		});
 	})();
@@ -2166,45 +2166,56 @@ tr._active .blue-badge{
 	color: #afafaf !important;
 }
+.pb-table tr.selected.next-sch a{
+	color: white !important;
+}
+
 .tab_line .pb-table tr._tr_active.active-line-no a.remarks-popover{
 	color: #bebebe;
 }
 .tab_line .pb-table tr._tr_active.active-line-no td.tl-qrlb,
 .pb-table tr.selected.dir_0 td.tl-qrlb,
-.pb-table tr.selected.dir_1 td.tl-qrlb{
+.pb-table tr.selected.dir_1 td.tl-qrlb,
+.pb-table tr.selected.next-sch td.tl-qrlb{
 	background: none;
     color: #ff796a;
 }
 .tab_line .pb-table tr._tr_active.active-line-no td.tl-zzzx,
 .pb-table tr.selected.dir_0 td.tl-zzzx,
-.pb-table tr.selected.dir_1 td.tl-zzzx{
+.pb-table tr.selected.dir_1 td.tl-zzzx,
+.pb-table tr.selected.next-sch td.tl-zzzx{
 	background: none;
     color: #5ae35a;
 }
 .tab_line .pb-table tr._tr_active.active-line-no td.tl-yzx,
 .pb-table tr.selected.dir_0 td.tl-yzx,
-.pb-table tr.selected.dir_1 td.tl-yzx{
+.pb-table tr.selected.dir_1 td.tl-yzx,
+.pb-table tr.selected.next-sch td.tl-yzx{
 	background: none;
     color: #80c8fa;
 }
 .tab_line .pb-table tr._tr_active.active-line-no td.tl-xxfc,
 .pb-table tr.selected.dir_0 td.tl-xxfc,
-.pb-table tr.selected.dir_1 td.tl-xxfc{
+.pb-table tr.selected.dir_1 td.tl-xxfc,
+.pb-table tr.selected.next-sch td.tl-xxfc{
 	background: none;
     color: #a16dff;
 }
 .tab_line .pb-table tr._tr_active.active-line-no td.tl-xxsd,
 .pb-table tr.selected.dir_0 td.tl-xxsd,
-.pb-table tr.selected.dir_1 td.tl-xxsd{
+.pb-table tr.selected.dir_1 td.tl-xxsd,
+.pb-table tr.selected.next-sch td.tl-xxsd{
 	background: none;
     color: #ffb193;
 }
+
 .tab_line .pb-table tr._tr_active.active-line-no td.tl-xxrd,
 .pb-table tr.selected.dir_0 td.tl-xxrd,
-.pb-table tr.selected.dir_1 td.tl-xxrd{
+.pb-table tr.selected.dir_1 td.tl-xxrd,
+.pb-table tr.selected.next-sch td.tl-xxrd{
 	background: none;
     color: #5cb0e9;
 }
@@ -136,7 +136,7 @@
     <li class="menu-separator"></li>
     <li class="menu-item" >
         <button type="button" class="menu-btn" data-multi=1 data-method="spaceAdjust">
-            <span class="menu-text">待发间隔调整</span>
+            <span class="menu-text">间隔调整</span>
         </button>
     </li>
     <!-- <li class="menu-item disabled" >
@@ -144,7 +144,6 @@
             <span class="menu-text">误点调整</span>
         </button>
     </li> -->
-    <li class="menu-separator"></li>
     <li class="menu-item" >
         <button type="button" class="menu-btn" data-method="schInfoFineTune">
             <span class="menu-text">发车信息微调</span>
@@ -165,6 +165,9 @@ var _alone = (function(){
 	function calculateLineNo(table){
 		var rows = table.rows;
 		$.each(rows,function(i, r){
+			if($(r).hasClass('child-task-list'))
+				return true;
+			
 			var cells = r.cells;
 			$(cells[0]).text(i + 1);
@@ -8,8 +8,8 @@ var _data = (function(){
 	//实时GPS数据
 	var allGps = {};
-	//300秒刷新一次实时GPS
-	var realGpsT = 1000 * 300;
+	//10秒刷新一次实时GPS
+	var realGpsT = 1000 * 10;
 	var dateStr = moment().format('YYYY-MM-DD');
 	//实际排班
@@ -29,7 +29,7 @@ var _data = (function(){
 	var carDeviceIdMapp = {};
 	var fcsjSort = function(a, b){
-		return a.fcsjT - b.fcsjT;
+		return (a.fcno - b.fcno) + (a.fcsjT - b.fcsjT);
 	}
 	var dataObject = {
@@ -288,23 +288,22 @@ var _data = (function(){
 			for(var i = 0, gps; gps=gpsList[i++];){
 				oldGps = prve[gps.deviceId];
 				if(!oldGps){
-					//添加
-					prve[gps.deviceId] = gps;
 					addArray.push(gps);
 				}
 				else if(gps.timestamp > oldGps.timestamp){
 					//更新
 					upArray.push(gps);
 				}
+				allGps[gps.deviceId] = gps;
 			}
 			cb && cb(addArray, upArray);
 		}
 		function getGpsError(jqXHR, textStatus){
-			if(textStatus === 'error'){}
-				//layer.alert('获取GPS数据时，服务器出现异常', {icon: 2});
-			else if(textStatus === 'timeout'){}
-				//layer.alert('连接服务器超时', {icon: 2});
+			if(textStatus === 'error')
+				layer.alert('获取GPS数据时出现异常，请尝试刷新页面！', {icon: 2});
+			else if(textStatus === 'timeout')
+				layer.alert('连接服务器超时', {icon: 2});
 			//停止gps刷新
 			clearTimeout(gpsTimer);
@@ -62,6 +62,10 @@ var drawSvg = (function(){
 			//线路编码 和 单线路SVG对照
 			aloneSvgMapp[lineId] = svg;
 		},
+		clear: function(){
+			for(var k in seGps)
+				seGps[k] = [];
+		},
 		init: function(lineId, data, container, w, mtop){
 			if(!data || data.length == 0)
 				return;
@@ -176,12 +180,34 @@ var drawSvg = (function(){
 		//画出GPS点
 		drawVehicle: function(gpsArray){
+			if(!gpsArray || gpsArray.length == 0)
+				return;
+			
+			//console.log('len', gpsArray.length);
+			//暂时先清空重新画
+			var fGps = gpsArray[0];
+			var hSvg = homeSvgMapp[fGps.lineId]
+				,aSvg = aloneSvgMapp[fGps.lineId];
+			//svg.selectAll('.vehci-g').remove();
+			if(fGps.upDown == 0){
+				hSvg.selectAll('.vehci-g.up').remove();
+				hSvg.selectAll('.start.park').remove();
+				
+				aSvg.selectAll('.vehci-g.up').remove();
+				aSvg.selectAll('.start.park').remove();
+			}
+			else if(fGps.upDown == 1){
+				hSvg.selectAll('.vehci-g.down').remove();
+				hSvg.selectAll('.end.park').remove();
+				
+				aSvg.selectAll('.vehci-g.down').remove();
+				aSvg.selectAll('.end.park').remove();
+			}
+			
 			for(var i = 0, gps; gps = gpsArray[i ++];){
-				//drawGpsToSvg(gps, aloneSvgMapp[gps.lineId]);
+				drawGpsToSvg(gps, hSvg);
-				//暂时先清空重新画
-				homeSvgMapp[gps.lineId].select('g.gps-g-wrap').html('');
-				drawGpsToSvg(gps, homeSvgMapp[gps.lineId]);
+				drawGpsToSvg(gps, aSvg, true);
 			}
 			//画出起终点GPS信号
@@ -189,34 +215,42 @@ var drawSvg = (function(){
 			for(var eid in seGps){
 				len = seGps[eid].length;
 				if(len > 0){
-					var e = $('#' + eid)
-					,x = parseInt(e.attr('cx'))
-					,y = parseInt(e.attr('cy'));
+					var a_e = $('#' + eid, aSvg[0])
+						,a_x = parseInt(a_e.attr('cx'))
+						,a_y = parseInt(a_e.attr('cy'));
+					tempStartAndStop(aSvg, eid, a_e, a_x, a_y);
-					var svg = homeSvgMapp[seGps[eid][0].lineId];
-					
-					var gs = svg.append('g').classed({'start': e.attr('class').indexOf('start') != -1, 'park': true})
-						.selectAll('g').data(seGps[eid]).enter().append('g');
-					//Y轴居中
-					y = (y + 66) - len * 13;
-					gs.append('rect')
-						.attr('x', x + 15)
-						.attr('y', function(d, i){
-							return y + i * 27;
-						})
-						.classed({'gps-rect': true});
-					
-					gs.append('text')
-						.attr('x', x + 18)
-						.attr('y', function(d, i){
-							return y + i * 27 + 17;
-						})
-						.text(function(d){return cutNbbm(d.nbbm)});
-					
-					_tooltip.initStartAndEndGPS(gs);
+					var h_e = $('#' + eid, hSvg[0])
+						,h_x = parseInt(h_e.attr('cx'))
+						,h_y = parseInt(h_e.attr('cy'));
+					tempStartAndStop(hSvg, eid ,h_e , h_x, h_y);
 				}
 			}
+			function tempStartAndStop(svg, eid, e, x, y){
+				
+				var gs = svg.append('g').classed({'start': e.attr('class').indexOf('start') != -1, 'park': true})
+						.selectAll('g').data(seGps[eid]).enter().append('g');
+				
+				//Y轴居中
+				y = (y + 66) - len * 13;
+				gs.append('rect')
+					.attr('x', x + 15)
+					.attr('y', function(d, i){
+						return y + i * 27;
+					})
+					.classed({'gps-rect': true});
+				
+				gs.append('text')
+					.attr('x', x + 18)
+					.attr('y', function(d, i){
+						return y + i * 27 + 17;
+					})
+					.text(function(d){return cutNbbm(d.nbbm)});
+				
+				_tooltip.initStartAndEndGPS(gs);
+			}
+			
 			/**
 			 * 堆叠多个GPS信号
 			 */
@@ -245,7 +279,7 @@ var drawSvg = (function(){
 			});
 			function drawNumber(multiGps, num, that, start, end){
-				var circle = $('#' + $(multiGps).attr('for'))
+				/*var circle = $('#' + $(multiGps).attr('for'))
 				,x = circle.attr('cx')
 				,y = circle.attr('cy');
@@ -258,23 +292,24 @@ var drawSvg = (function(){
 					numberG.classed({'end': true});//终点站
 				numberG.append('rect').attr('x', x).attr('y', y);
-				numberG.append('text').attr('x', x).attr('y', y).text(num);
+				numberG.append('text').attr('x', x).attr('y', y).text(num);*/
 			}
 		}
 	};
-	function drawGpsToSvg(gps, svg){
+	function drawGpsToSvg(gps, svg, flag){
 		var stionId = gps.lineId + '_' + gps.stopNo
-		,station = $('#' + stionId)
+		,station = $('#' + stionId, svg[0])/*
 		,c = station.attr('class')||""
 		,start = c.indexOf('start') != -1
-		,end = c.indexOf('end') != -1;
+		,end = c.indexOf('end') != -1*/;
+		//console.log(stionId, station);
 		if(station.length == 0)
 			return;
 		//起终点站GPS信号
-		if(seGps[stionId]){
+		if(flag && seGps[stionId]){
 			seGps[stionId].push(gps);
 			return;
 		}
@@ -285,7 +320,7 @@ var drawSvg = (function(){
 			,gpsGWrap = svg.select('.gps-g-wrap')
 			,gpscont;
-		if($('g[for='+stionId+']').length == 0){
+		if($('g[for='+stionId+']',  svg[0]).length == 0){
 			gpscont = gpsGWrap.append('g')
 				.attr('class', 'station-gps-container')
 				.attr('updown', updown)
@@ -338,8 +373,9 @@ var drawSvg = (function(){
 			.attr('cx', cx)
 			.attr('cy',  updown=='up'?mt:mt + p)
 			.attr('id',function(d){
-				if(d.id[0] != -1)
-					return lineId + '_' + d.id[0];
+				var i = updown=='up'?0:1;
+				if(d.id[i] != -1)
+					return lineId + '_' + d.id[i];
 			})
 			.attr('updown', updown=='up'?0:1)
 			.attr('class', function(d, i){
@@ -28,14 +28,25 @@ $(document.body).on(&#39;keydown&#39;, function(e){
 			  		if(!array || array.length == 0)
 			  			layer.msg('没有找到相关班次信息！');
 			  		else{
-			  			//定位到当前正在执行的班次
-			  			var sch;
+			  			var runingSch,nearestSch;
+			  			//当前时间戳，忽略毫秒
+			  			var t = Date.parse(new Date());
 			  			$.each(array, function(){
+			  				//正在执行的班次
 			  				if(this.status == 1)
 			  					sch = this;
+			  				
+			  				//距离当前时间最近的班次
+			  				if(!nearestSch
+			  						|| Math.abs(this.fcsjT - t) < Math.abs(nearestSch.fcsjT - t))
+			  					nearestSch = this;
+			  				
+			  				//高亮所有班次
+			  				$('.pb-table tr[data-id='+this.id+']').addClass('selected dir_' + this.xlDir);
 			  			});
+			  			
 			  			if(!sch)
-			  				sch = array[0];
+			  				sch = nearestSch;
 			  			var delay;
 			  			//当前选中的选项卡
@@ -42,7 +42,6 @@
 			$('#tab_home').html(homeHtmlStr);
 			//计算高度 40 页脚
 			var ah = $('#top-tabs-wrap .tab-content').height() - 40 - 5;
-			console.log(ah);
 			$('.card_wrap').css('height', ah / 3);
 			//滚动条
@@ -67,16 +66,18 @@
 		 		var list = _data.findAllGps();
 		 		_data.attachSchedulInfo(list);
-		 		drawSvg.drawVehicle(list);
-		 		
+		 		//drawSvg.drawVehicle(list);
 		 		//按线路分组
 		 		var listMap = groupByLine(list);
-		 		console.log('listMap', listMap);
+		 		
 		 		for(var key in listMap){
 					var htmlStr = template('home_table_temp', {list: listMap[key]});
 					$('#tab_' + key).find('tbody').html(htmlStr);
 					//更新badge
 					$('#'+key+'_badge').text('( ' + listMap[key].length + ' )');
+					
+					drawSvg.clear();
+					drawSvg.drawVehicle(listMap[key]);
 				}
 		 	});
@@ -357,10 +357,10 @@ var _menu = (function() {
 					  layer.close(index);
 					  $post('/realSchedule/realOutAdjust', params
 							  ,function(rs){
-						  	if(rs.t){
+						  	if(rs.ts){
 						  		msg_ct('实发调整成功！');
 								//更新前端数据
-								_alone.refreshSchedule(rs.t);
+								_alone.refreshScheduleArray(rs.ts);
 							}
 					  });
 				  });
@@ -375,10 +375,11 @@ var _menu = (function() {
 				shift :5,
 			}, function(){
 				$post('/realSchedule/revokeRealOutgo', {id: schedul.id}, function(rs){
-					if(rs.t){
+					console.log(rs);
+					if(rs.ts){
 						msg_ct('撤销实发成功！');
 						//更新前端数据
-						_alone.refreshSchedule(rs.t);
+						_alone.refreshScheduleArray(rs.ts);
 					}
 				});
 			});
@@ -545,11 +546,11 @@ var _menu = (function() {
 						$post('/realSchedule/schInfoFineTune', params, function(rs){
 							layer.close(index);
-							if(rs.t)
-								_alone.refreshSchedule(rs.t);
+							if(rs.ts)
+								_alone.refreshScheduleArray(rs.ts);
-							if(rs.nextSch)
-								_alone.refreshSchedule(rs.nextSch);
+							/*if(rs.nextSch)
+								_alone.refreshSchedule(rs.nextSch);*/
 						});
 					});
 			  }
@@ -20,7 +20,6 @@
 							<td>待发</td>
 							<td>实发</td>
 							<td class="hide-lt-1080">原因</td>
-							<!--<td>类型</td>-->
 						</tr>
 					</thead>
 			</table>
@@ -52,7 +51,6 @@
 							<td>待发</td>
 							<td>实发</td>
 							<td class="hide-lt-1080">原因</td>
-							<!--<td>类型</td>-->
 						</tr>
 					</thead>
 			</table>
@@ -148,13 +146,35 @@
 	<td data-name="sjfcsj" class="sfsj-item">{{item.fcsjActual}}<span class="fcsj-diff">{{item.fcsj_diff}}</span></td>
 {{/if}}
-	<td class="hide-lt-1080" data-name="remarks">
+<td class="hide-lt-1080" data-name="remarks">
 	{{if item.remarks != null && item.remarks.length > 0}}
 		<a class="remarks-popover" href="javascript:;" data-toggle="popover" data-content="{{item.remarks}}" >查看...</a>
 	{{/if}}
 	</td>
-	<!--<td><a href="javascript:;">主</a></td>-->
-	</tr>
+</tr>
+
+{{if item.cTasks.length > 0}}
+<!-- 子任务列表 
+<tr class="child-task-list">
+<td></td>
+<td colspan=9>
+<div>
+{{each item.cTasks as task j}}
+	<div>
+		<span>{{task.startStationName}}</span>
+		<span>{{task.endStationName}}</span>
+		<span>{{task.startDate}}</span>
+		<span>{{task.endDate}}</span>
+		<span>{{task.mileageType}}</span>
+	</div>
+{{/each}}
+</div>
+</td>
+</tr>
+-->
+{{/if}}
+
+
 {{/each}}
 </script>
@@ -503,7 +503,7 @@ html{
 .mapRightWrap .search_result .item_vehicle_list{
 	margin-bottom: 20px;
-	border-bottom: 1px solid #F3F5F5;
+	/* border-bottom: 1px solid #F3F5F5; */
 }
 .mapRightWrap .search_result .item_vehicle{
@@ -696,7 +696,7 @@ display: none;
 .play-back-btns{
     display: none;
     background: rgb(255, 255, 255);
-    width: 206px;
+    width: 216px;
     height: 44px;
     position: absolute;
     right: 320px;
@@ -776,7 +776,7 @@ display: none;
     font-size: 15px;
     vertical-align: middle;
     font-weight: 600;
-    margin-right: 12px;
+    margin-right: 5px;
     color: #565555;
     padding: 4px 8px 4px 13px;
     cursor: pointer;
@@ -51,6 +51,8 @@ var realMap = (function() {
 	//百度 -轨迹回放点聚合
 	//var historyClusterer;
+	var markerClusterer;
+	
 	//设备号和marker对照
 	var markersMap;
 	var real_map = {
@@ -125,6 +127,8 @@ var realMap = (function() {
 			},
 			clear: function(){
 				currentMap.map.clearOverlays();
+				markerClusterer && markerClusterer.clearMarkers();
+				
 			},
 			change : function() {
 				if(currentMap.mapName == REAL_BAIDU_TEXT)
@@ -212,7 +216,9 @@ var realMap = (function() {
 			drawGpsMarker: function(gpsList){
 				markersMap = {};
 				var map = currentMap.map;
-				var markerClusterer = new BMapLib.MarkerClusterer(map, {isAverangeCenter : true,minClusterSize : 3});
+				
+				markerClusterer && markerClusterer.clearMarkers();
+				markerClusterer = new BMapLib.MarkerClusterer(map, {isAverangeCenter : true,minClusterSize : 3});
 				real_map.baidu.coordsConvert(gpsList, function(){
 					//绘制车辆位置
 					var marker;
@@ -102,8 +102,11 @@ var playBack = (function() {
 				marker = markerMap[gps.nbbm];
 				if(marker)
 					getCurrMap().moveMarker(marker, gps);//移动marker
-				else
+				else{
 					markerMap[gps.nbbm] = getCurrMap().addHistoryMarker(gps);//添加marker
+					//定位到marker
+					getCurrMap().markerToCenter(markerMap[gps.nbbm]);
+				}
 				if(gps.inout_stop != -1){
 					//到离站信息
@@ -123,6 +126,8 @@ var playBack = (function() {
 	function addInOutText(gps){
 		var info = gps.inout_stop_info
 			,date = moment(gps.ts).format('HH:mm.ss');
+		if(!info)
+			return;
 		var html = '<div class="pback-logs-item">'+
 						gps.nbbm + ' '+ (info.inOut==1?'出':'进') +'站 '+info.stopName+' '+
 						'<span class="pback-logs-item-date">'+ date +'</span>'+
@@ -8,25 +8,64 @@ var searchPanel = (function() {
 		return realMap[realMap.getMap().fName];
 	}
+	var allGps;
+	
 	var exports = {
 		init : function() {
 			var htmlStr = template('search_panel_temp', {});
 			$('.mapRightWrap').html(htmlStr);
-			// 建立一个自动完成的对象
+			//focus
+			//焦点时获取所有的gps
+			$('#realSearchInput').on('focus', function(){
+				allGps = vehiclePanel.getAllGps();
+				console.log('focus', allGps);
+			})
+			.on('keyup', function(){
+				var t = $(this).val()
+					,list = [];
+				
+				$.each(allGps, function(){
+					if(this.nbbm.indexOf(t) == -1)
+						return true;
+					
+					this.fromNow = moment(this.timestamp).fromNow();
+					list.push(this);
+				});
+				
+				var resultHtml = template('search_result_temp', {list: list});
+				$('.mapRightWrap .search_result').html(resultHtml);
+			});
-			getCurr().autocomplete('realSearchInput', function(json){
-				console.log(json);
+			$('.search_result').on('click', '.result_item' ,function(){
+				console.log($(this).data('device'));
+			});
+			
+			//var allGps = vehiclePanel.getAllCars();
+			/*$('#realSearchInput').on('keyup', function(){
+				var t = $(this).val()
+					,array = [];
+				$.each(allCars, function(i, nbbm){
+					if(nbbm.indexOf(t) != -1)
+						array.push(nbbm);
+				});
+			});*/
+			// 建立一个自动完成的对象
+			/*getCurr().autocomplete('realSearchInput', function(json){
+				
 				var resultHtml = template('search_result_temp', json);
 				$('.mapRightWrap .search_result').html(resultHtml);
+				//搜索车辆
+				//console.log(json);
 			});
 			//查询结果选中事件
 			$('.search_result').on('click', '.result_item'
 					,function(){
-				getCurr().setPlace($(this).data('title'));
-			});
+				console.log(this);
+				//getCurr().setPlace($(this).data('title'));
+			});*/
 		}
 	};
@@ -30,20 +30,30 @@ var vehiclePanel = (function() {
 		//收拢其他
 		closeAll();
 		cLineCode = lineCode;
-		drawLineAndGps(lineCode);
+		drawLineAndGps(lineCode, function(){
+			//从storage里获取路由数据
+			var route = JSON.parse(storage.getItem(lineCode + '_route'));
+			//在地图上画出线路
+			getCurrMap().drawLine(route);
+		});
 	});
 	//绘制线路和GPS
-	function drawLineAndGps(lineCode){
+	function drawLineAndGps(lineCode, callFun){
 		//过滤出该线路的GPS点
 		var showList = [], gps;
-		if(lineGps[lineCode]){
+		/*if(lineGps[lineCode]){
 			$.each(lineGps[lineCode], function(){
 				gps = allGps[this];
 				showList.push(gps);
 				gpsMarker[gps.deviceId] = gps;
 			});
+		}*/
+		for(var dId in allGps){
+			if(allGps[dId].lineId == lineCode)
+				showList.push(allGps[dId]);
 		}
+		
 		//显示车辆列表
 		var htmlStr = template('vehicle_panel_collapse_temp', {list: showList});
 		$('#collapse_' + lineCode).html(htmlStr);
@@ -53,13 +63,10 @@ var vehiclePanel = (function() {
 		 */
 		var that = $(this);
 		setTimeout(function(){
-			//在地图上画出线路
-			var mapObj = getCurrMap();
-			//从storage里获取路由数据
-			var route = JSON.parse(storage.getItem(lineCode + '_route'));
-			mapObj.drawLine(route);
+			callFun && callFun();
 			//画GPS
-			mapObj.drawGpsMarker(showList);
+			getCurrMap().drawGpsMarker(showList);
+			
 		}, 500);
 	}
@@ -78,7 +85,7 @@ var vehiclePanel = (function() {
 	//GPS刷新事件
 	var allGps = {};
-	var lineGps = {};
+	//var lineGps = {};
 	$('#mapContainer').on('gps_refresh', function(e, add, up){
 		var temp = add;
 		if(up)
@@ -90,23 +97,24 @@ var vehiclePanel = (function() {
 				allGps[this.deviceId] = this;
 			});
-			$.each(add, function(){
+		/*	$.each(add, function(){
 				if(!lineGps[this.lineId])
 					lineGps[this.lineId] = [];
 				//线路和设备号映射
-				lineGps[this.lineId].push(this.deviceId);
-			})
+				//lineGps[this.lineId].push(this.deviceId);
+			})*/
 		}
 		//先暂时重绘，后面再优化
 		if(cLineCode){
-			var showList = [];
+			drawLineAndGps(cLineCode);
+			/*var showList = [];
 			if(lineGps[cLineCode]){
 				$.each(lineGps[cLineCode], function(){
 					showList.push(allGps[this]);
 				});
 			}
-			mapObj.drawGpsMarker(showList);
+			mapObj.drawGpsMarker(showList);*/
 		}
 	});
@@ -146,6 +154,21 @@ var vehiclePanel = (function() {
 		},
 		drawLineAndGps: function(lineCode){
 			drawLineAndGps(lineCode);
+		},
+		//获取所有的车辆 - 从GPS定时定距里查询
+		getAllGps: function(){
+			var array = [];
+			/*var array = [
+			   {nbbm: 'B-91524', state: 0, timestamp: 1469427233000, stationName: '金桥路浦东大道', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 000},
+			   {nbbm: 'B-91334', state: 1, timestamp: 1469427233000, stationName: '博山东路', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 111},
+			   {nbbm: 'B-91224', state: 0, timestamp: 1469427233000, stationName: '闵浦大桥', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 222},
+			   {nbbm: 'B-91124', state: 0, timestamp: 1469427312000, stationName: '旧金山', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 333},
+			   {nbbm: 'B-91924', state: -1, timestamp: 1469427233000, stationName: '硅谷', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 444},
+			   {nbbm: 'B-92224', state: 0, timestamp: 1469427312000, stationName: '意大利', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 555}
+			];*/
+			for(var deviceId in allGps)
+				array.push(allGps[deviceId]);
+			return array;
 		}
 	};
 <script id="search_panel_temp" type="text/html">
 <div class="input-group">
-    <input type="text" id="realSearchInput" class="form-control" placeholder="车辆自编号/地图位置...">
+    <input type="text" id="realSearchInput" class="form-control" placeholder="车辆自编号搜索...">
     <span class="input-group-btn">
         <button class="btn" type="button"><i class="fa fa-search"></i> 搜索</button>
     </span>
@@ -11,19 +11,18 @@
 </script>
 <script id="search_result_temp" type="text/html">
-
-	<div class="item_vehicle_list">
-		<p class="result_item item_vehicle">
-			<i class="fa fa-circle font-green-jungle"></i> &nbsp;W1B-023 &nbsp;&nbsp;-营运中<br>
-			<span class="sub_text">开往 金桥路浦东大道 站（30秒前）</span>
+<div class="item_vehicle_list">
+{{each list as gps i}}
+		<p class="result_item item_vehicle" data-device={{gps.deviceId}}>
+			&nbsp;{{gps.nbbm}} &nbsp;&nbsp;- {{if gps.state==0}}营运中{{else if gps.state==1}}非营运{{else}}未知营运状态{{/if}}<br>
+			<span class="sub_text"> {{gps.stationName}}（{{gps.fromNow}} 更新）</span>
 		</p>
-		<p class="result_item item_vehicle">
-			<i class="fa fa-circle font-green-jungle"></i> &nbsp;W2C-578 &nbsp;&nbsp;-营运中<br>
-			<span class="sub_text">开往 张江路华谊路 站（刚刚）</span>
-		</p>
-	</div>
+{{/each}}
+</div>
+</script>
+<!-- 
 {{if type == "baidu"}}
 {{each result as obj i}}
 	<p class="result_item" data-title="{{obj.business}}">
@@ -39,4 +38,4 @@
 	</p>
 {{/each}}
 {{/if}}
-</script>
+ -->
 \ No newline at end of file
@@ -34,7 +34,7 @@
 			<span style="font-size: 13px;">{{gpsObj.stationName}}</span>
 		</div>
 		<div class="icon">
-			 <i class="fa fa-file-text-o"></i>
+			 <!--<i class="fa fa-file-text-o"></i>-->
 		</div>
 	</div>
 {{/each}}