例行更新

潘钊
1 parent 06356c2b
Showing 21 changed files with 556 additions and 131 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
src/main/java/com/bsth/service/realcontrol/buffer/ScheduleBuffer.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/vehicle/directive/buffer/DirectiveBuffer.java
src/main/java/com/bsth/vehicle/directive/entity/Directive60.java
src/main/java/com/bsth/vehicle/directive/thread/DirectivePersistenceThread.java
src/main/java/com/bsth/vehicle/directive/thread/FirstScheduleIssuedThread.java
src/main/java/com/bsth/vehicle/gpsdata/GpsArrivalStationThread.java
src/main/java/com/bsth/vehicle/gpsdata/GpsArrivalStationThread_old.java
src/main/java/com/bsth/vehicle/gpsdata/buffer/GpsRealDataBuffer.java
src/main/resources/static/pages/control/line/child_pages/child_task.html
src/main/resources/static/pages/control/line/child_pages/outgo_adjust_all.html
src/main/resources/static/pages/control/line/css/lineControl.css
src/main/resources/static/pages/control/line/js/alone.js
src/main/resources/static/pages/control/line/js/data.js
src/main/resources/static/pages/control/line/js/rightMenu.js
src/main/resources/static/pages/control/line/temps/alone_tp.html
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -205,6 +206,18 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<Integer, Integer> trustStatus(@RequestParam String lineCodes) {
 		return scheduleRealInfoService.trustStatus(lineCodes);
 	}
+	
+	/**
+	 * 
+	 * @Title: outgoAdjustAll 
+	 * @Description: TODO(批量待发调整) 
+	 * @param @param list
+	 * @throws
+	 */
+	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
+	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
+		return scheduleRealInfoService.outgoAdjustAll(params);
+	}
 	/**
 	 * 
@@ -223,13 +236,23 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @Description: TODO(根据线路和走向获取班次) 
 	 * @param @param line
 	 * @param @param upDown
-	 * @throws
 	 */
 	@RequestMapping(value = "/findByLineAndUpDown")
 	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam Integer line,@RequestParam Integer upDown){
 		return ScheduleBuffer.findByLineAndUpDown(line, upDown);
 	}
+	/**
+	 * 
+	 * @Title: findByLineCode 
+	 * @Description: TODO(根据线路获取班次信息) 
+	 * @param @param lineCode
+	 */
+	@RequestMapping(value = "/lineCode/{lineCode}")
+	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
+		return ScheduleBuffer.schedulListMap.get(lineCode);
+	}
+
 	@RequestMapping(value = "/queryUserInfo")
 	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line, @RequestParam String date) {
 		return scheduleRealInfoService.queryUserInfo(line, date);
@@ -482,6 +482,17 @@ public class ScheduleRealInfo {
 		this.dfsj = sdfHHmm.format(new Date(this.dfsjT));
 	}
+	public void setDfsjAll(String dfsj) {
+		
+		try {
+			String dfsjFull = sdfyyyyMMdd.format(this.scheduleDate) + " " + dfsj;
+			this.dfsjT = sdfyyyyMMddHHmm.parse(dfsjFull).getTime();
+			this.dfsj = dfsj;
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+	}
+	
 	@Transient
 	static SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
 	@Transient
@@ -78,4 +78,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Object> schInfoFineTune(Map<String, String> map);
+	Map<String, Object>  outgoAdjustAll(String params);
+
 }
 package com.bsth.service.realcontrol.buffer;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -16,7 +17,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.util.BatchSaveUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.bsth.vehicle.directive.buffer.DirectiveBuffer;
 /**
  * 
@@ -37,56 +38,65 @@ public class GetSchedulePlanThread  extends Thread{
 	@Autowired
 	ScheduleRealInfoRepository scheduleRealInfoRepository;
-	@Autowired
-	ObjectMapper objectMapper;
-	
 	SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+	@Autowired
+	DirectiveBuffer directiveBuffer;
+	
 	@Override
 	public void run() {
 		try{
+			//清除缓存
 			ScheduleBuffer.clear();
+			//所有指令入库
+			directiveBuffer.saveAll();
+			DirectiveBuffer.clear();
-			List<ScheduleRealInfo>  realList = null;
-			String dateStr = sdfyyyyMMdd.format(new Date());
-			Date cDate = sdfyyyyMMdd.parse(dateStr);
-			//查询数据库是否有今日排班
-			int size = scheduleRealInfoRepository.countByDate(cDate);
-			if(size > 0){
-				//从数据库恢复当日排班
-				realList = scheduleRealInfoRepository.findByDate(cDate);
-				logger.info("从数据库恢复当日排班 " + realList.size());
-				//写入缓存
-				ScheduleBuffer.init(realList);
-			}
-			else{
-				List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(cDate);
-				
-				for(SchedulePlanInfo sp : list){
-					sp.setSchedulePlan(null);
-				}
-				
-				//实际排班计划
-				realList = JSONArray.parseArray(JSON.toJSONString(list), ScheduleRealInfo.class);
-				//查询数据库最大ID
-				Long id = scheduleRealInfoRepository.getMaxId();
-				if(null == id)
-					id = 0L;
-				id ++;
-				
-				for(ScheduleRealInfo item : realList){
-					item.setSpId(item.getId());
-					item.setId(id ++);//设置ID
-				}
-				
-				//写入缓存
-				ScheduleBuffer.init(realList);
-				//入库
-				new BatchSaveUtils<ScheduleRealInfo>().saveList(realList, ScheduleRealInfo.class);
-			}
-			logger.info("获取当天实际排班计划数量：" + realList.size());
+			//加载新的排班
+			loaSchedule();
 		}catch(Exception e){
 			logger.error("",e);
 		}
 	}
+	
+	public void loaSchedule() throws ParseException{
+		List<ScheduleRealInfo>  realList = null;
+		String dateStr = sdfyyyyMMdd.format(new Date());
+		Date cDate = sdfyyyyMMdd.parse(dateStr);
+		//查询数据库是否有今日排班
+		int size = scheduleRealInfoRepository.countByDate(cDate);
+		if(size > 0){
+			//从数据库恢复当日排班
+			realList = scheduleRealInfoRepository.findByDate(cDate);
+			logger.info("从数据库恢复当日排班 " + realList.size());
+			//写入缓存
+			ScheduleBuffer.init(realList);
+		}
+		else{
+			List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(cDate);
+			
+			for(SchedulePlanInfo sp : list){
+				sp.setSchedulePlan(null);
+			}
+			
+			//实际排班计划
+			realList = JSONArray.parseArray(JSON.toJSONString(list), ScheduleRealInfo.class);
+			//查询数据库最大ID
+			Long id = scheduleRealInfoRepository.getMaxId();
+			if(null == id)
+				id = 0L;
+			id ++;
+			
+			for(ScheduleRealInfo item : realList){
+				item.setSpId(item.getId());
+				item.setId(id ++);//设置ID
+			}
+			
+			//写入缓存
+			ScheduleBuffer.init(realList);
+			//入库
+			new BatchSaveUtils<ScheduleRealInfo>().saveList(realList, ScheduleRealInfo.class);
+		}
+		logger.info("获取当天实际排班计划数量：" + realList.size());
+	}
 }
@@ -36,13 +36,19 @@ public class ScheduleBuffer {
 	/**
 	 * K: 车辆自编号  V: 未完成班次链表
 	 */
-	public static Map<String, LinkedList<ScheduleRealInfo>> vehLinkedMap;
+	/*public static Map<String, LinkedList<ScheduleRealInfo>> vehLinkedMap;*/
+	
+	/**
+	 * K: 车辆自编号  V: 班次链表
+	 */
+	public static ArrayListMultimap<String, ScheduleRealInfo> vehSchListMap;
+	/*public static Map<String, LinkedList<ScheduleRealInfo>> vehSchLinkedMap;*/
 	/**
 	 * K: 车辆自编号  V: 已执行班次链表
 	 */
-	public static LinkedListMultimap<String, ScheduleRealInfo> finishLinkedMap;
+	/*public static LinkedListMultimap<String, ScheduleRealInfo> finishLinkedMap;*/
 	/**
@@ -73,8 +79,9 @@ public class ScheduleBuffer {
 		schedulListMap = ArrayListMultimap.create();
 		pkSchedulMap = new HashMap<>();
 		persistentList = new LinkedList<>();
-		vehLinkedMap = new HashMap<>();
-		finishLinkedMap = LinkedListMultimap.create();
+		/*vehLinkedMap = new HashMap<>();
+		finishLinkedMap = LinkedListMultimap.create();*/
+		vehSchListMap = ArrayListMultimap.create();
 		trustMap = new HashMap<>();
 	}
