加入到离站预测模块

潘钊
1 parent 54e31c08
Showing 48 changed files with 1427 additions and 308 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/directive/UpstreamEntrance.java
src/main/java/com/bsth/controller/forecast/SampleController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/arrival/ArrivalEntity.java
src/main/java/com/bsth/data/arrival/DataLoader.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/forecast/SampleTimeDataLoader.java
src/main/java/com/bsth/data/forecast/entity/ForecastResult.java
src/main/java/com/bsth/data/forecast/entity/SimpleRoute.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/match/Arrival2Schedule.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/entity/forecast/Sample.java
@@ -16,7 +16,7 @@ import org.springframework.context.annotation.Primary;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(8);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(11);
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -62,7 +62,7 @@ public class DirectiveController {
 	 * @param @param lineId 新线路编码
 	 * @throws
 	 */
-	@RequestMapping(value = "/lineChnage", method = RequestMethod.GET)
+	@RequestMapping(value = "/lineChnage", method = RequestMethod.POST)
 	public int lineChange(@RequestParam String nbbm, @RequestParam Integer lineId){
 		SysUser user = SecurityUtils.getCurrentUser();
 		return directiveService.lineChange(nbbm, lineId, user.getUserName());
@@ -3,7 +3,6 @@ package com.bsth.controller.directive;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -26,7 +25,6 @@ import com.bsth.entity.directive.DirectiveReponse;
  */
 @RestController
 @RequestMapping("/control")
-@Scope("prototype")
 public class UpstreamEntrance {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -2,7 +2,11 @@ package com.bsth.controller.forecast;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -10,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
 import com.bsth.controller.forecast.dto.CreateSampleParam;
 import com.bsth.entity.forecast.Sample;
@@ -22,16 +27,20 @@ public class SampleController extends BaseController&lt;Sample, Long&gt;{
 	@Autowired
 	SampleService sampleService;
+	Logger loger = LoggerFactory.getLogger(this.getClass());
+	
 	@RequestMapping("/create/gps")
-	public int createDataByGps(@RequestParam String data){
-		
+	public Map<String, Object> createDataByGps(@RequestParam String data){
+		Map<String, Object> rs = new HashMap<>();
 		try {
 			data = URLDecoder.decode(data, "utf-8");
 			CreateSampleParam param = JSONObject.toJavaObject(JSON.parseObject(data), CreateSampleParam.class);
-			System.out.println(param);
+			
+			rs = sampleService.createDataByGps(param);
 		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
+			loger.info("", e);
+			rs.put("status", ResponseCode.ERROR);
 		}
-		return 0;
+		return rs;
 	}
 }
@@ -26,12 +26,12 @@ public class GpsController {
 	GpsService gpsService;
 	@RequestMapping(value = "/real/line/{lineCode}")
-	public List<GpsEntity> findByLineCode(@PathVariable("lineCode") Integer lineCode) {
-		return gpsRealData.get(lineCode);
+	public List<GpsEntity> findByLineCode(@PathVariable("lineCode") String lineCode) {
+		return gpsRealData.getByLine(lineCode);
 	}
 	@RequestMapping(value = "/real/line")
-	public List<GpsEntity> findByLineCode(@RequestParam String lineCodes) {
+	public List<GpsEntity> findByLineCodes(@RequestParam String lineCodes) {
 		return gpsRealData.get(Splitter.on(",").splitToList(lineCodes));
 	}
@@ -262,7 +262,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @throws
 	 */
 	@RequestMapping(value = "/findRouteByLine")
-	public Map<String, Object> findRouteByLine(@RequestParam Integer lineCode){
+	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
 		return scheduleRealInfoService.findRouteByLine(lineCode);
 	}
@@ -57,7 +57,7 @@ public class BasicData implements CommandLineRunner{
 	public static TreeMultimap<String, String> lineCode2SocketUserMap = TreeMultimap.create();
 	//线路ID和code 对照
-	public static BiMap<Integer, Integer> lineId2CodeMap;
+	public static BiMap<Integer, String> lineId2CodeMap;
 	//线路编码和名称对照
 	public static Map<String, String> lineCode2NameMap;
@@ -211,12 +211,12 @@ public class BasicData implements CommandLineRunner{
 			Iterator<Line> iterator = lineRepository.findAll().iterator();
 			Line line;
-			BiMap<Integer, Integer> biMap = HashBiMap.create();
+			BiMap<Integer, String> biMap = HashBiMap.create();
 			Map<String, String> code2name = new HashMap<>();
 			while(iterator.hasNext()){
 				line = iterator.next();
-				biMap.put(line.getId(), Integer.parseInt(line.getLineCode()));
+				biMap.put(line.getId(), line.getLineCode());
 				code2name.put(line.getLineCode(), line.getName());
 			}
@@ -88,6 +88,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 				}
 				//从专业的角度分析一下数据
 				analyseData.analyse(carSet);
+				
 				//开始匹配
 				Arrival2Schedule.start(carSet);
 			}catch(Exception e){
 package com.bsth.data.arrival;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import com.bsth.data.BasicData;
-import com.bsth.util.DateUtils;
 /**
  * 
@@ -88,7 +88,8 @@ public class ArrivalEntity {
 	@Override
 	public String toString() {
 		try {
-			return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+"， "+DateUtils.sdfHHmm.format(new Date(this.ts))
+			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+			return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+"， "+sdfHHmm.format(new Date(this.ts))
 			+"，"+(this.getUpDown()==0?"上行":"下行")+"，"+(this.inOut==0?"进":"出")+"，"+this.stopNo+" （"+this.stopName+"）]";
 		} catch (Exception e) {
 			return "";
@@ -141,6 +141,41 @@ public class DataLoader {
 		return list;
 	}
+	/**
+	 * 
+	 * @Title: loadByLineAndStartTime 
+	 * @Description: TODO(根据线路，走向和时间戳加载数据) 
+	 */
+	public List<ArrivalEntity> loadByLineAndTime(String lineCode, int updown, long st, long et){
+		Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(st);
+		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
+		
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		
+		List<ArrivalEntity> list = new ArrayList<>();
+		String sql = "select * from bsth_c_arrival_info where weeks_year=? and line_id=? and up_down=? and in_out=0 AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
+		try{
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setInt(1, weeks_year);
+			ps.setString(2, lineCode);
+			ps.setInt(3, updown);
+			ps.setLong(4, st);
+			ps.setLong(5, et);
+			rs = ps.executeQuery();
+			
+			list = resultSet2Set(rs);
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		return list;
+	}
+	
 	public List<ArrivalEntity> resultSet2Set(ResultSet rs) throws SQLException{
 		List<ArrivalEntity> list = new ArrayList<>();
+package com.bsth.data.forecast;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import com.bsth.Application;
+import com.bsth.data.forecast.entity.ForecastResult;
+import com.bsth.data.forecast.entity.ForecastResult.ForecastResultItem;
+import com.bsth.data.forecast.entity.SimpleRoute;
+import com.bsth.data.forecast.entity.SimpleRoute.TimeRange;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.google.common.collect.ArrayListMultimap;
+
+/**
+ * 
+ * @ClassName: SampleTimeData 
+ * @Description: TODO(实时到离站预测) 
+ * @author PanZhao 
+ * @date 2016年9月18日 上午10:15:17 
+ *
+ */
+@Component
+public class ForecastRealServer implements CommandLineRunner {
+	
+	@Autowired
+	SampleTimeDataLoader dataLoader;
+	
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+	
+	@Autowired
+	GpsRealData gpsRealData;
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	//车辆 ——> 预测终点时间
+	//static Map<String, Float> forecastMap = new HashMap<>(); 
+	//线路_上下行 ——> 封装耗时数据的路由链
+	public static ArrayListMultimap<String, SimpleRoute> lineSampleMap;
+	//车辆 ——> 预测结果
+	public static Map<String, ForecastResult> forecastMap;
+	
+	static{
+		lineSampleMap = ArrayListMultimap.create();
+		forecastMap = new HashMap<>();
+	}
+	
+	@Override
+	public void run(String... arg0) throws Exception {
+		//2小时更新一次站点间耗时数据
+		Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS);
+	}
+	
+	/**
+	 * 
+	 * @Title: forecast 
+	 * @Description: TODO(预测后续时间) 
+	 * @param @param nbbm 车辆自编号
+	 */
+/*	public void forecast(String nbbm){
+		logger.info("预测，" + nbbm);
+		//当前执行班次
+		ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+		if(null == sch)
+			return;
+		
+		//车辆当前位置
+		//GpsEntity gps = gpsRealData.findByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh()));
+		GpsEntity gps = gpsRealData.findByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+		forecast(nbbm, gps);
+	}*/
+	
+	public void forecast(String nbbm, GpsEntity gps){
+		try{
+			long t = System.currentTimeMillis();
+			//终点站
+			String eStation = null;
+			//当前执行班次
+			ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+			if(null != sch)
+				eStation = sch.getZdzCode();
+			
+			//预测结果
+			ForecastResult forecastRes = new ForecastResult();
+			forecastRes.setStation(gps.getStopNo());
+			forecastRes.setArrTime(gps.getArrTime());
+			forecastRes.setFollows(
+					calc(gps.getLineId()
+							,gps.getUpDown()
+							, gps.getStopNo(), eStation
+							, t - gps.getArrTime()));
+
+			
+			forecastMap.put(nbbm, forecastRes);
+			//GPS附加预计终点时间
+			gps.setExpectStopTime(expectStopTime(nbbm));
+		}catch(Exception e){
+			logger.error("", e);
+		}
+	}
+	
+	/**
+	 * 
+	 * @Title: expectStopTime 
+	 * @Description: TODO(预计到达终点时间) 
+	 */
+	public Float expectStopTime(String nbbm){
+		long t = System.currentTimeMillis();
+		
+		Float rs = null;
+		ForecastResult forecastRes = forecastMap.get(nbbm);
+		if(null != forecastRes){
+			List<ForecastResultItem> trs = forecastRes.getFollows();
+			if(null != trs && trs.size() > 0)
+				rs = ((float)((trs.get(trs.size() - 1).getTime()) - t)) / 1000 / 60;
+		}
+		
+		//保留2位小数
+		if(null != rs)
+			rs = Float.parseFloat(new DecimalFormat(".00").format(rs));
+		
+		return rs;
+	}
+	
+	/**
+	 * 
+	 * @Title: expectDetail 
+	 * @Description: TODO(预测明细) 
+	 */
+	public List<TimeRange> expectDetail(String nbbm){
+		
+		return null;
+	}
+
+	
+	public List<ForecastResultItem> calc(String lineCode, int updown , String sStation, String eStation, long diff){
+		long t = System.currentTimeMillis()
+			, ct = t - diff;
+		
+		List<SimpleRoute> srs = lineSampleMap.get(lineCode + "_" + updown);
+		SimpleRoute curr;
+		int len = srs.size();
+		
+		List<ForecastResultItem> rs = null;
+		ForecastResultItem frItem;
+		
+		for(int i = 0; i < len; i ++){
+			curr = srs.get(i);
+			
+			if(curr.stationCode.equals(sStation)){
+				rs = new ArrayList<>();
+				continue;
+			}
+			
+			if(null == rs)
+				continue;
+			
+			frItem = new ForecastResultItem();
+			frItem.setStationId(curr.stationCode);
+			frItem.setStationName(curr.stationName);
+			if(null == curr.ranges || curr.ranges.size() == 0)
+				break;
+			
+			//从多个时区耗时中选择一个
+			for(TimeRange tr : curr.ranges){
+				if(tr.startTime < t){
+					ct += ((long)(tr.runTime * 60 * 1000));
+					frItem.setTime(ct);
+					break;
+				}
+			}
+			
+			if(null != eStation && eStation.equals(curr.stationCode))
+				break;
+			
+			rs.add(frItem);
+		}
+		
+		return rs;
+	}
+}
+package com.bsth.data.forecast;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.data.forecast.entity.SimpleRoute;
+import com.bsth.data.forecast.entity.SimpleRoute.TimeRange;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.forecast.Sample;
+import com.bsth.repository.StationRouteRepository;
+import com.bsth.repository.forecast.SampleRepository;
+import com.google.common.collect.ArrayListMultimap;
+
+/**
+ * 
+ * @Title: loadData
+ * @Description: TODO(从数据库加载数据)
+ */
+@Component
+public class SampleTimeDataLoader extends Thread {
+
+	@Autowired
+	SampleRepository sampleRepository;
+
+	@Autowired
+	StationRouteRepository stationRouteRepository;
+
+	// 当天日期
+	String rq;
+
+	SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	@Override
+	public void run() {
+		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+		rq = sdfyyyyMMdd.format(new Date());
+
+		Iterator<Sample> iterator = sampleRepository.findAll().iterator();
+		ArrayListMultimap<String, Sample> sampleMap = ArrayListMultimap.create();
+
+		Sample sample;
+		String key;
+		while (iterator.hasNext()) {
+			sample = iterator.next();
+			key = sample.getLineCode() + "_" + sample.getUpdown() + "_" + sample.getsStation() + "_"
+					+ sample.geteStation();
+			sampleMap.put(key, sample);
+		}
+
+		// 加载全部路由信息
+		List<StationRoute> allRoutes = stationRouteRepository.findAll2();
+		// 线路和走向分组
+		ArrayListMultimap<String, StationRoute> groupMap = ArrayListMultimap.create();
+		for (StationRoute sr : allRoutes)
+			groupMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
+
+		ArrayListMultimap<String, SimpleRoute> lineSampleMapCopy = ArrayListMultimap.create();
+		// 排序路由链并附加各个时区耗时信息
+		StationRouteComp comp = new StationRouteComp();
+		Set<String> kys = groupMap.keySet();
+		List<StationRoute> routeList;
+		StationRoute sRoute;
+		
+		List<Sample> sapList;
+		for (String k : kys) {
+			routeList = groupMap.get(k);
+			// 排序
+			Collections.sort(routeList, comp);
+
+			for (int i = 1; i < routeList.size(); i++) {
+				sRoute = routeList.get(i);
+
+				sapList = sampleMap.get(k + "_" +routeList.get(i - 1).getStationCode() + "_" + sRoute.getStationCode());
+				
+				lineSampleMapCopy.put(k, createSimpleRoute(sRoute, sapList));
+			}
+		}
+
+		ForecastRealServer.lineSampleMap = lineSampleMapCopy;
+		logger.info("SampleTimeDataLoader.... over...");
+	}
+
+	private SimpleRoute createSimpleRoute(StationRoute sRoute, List<Sample> list) {
+		SimpleRoute simple = new SimpleRoute();
+
+		simple.stationCode = sRoute.getStationCode();
+		simple.ranges = new ArrayList<>();
+
+		try{
+			TimeRange tg;
+			for (Sample s : list) {
+				tg = new TimeRange();
+				tg.startTime = sdfyyyyMMddHHmm.parse(rq + s.getsDate()).getTime();
+				tg.endTime = sdfyyyyMMddHHmm.parse(rq + s.geteDate()).getTime();
+				tg.runTime = s.getRunTime();
+				simple.ranges.add(tg);
+			}
+			
+			//排序
+			Collections.sort(simple.ranges);
+		}catch(Exception e){
+			logger.error("", e);
+		}
+		return simple;
+	}
+	
+	public static class StationRouteComp implements Comparator<StationRoute> {
+
+		@Override
+		public int compare(StationRoute o1, StationRoute o2) {
+			return o1.getStationRouteCode() - o2.getStationRouteCode();
+		}
+	}
+}
+package com.bsth.data.forecast.entity;
+
+import java.util.List;
+
+/**
+ * 
+ * @ClassName: ForecastResult 
+ * @Description: TODO(预测结果) 
+ * @author PanZhao 
+ * @date 2016年9月19日 上午11:09:28 
+ *
+ */
+public class ForecastResult {
+	
+	/** 当前站 */
+	private String station;
+	
+	/** 到站时间 */
+	private long arrTime;
+	
+	/** 后续站点预测明细  */
+	private List<ForecastResultItem> follows;
+	
+	/** 预计到达终点时间（分钟） */
+	private Float stopTime;
+	
+	public static class ForecastResultItem {
+		
+		/** 站点ID */
+		private String stationId;
+		
+		/** 站点名称 */
+		private String stationName;
+		
+		/** 时间戳 */
+		private long time;
+
+		public String getStationId() {
+			return stationId;
+		}
+
+		public void setStationId(String stationId) {
+			this.stationId = stationId;
+		}
+
+		public String getStationName() {
+			return stationName;
+		}
+
+		public void setStationName(String stationName) {
+			this.stationName = stationName;
+		}
+
+		public long getTime() {
+			return time;
+		}
+
+		public void setTime(long time) {
+			this.time = time;
+		}
+	}
+
+	public String getStation() {
+		return station;
+	}
+
+	public void setStation(String station) {
+		this.station = station;
+	}
+
+	public long getArrTime() {
+		return arrTime;
+	}
+
+	public void setArrTime(long arrTime) {
+		this.arrTime = arrTime;
+	}
+
+	public Float getStopTime() {
+		return stopTime;
+	}
+
+	public void setStopTime(Float stopTime) {
+		this.stopTime = stopTime;
+	}
+
+	public List<ForecastResultItem> getFollows() {
+		return follows;
+	}
+
+	public void setFollows(List<ForecastResultItem> follows) {
+		this.follows = follows;
+	}
+}
+package com.bsth.data.forecast.entity;
+
+import java.util.List;
+
+/**
+ * 
+ * @ClassName: SimpleStationRoute 
+ * @Description: TODO(简单的路由耗时封装) 
+ * @author PanZhao 
+ * @date 2016年9月18日 上午10:51:56 
+ *
+ */
+public class SimpleRoute {
+	
+	/** 站点编码 */
+	public String stationCode;
+	
+	/** 站点名称  */
+	public String stationName;
+	
+	public List<TimeRange> ranges;
+	
+	public static class TimeRange implements Comparable<TimeRange>{
+		
+		/**  开始时间 */
+		public long startTime;
+		
+		/** 截止时间 */
+		public long endTime;
+		
+		/** 运行时间 */
+		public float runTime;
+
+		@Override
+		public int compareTo(TimeRange o) {
+			return (int) (o.startTime - this.startTime);
+		}
+	}
+}
@@ -14,7 +14,7 @@ public class GpsEntity {
 	private Integer companyCode;
 	/** 线路编码 */
-	private Integer lineId;
+	private String lineId;
 	/** 设备编码 */
 	private String deviceId;
@@ -24,6 +24,12 @@ public class GpsEntity {
 	/** 站点编码 */
 	private String stopNo;
+	
+	/** 站点名称 */
+	private String stationName;
+	
+	/** 到站时间  */
+	private long arrTime;
 	/** 经度 */
 	private Float lon;
@@ -49,17 +55,14 @@ public class GpsEntity {
 	/** 车辆内部编码 */
 	private String nbbm;
-	/** 站点名称 */
-	private String stationName;
-	
-	/** 当前班次ID */
-	private Long currSchId;
-	
-	/** 下一个班次ID */
-	private Long nextSchId;
+	/** 预计到达终点时间 */
+	private Float expectStopTime;
 	/** 设备是否在线 */
 	private boolean online;
+	
+	/** 当前执行班次ID */
+	private Long schId;
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -69,14 +72,6 @@ public class GpsEntity {
 		this.companyCode = companyCode;
 	}
-	public Integer getLineId() {
-		return lineId;
-	}
-
-	public void setLineId(Integer lineId) {
-		this.lineId = lineId;
-	}
-
 	public String getDeviceId() {
 		return deviceId;
 	}
@@ -156,22 +151,6 @@ public class GpsEntity {
 	public void setUpDown(Integer upDown) {
 		this.upDown = upDown;
 	}
-	
-	public Long getCurrSchId() {
-		return currSchId;
-	}
-
-	public void setCurrSchId(Long currSchId) {
-		this.currSchId = currSchId;
-	}
-
-	public Long getNextSchId() {
-		return nextSchId;
-	}
-
-	public void setNextSchId(Long nextSchId) {
-		this.nextSchId = nextSchId;
-	}
 	public String getNbbm() {
 		return nbbm;
@@ -196,4 +175,36 @@ public class GpsEntity {
 	public void setOnline(boolean online) {
 		this.online = online;
 	}
+
+	public long getArrTime() {
+		return arrTime;
+	}
+
+	public void setArrTime(long arrTime) {
+		this.arrTime = arrTime;
+	}
+
+	public Float getExpectStopTime() {
+		return expectStopTime;
+	}
+
+	public void setExpectStopTime(Float expectStopTime) {
+		this.expectStopTime = expectStopTime;
+	}
+
+	public String getLineId() {
+		return lineId;
+	}
+
+	public void setLineId(String lineId) {
+		this.lineId = lineId;
+	}
+
+	public Long getSchId() {
+		return schId;
+	}
+
+	public void setSchId(Long schId) {
+		this.schId = schId;
+	}
 }
@@ -25,6 +25,9 @@ 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.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.util.ConfigUtil;
 import com.google.common.collect.TreeMultimap;
@@ -44,7 +47,7 @@ public class GpsRealData implements CommandLineRunner{
 	private static Map<String, GpsEntity> gpsMap;
 	//按线路分组设备号
-	private static TreeMultimap<Integer, String> lineCode2Devices;
+	private static TreeMultimap<String, String> lineCode2Devices;
 	// 网关数据接口地址
 	private static String url;
@@ -52,6 +55,11 @@ public class GpsRealData implements CommandLineRunner{
 	@Autowired
 	GpsDataLoader gpsDataLoader;
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+	
+	@Autowired
+	ForecastRealServer forecastRealServer;	
 	/**
 	 * 构造函数
 	 */
@@ -63,12 +71,25 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
-		logger.info("gpsDataLoader,20,8");
 		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 8, TimeUnit.SECONDS);
 	}
-	public static GpsEntity add(GpsEntity gps) {
+	public GpsEntity add(GpsEntity gps) {
 		String device = gps.getDeviceId();
+		GpsEntity old = gpsMap.get(device);
+		
+		//定时定距数据附带站点编码改变
+		if(null == old || !old.getStopNo().equals(gps.getStopNo())){
+			gps.setArrTime(gps.getTimestamp());
+			//预测到达终点时间
+			forecastRealServer.forecast(gps.getNbbm(), gps);
+		}
+		else{
+			gps.setArrTime(old.getArrTime());
+			//不预测， 重新计算终点时间
+			gps.setExpectStopTime(forecastRealServer.expectStopTime(gps.getNbbm()));
+		}
+		
 		gpsMap.put(device, gps);
 		lineCode2Devices.put(gps.getLineId(), device);
 		return gps;
@@ -86,12 +107,18 @@ public class GpsRealData implements CommandLineRunner{
 	 * 
 	 * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
 	 */
-	public List<GpsEntity> get(Integer lineCode) {
+	public List<GpsEntity> getByLine(String lineCode) {
 		NavigableSet<String> set = lineCode2Devices.get(lineCode);
 		List<GpsEntity> rs = new ArrayList<>();
+		GpsEntity gps;
+		ScheduleRealInfo sch;
 		for(String device : set){
-			rs.add(gpsMap.get(device));
+			gps = gpsMap.get(device);
+			sch = dayOfSchedule.execPlamMap().get(gps.getNbbm());
+			if(null != sch)
+				gps.setSchId(sch.getId());
+			rs.add(gps);
 		}
 		return rs;
@@ -101,7 +128,7 @@ public class GpsRealData implements CommandLineRunner{
 		List<GpsEntity> list = new ArrayList<>();
 		for(String code : pArray)
-			list.addAll(get(Integer.parseInt(code)));
+			list.addAll(getByLine(code));
 		return list;
 	}
@@ -113,6 +140,9 @@ public class GpsRealData implements CommandLineRunner{
 	public static class GpsDataLoader extends Thread{
 		Logger logger = LoggerFactory.getLogger(GpsDataLoader.class);
+		
+		@Autowired
+		GpsRealData gpsRealData;
 		@Override
 		public void run() {
@@ -130,7 +160,7 @@ public class GpsRealData implements CommandLineRunner{
 			try {
 				httpClient = HttpClients.createDefault();
 				HttpGet get = new HttpGet(url);
-
+				
 				response = httpClient.execute(get);
 				HttpEntity entity = response.getEntity();
@@ -156,7 +186,7 @@ public class GpsRealData implements CommandLineRunner{
 						gps.setNbbm(nbbm);
 						gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
-						add(gps);
+						gpsRealData.add(gps);
 					}
 				} else
 					logger.error("result is null");
@@ -91,6 +91,14 @@ public class Arrival2Schedule implements ApplicationContextAware {
 			for(ArrivalEntity arr : arrList){
 				match(arr, schList);
 			}
+			
+			//车辆关联到班次
+			//ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(this.nbbm);
+			//if(null == sch){
+				//dayOfSchedule.findByNbbm(this.nbbm);
+				//dayOfSchedule.addExecPlan(sch);
+				//dayOfSchedule.linkToSchPlan(this.nbbm);
+			//}
 		}
 		private void match(ArrivalEntity arr, List<ScheduleRealInfo> schList) {
@@ -163,6 +171,8 @@ public class Arrival2Schedule implements ApplicationContextAware {
 					sendUtils.sendFcsj(mr.sch);
 					//持久化
 					dayOfSchedule.save(mr.sch);
+					//车辆当前执行班次
+					dayOfSchedule.addExecPlan(mr.sch);
 				}
 			}
 		}
@@ -222,6 +232,9 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				sendUtils.sendZdsj(mr.sch, next, doneSum);
 				//持久化
 				dayOfSchedule.save(mr.sch);
+				logger.info(mr.sch.getClZbh() + "移除正在执行班次，" + mr.sch.getFcsj());
+				//移除车辆正在执行班次引用
+				dayOfSchedule.removeExecPlan(mr.sch.getClZbh());
 			}
 		}
 package com.bsth.data.schedule;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -23,8 +24,11 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.FirstScheduleCheckThread;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.schedule.thread.ScheduleLateThread;
 import com.bsth.data.schedule.thread.SchedulePstThread;
 import com.bsth.data.schedule.thread.ScheduleRefreshThread;
@@ -60,6 +64,9 @@ public class DayOfSchedule implements CommandLineRunner {
 	// 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
 	private static TreeMultimap<String, String> nbbm2SEStationMap;
+	
+	//车辆 ——> 当前执行班次
+	private static Map<String, ScheduleRealInfo> carExecutePlanMap;
 	// 持久化缓冲区
 	public static LinkedList<ScheduleRealInfo> pstBuffer;
@@ -81,6 +88,9 @@ public class DayOfSchedule implements CommandLineRunner {
 	@Autowired
 	SendUtils sendUtils;
+	
+	@Autowired
+	GpsRealData gpsRealData;
 	/** 线路当前使用的排班的日期 */
 	public static Map<String, String> currSchDateMap;
@@ -92,6 +102,7 @@ public class DayOfSchedule implements CommandLineRunner {
 		schFCSJComparator = new ScheduleComparator.FCSJ();
 		currSchDateMap = new HashMap<>();
 		nbbm2SEStationMap = TreeMultimap.create();
+		carExecutePlanMap = new HashMap<>();
 	}
 	@Autowired
@@ -130,7 +141,9 @@ public class DayOfSchedule implements CommandLineRunner {
 	public String calcSchDate(String lineCode) {
 		LineConfig conf = lineConfigData.get(lineCode);
 		long ct = System.currentTimeMillis();
-		String schDate = DateUtils.sdfyyyyMMdd.format(new Date(ct));
+		
+		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+		String schDate = sdfyyyyMMdd.format(new Date(ct));
 		// 小于当天起始运营时间,则取前一天的排班
 		if (ct < conf.getCurrStartTime())
 			schDate = DateUtils.subtractDay(schDate, 1);
@@ -283,7 +296,10 @@ public class DayOfSchedule implements CommandLineRunner {
 		try {
 			Map<String, Object> data = new HashMap<>();
-			data.put("scheduleDate_eq", DateUtils.sdfyyyyMMdd.parse(schDate));
+			SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
+						,sdfHHmm = new SimpleDateFormat("HH:mm");
+			
+			data.put("scheduleDate_eq", sdfyyyyMMdd.parse(schDate));
 			data.put("xlBm_eq", lineCode);
 			// 查询计划排班
@@ -293,13 +309,13 @@ public class DayOfSchedule implements CommandLineRunner {
 			realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
 			for (ScheduleRealInfo sch : realList) {
-				sch.setScheduleDateStr(DateUtils.sdfyyyyMMdd.format(sch.getScheduleDate()));
+				sch.setScheduleDateStr(sdfyyyyMMdd.format(sch.getScheduleDate()));
 				sch.setRealExecDate(sch.getScheduleDateStr());
 				// 计划终点时间
 				if (sch.getBcsj() != null) {
 					try{
-						sch.setZdsjT(DateUtils.sdfHHmm.parse(sch.getFcsj()).getTime() + (sch.getBcsj() * 60 * 1000));
-						sch.setZdsj(DateUtils.sdfHHmm.format(sch.getZdsjT()));
+						sch.setZdsjT(sdfHHmm.parse(sch.getFcsj()).getTime() + (sch.getBcsj() * 60 * 1000));
+						sch.setZdsj(sdfHHmm.format(sch.getZdsjT()));
 						sch.setLate(false);
 					}catch(ParseException pe){
 						logger.error("loadPlanSch... 计算终点时间失败...");
@@ -326,10 +342,11 @@ public class DayOfSchedule implements CommandLineRunner {
 			id = 0L;
 		id++;
+		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
 		for (ScheduleRealInfo item : list) {
 			item.setSpId(item.getId());// 保留原始的计划ID
 			item.setId(id++);// 设置ID
-			item.setScheduleDateStr(DateUtils.sdfyyyyMMdd.format(item.getScheduleDate()));
+			item.setScheduleDateStr(sdfyyyyMMdd.format(item.getScheduleDate()));
 		}
 		// 入库
@@ -596,4 +613,44 @@ public class DayOfSchedule implements CommandLineRunner {
 	public Collection<ScheduleRealInfo> findAll(){
 		return nbbmScheduleMap.values();
 	}
+	
+	public void addExecPlan(ScheduleRealInfo sch){
+		carExecutePlanMap.put(sch.getClZbh(), sch);
+	}
+	
+	public void removeExecPlan(String clzbh){
+		carExecutePlanMap.remove(clzbh);
+	}
+	
+	public Map<String, ScheduleRealInfo> execPlamMap(){
+		return carExecutePlanMap;
+	}
+
+	/**
+	 * 
+	 * @Title: linkToSchPlan 
+	 * @Description: TODO(车辆关联到班次) 
+	 */
+/*	public void linkToSchPlan(String nbbm) {
+		//当前GPS状态
+		GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+		if(null == gps)
+			return;
+		
+		//班次集合
+		List<ScheduleRealInfo> schArr = nbbmScheduleMap.get(nbbm);
+		
+		for(ScheduleRealInfo sch : schArr){
+			if(sch.getStatus() == 2)
+				continue;
+			if(sch.isDestroy())
+				continue;
+			if(!sch.getXlBm().equals(gps.getLineId()) 
+					|| Integer.parseInt(sch.getXlDir()) != gps.getUpDown().intValue())
+				continue;
+			
+			addExecPlan(sch);
+			break;
+		}
+	}*/
 }
 package com.bsth.data.schedule;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -13,7 +14,6 @@ import org.springframework.stereotype.Component;
 import com.bsth.data.LineConfigData;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.util.DateUtils;
 /**
  * 
@@ -48,11 +48,13 @@ public class SchAttrCalculator {
 			 * 早于线路开始运营时间的，加一天
 			 * 如该线路 2点开始运营，2016-08-23的班次，则 2016-08-23 0:25 的班次应该调整成 2016-08-24 0:25
 			 */
-			long st = DateUtils.sdfyyyyMMddHHmm.parse(sch.getScheduleDateStr() + conf.getStartOpt()).getTime();
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm")
+						,sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+			long st = sdfyyyyMMddHHmm.parse(sch.getScheduleDateStr() + conf.getStartOpt()).getTime();
 			if (st > sch.getFcsjT()) 
 				sch.setFcsjAll(sch.getFcsjT() + DAY_TIME);
-			sch.setRealExecDate(DateUtils.sdfyyyyMMdd.format(new Date(sch.getFcsjT())));
+			sch.setRealExecDate(sdfyyyyMMdd.format(new Date(sch.getFcsjT())));
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -69,11 +71,12 @@ public class SchAttrCalculator {
 			// 生成时间戳
 			calcTimestamp(sch);
+			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 			// 计划终点时间
 			if (sch.getBcsj() != null) {
 				Date zdDate = new Date(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
 				sch.setZdsjT(zdDate.getTime());
-				sch.setZdsj(DateUtils.sdfHHmm.format(zdDate));
+				sch.setZdsj(sdfHHmm.format(zdDate));
 			}
 		} catch (ParseException e) {
 			logger.error("", e);
@@ -132,7 +135,8 @@ public class SchAttrCalculator {
 	}
 	public SchAttrCalculator calcFcsjTime(ScheduleRealInfo sch) throws ParseException {
-		sch.setFcsjT(DateUtils.sdfyyyyMMddHHmm.parse(sch.getRealExecDate() + sch.getFcsj()).getTime());
+		SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+		sch.setFcsjT(sdfyyyyMMddHHmm.parse(sch.getRealExecDate() + sch.getFcsj()).getTime());
 		return this;
 	}
 package com.bsth.entity.forecast;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.bsth.data.arrival.ArrivalEntity;
+
 /**
  * 
  * @ClassName: Sample
@@ -19,11 +27,36 @@ import javax.persistence.Transient;
 @Table(name = "bsth_forecast_sample")
 public class Sample {
+	@Transient
+	static Logger logger = LoggerFactory.getLogger(Sample.class);
+	
+	public Sample(ArrivalEntity prve, ArrivalEntity curr) {
+		//SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		
+		this.setsStation(prve.getStopNo());
+		this.seteStation(curr.getStopNo());
+		this.setsTime(prve.getTs());
+		this.seteTime(curr.getTs());
+		//this.setsDate(sdfHHmm.format(new Date(prve.getTs())));
+		//this.seteDate(sdfHHmm.format(new Date(curr.getTs())));
+		
+		/*try{
+			this.setsTime(sdfHHmm.parse(this.sDate).getTime());
+			this.seteTime(sdfHHmm.parse(this.eDate).getTime());
+		}catch(Exception e){
+			logger.error("", e);
+		}*/
+		Long diff = (curr.getTs() - prve.getTs());
+		this.setRunTime(Float.parseFloat(diff.toString()) / 1000 / 60);
+	}
+	
+	public Sample(){}
+	
 	@Id
 	@GeneratedValue
 	private Long id;
-	private Integer lineCode;
+	private String lineCode;
 	// 开始时间
 	private String sDate;
@@ -135,11 +168,11 @@ public class Sample {
 		this.runTime = runTime;
 	}
-	public Integer getLineCode() {
+	public String getLineCode() {
 		return lineCode;
 	}
-	public void setLineCode(Integer lineCode) {
+	public void setLineCode(String lineCode) {
 		this.lineCode = lineCode;
 	}
 package com.bsth.entity.realcontrol;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -137,7 +138,9 @@ public class LineConfig {
 	public long getCurrStartTime() {
 		Date d = null;
 		try {
-			d = DateUtils.sdfyyyyMMddHHmm.parse(DateUtils.sdfyyyyMMdd.format(new Date()) + this.startOpt);
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm")
+						,sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+			d = sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(new Date()) + this.startOpt);
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
 package com.bsth.entity.realcontrol;
 import com.bsth.entity.sys.SysUser;
-import com.bsth.util.DateUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
@@ -9,6 +8,7 @@ import javax.persistence.*;
 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;
@@ -510,13 +510,15 @@ public class ScheduleRealInfo {
 	public void setDfsjAll(Long dfsjT) {
 		this.dfsjT = dfsjT;
-		this.dfsj = DateUtils.sdfHHmm.format(new Date(this.dfsjT));
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		this.dfsj = sdfHHmm.format(new Date(this.dfsjT));
 	}
 	public void setDfsjAll(String dfsj) {
 		try {
-			this.dfsjT = DateUtils.sdfyyyyMMddHHmm.parse(this.realExecDate + dfsj).getTime();
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+			this.dfsjT = sdfyyyyMMddHHmm.parse(this.realExecDate + dfsj).getTime();
 			this.dfsj = dfsj;
 		} catch (ParseException e) {
 			e.printStackTrace();
@@ -525,10 +527,11 @@ public class ScheduleRealInfo {
 	public void calcEndTime(){
 		//计划终点时间
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 		if(this.getBcsj() != null){
 			Date zdDate = new Date(this.getDfsjT() + (this.getBcsj() * 60 * 1000));
 			this.setZdsjT(zdDate.getTime());
-			this.setZdsj(DateUtils.sdfHHmm.format(zdDate));
+			this.setZdsj(sdfHHmm.format(zdDate));
 		}
 	}
@@ -581,7 +584,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjAll(String fcsj){
 		try {
-			this.fcsjT = DateUtils.sdfyyyyMMddHHmm.parse(this.realExecDate + fcsj).getTime();
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+			this.fcsjT = sdfyyyyMMddHHmm.parse(this.realExecDate + fcsj).getTime();
 			this.fcsj = fcsj;
 		} catch (ParseException e) {
 			e.printStackTrace();
@@ -596,7 +600,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjAll(Long fcsjT){
 		this.fcsjT = fcsjT;
-		this.fcsj = DateUtils.sdfHHmm.format(new Date(fcsjT));
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		this.fcsj = sdfHHmm.format(new Date(fcsjT));
 	}
 	/**
@@ -607,7 +612,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjActualAll(String fcsjActual){
 		try {
-			this.fcsjActualTime = DateUtils.sdfyyyyMMddHHmm.parse(this.realExecDate + fcsjActual).getTime();
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+			this.fcsjActualTime = sdfyyyyMMddHHmm.parse(this.realExecDate + fcsjActual).getTime();
 			this.fcsjActual = fcsjActual;
 			calcStatus();
@@ -624,7 +630,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjActualAll(Long t){
 		this.fcsjActualTime = t;
-		this.fcsjActual = DateUtils.sdfHHmm.format(new Date(t));
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		this.fcsjActual = sdfHHmm.format(new Date(t));
 		//更新班次状态
 		calcStatus();
@@ -638,7 +645,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setZdsjActualAll(Long t){
 		this.zdsjActualTime = t;
-		this.zdsjActual = DateUtils.sdfHHmm.format(new Date(t));
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		this.zdsjActual = sdfHHmm.format(new Date(t));
 		//更新班次状态
 		calcStatus();
@@ -653,7 +661,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setZdsjActualAll(String zdsjActual){
 		try {
-			this.zdsjActualTime = DateUtils.sdfyyyyMMddHHmm.parse(this.realExecDate + zdsjActual).getTime();
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+			this.zdsjActualTime = sdfyyyyMMddHHmm.parse(this.realExecDate + zdsjActual).getTime();
 			this.zdsjActual = zdsjActual;
 			calcStatus();
@@ -233,4 +233,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
     @Query("select new map(sr.station.id as stationid, sr.stationName as stationname) from StationRoute sr where sr.line.id=?1 and sr.directions=?2")
     List<Map<String, Object>> findStations(Integer xlid, Integer xldir);
+    
+	@Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
+	List<StationRoute> findByLine(String lineCode, int updown);
 }
@@ -15,5 +15,5 @@ public interface SampleRepository extends BaseRepository&lt;Sample, Long&gt;{
 	@Transactional
     @Modifying
     @Query("delete Sample where lineCode=?1 and updown=?2")
-	void deleteByLineAndUpdown(Integer lineCode, int updown);
+	void deleteByLineAndUpdown(String lineCode, int updown);
 }
@@ -397,10 +397,11 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		List<Directive> rs = list.subList(s, e);
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 		// 时间格式化，车辆自编号转换
 		for (Directive d : rs) {
 			if (d.getTimeHHmm() == null)
-				d.setTimeHHmm(DateUtils.sdfHHmm.format(new Date(d.getTimestamp())));
+				d.setTimeHHmm(sdfHHmm.format(new Date(d.getTimestamp())));
 			if (d.getNbbm() == null)
 				d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
 		}
@@ -449,9 +450,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		if (e > count)
 			e = count;
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 		List<D80> rs = d80s.subList(s, e);
 		for(D80 d80 : rs){
-			d80.setTimeStr(DateUtils.sdfHHmm.format(new Date(d80.getTimestamp())));
+			d80.setTimeStr(sdfHHmm.format(new Date(d80.getTimestamp())));
 		}
 		Map<String, Object> rsMap = new HashMap<>();
 package com.bsth.service.forecast;
+import java.util.Map;
+
+import com.bsth.controller.forecast.dto.CreateSampleParam;
 import com.bsth.entity.forecast.Sample;
 import com.bsth.service.BaseService;
 public interface SampleService extends BaseService<Sample, Long>{
-	int createDataByGps(String lineCode, Integer updown);
+	Map<String, Object> createDataByGps(CreateSampleParam param);
 }
 package com.bsth.service.forecast;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import javax.transaction.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.forecast.dto.CreateSampleParam;
 import com.bsth.data.BasicData;
+import com.bsth.data.arrival.ArrivalEntity;
+import com.bsth.data.arrival.DataLoader;
 import com.bsth.entity.forecast.Sample;
 import com.bsth.repository.forecast.SampleRepository;
+import com.bsth.service.forecast.util.CreateByArrivalData;
 import com.bsth.service.impl.BaseServiceImpl;
 @Service
@@ -19,10 +32,16 @@ public class SampleServiceImpl extends BaseServiceImpl&lt;Sample, Long&gt; implements 
 	@Autowired
 	SampleRepository sampleRepository;
+	@Autowired
+	CreateByArrivalData createByArrivalData;
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
 	@Override
 	public Iterable<Sample> list(Map<String, Object> map) {
 		Iterable<Sample> rs = super.list(map);
+		List<Sample> rsList = new ArrayList<>();
 		//转换站点名称
 		Iterator<Sample> iterator = rs.iterator();
 		Sample s;
@@ -30,16 +49,62 @@ public class SampleServiceImpl extends BaseServiceImpl&lt;Sample, Long&gt; implements 
 			s = iterator.next();
 			s.setsName(BasicData.stationCode2NameMap.get(s.getsStation()));
 			s.seteName(BasicData.stationCode2NameMap.get(s.geteStation()));
+			
+			rsList.add(s);
 		}
-		return rs;
+		
+		//排序
+		Collections.sort(rsList, new Comparator<Sample>() {
+			@Override
+			public int compare(Sample arg0, Sample arg1) {
+				return arg0.geteDate().compareTo(arg1.geteDate());
+			}
+		});
+		
+		return rsList;
+	}
+	
+	@Override
+	public Map<String, Object> save(Sample t) {
+		t.setTag(t.getTag() + t.getsDate() + " - " + t.geteDate());
+		return super.save(t);
 	}
 	@Transactional
 	@Override
-	public int createDataByGps(String lineCode, Integer updown) {
-		//删除原有数据
-		sampleRepository.deleteByLineAndUpdown(Integer.parseInt(lineCode), updown);
+	public Map<String, Object> createDataByGps(CreateSampleParam param) {
+		Map<String, Object> rs = new HashMap<>(); 
+		try{
+			//删除原有数据
+			sampleRepository.deleteByLineAndUpdown(param.getLineCode(), param.getUpdown());
+			
+			//查询到离站数据
+			DataLoader loader = new DataLoader();
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			
+			long st = sdf.parse(param.getStartDate()).getTime()
+				,et = sdf.parse(param.getEndDate()).getTime()
+				,i = st
+				,range = 1000 * 60 * 60 * 24;
+			
+			logger.info("初始值：" + 1500 * (int)((et - st) / range));
+			List<ArrivalEntity> all = new ArrayList<>(1500 * (int)((et - st) / range));
+			for(; i < et; i += range)
+				all.addAll(loader.loadByLineAndTime(param.getLineCode(), param.getUpdown() , i, i + range));
+			
+			logger.info("实际数据量：" + all.size());
+			
+			List<Sample> resList = createByArrivalData.create(all, param);
+			
+			//入库
+			sampleRepository.save(resList);
+			
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			logger.error("" , e);
+			rs.put("status", ResponseCode.ERROR);
+		}
-		return 0;
+		return rs;
 	}
 }
+package com.bsth.service.forecast.util;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+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.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import com.bsth.controller.forecast.dto.CreateSampleParam;
+import com.bsth.controller.forecast.dto.CreateSampleParam.TimeRange;
+import com.bsth.data.arrival.ArrivalComparator;
+import com.bsth.data.arrival.ArrivalEntity;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.forecast.Sample;
+import com.bsth.repository.StationRouteRepository;
+import com.google.common.collect.ArrayListMultimap;
+
+/**
+ * 
+ * @ClassName: CreateByArrivalData
+ * @Description: TODO(根据到离站数据生成线路站点间耗时)
+ * @author PanZhao
+ * @date 2016年9月17日 下午2:33:20
+ *
+ */
+@Component
+@Scope("prototype")
+public class CreateByArrivalData {
+
+	@Autowired
+	StationRouteRepository routeRepository;
+	
+	SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
+			,sdfHHmm = new SimpleDateFormat("HH:mm")
+			,sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+
+	String rq = sdfyyyyMMdd.format(new Date());
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	/**
+	 * 
+	 * @Title: create 
+	 * @Description: TODO(到离站数据  生成站点耗时) 
+	 * @throws
+	 */
+	public List<Sample> create(List<ArrivalEntity> all, CreateSampleParam param) {
+		List<Sample> rs = new ArrayList<>();
+		try{
+			//路由
+			List<StationRoute> routes = routeRepository.findByLine(param.getLineCode(), param.getUpdown());
+			//按顺序索引路由
+			Map<String, Integer> rMap = new HashMap<>();
+			for(int i = 0; i < routes.size(); i ++){
+				//起点站不要
+				if(routes.get(i).getStationMark().equals("B"))
+					continue;
+				rMap.put(routes.get(i).getStationCode(), i);
+			}
+				
+			Collections.sort(all, new ArrivalComparator());
+			
+			//所有的站点耗时数据
+			List<Sample> sampleList = calcTimeArray(rMap, all);
+			//时区分组，取值
+			Set<TimeRange> rgs = param.getTimeRange();
+			
+			//生成数据
+			for(TimeRange rg : rgs)
+				rs.addAll(calcCenterVal(sampleList, rg, param.getUpdown()));
+		}catch(Exception e){
+			logger.error("", e);
+		}
+		
+		return rs;
+	}
+	
+	private List<Sample> calcTimeArray(Map<String, Integer> rMap, List<ArrivalEntity> arrs) throws ParseException {
+		
+		//车辆和所在站点对照
+		Map<String, ArrivalEntity> carMap = new HashMap<>();
+		
+		int size = arrs.size();
+		ArrivalEntity curr, old;
+		String device;
+		
+		List<Sample> sampleList = new ArrayList<>();
+		Sample sample;
+		for(int i = 0; i < size; i ++){
+			curr = arrs.get(i);
+			device = curr.getDeviceId();
+			old = carMap.get(device);
+			
+			carMap.put(device, curr);
+			
+			if(null == old || null == rMap.get(curr.getStopNo()) 
+					|| null == rMap.get(old.getStopNo())
+					//跨天的数据不要
+					|| !sdfyyyyMMdd.format(new Date(old.getTs())).equals(sdfyyyyMMdd.format(new Date(curr.getTs()))))
+				continue;
+			
+			//连续站点
+			if(rMap.get(curr.getStopNo()) 
+					- rMap.get(old.getStopNo()) == 1){
+				
+				sample = new Sample(old, curr);
+				//将日期全部拉到同一天
+				sample.setLineCode(old.getLineCode());
+				sample.setsTime(sdfyyyyMMddHHmm.parse(rq + sdfHHmm.format(sample.getsTime())).getTime());
+				sample.seteTime(sdfyyyyMMddHHmm.parse(rq + sdfHHmm.format(sample.geteTime())).getTime());
+				//sample.setsDate(sdfHHmm.format(new Date(sample.getsTime())));
+				//sample.seteDate(sdfHHmm.format(new Date(sample.geteTime())));
+				sampleList.add(sample);
+				
+			}
+			carMap.put(device, curr);
+		}
+		return sampleList;
+	}
+	
+	
+	private List<Sample> calcCenterVal(List<Sample> all, TimeRange rg, Integer updown){
+		List<Sample> subList = new ArrayList<>()
+					,rsList = new ArrayList<>();
+		
+		try{
+			Collections.sort(all, new SampleComp2());
+			//按时区分组数据
+			long st = sdfyyyyMMddHHmm.parse(rq + rg.getS()).getTime()
+					,et = sdfyyyyMMddHHmm.parse(rq + rg.getE()).getTime();
+			for(Sample s : all){
+				if(s.geteTime() > st && s.geteTime() < et)
+					subList.add(s);
+				else if(s.geteTime() > et)
+					break;
+			}
+			
+			//按站点分组数据
+			ArrayListMultimap<String, Sample> arrMap = ArrayListMultimap.create();
+			for(Sample s : subList)
+				arrMap.put(s.getsStation() + "_" + s.geteStation(), s);
+			
+			//每个站点间取出一个占比最大的数值
+			Set<String> keys = arrMap.keySet();
+			Sample sample;
+			for(String k : keys){
+				sample = maxRatioVal(arrMap.get(k));
+				
+				sample.setTag(rg.getTag() + rg.getS() + " - " + rg.getE());
+				sample.setsDate(rg.getS());
+				sample.seteDate(rg.getE());
+				sample.setUpdown(updown);
+				rsList.add(sample);
+			}
+			
+		}catch(Exception e){
+			logger.error("", e);
+		}
+		return rsList;
+	}
+	
+	/**
+	 * 
+	 * @Title: maxRatioVal 
+	 * @Description: TODO(从一组数值中取出占比最大的值) 
+	 */
+	public Sample maxRatioVal(List<Sample> list){
+		//StringBuilder valStr = new StringBuilder();
+		if(list.size() == 0)
+			return null;
+		//排序
+		Collections.sort(list, new SampleComp());
+		
+		ArrayListMultimap<String, Sample> arrMap = ArrayListMultimap.create();
+		//1.5分钟范围分组
+		int range = 15
+			,curr = (int)(list.get(0).getRunTime() * 10);
+		
+		for(Sample s : list){
+			if(s.getRunTime() * 10 > curr + range){
+				curr += range;
+			}
+			arrMap.put(curr + "_" + curr + range, s);
+			//valStr.append(s.getRunTime() + ",");
+		}
+		
+		//数值最多的分组，求个平均值
+		String maxKey = maxKey(arrMap);
+		float absVal = abs(arrMap.get(maxKey));
+		
+		Sample rs = list.get(0);
+		
+		DecimalFormat dformat=new DecimalFormat(".00");
+		rs.setRunTime(Float.parseFloat(dformat.format(absVal)));
+		
+		//logger.info("全部：[ " + valStr + "] ，计算的中间值：" + absVal);
+		return rs;
+	}
+	
+	private String maxKey(ArrayListMultimap<String, Sample> arrMap){
+		String maxKey = null;
+		int size = 0;
+		Set<String> kys = arrMap.keySet();
+		for(String k : kys){
+			if(null != maxKey && arrMap.get(k).size() < size)
+				continue;
+			
+			size = arrMap.get(k).size();
+			maxKey = k;
+		}
+		return maxKey;
+	}
+	
+	private float abs(List<Sample> list){
+		float sum = 0;
+		
+		for(Sample s : list)
+			sum += s.getRunTime();
+		
+		return sum / list.size();
+	}
+	
+	public static class SampleComp implements Comparator<Sample>{
+
+		@Override
+		public int compare(Sample arg0, Sample arg1) {
+			return (int)(arg0.getRunTime() * 10 - arg1.getRunTime() * 10);
+		}
+	}
+	
+	public static class SampleComp2 implements Comparator<Sample>{
+
+		@Override
+		public int compare(Sample arg0, Sample arg1) {
+			return (int)(arg0.geteTime() - arg1.geteTime());
+		}
+	}
+}
@@ -80,7 +80,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Object>  outgoAdjustAll(String params);
-	Map<String, Object> findRouteByLine(Integer lineCode);
+	Map<String, Object> findRouteByLine(String lineCode);
 	List<Map<String,String>> findLine(String line);
@@ -310,8 +310,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			SysUser user = SecurityUtils.getCurrentUser();
 			String schDate = DayOfSchedule.currSchDateMap.get(t.getXlBm());
+			SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
 			t.setScheduleDateStr(schDate);
-			t.setScheduleDate(DateUtils.sdfyyyyMMdd.parse(schDate));
+			t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
 			t.setRealExecDate(schDate);
 			t.setCreateBy(user);
 			t.setSflj(true);
@@ -899,7 +900,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	}
 	@Override
-	public Map<String, Object> findRouteByLine(Integer lineCode) {
+	public Map<String, Object> findRouteByLine(String lineCode) {
 		Map<String, Object> map = new HashMap<>();
 		//上行
 		Integer lineId = BasicData.lineId2CodeMap.inverse().get(lineCode);
@@ -96,7 +96,7 @@ public class DateUtils {
 		return (int) (cal.getTimeInMillis() / 1000);
 	}
-	public static SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm") 
+	private static SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm") 
 				,sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
 				,sdfHHmm = new SimpleDateFormat("HH:mm"); 
 	public static long getTimesByHHmm(String str) throws ParseException{
 <!DOCTYPE html>
-<html>
+<html lang="zh">
 <head>
+<meta name="renderer" content="webkit" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 <meta charset="UTF-8">
 <title>调度系统</title>
-<meta name=”renderer” content=”webkit”>
-<meta http-equiv=”X-UA-Compatible” content=”IE=Edge,chrome=1″ >
 <meta http-equiv="Pragma" content="no-cache">
 <meta http-equiv="Cache-control" content="no-cache">
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh">
 <head>
+<meta name="renderer" content="webkit" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 <meta charset="utf-8" />
 <title>登录</title>
 <link
@@ -176,7 +176,7 @@ $(function(){
 	var scheduleIdMap;
 	//滚动时固定表头
-	$('.custom-table-panel').on('scroll', function(){
+	$('#childTaskDiv .custom-table-panel').on('scroll', function(){
 		var top = $(this).scrollTop()
 		,$header = $(this).find('.custom-table-header');
 		$header.css('top', top);
@@ -267,8 +267,8 @@ body{
 }
 .portlet-fullscreen .nav-tabs > li > a:hover
-,.portlet-fullscreen .nav-tabs > li > a:active{
-	border: none;
+/* ,.portlet-fullscreen .nav-tabs > li > a:active */{
+ 	 border: none;
 	background: #0E5384;
 }
@@ -279,10 +279,11 @@ body{
 .portlet-fullscreen  .nav-tabs>li.active>a{
     background: #FFFFFF;
     color: #0A3F64;
-    border: 1px solid #FFFFFF;
+    border: none;
     border-radius: 5px 5px 0 0 !important;
 }
+
 .portlet-fullscreen .nav-tabs {
     /* border-bottom: 1px solid #337AB7; */
 }
@@ -397,7 +398,7 @@ body{
 .card_wrap .line_chart .top .center{
     height: 100%;
     font-size: 15px;
-    color: #5E96D2;
+    color: #babdbd;
     padding: 10px 0px;
     width: auto;
     float: left;
@@ -644,16 +645,24 @@ body{
     height: 25px;
     fill: rgba(253, 253, 253, 0.17);
     rx: 5px;
-    stroke: #26c281;
 }
 .vehci-g.up text,
 .vehci-g.down text{
-    stroke: #26c281;
     font-size: 12px;
     cursor: default;
 }
+.vehci-g.up text,
+.vehci-g.up rect{
+	stroke: #337ac4;
+}
+
+.vehci-g.down text,
+.vehci-g.down rect{
+	stroke: #e43a45;
+}
+
 .vehci-g.updown-error rect,
 .vehci-g.updown-error text{
 	stroke: #CACA17;
@@ -1035,7 +1044,8 @@ height: 400px;
 	}
 	.station_text {
-	    letter-spacing: -2.6px;
+	    /* letter-spacing: -2.6px; */
+	    font-family: 华文细黑,华文黑体,宋体;
 	}
 }
@@ -1577,7 +1587,11 @@ height: 400px;
 ::-webkit-scrollbar {  
     width: 15px;
     height: 16px;  
-}  
+} 
+
+#tab_home .custom-table-panel::-webkit-scrollbar{
+    border-top: 1px solid #e7ecf1;
+}
 ::-webkit-scrollbar-track,  
 ::-webkit-scrollbar-thumb {  
@@ -2588,4 +2602,65 @@ tr.child_task td:nth-child(1):AFTER{
     font-size: 10px;
     color: #bdbdbd;
     margin-left: 3px;
+}
+
+.card_wrap .custom-table-panel{
+	height: calc(100% - 40px);
+}
+
+#tab_home .card_wrap table tr td{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    cursor: pointer;
+}
+.sm-text{
+	font-size: 12px;
+	color: #9a9a9a;
+}
+
+td.lt-no-data{
+    text-align: left;
+    font-size: 12px !important;
+    color: #ff7676;
+    text-indent: 8px;
+}
+
+tr._home_tr_active td.lt-no-data{
+    color: #ffffff;
+}
+
+tr._home_tr_active {
+    background: #6a96c5;
+    color: #ffffff;
+}
+
+tr._home_tr_active .sm-text{
+	color: #ded8d8;
+}
+
+abbr.abnormal{
+	color: red;
+}
+
+tr._home_tr_active abbr.abnormal{
+	color: #ffffff;
+}
+
+.line_chart:BEFORE {
+	content: "\f178";
+	font: normal normal normal 14px/1 FontAwesome;
+	position: absolute;
+	top: 20px;
+	left: 20px;
+	color: #d0d0d0;
+}
+
+.line_chart:AFTER {
+    content: "\f177";
+	font: normal normal normal 14px/1 FontAwesome;
+	position: absolute;
+	bottom: 20px;
+	right: 20px;
+	color: #d0d0d0;
 }
 \ No newline at end of file
@@ -174,7 +174,7 @@
     </li>
     <li class="menu-item submenu">
         <button type="button" class="menu-btn">
-            <span class="menu-text">车辆状态发送</span>
+            <span class="menu-text">车辆状态切换</span>
         </button>
         <menu class="menu">
             <li class="menu-item">
@@ -9,7 +9,7 @@ var _data = (function(){
 	//实时GPS数据
 	var allGps = {};
 	//10秒刷新一次实时GPS
-	var realGpsT = 1000 * 10;
+	var realGpsT = 1000 * 8;
 	var dateStr = moment().format('YYYY-MM-DD');
 	//实际排班
@@ -33,26 +33,6 @@ var _data = (function(){
 	}
 	var dataObject = {
-		/*//班次发车
-		setFcsj: function(schId, fcsj, fcsjT){
-			schedules[schId].fcsjActual = fcsj;
-			schedules[schId].fcsjActualTime = fcsjT;
-		},*/
-		//根据线路编码获取上行和下行班次
-		/*findByLineAll: function(xlbm){
-			var array = [],sch;
-			for(var id in schedules){
-				sch = schedules[id];
-				if(sch.xlBm == xlbm)
-					array.push(e);
-			}
-			//排序
-			array.sort(function(a, b){
-				return a.fcsjT - b.fcsjT;
-			});
-			
-			return array;
-		},*/
 		//根据线路和上下行获取计划排班
 		findSchByLine: function(xlbm, upDown){
 			var array = [];
@@ -160,14 +140,10 @@ var _data = (function(){
 		attachSchedulInfo: function(gpsArray){
 			$.each(gpsArray, function(){
 				gps = this;
-				if(gps.currSchId)
-					gps.currSch = schedules[gps.currSchId];
-				if(gps.nextSchId)
-					gps.nextSch = schedules[gps.nextSchId];
+				if(gps.schId)
+					gps.sch = schedules[gps.schId];
 			});
-			
-			return gpsArray;
 		}
 		//查询站点路由
 		,queryStationRoute : function(lineId,container, cb, width){
@@ -180,7 +156,7 @@ var _data = (function(){
 		startRefreshGpsTimer: function(){
 			var f = arguments.callee;
 			refreshGpsProxy();
-			gpsTimer = setTimeout(f, realGpsT);
+			//gpsTimer = setTimeout(f, realGpsT);
 		},
 		//查询实际排班计划
 		queryRealSchedule: function(lineArrayStr, cb){
@@ -274,6 +250,7 @@ var _data = (function(){
 	function refreshGpsProxy(){
 		refreshGps(function(add, up){
+			//触发元素刷新事件
 			$('#tab_home,#tab_map #mapContainer').trigger('gps_refresh', [add, up]);
 		});
 	}
@@ -316,22 +293,49 @@ var _data = (function(){
 			if(!gpsList || gpsList.length == 0)
 				return;
-			var prve = allGps
-				,addArray = []
-				,upArray = []
-				,oldGps;
+			//var prve = allGps
+				//,addArray = []
+				//,upArray = []
+			//	,oldGps;
 			for(var i = 0, gps; gps=gpsList[i++];){
-				oldGps = prve[gps.deviceId];
+				/*oldGps = prve[gps.deviceId];
 				if(!oldGps){
 					addArray.push(gps);
 				}
 				else if(gps.timestamp > oldGps.timestamp){
 					//更新
 					upArray.push(gps);
-				}
+				}*/
+				//addArray.push(gps);
+/*				if(prve[gps.deviceId] && 
+						gps.timestamp == prve[gps.deviceId].timestamp)
+					continue;*/
+				//异常状态检查
+				abnormalCheck(gps);
+				//关联班次信息
+				if(gps.schId)
+					gps.sch = schedules[gps.schId];
+				
 				allGps[gps.deviceId] = gps;
 			}
-			cb && cb(addArray, upArray);
+			//cb && cb(addArray, upArray);
+			cb && cb(allGps);
+		}
+		
+		function abnormalCheck(gps){
+			var routes = stationRoute[gps.lineId][gps.upDown]
+				,rs;
+			$.each(routes , function(){
+				if(this.stationCode == gps.stopNo){
+					rs = 1;
+					return false;
+				}
+			});
+			
+			if(!rs){
+				gps.abnormal = true;
+				gps.abnormalText = '走向异常？';
+			}
 		}
 		function getGpsError(jqXHR, textStatus){
@@ -5,7 +5,7 @@
 var drawSvg = (function(){
 	var mt = 44//顶部距离
-		,p = 112//上下行之间的间隔  132
+		,p = 116//上下行之间的间隔 
 		,x = d3.scale.linear()
 		,w
 		,homeSvgMapp = {}
@@ -69,12 +69,14 @@ var drawSvg = (function(){
 		init: function(lineId, data, container, w, mtop){
 			if(!data || data.length == 0)
 				return;
-				
+			
 			mt = mtop;
-			//起终点站
+			//索引起终点站
 			$.each(data, function(){
-				if(this.stationMark == 'B' || this.stationMark == 'E' )
+				if(this.stationMark == 'B' || this.stationMark == 'E' ){
 					seGps[lineId + '_' + this.id[0]] = [];
+					seGps[lineId + '_' + this.id[1]] = [];
+				}
 			});
 			var svg = d3.select('#' + container).append('svg')
@@ -94,22 +96,6 @@ var drawSvg = (function(){
 			//下行线条
 			drawPath(svg, data, 'down', 10);
-/*			//左弧线 path
-			svg.append('path')
-				.attr('d', function(){
-					var cx = x(0) - 8;
-					return arcPath(cx , mt + 5,cx - 20);
-				})
-				.attr('class', 'up_path arc');
-			
-			//右弧线 path
-			svg.append('path')
-				.attr('d', function(){
-					var cx = x(dLen - 1) + 8;
-					return arcPath(cx , mt + 5,cx + 20);
-				})
-				.attr('class', 'down_path arc');*/
-			
 			var g = svg.append('g').selectAll('g')
 					.data(data)
 					.enter()
@@ -183,12 +169,11 @@ var drawSvg = (function(){
 			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();
@@ -205,8 +190,9 @@ var drawSvg = (function(){
 			}
 			for(var i = 0, gps; gps = gpsArray[i ++];){
+				//首页svg
 				drawGpsToSvg(gps, hSvg);
-				
+				//单线路svg
 				drawGpsToSvg(gps, aSvg, true);
 			}
@@ -215,25 +201,28 @@ var drawSvg = (function(){
 			for(var eid in seGps){
 				len = seGps[eid].length;
 				if(len > 0){
-					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);
-					
+					//首页svg
 					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);
+					//单线路svg
+					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);
 				}
 			}
 			function tempStartAndStop(svg, eid, e, x, y){
+				var se = e.attr('class').indexOf('start') != -1?'start':'end';
-				var gs = svg.append('g').classed({'start': e.attr('class').indexOf('start') != -1, 'park': true})
+				var gs = svg.append('g').attr('class', se + ' park')
 						.selectAll('g').data(seGps[eid]).enter().append('g');
+				
 				//Y轴居中
-				y = (y + 66) - len * 13;
+				//y = (y + 66) - len * 13;
 				gs.append('rect')
 					.attr('x', x + 15)
 					.attr('y', function(d, i){
@@ -297,6 +286,7 @@ var drawSvg = (function(){
 		}
 	};
+	//flag 2张svg ， 起终点只画一次
 	function drawGpsToSvg(gps, svg, flag){
 		var stionId = gps.lineId + '_' + gps.stopNo
 		,station = $('#' + stionId, svg[0])/*
@@ -35,10 +35,17 @@ var _home = (function() {
 			$('.card_wrap').css('height', ah / 3);
 			// 滚动条
-			$('.card_wrap .table_wrap').slimscroll({
+			/*$('.card_wrap .table_wrap').slimscroll({
 				height : '187px',
 				alwaysVisible : true,
 				opacity : .8
+			});*/
+			
+			//table 滚动时固定表头
+			$('#tab_home .custom-table-panel').on('scroll', function(){
+				var top = $(this).scrollTop()
+				,$header = $(this).find('.custom-table-header');
+				$header.css('top', top);
 			});
 			// SVG线路图
@@ -54,19 +61,20 @@ var _home = (function() {
 			// 模拟图GPS刷新事件
 			$('#tab_home').on(
 					'gps_refresh',
-					function(e, add, up) {
+					function(e, allGps) {
 						// 现在先每次全量画
-						var list = _data.findAllGps();
-						_data.attachSchedulInfo(list);
+						//var list = _data.findAllGps();
+						//allGps = _data.attachSchedulInfo(allGps);
 						// drawSvg.drawVehicle(list);
 						// 按线路分组
-						var listMap = groupByLine(list);
-
+						var listMap = groupByLine(allGps);
+						
 						for ( var key in listMap) {
 							var htmlStr = template('home_table_temp', {
 								list : listMap[key]
 							});
+							//表格
 							$('#tab_' + key).find('tbody').html(htmlStr);
 							// 更新badge
 							$('#' + key + '_badge').text(
@@ -84,7 +92,7 @@ var _home = (function() {
 				$('.load-anim').fadeOut(800);
 				$('menu.menu').show();
 			}, 400);
-			
+/*			
 			setTimeout(function() {
 				// 提示文本
 				var promptFlag = storage.getItem('promptFlag_0913');
@@ -97,7 +105,7 @@ var _home = (function() {
 					storage.setItem('promptFlag_0913', 1);
 				}
 			}, 1500);
-		}
+*/		}
 	}
 	function gpslistToMap(gpslist){
@@ -117,10 +125,23 @@ var _home = (function() {
 			rs[key].push(this);
 		});
+		
+		//排序
+		for(var k in rs){
+			rs[k].sort(gpsSort);
+		}
 		return rs;
 	}
-
+	function gpsSort(a, b){
+		if(!a.expectStopTime)
+			return 1;
+		if(!b.expectStopTime)
+			return 0;
+		
+		return a.expectStopTime - b.expectStopTime;
+	}
+	
 	countDown('home.js');
 	return homeObject;
 })();
 \ No newline at end of file
@@ -34,7 +34,12 @@ var _home_menu = (function(){
 				$('#homeMenu').removeClass('show-menu');
 			});
 	});
-	
+	//点击选中
+	$('.portlet-fullscreen').on('click', '.vehicDataTable tr td', function(e){
+		e.preventDefault();
+		$('.vehicDataTable tr._home_tr_active').removeClass('_home_tr_active');
+		$(this).parent().addClass('_home_tr_active');
+	});
     function showMenu(x, y) {
 		var menu = $('#homeMenu'),
 var _main = (function(){
-	
-/*setTimeout(function(){
-	//生成头部选项卡
-	var topTabs = '', tabPanels = '';
-	$.each(_data.getLines(), function(i, line){
-		topTabs += '<li ><a data-id="'+line.lineCode+'" href="#tab_line_'+line.lineCode+'" data-toggle="tab" '+
-					'aria-expanded="false"> '+line.name+'<span>（<zz>0</zz>,<zz>0</zz> <zz>托管</zz>）</span> </a></li>';
-		
-		tabPanels += '<div class="tab-pane fade tab_line" data-id="'+line.lineCode+'" id="tab_line_'+line.lineCode+'"></div>';
-		
-	});
-	$('#top-tabs-wrap .nav-tabs').append(topTabs);
-	$('#top-tabs-wrap .tab-content').append(tabPanels);
-	
-	//加载地图页数据
-	$('#tab_map').load('/pages/mapmonitor/real/real.html');
-	
-	//初始化单线路调度页面
-	_alone.init(function(){
-		//初始化信使
-		_messenger.init();
-		//初始化主页
-		homeObject.init();
-		
-		$.each(_data.getLines(), function(){
-			//计算应发未发数量
-			_messenger.setYFWFNum(this.lineCode);
-		});
-	});
-	
-	//监控模式下，拦截post请求
-	if(operationMode == 0){
-		$(document).on('ajaxSend', interceptPOST);
-	}
-	
-}, 200)*/
-	
-	/*var startEp = EventProxy.create("template", function (template, data, l10n) {
-		_.template(template, data, l10n);
-	});*/
 	var initEp;
 	var mainInstance = {
 		start: function(){
@@ -27,26 +27,42 @@
 			</div>
 		</div>
-		<table class="table table-striped table-bordered table-advance"
-			style="table-layout: fixed;">
-			<thead>
-				<tr>
-					<th style="width: 22%;">车辆编码</th>
-					<th style="width: 17%;">路牌</th>
-					<th style="width: 17%;">速度</th>
-					<th style="width: 22%;">终点时间</th>
-					<th style="width: 22%;" class="col_hide_1680">下一班</th>
-				</tr>
-			</thead>
-		</table>
-		<div class="table_wrap">
-			<table
-				class="table table-striped table-bordered table-advance table-hover vehicDataTable"
-				style="table-layout: fixed;" id="tab_{{lineObj.lineCode}}_0">
-				<tbody>
-				</tbody>
-			</table>
+		<div class="custom-table-panel">
+			<div style="height: 33px;position: relative;">
+				 <div class="custom-table-header" style="min-width: 700px;">
+					<table class="table table-bordered table-advance" >
+						<thead>
+							<tr>
+								<th width="14%">车辆编码</th>
+								<th width="8%">速度</th>
+								<th width="14%">终点时间</th>
+								<th width="16%">当前站点</th>
+								<th width="16%">终点站</th>
+								<th width="11%">计划终点</th>
+								<th width="10%">驾驶员</th>
+								<th width="10%">售票员</th>
+							</tr>
+						</thead>
+					</table>
+				 </div>
+			</div>
+			<div class="custom-table-body" style="min-width: 700px;">
+				<table class="table table-bordered vehicDataTable" id="tab_{{lineObj.lineCode}}_0">
+					<colgroup>
+						<col width="14%"></col>
+						<col width="8%"></col>
+						<col width="14%"></col>
+						<col width="16%"></col>
+						<col width="16%"></col>
+						<col width="11%"></col>
+						<col width="10%"></col>
+						<col width="10%"></col>
+					</colgroup>
+					<tbody></tbody>
+				</table>
+			</div>
 		</div>
+		
 	</div>
 	<div class="col-lg-8 line_chart" id="line_chart_{{lineObj.lineCode}}"> 
 		<div class="top">
@@ -74,25 +90,40 @@
 				</ul>-->
 			</div>
 		</div>
-		<table class="table table-striped table-bordered table-advance"
-			style="table-layout: fixed;">
-			<thead>
-				<tr>
-					<th style="width: 22%;">车辆编码</th>
-					<th style="width: 17%;">路牌</th>
-					<th style="width: 17%;">速度</th>
-					<th style="width: 22%;">终点时间</th>
-					<th style="width: 22%;" class="col_hide_1680">下一班</th>
-				</tr>
-			</thead>
-		</table>
-		<div class="table_wrap">
-			<table
-				class="table table-striped table-bordered table-advance table-hover vehicDataTable"
-				style="table-layout: fixed;" id="tab_{{lineObj.lineCode}}_1">
-				<tbody>
-				</tbody>
-			</table>
+		<div class="custom-table-panel">
+			<div style="height: 33px;position: relative;">
+				 <div class="custom-table-header" style="min-width: 700px;">
+					<table class="table table-bordered table-advance" >
+						<thead>
+							<tr>
+								<th width="14%">车辆编码</th>
+								<th width="8%">速度</th>
+								<th width="14%">终点时间</th>
+								<th width="16%">当前站点</th>
+								<th width="16%">终点站</th>
+								<th width="11%">计划终点</th>
+								<th width="10%">驾驶员</th>
+								<th width="10%">售票员</th>
+							</tr>
+						</thead>
+					</table>
+				 </div>
+			</div>
+			<div class="custom-table-body" style="min-width: 700px;">
+				<table class="table table-bordered vehicDataTable" id="tab_{{lineObj.lineCode}}_1">
+					<colgroup>
+						<col width="14%"></col>
+						<col width="8%"></col>
+						<col width="14%"></col>
+						<col width="16%"></col>
+						<col width="16%"></col>
+						<col width="11%"></col>
+						<col width="10%"></col>
+						<col width="10%"></col>
+					</colgroup>
+					<tbody></tbody>
+				</table>
+			</div>
 		</div>
 	</div>
 </div>
@@ -122,23 +153,30 @@
 <script id="home_table_temp" type="text/html">
 {{each list as obj i}}
 <tr data-nbbm="{{obj.nbbm}}" data-device="{{obj.deviceId}}">
-   <td style="width: 22%;"> {{obj.nbbm}} </td>
-   <td style="width: 17%;"> 
-	{{if obj.currSch != null}}
-		{{obj.currSch.lpName}}
+   <td title="{{obj.nbbm}}"> 
+	{{if !obj.abnormal}}
+		{{obj.nbbm}} 
+	{{else}}
+		<abbr class="abnormal" title="{{obj.abnormalText}}">{{obj.nbbm}}</abbr>
+	{{/if}}
+   </td>
+   <td> {{obj.speed}} </td>
+   <td>
+	{{if obj.expectStopTime != null}}
+		{{obj.expectStopTime}} <span class="sm-text">分钟</span>
 	{{else}}
-		无
+		<span class="sm-text">无</span>
 	{{/if}}
    </td>
-   <td  style="width: 17%;"> {{obj.speed}} </td>
-   <td style="width: 22%;" > 暂无 </td>
-   <td style="width: 22%;" class="col_hide_1680">
-{{if obj.nextSch != null}}
-	{{obj.nextSch.dfsj}}
-{{else}}
-	无
-{{/if}}
-	</td>
+   <td title="{{obj.stationName}}"> {{obj.stationName}} </td>
+   {{if obj.sch != null}}
+	 <td title="{{obj.sch.zdzName}}"> {{obj.sch.zdzName}} </td>
+	 <td>{{obj.sch.zdsj}}</td>
+	 <td> {{obj.sch.jName}} </td>
+	 <td> {{obj.sch.sName}} </td>
+    {{else}}
+	   <td colspan=4 class="lt-no-data">无班次信息</td>
+   {{/if}}
 </tr>
 {{/each}}
 </script>
@@ -9,14 +9,7 @@
 	<div><a href="javascript:;" data-for="station" class="tip_modal">{{stationName}}</a></div>
 	<div>速度：{{speed}}</div>
 	<hr >
-	<div>预计 ? 分钟后到达<a href="javascript:;" data-for="station" class="tip_modal">下一站</a></div>
-	<div>终点站：
-		<a href="javascript:;" data-for="station" > 
-		{{if currSch != null}}
-			{{currSch.zdzName}}
-		{{/if}}
-
-		</a></div>
+	<div>预计 {{expectStopTime}} 分钟到达终点</div>
 	<hr >
 	<div class="subtitle">{{fromNow}}更新（在线）</div>
 	<div class="subtitle" style="margin-top: 8px;">
@@ -311,4 +311,16 @@ rect.f_rect{
     overflow-x: hidden;
     padding-right: 15px;
     margin: 15px 0px;
-}
 \ No newline at end of file
+}
+
+#forecast_sample_modal ul.tabs-left li{
+}
+
+#forecast_sample_modal span.desc {
+    color: #5580a5;
+    text-align: left;
+    font-size: 12px;
+}
+#forecast_sample_modal ul.tabs-left li.active span.desc{
+	color: #989292;	
+}
@@ -70,7 +70,7 @@ var sampleSvg = (function(){
 		});
 		var h = rts[rts.length - 1].cy + 50;
-		svg.style('height', h).style('opacity', 0);
+		svg.style('height', h)/*.style('opacity', 0)*/;
 		$('#svgWrap').css('height', h + 6);
 		//画线
@@ -97,7 +97,7 @@ var sampleSvg = (function(){
 		showTags();
 		//d3 anim
-		svg.transition().delay(100).style('opacity', 1);
+		//svg.transition().delay(100).style('opacity', 1);
 	}
 	//tag 点击事件
@@ -141,7 +141,7 @@ var sampleSvg = (function(){
 			.attr('x', function(d){return d.cp[0]})
 			.attr('y', function(d){return d.cp[1]})
 			.attr('class', 'f_text')
-			.text(function(d){return d.runTime + 'm'});
+			.text(function(d){return d.runTime + '分'});
 	}
@@ -151,17 +151,19 @@ var sampleSvg = (function(){
 	}
 	function showTags(){
+		var index = layer.msg('加载中', {icon: 16, time: 0,shade:0.3});
 		//查询 耗时信息
 		$.get('/sample/all', {'lineCode_eq': _opt.lineCode, 'updown_eq': _opt.updown}, function(rs){
 			//按tag分组数据
 			_data = {};
-			var tags = '';//
+			var tags = '', ct;//
 			$.each(rs, function(i, d){
-				if(!_data[d.tag]){
-					_data[d.tag] = [];
-					tags += '<a class="tag" title="'+d.tag+'">'+(d.tag + ' ' + d.sDate + ' - ' + d.eDate)+'</a>';
+				ct = cutTag(d.tag);
+				if(!_data[ct]){
+					_data[ct] = [];
+					tags += '<a class="tag" title="'+ct+'">'+ d.tag +'</a>';
 				}
-				_data[d.tag].push(d);
+				_data[ct].push(d);
 			});
 			var wrap = $('#trafficChart .sample_tags');
@@ -169,6 +171,8 @@ var sampleSvg = (function(){
 			wrap.append(tags);
 			//选中第一个tag
 			$('#trafficChart .sample_tags a.tag:eq(0)').click();
+			
+			layer.close(index);
 		});
 	}
@@ -185,7 +189,7 @@ var sampleSvg = (function(){
 		$.get('/pages/forecast/sample/modal.html', function(rs){
 			var index = layer.open({
 				  type: 1,
-				  area: '550px',
+				  area: '560px',
 				  content: rs,
 				  shift: 5,
 				  title: '人工编辑',
@@ -230,5 +234,9 @@ var sampleSvg = (function(){
 		return cp;
 	}
+	function cutTag(tag){
+		return tag.replace(new RegExp(/:/g),'').replace(new RegExp(/ /g),'').replace(new RegExp(/-/g) ,'');
+	}
+	
 	return drawObject;
 })();
 \ No newline at end of file
@@ -264,8 +264,10 @@
 						  delete param.dr_etime;
 						  param.timeRange = timeRange;
-						  $.post('/sample/create/gps', {data: encodeURI(JSON.stringify(param))}, function(rs){
-							 console.log(rs); 
+						  layer.msg('服务器正在处理数据，请稍等...', {icon: 16, shade: 0.3});
+						  $post('/sample/create/gps', {data: encodeURI(JSON.stringify(param))}, function(rs){
+							 layer.closeAll();
+							 drawSvg();
 						  });
 					  }
 				  }catch (e){
@@ -8,7 +8,7 @@
  <ul class="nav nav-tabs tabs-left">
 {{each data as obj i}}
 	<li >
-      <a href="#tab_sample_{{i}}" data-toggle="tab" title="{{obj.t}}"> {{obj.t}}  </a>
+      <a href="#tab_sample_{{i}}" data-toggle="tab" title="{{obj.t}}"> {{#obj.escapeTag}}  </a>
     </li>
 {{/each}}
 <li ><a href="#tab_sample_add" data-toggle="tab" style="font-size: 12px;color: red;"> <i class="fa fa-plus"></i> 新增 </a></li>
@@ -89,9 +89,9 @@
             		<label class="col-md-3 control-label">时区：</label>
             		<div class="col-md-9">
 						<select class="form-control" name="tag" style="width:100%;" multiple required>
-							<option value="早高峰">早高峰</option>
-							<option value="平峰">平峰</option>
-							<option value="晚高峰">晚高峰</option>
+							{{each tsArray as t i}}
+								<option value="{{t}}">{{t}}</option>
+							{{/each}}
 						</select>
             		</div>
         		</div>
@@ -129,9 +129,12 @@
 <script>
 !function(){
 	var _data,_opt,id, currentData, layero, drawObject;
-	var tagRange = {'早高峰': {s: '06:31', e: '08:30'}, '平峰': {s: '08:31', e: '16:00'}, '晚高峰': {s: '16:01', e: '18:00'}};
+	var tagRange = {};
 	$('#forecast_sample_modal').on('init', function(e, rs){
+		//提取出tag Range
+		var tsArray = extractTag(rs._data);
+		
 		_data = rs._data;
 		_opt = rs._opt;
 		drawObject = rs.drawObject;
@@ -147,8 +150,14 @@
 		var eid = id, sid = _prve.stationCode;
 		var sampData = searchData(sid, eid);
 		var baseData = {sid: sid, eid: eid, sName: toName(sid), eName: toName(eid)};
-		console.log('baseData', baseData);
-		var html = template('forecast_sample_tab_detail_temp', {data: sampData, base: baseData});
+		
+		//tag加换行符
+		$.each(sampData, function(){
+			var t = this.d.tag.replace(new RegExp(/ /g),'');
+			this.escapeTag = t.substr(0, t.length - 11) + '<br>' + '<span class="desc">' + t.substr(t.length - 11, 11) + '</span>';
+		});
+		
+		var html = template('forecast_sample_tab_detail_temp', {data: sampData, base: baseData, tsArray: tsArray});
 		$('#forecast_sample_modal .row').html(html);
 		//默认选中tab
 		defaultSelect(rs.tag);
@@ -294,5 +303,23 @@
 		}
 		return rs;
 	}
+	
+	function extractTag(_data){
+		var rs = [];
+		var len, t, s, e;
+		for(var key in _data){
+			len = key.length;
+			t = key.substring(0, len - 8);
+			s = key.substring(len - 8, len - 4);
+			e = key.substring(len - 4, len);
+			
+			s = s.substr(0, 2) + ':' + s.substr(2);
+			e = e.substr(0, 2) + ':' + e.substr(2);
+			tagRange[t] = {s: s, e: e};
+			rs.push(t);
+		}
+		
+		return rs;
+	}
 }();
 </script>
 \ No newline at end of file
@@ -124,12 +124,12 @@ CanvasRenderingContext2D.prototype.roundRect = function (x, y, w, h, r) {
 }
 //GPS刷新事件
-$('#mapContainer').on('gps_refresh', function(e, add, up){
+$('#mapContainer').on('gps_refresh', function(e, all){
 	if($(this).is(":hidden"))
 		return;
-	var all = add ,gps;
+/* 	var all = add ,gps;
 	if(up)
-		all = all.concat(up);
+		all = all.concat(up); */
 	$.each(all, function(){
 		consts.allGps[this.deviceId] = this;