从SimpleDateFormat 切换至 joda time

潘钊
1 parent 97545ae6
Showing 15 changed files with 789 additions and 823 deletions
src/main/java/com/bsth/controller/realcontrol/BasicDataController.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/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/forecast/SampleTimeDataLoader.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/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/entity/directive/DC0_A3.java
src/main/java/com/bsth/entity/directive/DC0_A4.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
@@ -21,6 +21,11 @@ public class BasicDataController {
 		return BasicData.deviceId2NbbmMap.values();
 	}
+	@RequestMapping("/nbbm2deviceId")
+	public Map<String, String> nbbm2deviceId(Map<String, Object> map){
+		return BasicData.deviceId2NbbmMap.inverse();
+	}
+	
 	@RequestMapping("/lineCode2Name")
 	public Map<String, String> findLineCodeMap(){
 		return BasicData.lineCode2NameMap;
@@ -140,7 +140,7 @@ public class BasicData implements CommandLineRunner{
 				//车辆和线路映射信息
 				loadNbbm2LineInfo();
 				//站点路由信息
-				loadStationRouteInfo();
+				loadStationRouteInfo();	
 				//人员信息
 				loadPersonnelInfo();
 				logger.info("加载基础数据成功！，" );
@@ -51,7 +51,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("ArrivalData_GPS,30,10");
-		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 40, 20, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 40, 10, TimeUnit.SECONDS);
 	}
 	@Component