@@ -96,10 +103,11 @@ public class ScheduleBuffer {
 				//初始化车辆和班次列表对照
 				zbh = schedul.getClZbh();
-				if(!vehLinkedMap.containsKey(zbh))
+				vehSchListMap.put(zbh, schedul);
+				/*if(!vehLinkedMap.containsKey(zbh))
 					vehLinkedMap.put(zbh, new LinkedList<ScheduleRealInfo>());
-				vehLinkedMap.get(zbh).add(schedul);
+				vehLinkedMap.get(zbh).add(schedul);*/
 			}
 			//计算起点应到时间
@@ -152,18 +160,23 @@ public class ScheduleBuffer {
 	public static int put(ScheduleRealInfo sch){
 		schedulListMap.put(sch.getXlBm(), sch);
-		pkSchedulMap.put(sch.getId(), sch);
+		pkSchedulMap.put(sch.getId(), sch);
 		String zbh = sch.getClZbh();
-		if(!vehLinkedMap.containsKey(zbh))
+		vehSchListMap.put(zbh, sch);
+		
+		//List<ScheduleRealInfo> list = vehSchListMap.get(sch.getClZbh());
+		
+		/*if(!vehLinkedMap.containsKey(zbh))
 			vehLinkedMap.put(zbh, new LinkedList<ScheduleRealInfo>());
-		vehLinkedMap.get(zbh).add(sch);
+		vehLinkedMap.get(zbh).add(sch);*/
 		//重新排序
-		//Collections.sort(vehLinkedMap.get(zbh), scheduleComparator);
+		Collections.sort(schedulListMap.get(sch.getXlBm()), scheduleComparator);
 		//重新计算应到时间
-		calcArrDateQd(vehLinkedMap.get(zbh));
+		//calcArrDateQd(vehLinkedMap.get(zbh));
+		calcArrDateQd(vehSchListMap.get(zbh));
 		return 0;
 	}
@@ -184,12 +197,15 @@ public class ScheduleBuffer {
 	 * @throws
 	 */
 	public static ScheduleRealInfo finishSch(ScheduleRealInfo sch){
-		LinkedList<ScheduleRealInfo> list = vehLinkedMap.get(sch.getClZbh());
+		//LinkedList<ScheduleRealInfo> list = vehLinkedMap.get(sch.getClZbh());
 		//状态修改为已执行
 		sch.setStatus(2);
 		persistentList.add(sch);
-		ScheduleRealInfo temp;
+		//下一个班次
+		ScheduleRealInfo next = getNext(sch);
+		next.setQdzArrDateSJ(sch.getZdsjActual());
+		/*ScheduleRealInfo temp;
 		int len = list.size();
 		for(int i = 0; i < len; i ++){
 			temp = list.poll();
@@ -199,8 +215,41 @@ public class ScheduleBuffer {
 				break;
 			}
 		}
-		ScheduleRealInfo next = list.getFirst();
-		next.setQdzArrDateSJ(sch.getZdsjActual());
+		ScheduleRealInfo next = list.getFirst();*/
+		//next.setQdzArrDateSJ(sch.getZdsjActual());
+		return next;
+	}
+	
+	public static ScheduleRealInfo getNext(ScheduleRealInfo sch){
+		List<ScheduleRealInfo> list = vehSchListMap.get(sch.getClZbh());
+		
+		boolean flag = false;
+		ScheduleRealInfo next = null;
+		for(ScheduleRealInfo temp : list){
+			if(temp.getId() == sch.getId()){
+				flag = true;
+				continue;
+			}
+			//忽略烂班
+			if(temp.getStatus() == -1)
+				continue;
+			
+			if(flag){
+				next = temp;
+				break;
+			}
+		}
+		
+		
+		/*int size = list.size();
+		for(int i = 0; i < size; i ++){
+			current = list.get(i);
+			if(current.getId() == sch.getId()
+					&& i < (size - 1)){
+				next = list.get(i + 1);
+				break;
+			}
+		}*/
 		return next;
 	}
@@ -212,7 +261,56 @@ public class ScheduleBuffer {
 	 * @throws
 	 */
 	public static int getFinishSchNo(String nbbm){
-		return finishLinkedMap.get(nbbm) == null ? 0 : finishLinkedMap.get(nbbm).size();
+		List<ScheduleRealInfo> list = vehSchListMap.get(nbbm);
+		int no = 0;
+		for(ScheduleRealInfo sch : list){
+			if(sch.getStatus() == 2)
+				no ++;
+		}
+		return no;
+		//return finishLinkedMap.get(nbbm) == null ? 0 : finishLinkedMap.get(nbbm).size();
+	}
+	
+	/**
+	 * 
+	 * @Title: findCurrent 
+	 * @Description: TODO(获取车辆当前正在执行的班次) 
+	 * @param @param nbbm
+	 * @throws
+	 */
+	public static ScheduleRealInfo findCurrent(String nbbm){
+		List<ScheduleRealInfo> list = ScheduleBuffer.vehSchListMap.get(nbbm);
+		
+		int size = list.size();
+		ScheduleRealInfo sch;
+		//最后一个状态为 正在执行的班次
+		for(int i = size - 1; i > 0; i --){
+			sch = list.get(i);
+			if(sch.getStatus() == 1)
+				return sch;
+		}
+		return null;
+	}
+	
+	/**
+	 * 
+	 * @Title: findNextList 
+	 * @Description: TODO(获取后续班次) 
+	 * @param @param sch
+	 * @throws
+	 */
+	public static List<ScheduleRealInfo> findNextList(ScheduleRealInfo sch){
+		List<ScheduleRealInfo> list = vehSchListMap.get(sch.getClZbh()),
+					rs = null;
+		
+		for(ScheduleRealInfo temp : list){
+			if(temp.getId() == sch.getId())
+				rs = new ArrayList<>();
+			
+			if(rs != null)
+				rs.add(temp);
+		}
+		return rs == null?new ArrayList<ScheduleRealInfo>():rs;
 	}
 	public static void calcArrDateQd(List<ScheduleRealInfo> list){
@@ -19,6 +19,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
@@ -121,6 +123,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			ScheduleRealInfo schedule = null;
 			for (String id : idList) {
 				schedule = ScheduleBuffer.pkSchedulMap.get(Long.parseLong(id));
+				/*if(schedule.getStatus() == -1){
+					map.put("status", ResponseCode.ERROR);
+					map.put("msg", value)
+				}*/
 				if (null != schedule) {
 					schedule.setStatus(-1);
 					schedule.addRemarks(remarks);
@@ -264,7 +270,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		// 加入缓存
 		ScheduleBuffer.put(t);
 		//将该临加之后的班次作为更新返回页面
-		List<ScheduleRealInfo> list = ScheduleBuffer.vehLinkedMap.get(t.getClZbh())
+		List<ScheduleRealInfo> list = ScheduleBuffer.findNextList(t)
 				,rsList = null;
 		for(ScheduleRealInfo sch : list){
@@ -492,8 +498,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				rs.put("msg", "无实发时间，无法撤销！");
 			} else {
 				sch.setStatus(0);
-				sch.setFcsjActual("");
-				sch.setFcsjActualTime(0L);
+				sch.setFcsjActual(null);
+				sch.setFcsjActualTime(null);
 				rs.put("status", ResponseCode.SUCCESS);
 				rs.put("t", sch);
@@ -564,10 +570,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			String fcsj = map.get("fcsj");
 			//实际发车时间
 			String fcsjActual = map.get("fcsjActual");
-			//驾驶员
-			String[] jsy = map.get("jsy").split("/");
-			//售票员
-			String[] spy = map.get("spy").split("/");
+			
 			//实际终点时间
 			String zdsjActual = map.get("zdsjActual");
 			//备注
@@ -575,27 +578,47 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
 			if(null != sch){
+				//驾驶员
+				if(StringUtils.isNotBlank(map.get("jsy"))){
+					String[] jsy = map.get("jsy").split("/");
+					sch.setjGh(jsy[0]);
+					sch.setjName(jsy[1]);
+				}
+				
+				//售票员
+				if(StringUtils.isNotBlank(map.get("spy"))){
+					String[] spy = map.get("spy").split("/");
+					sch.setsGh(spy[0]);
+					sch.setsName(spy[1]);
+				}
+				
 				sch.setBcType(bcType);
 				sch.setClZbh(clZbh);
 				sch.setFcsjAll(fcsj);
-				if(null == fcsjActual){
+				if(StringUtils.isNotBlank(fcsjActual)){
+					//调整实发
+					sch.setFcsjActualAll(fcsjActual);
+					sch.setStatus(1);
+				}
+				else{
 					sch.setFcsjActual(null);
 					sch.setFcsjActualTime(null);
 				}
-				else
-					sch.setFcsjActualAll(fcsjActual);
-				if(null == zdsjActual){
+				if(StringUtils.isNotBlank(zdsjActual)){
+					//调整实达
+					sch.setZdsjActualAll(zdsjActual);
+					sch.setStatus(2);
+					//下一班次起点到达
+					ScheduleRealInfo next = ScheduleBuffer.getNext(sch);
+					next.setQdzArrDateSJ(zdsjActual);
+					rs.put("nextSch", next);
+				}
+				else{
 					sch.setZdsjActual(null);
 					sch.setZdsjActualTime(null);
 				}
-				else
-					sch.setZdsjActualAll(zdsjActual);
-				sch.setjGh(jsy[0]);
-				sch.setjName(jsy[1]);
-				sch.setsGh(spy[0]);
-				sch.setsName(spy[1]);
 				sch.setRemarks(remarks);
 			}
@@ -609,4 +632,32 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		}
 		return rs;
 	}
+
+	@Override
+	public Map<String, Object> outgoAdjustAll(String params) {
+		Map<String, Object> rs = new HashMap<>();
+		try{
+			JSONArray jsonArray = JSONArray.parseArray(params);
+			
+			ScheduleRealInfo schedule = null;
+			JSONObject jsonObj;
+			String dfsj;
+			for(int i = 0; i < jsonArray.size(); i ++){
+				jsonObj = jsonArray.getJSONObject(i);
+				dfsj = jsonObj.getString("t");
+				schedule = ScheduleBuffer.findOne(jsonObj.getLong("id"));
+				//设置待发时间
+				schedule.setDfsjAll(dfsj);
+				ScheduleBuffer.persistentList.add(schedule);
+			}
+			
+			rs.put("status", ResponseCode.SUCCESS);
+			//将更新的最后一个班次返回
+			rs.put("t", schedule);
+		}catch(Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
+	}
 }
 package com.bsth.vehicle.directive.buffer;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import org.slf4j.Logger;
@@ -19,6 +22,7 @@ import com.bsth.vehicle.directive.entity.Directive80;
 import com.bsth.vehicle.directive.entity.DirectiveC0;
 import com.bsth.vehicle.directive.entity.DirectiveC0.DirectiveC0Data;
 import com.bsth.vehicle.directive.entity.LineChange;
+import com.bsth.vehicle.directive.repository.Directive60Repository;
 import com.bsth.vehicle.directive.repository.Directive80Repository;
 import com.bsth.vehicle.directive.repository.LineChangeRepository;
 import com.bsth.vehicle.directive.util.HttpUtils;
@@ -61,6 +65,9 @@ public class DirectiveBuffer {
 	 */
 	private static Map<Integer, Directive60> directiveMap;
+	@Autowired
+	Directive60Repository d60Repository;
+	
 	/**
 	 * 驾驶员上报数据
 	 * {K: 线路编码}
@@ -71,10 +78,7 @@ public class DirectiveBuffer {
 	RealControlSocketHandler socketHandler;
 	static{
-		transientList = new LinkedList<>();
-		directiveMap = new HashMap<>();
-		reportMultiMap = ArrayListMultimap.create();
-		changeMap = new HashMap<>();
+		clear();
 	}
 	public static void put(Directive60 directive){
@@ -205,4 +209,34 @@ public class DirectiveBuffer {
 		c0.setData(data);
 		return c0;
 	}
+	
+	/**
+	 * 
+	 * @Title: saveAll 
+	 * @Description: TODO(所有缓存里的指令全部入库) 
+	 */
+	public void saveAll(){
+		Iterator<Directive60> iterator = directiveMap.values().iterator();
+		List<Directive60> pList = new ArrayList<>();
+		Directive60 d60;
+		while(iterator.hasNext()){
+			d60 = iterator.next();
+			if(!d60.isPersistent())
+				pList.add(d60);
+		}
+		d60Repository.save(pList);
+	}
+	
+	/**
+	 * 
+	 * @Title: clear 
+	 * @Description: TODO(清理缓存) 
+	 * @throws
+	 */
+	public static void clear(){
+		transientList = new LinkedList<>();
+		directiveMap = new HashMap<>();
+		reportMultiMap = ArrayListMultimap.create();
+		changeMap = new HashMap<>();
+	}
 }
@@ -84,6 +84,9 @@ public class Directive60 {
 	@ManyToOne
 	private SysUser sender;
+	@Transient
+	private boolean persistent;
+	
 	@Embeddable
 	public static class DirectiveData {
 		// 公司代码
@@ -280,4 +283,12 @@ public class Directive60 {
 	public void setSender(SysUser sender) {
 		this.sender = sender;
 	}
+
+	public boolean isPersistent() {
+		return persistent;
+	}
+
+	public void setPersistent(boolean persistent) {
+		this.persistent = persistent;
+	}
 }
@@ -38,6 +38,7 @@ public class DirectivePersistenceThread extends Thread{
 			if(null == directive)
 				break;
+			directive.setPersistent(true);
 			directiveRepository.save(directive);
 		}
 	}
 package com.bsth.vehicle.directive.thread;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +28,25 @@ public class FirstScheduleIssuedThread extends Thread{
 	@Override
 	public void run() {
-		Set<String> keys = ScheduleBuffer.vehLinkedMap.keySet();
+		Set<String> keys = ScheduleBuffer.vehSchListMap.keySet();
+		List<ScheduleRealInfo> list;
+		
+		Long t = System.currentTimeMillis();
+		ScheduleRealInfo sch;
+		for(String nbbm : keys){
+			list = ScheduleBuffer.vehSchListMap.get(nbbm);
+			
+			if(list.size() == 0)
+				continue;
+			
+			sch = list.get(0);
+			
+			if(sch.getStatus() == 0 && sch.getFcsjT() > t){
+				directiveService.send60Dispatch(sch, 0);
+			}
+		}
+		
+		/*Set<String> keys = ScheduleBuffer.vehLinkedMap.keySet();
 		LinkedList<ScheduleRealInfo> linkedList;
 		ScheduleRealInfo sch;
 		for(String nbbm : keys){
@@ -39,6 +58,6 @@ public class FirstScheduleIssuedThread extends Thread{
 			if(!ScheduleBuffer.finishLinkedMap.containsKey(nbbm) 
 					&& sch.getFcsjActual() == null)
 				directiveService.send60Dispatch(sch, 0);
-		}
+		}*/
 	}
 }
@@ -9,7 +9,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -68,18 +67,18 @@ public class GpsArrivalStationThread extends Thread{
 			set.add(CommonMapped.vehicDeviceBiMap.get(arr.getDeviceId()));
 		List<ArrivalInfo> rsList = null;
-		LinkedList<ScheduleRealInfo> linked = null;
+		List<ScheduleRealInfo> subList = null;
 		ArrivalInfo[] status;
 		for(String nbbm : set){
 			rsList = GpsArrivalDataBuffer.pops(nbbm);
-			//和该车辆未执行班次进行匹配
-			linked = ScheduleBuffer.vehLinkedMap.get(nbbm);
+			//和该车辆班次进行匹配
+			subList = ScheduleBuffer.vehSchListMap.get(nbbm);
-			if(null == linked || linked.size() == 0)
+			if(null == subList || subList.size() == 0)
 				continue;
 			try{
-				for(ScheduleRealInfo schedule : linked){
+				for(ScheduleRealInfo schedule : subList){
 					//匹配结果
 					status = match(rsList, schedule);
@@ -64,7 +64,7 @@ public class GpsArrivalStationThread_old extends Thread{
 		System.out.println("开始...");
 		List<ScheduleRealInfo> schList;
 		for(String key : keySet){
-			schList = extractSched(ScheduleBuffer.vehLinkedMap.get(key));
+			schList = extractSched(ScheduleBuffer.vehSchListMap.get(key));
 			if(null != schList)
 				match(GpsArrivalDataBuffer.allMap.get(key), schList);
 		}
@@ -221,8 +221,8 @@ public class GpsArrivalStationThread_old extends Thread{
 		try {
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
-			ps.setInt(1, /*weeks_year*/28);
-			ps.setLong(2, /*GpsArrivalDataBuffer.markTime*/1467853749000L);
+			ps.setInt(1, weeks_year);
+			ps.setLong(2, GpsArrivalDataBuffer.markTime);
 			Long t = System.currentTimeMillis();
 			rs = ps.executeQuery();
@@ -3,7 +3,6 @@ package com.bsth.vehicle.gpsdata.buffer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -136,15 +135,27 @@ public class GpsRealDataBuffer {
 		//写入车辆自编号
 		String nbbm;
-		LinkedList<ScheduleRealInfo> linkedList;
-		int size;
+		ScheduleRealInfo current, next;
 		for(GpsRealData gpsData : list){
 			nbbm = CommonMapped.vehicDeviceBiMap.get(gpsData.getDeviceId());
 			if(null != nbbm){
 				gpsData.setNbbm(nbbm);
 				gpsData.setStationName(CommonMapped.stationCodeMap.get(gpsData.getStopNo()));
-				linkedList = ScheduleBuffer.vehLinkedMap.get(nbbm);
+				current = ScheduleBuffer.findCurrent(nbbm);
+				next = ScheduleBuffer.getNext(current);
+				
+				if(current != null)
+					gpsData.setCurrSchId(current.getId());
+				if(next != null)
+					gpsData.setNextSchId(next.getId());
+				//gpsData.setCurrSchId(ScheduleBuffer.findCurrent(nbbm));
+				/*subList = ScheduleBuffer.vehSchListMap.get(nbbm);
+				if(subList.size() == 0)
+					continue;*/
+				
+				
+				/*linkedList = ScheduleBuffer.vehLinkedMap.get(nbbm);
 				if(null != linkedList){
 					//为GPS点附加班次信息
 					size = linkedList.size();
@@ -152,7 +163,7 @@ public class GpsRealDataBuffer {
 						gpsData.setCurrSchId(linkedList.peekFirst().getId());
 					if(size > 1)
 						gpsData.setNextSchId(linkedList.get(1).getId());
-				}
+				}*/
 				resList.add(gpsData);
 			}
 		}
@@ -189,7 +189,7 @@ $(function(){
 		//显示班次详细
 		$.each(this.cells, function(i,cell){
-			$('#mainDetailPabel input[data-cell='+i+']').val($(cell).text());
+			$('#mainDetailPabel input[data-cell='+i+']').val($.trim($(cell).text()));
 		});
 		if(!changeHandlerPanel(this))
 			return;
@@ -284,7 +284,7 @@ $(function(){
 				var cont = $('.custom-table-panel');
 			  	cont.animate({
 					scrollTop: $tr.offset().top - cont.offset().top + $tr.scrollTop() - 36 * 4
-			  	}, 500);
+			  	}, 500); 
 			}, 100);
 		});
@@ -381,6 +381,18 @@ $(function(){
 		$(this).show();
 		$('input.no', schAddPanel).val($(tr.cells[0]).text());
 		$('select[name=xlDir]', schAddPanel).trigger('change');
+		//当前表格第一条数据 data-type="empty"
+		var $tr = $('.mainTable tr[data-id]', '#childTaskDiv').eq(0);
+		if($tr.length > 0){
+			var sch = _data.getSchedulById($tr.data('id'));
+			console.log(sch);
+			//默认车辆
+			$('select[name=clZbh]', schAddPanel).val(sch.clZbh).trigger('change');
+			//默认驾驶员
+			$('select[name=jGh]', schAddPanel).val(sch.jGh + '/' + sch.jName).trigger('change');
+			//默认售票员 
+			$('select[name=sGh]', schAddPanel).val(sch.sGh + '/' + sch.sName).trigger('change');
+		}
 	});
 	//切换上下行
 	$(schAddPanel).on('change', 'select[name=xlDir]', function(){
@@ -454,7 +466,8 @@ $(function(){
 				_data.updateSchedule(ups[i]);
 			} */
 			//刷新表格
-			_alone.addScheduleToTable(sch);
+			//_alone.updateTableBySch(sch);
+			_alone.update2Table(sch.xlBm, sch);
 			//关闭弹出层
 			layer.closeAll();
@@ -122,7 +122,6 @@
 		//线路下拉框
 		var data = [];
 		lineCodeMaps = _data.getLineIds();
-		console.log(lineCodeMaps);
 		for(var line in lineCodeMaps){
 			data.push({id: line, text: lineCodeMaps[line]});
 		}
@@ -196,17 +195,35 @@
 				$(e).removeClass('custom-val-error');
 				if(old != t)
-					changes.push({old: old, t: t});
+					changes.push({old: old, t: t, id: $(e).parents('tr').data('id')});
 			}
 			var text = template('outgo_adjust_change_text_temp', {list: changes});
 			layer.confirm(text, {
 				  btn: ['确认调整','取消'],title:'待发调整确认'
 			}, function(){
-				  layer.msg('确认调整', {icon: 1});
+				 $.ajax({
+					url: '/realSchedule/outgoAdjustAll',
+					type: 'post',
+					data: {params: JSON.stringify(changes)},
+					success:function(rs){
+						if(rs.status == 'SUCCESS' && rs.t){
+							layer.closeAll();
+							layer.msg('调整成功！', {icon: 1});
+							//刷新表格
+							_alone.update2Table(rs.t.xlBm);
+						}
+					},
+					error: errorHandle
+				 });
 			});
 		});
 	});
+	
+	
+	function errorHandle(){
+		layer.alert('服务器出现异常！', {icon: 2, title: '操作失败'});
+	}
 }();
 </script>
 </div>
 \ No newline at end of file
@@ -2009,7 +2009,8 @@ span.log-item-handle a {
 .log-item.fache {
 }
-.in-badge, .out-badge {
+.in-badge, .out-badge,
+span.blue-badge {
     font-size: 13px;
     margin-left: 2px;
     padding: 2px 4px;
@@ -2017,6 +2018,16 @@ span.log-item-handle a {
     display: inline-block;
 }
+span.blue-badge{
+    background: #7cccaa;
+    color: white;
+}
+
+tr._active .blue-badge{
+	background: #ffffff;
+    color: #3c973c;
+}
+
 .out-badge{
 	background: #59d8e3;
     color: white;
@@ -2125,37 +2136,51 @@ span.log-item-handle a {
 	color: white;
 }
-.tab_line .panel-wrap ._panel ._body .pb-table tr._tr_active.active-line-no a{
-	color: #afafaf;
+.tab_line .panel-wrap ._panel ._body .pb-table tr._tr_active.active-line-no a,
+.pb-table tr.selected.dir_0 a,
+.pb-table tr.selected.dir_1 a{
+	color: #afafaf !important;
 }
 .tab_line .pb-table tr._tr_active.active-line-no a.remarks-popover{
 	color: #bebebe;
 }
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-qrlb{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-qrlb,
+.pb-table tr.selected.dir_0 td.tl-qrlb,
+.pb-table tr.selected.dir_1 td.tl-qrlb{
 	background: none;
     color: #ff796a;
 }
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-zzzx{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-zzzx,
+.pb-table tr.selected.dir_0 td.tl-zzzx,
+.pb-table tr.selected.dir_1 td.tl-zzzx{
 	background: none;
     color: #5ae35a;
 }
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-yzx{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-yzx,
+.pb-table tr.selected.dir_0 td.tl-yzx,
+.pb-table tr.selected.dir_1 td.tl-yzx{
 	background: none;
     color: #80c8fa;
 }
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxfc{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxfc,
+.pb-table tr.selected.dir_0 td.tl-xxfc,
+.pb-table tr.selected.dir_1 td.tl-xxfc{
 	background: none;
     color: #a16dff;
 }
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxsd{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxsd,
+.pb-table tr.selected.dir_0 td.tl-xxsd,
+.pb-table tr.selected.dir_1 td.tl-xxsd{
 	background: none;
     color: #ffb193;
 }
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxrd{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxrd,
+.pb-table tr.selected.dir_0 td.tl-xxrd,
+.pb-table tr.selected.dir_1 td.tl-xxrd{
 	background: none;
     color: #5cb0e9;
 }
@@ -2250,3 +2275,11 @@ tr._tr_active.active-line-no .out-badge{
 .change-confirm-text i{
 	    color: #46c146;
 }
+
+.pb-table tr.selected.dir_0{
+	background-color: #5d5da9 !important;
+}
+
+.pb-table tr.selected.dir_1{
+	background-color: #dc5a5a !important;
+}
 \ No newline at end of file
@@ -73,8 +73,8 @@ var _alone = (function(){
 			var table = $('tr[data-id='+array[0].id+']').parents('table')[0];
 			calculateLineNo(table);
 		},
-		//添加一个班次到表格
-		addScheduleToTable: function(schedule){
+		//将班次所在的表格做全量更新
+		updateTableBySch: function(schedule){
 			//将该线路走向班次 全部从服务器同步一次
 			var xlDir = schedule.xlDir, xlBm = schedule.xlBm;
 			$.get('/realSchedule/findByLineAndUpDown', {line: xlBm, upDown: xlDir}
@@ -103,6 +103,35 @@ var _alone = (function(){
 					currTr.parents('._body').slimScroll({ scrollTo: top + 'px' });
 			});
 		},
+		update2Table: function(xlBm, schedule){
+			//上行
+			$.get('/realSchedule/lineCode/' + xlBm, function(array){
+				//加入_data缓存
+				$.each(array, function(){
+					_data.pushSchedule(this);
+				});
+				
+				var rs = splitDir(array)
+					,tab = $('#tab_line_' + xlBm)
+					,half = tab.find('._body').height() / 2;
+				//填充表格数据
+				calculateLineNo(
+						//上行
+						tab.find('table[data-type=up] tbody').html(template('alone_plan_table_temp', {list: rs.up}))[0]
+				);
+				calculateLineNo(
+						//下行
+						tab.find('table[data-type=down] tbody').html(template('alone_plan_table_temp', {list: rs.down}))[0]
+				);
+				//定位到指定的班次
+				var currTr = tab.find('tr[data-id='+schedule.id+']')
+					,top = parseInt(currTr.find('td[name=lineNo]').text()) * 37 - half;
+			
+				top = top>0?top:0;
+				currTr.addClass('anim-delay animated flash');
+				currTr.parents('._body').slimScroll({ scrollTo: top + 'px' });
+			});
+		},
 		//重新计算行号
 		calculateLineNo: calculateLineNo
 	}
@@ -23,17 +23,36 @@ var _data = (function(){
 	//线路标准信息
 	var lineInformations = {};
 	//车辆和班次数组映射
-	var clSchMap = {};
+	//var clSchMap = {};
 	//车辆自编号和设备号对照
 	var carDeviceIdMapp = {};
+	var fcsjSort = function(a, b){
+		return a.fcsjT - b.fcsjT;
+	}
+	
 	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 = [];
@@ -46,15 +65,22 @@ var _data = (function(){
 				}
 			}
 			//排序
-			array.sort(function(a, b){
-				return a.fcsjT - b.fcsjT;
-			});
+			array.sort(fcsjSort);
 			return array;
 		},
 		//根据车辆获取班次数组
 		findByCl: function(nbbm){
-			return clSchMap[nbbm];
+			var array = [];
+			for(var id in schedules){
+				sch = schedules[id];
+				if(sch.clZbh == nbbm)
+					array.push(sch);
+			}
+			
+			//排序
+			array.sort(fcsjSort);
+			return array;
 		},
 		//添加一个班次
 		pushSchedule: function(sch){
@@ -133,9 +159,9 @@ var _data = (function(){
 							lineLpMap[lineCode][this.lpName] = [];
 						lineLpMap[lineCode][this.lpName].push(this);
 						//车辆 ——> 班次数组
-						if(!clSchMap[this.clZbh])
+						/*if(!clSchMap[this.clZbh])
 							clSchMap[this.clZbh] = [];
-						clSchMap[this.clZbh].push(this);
+						clSchMap[this.clZbh].push(this);*/
 					});
 					//按发车时间排序
@@ -161,9 +187,7 @@ var _data = (function(){
 			}
 			//排序
-			array.sort(function(a, b){
-				return a.fcsjT - b.fcsjT;
-			});
+			array.sort(fcsjSort);
 			return array;
 		},
 		//根据设备号获取GPS
@@ -31,7 +31,7 @@ var _menu = (function() {
 	// 表格右键呼出菜单
 	var ac = 'active-menu'
-		,items = '.pb-table.data tr td[name!=lineNo]';
+		,items = '.pb-table.data tr td[name!=lineNo][data-name!=lpName]';
 	$('.portlet-fullscreen').on('contextmenu', items, 
 			function(e) {
 				e.preventDefault();
@@ -83,6 +83,20 @@ var _menu = (function() {
 	});
+	//点击路牌
+	var lps = '.pb-table.data tr td[data-name=lpName]';
+	$('.portlet-fullscreen').on('click', lps, function(e){
+		var lp = $(this).text();
+		layer.msg('高亮路牌：' + lp + '',{offset: 'ct', shift : 5});
+		var lineCode = $(this).parents('.tab-pane').data('id');
+		var schArray = _data.getLineLpMap()[lineCode][lp];
+		
+		resetAllState();
+		$.each(schArray, function(){
+			$('.pb-table tr[data-id='+this.id+']').addClass('selected dir_' + this.xlDir);
+		});
+	});
+	
 	function selectOneRow(firstCell){
 		return $(firstCell).addClass('selected').parent().addClass('_tr_active active-line-no');
 	}
@@ -97,11 +111,11 @@ var _menu = (function() {
 			  tips: [2, '#709d94'],shift:5, time: 5000
 		});
 	});
-	
+/*	
 	$('.portlet-fullscreen').on('dbclick', 'table.pb-table .sfsj-item', function(){
 		alert(11);
 	});
-	
+*/	
 	//选中关联班次
 	function selCognateSch($ctr){
 		//选中关联班次
@@ -110,6 +124,7 @@ var _menu = (function() {
 			,sch = _data.getSchedulById(schId);
 		var scroll = false;
+		console.log(_data.findByCl(clnbbm));
 		$.each(_data.findByCl(clnbbm), function(){
 			if(scroll){
 				var nextTr = $('tr[data-id='+this.id+']');
@@ -122,8 +137,11 @@ var _menu = (function() {
 				}
 				scroll = false;
 				nextTr.addClass('next-sch');
+				
+				$('.pb-table tr[data-id='+this.id+']').addClass('selected');
+				return false;
 			}
-			$('.pb-table tr[data-id='+this.id+']').addClass('selected');
+			//$('.pb-table tr[data-id='+this.id+']').addClass('selected');
 			if(this.id == schId)
 				scroll = true;
 		});
@@ -134,6 +152,8 @@ var _menu = (function() {
 		$('.pb-table tr td.' + ac).removeClass(ac);
 		$('.pb-table tr.selected').removeClass('selected');
 		$('.pb-table tr.next-sch').removeClass('next-sch');
+		$('.pb-table tr.dir_0').removeClass('dir_0');
+		$('.pb-table tr.dir_1').removeClass('dir_1');
 		if(layerTip){
 			layer.close(layerTip);
 			layerTip = null;
@@ -142,6 +162,8 @@ var _menu = (function() {
 	function resetAllState(){
 		$('.pb-table tr td.' + ac).removeClass(ac);
 		$('.pb-table tr.selected').removeClass('selected');
+		$('.pb-table tr.dir_0').removeClass('dir_0');
+		$('.pb-table tr.dir_1').removeClass('dir_1');
 		$('.pb-table tr._tr_active').removeClass('_tr_active active-line-no');
 		$('.pb-table tr.next-sch').removeClass('next-sch');
 		$('.pb-table.data tr td.selected[name=lineNo]').removeClass('selected');
@@ -223,7 +245,18 @@ var _menu = (function() {
 		},
 		//计划烂班
 		planDestroy: function(schedul){
-			var data = {item: schedul, array : _data.getSchedulByVeh(schedul.clZbh)}
+			/*if(schedul.status == -1){
+				layer.alert('不能重复烂班！', {icon: 2, title: '提示', shift: 5}); 
+				return;
+			}*/
+			var array = [];
+			//获取未烂班的班次
+			$.each(_data.getSchedulByVeh(schedul.clZbh),function(){
+				if(this.status != -1)
+					array.push(this);
+			});
+			
+			var data = {item: schedul, array : array}
 			var index = layer.open({
 			  type: 1,
 			  area: ['370px', '645px'],
@@ -507,6 +540,9 @@ var _menu = (function() {
 							layer.close(index);
 							if(rs.t)
 								_alone.refreshSchedule(rs.t);
+							
+							if(rs.nextSch)
+								_alone.refreshSchedule(rs.nextSch);
 						});
 					});
 			  }
@@ -293,7 +293,7 @@
 {{each array as obj i}}
     				<label>
 						<div class="checker">
-						<span><input type="checkbox" value={{obj.id}} name="ids[]" class="icheck" {{if obj.dfsj==item.dfsj}}checked{{/if}}></span></div> {{obj.dfsj}}
+						<span><input type="checkbox" value={{obj.id}} name="ids[]" class="icheck" {{if obj.id==item.id}}checked{{/if}}></span></div> {{obj.dfsj}}
 					</label>
 {{/each}}
 					</div>
@@ -3,7 +3,7 @@
 <script id="child_task_main_table_temp" type="text/html">
 {{each list as item i}}
 {{if item == null}}
-	<tr class="empty">
+	<tr class="empty" data-type="empty">
 		<td width="5%" >{{i + 1}}</td>
 		<td width="9%" ></td>
 		<td width="9%" ></td>
@@ -17,7 +17,10 @@
 {{else}}
 <tr data-id="{{item.id}}" >
 	<td width="5%" >{{i + 1}}</td>
-	<td width="9%" >{{item.fcsj}}</td>
+	<td width="9%" >
+		{{if item.fcsjActual != null}}{{item.fcsjActual}}<span class="blue-badge">实</span>{{else}}{{item.dfsj}}
+		{{/if}}
+	</td>
 	<td width="9%" >{{item.zdsj}}</td>
 	<td width="14%" >{{item.qdzName}}</td>
 	<td width="14%" >{{item.zdzName}}</td>