@@ -52,7 +52,7 @@ public class GatewayHttpUtils {
 			post.setEntity(new StringEntity(jsonStr, "utf-8"));
 			CloseableHttpResponse response = httpClient.execute(post);
-			
+
 			JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
 			if(null != json && json.getInteger("errCode") == 0)
 				code = 0;
 package com.bsth.data.forecast;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -9,6 +8,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,14 +40,14 @@ public class SampleTimeDataLoader extends Thread {
 	// 当天日期
 	String rq;
-	SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+	private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm")
+				,fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
 	public void run() {
-		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
-		rq = sdfyyyyMMdd.format(new Date());
+		rq = fmtyyyyMMdd.print(new Date().getTime());
 		Iterator<Sample> iterator = sampleRepository.findAll().iterator();
 		ArrayListMultimap<String, Sample> sampleMap = ArrayListMultimap.create();
@@ -103,8 +104,9 @@ public class SampleTimeDataLoader extends Thread {
 			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.startTime = fmtyyyyMMddHHmm.parseMillis(rq + s.getsDate());
+				tg.endTime = fmtyyyyMMddHHmm.parseMillis(rq + s.geteDate());
 				tg.runTime = s.getRunTime();
 				simple.ranges.add(tg);
 			}
@@ -34,7 +34,7 @@ import com.google.common.collect.TreeMultimap;
 /**
  * 
- * @ClassName: GpsRealEntityBuffer
+ * @ClassName: GpsRealData
  * @Description: TODO(实时GPS数据集合)
  * @author PanZhao
  * @date 2016年8月12日 下午2:04:41
@@ -73,7 +73,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
 package com.bsth.data.match;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -24,7 +25,6 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
 /**
  * 
@@ -74,8 +74,9 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		private ScheduleComparator.FCSJ schComparator = new ScheduleComparator.FCSJ();
 		private ArrivalComparator arrComparator = new ArrivalComparator();
 		private MatchResultComparator mrComparator = new MatchResultComparator();
-		private SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-		
+
+		private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+
 		@Override
 		public void run() {
 			//班次列表
@@ -389,8 +390,9 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				//上行发车，和到达时间比较一下。起点一般不会立即发出
 				if(mr.sch.getXlDir().equals("0") 
 						&& null != mr.sch.getQdzArrDateSJ()){
-					
-					long dt = sdfyyyyMMddHHmm.parse(mr.sch.getRealExecDate() + mr.sch.getQdzArrDateSJ()).getTime();
+
+
+					long dt = fmtyyyyMMddHHmm.parseMillis(mr.sch.getRealExecDate() + mr.sch.getQdzArrDateSJ());
 					//停站时间少于 计划的3分之1，标记为漂移信号
 					if((mr.ts - dt < (mr.sch.getDfsjT() - dt) / 3)){
-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;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-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.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.bsth.Application;
-import com.bsth.data.LineConfigData;
-import com.bsth.data.directive.FirstScheduleCheckThread;
-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;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.service.schedule.SchedulePlanInfoService;
-import com.bsth.util.BatchSaveUtils;
-import com.bsth.util.DateUtils;
-import com.bsth.websocket.handler.SendUtils;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.TreeMultimap;
-
-/**
- * 
- * @ClassName: DayOfSchedule
- * @Description: TODO(当日实际排班)
- * @author PanZhao
- * @date 2016年8月15日 上午10:16:12
- *
- */
-@Component
-public class DayOfSchedule implements CommandLineRunner {
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	// 按车辆分组的班次数据
-	private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
-
-	// 班次主键映射
-	private static Map<Long, ScheduleRealInfo> id2SchedulMap;
-
-	// 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
-	private static TreeMultimap<String, String> nbbm2SEStationMap;
-	
-	//车辆 ——> 当前执行班次
-	private static Map<String, ScheduleRealInfo> carExecutePlanMap;
-
-	// 持久化缓冲区
-	public static LinkedList<ScheduleRealInfo> pstBuffer;
-
-	// 排序器
-	private static ScheduleComparator.FCSJ schFCSJComparator;
-
-	@Autowired
-	LineConfigData lineConfigData;
-
-	@Autowired
-	ScheduleRealInfoRepository schRepository;
-
-	@Autowired
-	SchedulePlanInfoService schPlanService;
-
-	@Autowired
-	SchAttrCalculator schAttrCalculator;
-
-	@Autowired
-	SendUtils sendUtils;
-	
-	@Autowired
-	GpsRealData gpsRealData;
-
-	/** 线路当前使用的排班的日期 */
-	public static Map<String, String> currSchDateMap;
-
-	static {
-		nbbmScheduleMap = ArrayListMultimap.create();
-		id2SchedulMap = new HashMap<>();
-		pstBuffer = new LinkedList<>();
-		schFCSJComparator = new ScheduleComparator.FCSJ();
-		currSchDateMap = new HashMap<>();
-		nbbm2SEStationMap = TreeMultimap.create();
-		carExecutePlanMap = new HashMap<>();
-	}
-
-	@Autowired
-	ScheduleRefreshThread scheduleRefreshThread;
-	
-	@Autowired
-	SchedulePstThread schedulePstThread;
-	
-	@Autowired
-	FirstScheduleCheckThread firstScheduleCheckThread;
-	
-	@Autowired
-	ScheduleLateThread scheduleLateThread;
-
-	@Override
-	public void run(String... arg0) throws Exception {
-		//翻班线程
-		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 20, 240, TimeUnit.SECONDS);
-		//入库
-		//Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
-		//首班出场指令补发器
-		//Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 10, 120, TimeUnit.SECONDS);
-		//班次误点扫描
-		//Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
-	}
-
-	public Map<String, String> getCurrSchDate() {
-		return currSchDateMap;
-	}
-
-	/**
-	 * 
-	 * @Title: calcSchDateB
-	 * @Description: TODO(计算线路当前应该使用的排班日期)
-	 */
-	public String calcSchDate(String lineCode) {
-		LineConfig conf = lineConfigData.get(lineCode);
-		long ct = System.currentTimeMillis();
-		
-		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
-		String schDate = sdfyyyyMMdd.format(new Date(ct));
-		// 小于当天起始运营时间,则取前一天的排班
-		if (ct < conf.getCurrStartTime())
-			schDate = DateUtils.subtractDay(schDate, 1);
-
-		return schDate;
-	}
-
-	/**
-	 * @Title: reloadSch
-	 * @Title: reloadSch
-	 * @Description: TODO(重新载入排班)
-	 * @param @param
-	 *            lineCode 线路编码
-	 * @param @param
-	 *            schDate 班次日期 yyyy-MM-dd
-	 * @param @param
-	 *            forcePlan 强制从计划调度重新抓取
-	 */
-	public int reloadSch(String lineCode, String schDate, boolean forcePlan) {
-		try {
-			List<ScheduleRealInfo> list;
-
-			if (forcePlan)
-				removeRealSch(lineCode, schDate);
-			else
-				clearRAMData(lineCode);
-
-			if (existRealSch(lineCode, schDate))
-				list = loadRealSch(lineCode, schDate);// 从实际排班表加载
-			else {
-				list = loadPlanSch(lineCode, schDate);// 从计划排班表加载
-				// 写入数据库
-				batchSave(list);
-			}
-
-			//更新线路和班次日期对照
-			currSchDateMap.put(lineCode, schDate);
-			//添加到缓存
-			putAll(list);
-			
-			Set<String> cars = searchAllCars(list);
-			//计算“起点站应到”时间
-			for(String nbbm : cars)
-				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
-			
-			//是否是出站即出场
-			LineConfig conf = lineConfigData.get(lineCode);
-			if(conf.getOutConfig() == 2){
-				for(String nbbm : cars)
-					schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
-			}
-			
-			// 页面 翻班通知
-			sendUtils.shiftSchedule(lineCode);
-		} catch (Exception e) {
-			logger.error("", e);
-			return -1;
-		}
-
-		return 0;
-	}
-
-	/**
-	 * 
-	 * @Title: searchAllCars 
-	 * @Description: TODO(搜索班次集合中的车辆) 
-	 */
-	private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
-		Set<String> cars = new HashSet<>();
-		for(ScheduleRealInfo sch : list)
-			cars.add(sch.getClZbh());
-		
-		return cars;
-	}
-
-	private void putAll(List<ScheduleRealInfo> list) {
-		for (ScheduleRealInfo sch : list) 
-			put(sch);
-	}
-
-	/**
-	 * @Title: removeRealSch
-	 * @Description: TODO(清除实际排班，包括数据库和内存数据)
-	 * @param @param
-	 *            lineCode 线路编码
-	 * @param @param
-	 *            schDate 班次日期 yyyy-MM-dd
-	 */
-	public void removeRealSch(String lineCode, String schDate) throws Exception {
-		try {
-			// 清理数据库数据
-			schRepository.deleteByLineCodeAndDate(lineCode + "", schDate);
-
-			// 清理内存数据
-			clearRAMData(lineCode + "");
-		} catch (Exception e) {
-			logger.error("removeRealSch error, " + lineCode + " -" + schDate, e);
-			throw e;
-		}
-	}
-
-	/**
-	 * 
-	 * @Title: clearRAMData
-	 * @Description: TODO(清理内存数据)
-	 */
-	public void clearRAMData(String lineCode) {
-		int count = 0;
-		List<ScheduleRealInfo> remList = new ArrayList<>();
-		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
-		for (ScheduleRealInfo sch : schs) {
-			if (sch.getXlBm().equals(lineCode))
-				remList.add(sch);
-		}
-		
-		for(ScheduleRealInfo sch : remList){
-			if(null != sch){
-				nbbmScheduleMap.remove(sch.getClZbh(), sch);
-				id2SchedulMap.remove(sch.getId());
-				count ++;
-			}
-		}
-		
-		logger.info(lineCode + "排班清理 " + count);
-	}
-
-	/**
-	 * @Title: existRealSch
-	 * @Description: TODO(实际排班是否已存在)
-	 */
-	public boolean existRealSch(String lineCode, String schDate) {
-		int count = schRepository.countByLineCodeAndDate(lineCode, schDate);
-		return count > 0;
-	}
-
-	/**
-	 * @Title: loadRealSch
-	 * @Description: TODO(从实际排班表加载数据)
-	 */
-	public List<ScheduleRealInfo> loadRealSch(String lineCode, String schDate) {
-		return schRepository.findByLineCodeAndDate(lineCode, schDate);
-	}
-
-	/**
-	 * @Title: loadPlanSch
-	 * @Description: TODO(从计划排班表加载数据)
-	 */
-	public List<ScheduleRealInfo> loadPlanSch(String lineCode, String schDate) {
-		logger.info("从计划排班表恢复排班，lineCode: " + lineCode + ", schDate: " + schDate);
-		List<ScheduleRealInfo> realList = new ArrayList<>();
-
-		try {
-			Map<String, Object> data = new HashMap<>();
-			SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
-						,sdfHHmm = new SimpleDateFormat("HH:mm");
-			
-			data.put("scheduleDate_eq", sdfyyyyMMdd.parse(schDate));
-			data.put("xlBm_eq", lineCode);
-
-			// 查询计划排班
-			List<SchedulePlanInfo> planItr = cleanSchPlanItr(schPlanService.list(data).iterator());
-
-			// 转换为实际排班
-			realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
-
-			for (ScheduleRealInfo sch : realList) {
-				sch.setScheduleDateStr(sdfyyyyMMdd.format(sch.getScheduleDate()));
-				sch.setRealExecDate(sch.getScheduleDateStr());
-				// 计划终点时间
-				if (sch.getBcsj() != null) {
-					try{
-						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... 计算终点时间失败...");
-					}
-				}
-				//计划里程为0，直接清空
-				if(sch.getJhlc() != null && sch.getJhlc() == 0)
-					sch.setJhlc(null);
-			}
-		} catch (Exception e) {
-			logger.error("", e);
-		}
-		return realList;
-	}
-
-	/**
-	 * @Title: batchSave
-	 * @Description: TODO(批量入库)
-	 */
-	private void batchSave(List<ScheduleRealInfo> list) {
-		// 查询数据库最大ID
-		Long id = schRepository.getMaxId();
-		if (null == id)
-			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(sdfyyyyMMdd.format(item.getScheduleDate()));
-		}
-
-		// 入库
-		new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
-	}
-
-	private List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
-		List<SchedulePlanInfo> list = new ArrayList<>();
-
-		SchedulePlanInfo sp;
-		while (itrab.hasNext()) {
-			sp = itrab.next();
-			sp.setSchedulePlan(null);
-			list.add(sp);
-		}
-		return list;
-	}
-
-	/**
-	 * 
-	 * @Title: findByLineCode
-	 * @Description: TODO(lineCode 获取班次)
-	 */
-	public List<ScheduleRealInfo> findByLineCode(String lineCode) {
-		List<ScheduleRealInfo> rs = new ArrayList<>();
-
-		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
-		for (ScheduleRealInfo sch : schs) {
-			if (sch.getXlBm().equals(lineCode))
-				rs.add(sch);
-		}
-		return rs;
-	}
-	
-	/**
-	 * 
-	 * @Title: findCarByLineCode 
-	 * @Description: TODO(线路下运营的车辆) 
-	 */
-	public Set<String> findCarByLineCode(String lineCode){
-		Set<String> rs = new HashSet<>();
-
-		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
-		for (ScheduleRealInfo sch : schs) {
-			if (sch.getXlBm().equals(lineCode))
-				rs.add(sch.getClZbh());
-		}
-		
-		return rs;
-	}
-
-	public List<ScheduleRealInfo> findByNbbm(String nbbm) {
-		return nbbmScheduleMap.get(nbbm);
-	}
-
-	/**
-	 * 
-	 * @Title: findByLineAndUpDown
-	 * @Description: TODO(lineCode 和走向获取班次)
-	 */
-	public List<ScheduleRealInfo> findByLineAndUpDown(String lineCode, Integer upDown) {
-		List<ScheduleRealInfo> list = findByLineCode(lineCode), rs = new ArrayList<>();
-
-		for (ScheduleRealInfo sch : list) {
-			if (sch.getXlDir().equals(upDown + ""))
-				rs.add(sch);
-		}
-		return rs;
-	}
-
-	public ScheduleRealInfo get(long id) {
-		return id2SchedulMap.get(id);
-	}
-
-	public Set<String> getSEStationList(String nbbm) {
-		return nbbm2SEStationMap.get(nbbm);
-	}
-
-	/**
-	 * 
-	 * @Title: next
-	 * @Description: TODO(下一个班次)
-	 */
-	public ScheduleRealInfo next(ScheduleRealInfo sch) {
-
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		
-		boolean flag = false;
-		ScheduleRealInfo next = null;
-		for(ScheduleRealInfo temp : list){
-			if(temp.getId() == sch.getId()){
-				flag = true;
-				continue;
-			}
-			//忽略烂班
-			if(temp.isDestroy())
-				continue;
-			
-			if(flag){
-				next = temp;
-				break;
-			}
-		}
-		return next;
-	}
-
-	public void put(ScheduleRealInfo sch) {
-		schAttrCalculator
-			.calcRealDate(sch)
-			.calcAllTimeByFcsj(sch);
-
-		String nbbm = sch.getClZbh();
-		nbbmScheduleMap.put(nbbm, sch);
-		nbbm2SEStationMap.put(nbbm, sch.getQdzCode());
-		nbbm2SEStationMap.put(nbbm, sch.getZdzCode());
-		
-		//主键索引
-		id2SchedulMap.put(sch.getId(), sch);
-	}
-	
-	public void delete(ScheduleRealInfo sch) {
-		//ScheduleRealInfo sch = id2SchedulMap.get(id);
-		if(!sch.isSflj())
-			return;
-		
-		nbbmScheduleMap.remove(sch.getClZbh(), sch);
-		id2SchedulMap.remove(sch.getId());
-		//return sch;
-	}
-	
-	public void calcQdzTimePlan(String nbbm){
-		schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
-	}
-	
-	public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm){
-		return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
-	}
-
-	/**
-	 * 
-	 * @Title: nextAll
-	 * @Description: TODO(之后的所有班次)
-	 */
-	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		// 排序
-		Collections.sort(list, schFCSJComparator);
-
-		List<ScheduleRealInfo> rs = new ArrayList<>();
-		ScheduleRealInfo temp;
-		for (int i = 0; i < list.size() - 1; i++) {
-			temp = list.get(i);
-			if(temp.getFcsjT() > sch.getFcsjT())
-				rs.add(temp);
-
-		}
-		return rs;
-	}
-
-	/**
-	 * 
-	 * @Title: doneSum
-	 * @Description: TODO(已完成班次总数)
-	 */
-	public int doneSum(String clZbh) {
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(clZbh);
-		int rs = 0;
-		
-		for(ScheduleRealInfo sch : list){
-			if(sch.getStatus() == 2 && !sch.isDestroy())
-				rs ++;
-		}
-		return rs;
-	}
-	
-	/**
-	 * 
-	 * @Title: prveNotExecNum 
-	 * @Description: TODO(班次之前未执行班次数量) 
-	 */
-	public int prveNotExecNum(ScheduleRealInfo sch){
-		int n = 0;
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		for(ScheduleRealInfo s : list){
-			if(s.getFcsjActual() == null && !s.isDestroy())
-				n ++;
-			
-			if(s.getId().equals(sch.getId()))
-				break;
-		}
-		return n;
-	}
-
-	/**
-	 * 
-	 * @Title: validEndTime
-	 * @Description: TODO(是否是有效的到达时间)
-	 */
-	public boolean validEndTime(ScheduleRealInfo sch, Long ts) {
-		if(sch.getFcsjActualTime() != null && sch.getFcsjActualTime() > ts)
-			return false;
-		
-		return validTime(sch, ts);
-	}
-
-	/**
-	 * 
-	 * @Title: validStartTime 
-	 * @Description: TODO(是否是合适的发车时间) 
-	 */
-	public boolean validStartTime(ScheduleRealInfo sch, Long ts) {
-		if(sch.getZdsjActualTime() != null && sch.getZdsjActualTime() < ts)
-			return false;
-		
-		return validTime(sch, ts);
-	}
-	
-	public boolean validTime(ScheduleRealInfo sch, Long ts){
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		int ci = list.indexOf(sch);
-		ScheduleRealInfo prve, next;
-		if(ci > 0){
-			//之前班次实际时间不能大于该时间
-			for(int i = ci - 1; i >= 0; i --){
-				prve = list.get(i);
-				if(prve.getZdsjActualTime() != null && prve.getZdsjActualTime() > ts )
-					return false;
-				
-				if(prve.getFcsjActualTime() != null && prve.getFcsjActualTime() > ts)
-					return false;
-			}
-		}
-		
-		if(ci < list.size() - 1){
-			//之后班次实际时间不能小于该时间
-			for(int i = ci + 1; i < list.size(); i ++){
-				next = list.get(i);
-				if(next.getFcsjActualTime() != null && next.getFcsjActualTime() < ts)
-					return false;
-				
-				if(next.getZdsjActualTime() != null && next.getZdsjActualTime() < ts)
-					return false;
-			}
-		}
-		return true;
-	}
-	
-	public void save(ScheduleRealInfo sch){
-		//schRepository.save(sch);
-		//pstBuffer.add(sch);
-	}
-	
-	
-	/**
-	 * 
-	 * @Title: nextByBcType 
-	 * @Description: TODO(获取下一个指定班次类型的班次) 
-	 */
-	public ScheduleRealInfo nextByBcType(String nbbm, String bcType){
-		List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
-		
-		Collections.sort(list, schFCSJComparator);
-		ScheduleRealInfo sch = null;
-		for(ScheduleRealInfo temp : list){
-			if(temp.getFcsjActual() == null)
-				sch = temp;
-		}
-		
-		return sch;
-	}
-	
-	public List<ScheduleRealInfo> findByBcType(String nbbm, String bcType){
-		List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm)
-				,outList = new ArrayList<>();
-	
-		for(ScheduleRealInfo sch : all){
-			if(sch.getBcType().equals(bcType))
-				outList.add(sch);
-		}
-		return outList;
-	}
-	
-	public Set<String> allCar(){
-		return nbbmScheduleMap.keySet();
-	}
-	
-	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: changeCar 
-	 * @Description: TODO(班次换车) 返回有更新的班次
-	 * @param @param sch	
-	 * @param @param newClZbh    新的车辆自编号 
-	 */
-	public List<ScheduleRealInfo> changeCar(ScheduleRealInfo sch , String newClZbh){
-		List<ScheduleRealInfo> ups = new ArrayList<>();
-		String oldClzbh = sch.getClZbh();
-		if(oldClzbh.equals(newClZbh))
-			return ups;
-		
-		
-		//变更相关映射信息
-		nbbmScheduleMap.remove(sch.getClZbh(), sch);
-		
-		sch.setClZbh(newClZbh);
-		nbbmScheduleMap.put(newClZbh, sch);
-		nbbm2SEStationMap.put(newClZbh, sch.getQdzCode());
-		nbbm2SEStationMap.put(newClZbh, sch.getZdzCode());
-		
-		//重新计算班次应到时间
-		ups.addAll(updateQdzTimePlan(oldClzbh));
-		ups.addAll(updateQdzTimePlan(newClZbh));
-		return ups;
-	}
-
-	/**
-	 * 
-	 * @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.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+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.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.Application;
+import com.bsth.data.LineConfigData;
+import com.bsth.data.directive.FirstScheduleCheckThread;
+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;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.schedule.SchedulePlanInfoService;
+import com.bsth.util.BatchSaveUtils;
+import com.bsth.util.DateUtils;
+import com.bsth.websocket.handler.SendUtils;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.TreeMultimap;
+
+/**
+ * 
+ * @ClassName: DayOfSchedule
+ * @Description: TODO(当日实际排班)
+ * @author PanZhao
+ * @date 2016年8月15日 上午10:16:12
+ *
+ */
+@Component
+public class DayOfSchedule implements CommandLineRunner {
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	// 按车辆分组的班次数据
+	private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
+
+	// 班次主键映射
+	private static Map<Long, ScheduleRealInfo> id2SchedulMap;
+
+	// 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
+	private static TreeMultimap<String, String> nbbm2SEStationMap;
+	
+	//车辆 ——> 当前执行班次
+	private static Map<String, ScheduleRealInfo> carExecutePlanMap;
+
+	// 持久化缓冲区
+	public static LinkedList<ScheduleRealInfo> pstBuffer;
+
+	// 排序器
+	private static ScheduleComparator.FCSJ schFCSJComparator;
+
+	@Autowired
+	LineConfigData lineConfigData;
+
+	@Autowired
+	ScheduleRealInfoRepository schRepository;
+
+	@Autowired
+	SchedulePlanInfoService schPlanService;
+
+	@Autowired
+	SchAttrCalculator schAttrCalculator;
+
+	@Autowired
+	SendUtils sendUtils;
+	
+	@Autowired
+	GpsRealData gpsRealData;
+
+	/** 线路当前使用的排班的日期 */
+	public static Map<String, String> currSchDateMap;
+
+	static {
+		nbbmScheduleMap = ArrayListMultimap.create();
+		id2SchedulMap = new HashMap<>();
+		pstBuffer = new LinkedList<>();
+		schFCSJComparator = new ScheduleComparator.FCSJ();
+		currSchDateMap = new HashMap<>();
+		nbbm2SEStationMap = TreeMultimap.create();
+		carExecutePlanMap = new HashMap<>();
+	}
+
+	@Autowired
+	ScheduleRefreshThread scheduleRefreshThread;
+	
+	@Autowired
+	SchedulePstThread schedulePstThread;
+	
+	@Autowired
+	FirstScheduleCheckThread firstScheduleCheckThread;
+	
+	@Autowired
+	ScheduleLateThread scheduleLateThread;
+
+	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
+				,fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+	@Override
+	public void run(String... arg0) throws Exception {
+		//翻班线程
+		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+		//入库
+		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+		//首班出场指令补发器
+		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
+		//班次误点扫描
+		//Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+	}
+
+	public Map<String, String> getCurrSchDate() {
+		return currSchDateMap;
+	}
+
+	/**
+	 * 
+	 * @Title: calcSchDateB
+	 * @Description: TODO(计算线路当前应该使用的排班日期)
+	 */
+	public String calcSchDate(String lineCode) {
+		LineConfig conf = lineConfigData.get(lineCode);
+		long ct = System.currentTimeMillis();
+		
+		String schDate = fmtyyyyMMdd.print(ct);
+		// 小于当天起始运营时间,则取前一天的排班
+		if (ct < conf.getCurrStartTime())
+			schDate = DateUtils.subtractDay(schDate, 1);
+
+		return schDate;
+	}
+
+	/**
+	 * @Title: reloadSch
+	 * @Title: reloadSch
+	 * @Description: TODO(重新载入排班)
+	 * @param @param
+	 *            lineCode 线路编码
+	 * @param @param
+	 *            schDate 班次日期 yyyy-MM-dd
+	 * @param @param
+	 *            forcePlan 强制从计划调度重新抓取
+	 */
+	public int reloadSch(String lineCode, String schDate, boolean forcePlan) {
+		try {
+			List<ScheduleRealInfo> list;
+
+			if (forcePlan)
+				removeRealSch(lineCode, schDate);
+			else
+				clearRAMData(lineCode);
+
+			if (existRealSch(lineCode, schDate))
+				list = loadRealSch(lineCode, schDate);// 从实际排班表加载
+			else {
+				list = loadPlanSch(lineCode, schDate);// 从计划排班表加载
+				// 写入数据库
+				batchSave(list);
+			}
+
+			//更新线路和班次日期对照
+			currSchDateMap.put(lineCode, schDate);
+			//添加到缓存
+			putAll(list);
+			
+			Set<String> cars = searchAllCars(list);
+			//计算“起点站应到”时间
+			for(String nbbm : cars)
+				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
+			
+			//是否是出站即出场
+			LineConfig conf = lineConfigData.get(lineCode);
+			if(conf.getOutConfig() == 2){
+				for(String nbbm : cars)
+					schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
+			}
+			
+			// 页面 翻班通知
+			sendUtils.shiftSchedule(lineCode);
+		} catch (Exception e) {
+			logger.error("", e);
+			return -1;
+		}
+
+		return 0;
+	}
+
+	/**
+	 * 
+	 * @Title: searchAllCars 
+	 * @Description: TODO(搜索班次集合中的车辆) 
+	 */
+	private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
+		Set<String> cars = new HashSet<>();
+		for(ScheduleRealInfo sch : list)
+			cars.add(sch.getClZbh());
+		
+		return cars;
+	}
+
+	private void putAll(List<ScheduleRealInfo> list) {
+		for (ScheduleRealInfo sch : list) 
+			put(sch);
+	}
+
+	/**
+	 * @Title: removeRealSch
+	 * @Description: TODO(清除实际排班，包括数据库和内存数据)
+	 * @param @param
+	 *            lineCode 线路编码
+	 * @param @param
+	 *            schDate 班次日期 yyyy-MM-dd
+	 */
+	public void removeRealSch(String lineCode, String schDate) throws Exception {
+		try {
+			// 清理数据库数据
+			schRepository.deleteByLineCodeAndDate(lineCode + "", schDate);
+
+			// 清理内存数据
+			clearRAMData(lineCode + "");
+		} catch (Exception e) {
+			logger.error("removeRealSch error, " + lineCode + " -" + schDate, e);
+			throw e;
+		}
+	}
+
+	/**
+	 * 
+	 * @Title: clearRAMData
+	 * @Description: TODO(清理内存数据)
+	 */
+	public void clearRAMData(String lineCode) {
+		int count = 0;
+		List<ScheduleRealInfo> remList = new ArrayList<>();
+		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+		for (ScheduleRealInfo sch : schs) {
+			if (sch.getXlBm().equals(lineCode))
+				remList.add(sch);
+		}
+		
+		for(ScheduleRealInfo sch : remList){
+			if(null != sch){
+				nbbmScheduleMap.remove(sch.getClZbh(), sch);
+				id2SchedulMap.remove(sch.getId());
+				count ++;
+			}
+		}
+		
+		logger.info(lineCode + "排班清理 " + count);
+	}
+
+	/**
+	 * @Title: existRealSch
+	 * @Description: TODO(实际排班是否已存在)
+	 */
+	public boolean existRealSch(String lineCode, String schDate) {
+		int count = schRepository.countByLineCodeAndDate(lineCode, schDate);
+		return count > 0;
+	}
+
+	/**
+	 * @Title: loadRealSch
+	 * @Description: TODO(从实际排班表加载数据)
+	 */
+	public List<ScheduleRealInfo> loadRealSch(String lineCode, String schDate) {
+		return schRepository.findByLineCodeAndDate(lineCode, schDate);
+	}
+
+	/**
+	 * @Title: loadPlanSch
+	 * @Description: TODO(从计划排班表加载数据)
+	 */
+	public List<ScheduleRealInfo> loadPlanSch(String lineCode, String schDate) {
+		logger.info("从计划排班表恢复排班，lineCode: " + lineCode + ", schDate: " + schDate);
+		List<ScheduleRealInfo> realList = new ArrayList<>();
+
+		try {
+			Map<String, Object> data = new HashMap<>();
+
+			data.put("scheduleDate_eq", fmtyyyyMMdd.parseDateTime(schDate).toDate());
+			data.put("xlBm_eq", lineCode);
+
+			// 查询计划排班
+			List<SchedulePlanInfo> planItr = cleanSchPlanItr(schPlanService.list(data).iterator());
+
+			// 转换为实际排班
+			realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
+
+			for (ScheduleRealInfo sch : realList) {
+				sch.setScheduleDateStr(fmtyyyyMMdd.print(sch.getScheduleDate().getTime()));
+				sch.setRealExecDate(sch.getScheduleDateStr());
+				// 计划终点时间
+				if (sch.getBcsj() != null) {
+					sch.setZdsj(fmtHHmm.print(fmtHHmm.parseMillis(sch.getFcsj()) + (sch.getBcsj() * 60 * 1000)));
+					sch.setLate(false);
+				}
+				//计划里程为0，设置NULL
+				if(sch.getJhlc() != null && sch.getJhlc() == 0)
+					sch.setJhlc(null);
+			}
+		} catch (Exception e) {
+			logger.error("", e);
+		}
+		return realList;
+	}
+
+	/**
+	 * @Title: batchSave
+	 * @Description: TODO(批量入库)
+	 */
+	private void batchSave(List<ScheduleRealInfo> list) {
+		// 查询数据库最大ID
+		Long id = schRepository.getMaxId();
+		if (null == id)
+			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(sdfyyyyMMdd.format(item.getScheduleDate()));
+		}
+
+		// 入库
+		new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
+	}
+
+	private List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
+		List<SchedulePlanInfo> list = new ArrayList<>();
+
+		SchedulePlanInfo sp;
+		while (itrab.hasNext()) {
+			sp = itrab.next();
+			sp.setSchedulePlan(null);
+			list.add(sp);
+		}
+		return list;
+	}
+
+	/**
+	 * 
+	 * @Title: findByLineCode
+	 * @Description: TODO(lineCode 获取班次)
+	 */
+	public List<ScheduleRealInfo> findByLineCode(String lineCode) {
+		List<ScheduleRealInfo> rs = new ArrayList<>();
+
+		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+		for (ScheduleRealInfo sch : schs) {
+			if (sch.getXlBm().equals(lineCode))
+				rs.add(sch);
+		}
+		return rs;
+	}
+	
+	/**
+	 * 
+	 * @Title: findCarByLineCode 
+	 * @Description: TODO(线路下运营的车辆) 
+	 */
+	public Set<String> findCarByLineCode(String lineCode){
+		Set<String> rs = new HashSet<>();
+
+		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+		for (ScheduleRealInfo sch : schs) {
+			if (sch.getXlBm().equals(lineCode))
+				rs.add(sch.getClZbh());
+		}
+		
+		return rs;
+	}
+
+	public List<ScheduleRealInfo> findByNbbm(String nbbm) {
+		return nbbmScheduleMap.get(nbbm);
+	}
+
+	/**
+	 * 
+	 * @Title: findByLineAndUpDown
+	 * @Description: TODO(lineCode 和走向获取班次)
+	 */
+	public List<ScheduleRealInfo> findByLineAndUpDown(String lineCode, Integer upDown) {
+		List<ScheduleRealInfo> list = findByLineCode(lineCode), rs = new ArrayList<>();
+
+		for (ScheduleRealInfo sch : list) {
+			if (sch.getXlDir().equals(upDown + ""))
+				rs.add(sch);
+		}
+		return rs;
+	}
+
+	public ScheduleRealInfo get(long id) {
+		return id2SchedulMap.get(id);
+	}
+
+	public Set<String> getSEStationList(String nbbm) {
+		return nbbm2SEStationMap.get(nbbm);
+	}
+
+	/**
+	 * 
+	 * @Title: next
+	 * @Description: TODO(下一个班次)
+	 */
+	public ScheduleRealInfo next(ScheduleRealInfo sch) {
+
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		
+		boolean flag = false;
+		ScheduleRealInfo next = null;
+		for(ScheduleRealInfo temp : list){
+			if(temp.getId() == sch.getId()){
+				flag = true;
+				continue;
+			}
+			//忽略烂班
+			if(temp.isDestroy())
+				continue;
+			
+			if(flag){
+				next = temp;
+				break;
+			}
+		}
+		return next;
+	}
+
+	public void put(ScheduleRealInfo sch) {
+
+		schAttrCalculator
+			.calcRealDate(sch)
+			.calcAllTimeByFcsj(sch);
+
+		String nbbm = sch.getClZbh();
+		nbbmScheduleMap.put(nbbm, sch);
+		nbbm2SEStationMap.put(nbbm, sch.getQdzCode());
+		nbbm2SEStationMap.put(nbbm, sch.getZdzCode());
+		
+		//主键索引
+		id2SchedulMap.put(sch.getId(), sch);
+	}
+	
+	public void delete(ScheduleRealInfo sch) {
+		//ScheduleRealInfo sch = id2SchedulMap.get(id);
+		if(!sch.isSflj())
+			return;
+		
+		nbbmScheduleMap.remove(sch.getClZbh(), sch);
+		id2SchedulMap.remove(sch.getId());
+		//return sch;
+	}
+	
+//	public void calcQdzTimePlan(String nbbm){
+//		schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
+//	}
+	
+	public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm){
+		return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
+	}
+
+	/**
+	 * 
+	 * @Title: nextAll
+	 * @Description: TODO(之后的所有班次)
+	 */
+/*	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		// 排序
+		Collections.sort(list, schFCSJComparator);
+
+		List<ScheduleRealInfo> rs = new ArrayList<>();
+		ScheduleRealInfo temp;
+		for (int i = 0; i < list.size() - 1; i++) {
+			temp = list.get(i);
+			if(temp.getFcsjT() > sch.getFcsjT())
+				rs.add(temp);
+
+		}
+		return rs;
+	}*/
+
+	/**
+	 * 
+	 * @Title: doneSum
+	 * @Description: TODO(已完成班次总数)
+	 */
+	public int doneSum(String clZbh) {
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(clZbh);
+		int rs = 0;
+		
+		for(ScheduleRealInfo sch : list){
+			if(sch.getStatus() == 2 && !sch.isDestroy())
+				rs ++;
+		}
+		return rs;
+	}
+	
+	/**
+	 * 
+	 * @Title: prveNotExecNum 
+	 * @Description: TODO(班次之前未执行班次数量) 
+	 */
+	public int prveNotExecNum(ScheduleRealInfo sch){
+		int n = 0;
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		for(ScheduleRealInfo s : list){
+			if(s.getFcsjActual() == null && !s.isDestroy())
+				n ++;
+			
+			if(s.getId().equals(sch.getId()))
+				break;
+		}
+		return n;
+	}
+
+	/**
+	 * 
+	 * @Title: validEndTime
+	 * @Description: TODO(是否是有效的到达时间)
+	 */
+	public boolean validEndTime(ScheduleRealInfo sch, Long ts) {
+		if(sch.getFcsjActualTime() != null && sch.getFcsjActualTime() > ts)
+			return false;
+		
+		return validTime(sch, ts);
+	}
+
+	/**
+	 * 
+	 * @Title: validStartTime 
+	 * @Description: TODO(是否是合适的发车时间) 
+	 */
+	public boolean validStartTime(ScheduleRealInfo sch, Long ts) {
+		if(sch.getZdsjActualTime() != null && sch.getZdsjActualTime() < ts)
+			return false;
+		
+		return validTime(sch, ts);
+	}
+	
+	public boolean validTime(ScheduleRealInfo sch, Long ts){
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		int ci = list.indexOf(sch);
+		ScheduleRealInfo prve, next;
+		if(ci > 0){
+			//之前班次实际时间不能大于该时间
+			for(int i = ci - 1; i >= 0; i --){
+				prve = list.get(i);
+				if(prve.getZdsjActualTime() != null && prve.getZdsjActualTime() > ts )
+					return false;
+				
+				if(prve.getFcsjActualTime() != null && prve.getFcsjActualTime() > ts)
+					return false;
+			}
+		}
+		
+		if(ci < list.size() - 1){
+			//之后班次实际时间不能小于该时间
+			for(int i = ci + 1; i < list.size(); i ++){
+				next = list.get(i);
+				if(next.getFcsjActualTime() != null && next.getFcsjActualTime() < ts)
+					return false;
+				
+				if(next.getZdsjActualTime() != null && next.getZdsjActualTime() < ts)
+					return false;
+			}
+		}
+		return true;
+	}
+	
+	public void save(ScheduleRealInfo sch){
+		//schRepository.save(sch);
+		pstBuffer.add(sch);
+	}
+	
+	
+	/**
+	 * 
+	 * @Title: nextByBcType 
+	 * @Description: TODO(获取下一个指定班次类型的班次) 
+	 */
+	public ScheduleRealInfo nextByBcType(String nbbm, String bcType){
+		List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
+		
+		Collections.sort(list, schFCSJComparator);
+		ScheduleRealInfo sch = null;
+		for(ScheduleRealInfo temp : list){
+			if(temp.getFcsjActual() == null)
+				sch = temp;
+		}
+		
+		return sch;
+	}
+	
+	public List<ScheduleRealInfo> findByBcType(String nbbm, String bcType){
+		List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm)
+				,outList = new ArrayList<>();
+	
+		for(ScheduleRealInfo sch : all){
+			if(sch.getBcType().equals(bcType))
+				outList.add(sch);
+		}
+		return outList;
+	}
+	
+	public Set<String> allCar(){
+		return nbbmScheduleMap.keySet();
+	}
+	
+	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: changeCar 
+	 * @Description: TODO(班次换车) 返回有更新的班次
+	 * @param @param sch	
+	 * @param @param newClZbh    新的车辆自编号 
+	 */
+	public List<ScheduleRealInfo> changeCar(ScheduleRealInfo sch , String newClZbh){
+		List<ScheduleRealInfo> ups = new ArrayList<>();
+		String oldClzbh = sch.getClZbh();
+		if(oldClzbh.equals(newClZbh))
+			return ups;
+		
+		
+		//变更相关映射信息
+		nbbmScheduleMap.remove(sch.getClZbh(), sch);
+		
+		sch.setClZbh(newClZbh);
+		nbbmScheduleMap.put(newClZbh, sch);
+		nbbm2SEStationMap.put(newClZbh, sch.getQdzCode());
+		nbbm2SEStationMap.put(newClZbh, sch.getZdzCode());
+		
+		//重新计算班次应到时间
+		ups.addAll(updateQdzTimePlan(oldClzbh));
+		ups.addAll(updateQdzTimePlan(newClZbh));
+		return ups;
+	}
+
+	/**
+	 * 
+	 * @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.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +34,10 @@ public class SchAttrCalculator {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
+			,fmtHHmm = DateTimeFormat.forPattern("HH:mm")
+			,fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+
 	/**
 	 * @Title: calcRealDate
 	 * @Description: TODO(计算班次的真实执行日期)
@@ -45,22 +49,12 @@ public class SchAttrCalculator {
 			if (null == sch.getFcsjT())
 				calcFcsjTime(sch);
-			SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
-			/*
-			 * 早于线路开始运营时间的，加一天
-			 * 如该线路 2点开始运营，2016-08-23的班次，则 2016-08-23 0:25 的班次应该调整成 2016-08-24 0:25
-			 
-			
-						,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);*/
 			if(sch.getFcsj().compareTo(conf.getStartOpt()) < 0){
 				sch.setFcsjAll(sch.getFcsjT() + DAY_TIME);
 			}
-			sch.setRealExecDate(sdfyyyyMMdd.format(new Date(sch.getFcsjT())));
+			sch.setRealExecDate(fmtyyyyMMdd.print(sch.getFcsjT()));
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -77,12 +71,10 @@ 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(sdfHHmm.format(zdDate));
+				sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
+				sch.setZdsj(fmtHHmm.print(sch.getZdsjT()));
 			}
 		} catch (ParseException e) {
 			logger.error("", e);
@@ -178,8 +170,7 @@ public class SchAttrCalculator {
 	}
 	public SchAttrCalculator calcFcsjTime(ScheduleRealInfo sch) throws ParseException {
-		SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-		sch.setFcsjT(sdfyyyyMMddHHmm.parse(sch.getRealExecDate() + sch.getFcsj()).getTime());
+		sch.setFcsjT(fmtyyyyMMddHHmm.parseMillis(sch.getRealExecDate() + sch.getFcsj()));
 		return this;
 	}
@@ -18,7 +18,7 @@ import com.bsth.entity.realcontrol.LineConfig;
 /**
  * 
- * @ClassName: refreshScheduleThread
+ * @ClassName: ScheduleRefreshThread
  * @Description: TODO(班次刷新线程，用于在营运开始时间切换到当日排班)
  * @author PanZhao
  * @date 2016年8月17日 下午1:23:34
@@ -72,6 +72,7 @@ public class ScheduleRefreshThread extends Thread{
 					logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
 				}
 			}
+			
 		} catch (Exception e) {
 			logger.error("", e);
 		}
 package com.bsth.entity.directive;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 /**
  * 
@@ -41,6 +36,7 @@ public class DC0_A3 extends Directive{
 		/** 定时定距上报模式 */
 		private short reportMode;
 		/** 定时上报时间间隔 */
+		@Column(name = "_interval")
 		private int interval;
 		/** 定距上报距离间隔 */
 		private String distance; 
 package com.bsth.entity.directive;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 /**
  * 
@@ -41,6 +36,7 @@ public class DC0_A4 extends Directive{
 		/** 定时定距上报模式 */
 		private short reportMode;
 		/** 定时上报时间间隔 */
+		@Column(name = "_interval")
 		private int interval;
 		/** 定距上报距离间隔 */
 		private String distance; 
@@ -6,9 +6,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -507,31 +507,28 @@ public class ScheduleRealInfo {
 	public void setDfsjT(Long dfsjT) {
 		this.dfsjT = dfsjT;
 	}
-	
+
+
+	@Transient
+	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+	@Transient
+	private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+
 	public void setDfsjAll(Long dfsjT) {
 		this.dfsjT = dfsjT;
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-		this.dfsj = sdfHHmm.format(new Date(this.dfsjT));
+		this.dfsj = fmtHHmm.print(this.dfsjT);
 	}
 	public void setDfsjAll(String dfsj) {
-		
-		try {
-			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-			this.dfsjT = sdfyyyyMMddHHmm.parse(this.realExecDate + dfsj).getTime();
-			this.dfsj = dfsj;
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+		this.dfsjT = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + dfsj);
+		this.dfsj = dfsj;
 	}
 	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(sdfHHmm.format(zdDate));
+			this.setZdsjT(this.getDfsjT() + (this.getBcsj() * 60 * 1000));
+			this.setZdsj(fmtHHmm.print(this.zdsjT));
 		}
 	}
@@ -583,13 +580,8 @@ public class ScheduleRealInfo {
 	 * @throws
 	 */
 	public void setFcsjAll(String fcsj){
-		try {
-			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-			this.fcsjT = sdfyyyyMMddHHmm.parse(this.realExecDate + fcsj).getTime();
-			this.fcsj = fcsj;
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+		this.fcsjT = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + fcsj);
+		this.fcsj = fcsj;
 	}
 	/**
@@ -600,8 +592,7 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjAll(Long fcsjT){
 		this.fcsjT = fcsjT;
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-		this.fcsj = sdfHHmm.format(new Date(fcsjT));
+		this.fcsj = fmtHHmm.print(fcsjT);
 	}
 	/**
@@ -611,15 +602,9 @@ public class ScheduleRealInfo {
 	 * @throws
 	 */
 	public void setFcsjActualAll(String fcsjActual){
-		try {
-			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-			this.fcsjActualTime = sdfyyyyMMddHHmm.parse(this.realExecDate + fcsjActual).getTime();
-			this.fcsjActual = fcsjActual;
-			
-			calcStatus();
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+		this.fcsjActualTime = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + fcsjActual);
+		this.fcsjActual = fcsjActual;
+		calcStatus();
 	}
 	/**
@@ -630,9 +615,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjActualAll(Long t){
 		this.fcsjActualTime = t;
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-		this.fcsjActual = sdfHHmm.format(new Date(t));
-		
+		this.fcsjActual = fmtHHmm.print(t);
+
 		//更新班次状态
 		calcStatus();
 	}
@@ -645,12 +629,10 @@ public class ScheduleRealInfo {
 	 */
 	public void setZdsjActualAll(Long t){
 		this.zdsjActualTime = t;
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-		this.zdsjActual = sdfHHmm.format(new Date(t));
+		this.zdsjActual = fmtHHmm.print(t);
 		//更新班次状态
 		calcStatus();
-		//this.synchroZdsj();
 	}
 	/**
@@ -660,15 +642,10 @@ public class ScheduleRealInfo {
 	 * @throws
 	 */
 	public void setZdsjActualAll(String zdsjActual){
-		try {
-			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-			this.zdsjActualTime = sdfyyyyMMddHHmm.parse(this.realExecDate + zdsjActual).getTime();
-			this.zdsjActual = zdsjActual;
-			
-			calcStatus();
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+		this.zdsjActualTime = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + zdsjActual);
+		this.zdsjActual = zdsjActual;
+
+		calcStatus();
 	}
 	public Long getSpId() {
@@ -713,17 +690,17 @@ public class ScheduleRealInfo {
 		return this.status == -1;
 	}
-	public boolean isNotDestroy(){
+/*	public boolean isNotDestroy(){
 		return this.status != -1;
-	}
+	}*/
 	public Set<ChildTaskPlan> getcTasks() {
 		return cTasks;
 	}
-	public void setcTasks(Set<ChildTaskPlan> cTasks) {
+/*	public void setcTasks(Set<ChildTaskPlan> cTasks) {
 		this.cTasks = cTasks;
-	}
+	}*/
 	public String getScheduleDateStr() {
 		return scheduleDateStr;
 package com.bsth.service.directive;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -11,6 +10,8 @@ import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +74,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	@Autowired
 	DayOfSchedule dayOfSchedule;
-	static Long schDiff = 1000 * 60 * 60L;
+	//static Long schDiff = 1000 * 60 * 60L;
+
+	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm")
+				,fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分");
 	@Override
 	public int send60Phrase(String nbbm, String text, String sender) {
@@ -111,10 +115,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 				logger.warn("烂班不允许发送调度指令....");
 				return -1;
 			}
-			//多线程下发指令时，SimpleDateFormat必须方法内初始化
-			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH点mm分");
-			
-			String text = "已完成" + finish + "个班次，下一发车时间" + sdfHHmm.format(new Date(sch.getDfsjT())) + "，由"
+			String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
 					+ sch.getQdzName() + "发往" + sch.getZdzName();
 			//下发0x02指令  调度指令(闹钟有效)
@@ -168,7 +169,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	@Override
 	public void sendD60ToPage(ScheduleRealInfo sch) {
 		Map<String, Object> map = new HashMap<>();
-		map.put("fn", sch);
+		map.put("fn", "directive");
 		map.put("t", sch);
 		ObjectMapper mapper = new ObjectMapper();
@@ -402,11 +403,10 @@ 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(sdfHHmm.format(new Date(d.getTimestamp())));
+				d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
 			if (d.getNbbm() == null)
 				d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
 		}
@@ -455,10 +455,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		if (e > count)
 			e = count;
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		//SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 		List<D80> rs = d80s.subList(s, e);
 		for(D80 d80 : rs){
-			d80.setTimeStr(sdfHHmm.format(new Date(d80.getTimestamp())));
+			d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
 		}
 		Map<String, Object> rsMap = new HashMap<>();
@@ -105,7 +105,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 	 * 给所有在线用户发送消息
 	 *
 	 * @param message
-	 */
+	 
 	public synchronized void sendMessageToUsers(TextMessage message) {
 		for (WebSocketSession user : users) {
 			try {
@@ -116,14 +116,14 @@ public class RealControlSocketHandler implements WebSocketHandler {
 				e.printStackTrace();
 			}
 		}
-	}
+	}*/
 	/**
 	 * 给某些用户发送消息
 	 *
 	 * @param userId
 	 * @param message
-	 */
+	 
 	public synchronized void sendMessageToUser(Set<String> uids, String msg) {
 		TextMessage message = new TextMessage(msg.getBytes());
 		for (WebSocketSession user : users) {
@@ -137,7 +137,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 				}
 			}
 		}
-	}
+	}*/
 	/**
 	 * 根据线路推送消息