update

潘钊
1 parent ad4380bd
Showing 24 changed files with 470 additions and 104 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/sys/Module.java
src/main/java/com/bsth/repository/ModuleRepository.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/util/TestPad.java
src/main/java/com/bsth/vehicle/directive/FirstScheduleIssuedThread.java
src/main/java/com/bsth/vehicle/directive/buffer/DirectiveBuffer.java
src/main/java/com/bsth/vehicle/directive/entity/Directive.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveService.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveServiceImpl.java
src/main/java/com/bsth/vehicle/gpsdata/GpsArrivalStationThread.java
src/main/java/com/bsth/vehicle/gpsdata/GpsRefreshThread.java
src/main/java/com/bsth/vehicle/gpsdata/buffer/GpsArrivalDataBuffer.java
src/main/java/com/bsth/vehicle/gpsdata/service/GpsDataServiceImpl.java
src/main/resources/static/gpsTest/test.html
src/main/resources/static/index.html
src/main/resources/static/pages/control/line/child_pages/child_task.html
@@ -16,6 +16,7 @@ import com.bsth.service.realcontrol.buffer.GetSchedulePlanThread;
 import com.bsth.service.realcontrol.buffer.SchedulePersistenceThread;
 import com.bsth.vehicle.common.CommonRefreshThread;
 import com.bsth.vehicle.directive.DirectivePersistenceThread;
+import com.bsth.vehicle.directive.FirstScheduleIssuedThread;
 import com.bsth.vehicle.gpsdata.GpsArrivalStationThread;
 import com.bsth.vehicle.gpsdata.GpsRefreshThread;
@@ -32,7 +33,7 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	SecurityMetadataSourceService invocationSecurityMetadataSourceService;
-	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(6);
+	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(7);
 	@Autowired
 	GpsRefreshThread gpsRefreshThread;
@@ -46,6 +47,8 @@ public class StartCommand implements CommandLineRunner{
 	SchedulePersistenceThread SchedulePersistenceThread;
 	@Autowired
 	GpsArrivalStationThread gpsArrivalStationThread;
+	@Autowired
+	FirstScheduleIssuedThread firstScheduleIssuedThread;
 	@Override
 	public void run(String... arg0){
@@ -54,20 +57,48 @@ public class StartCommand implements CommandLineRunner{
 			//启动时加载所有资源
 			invocationSecurityMetadataSourceService.loadResourceDefine();
-			//GPS实时数据更新线程，每次执行完成4秒后开始下一次
-			scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 4, TimeUnit.SECONDS);
-			//定时0点从计划排班表抓取当天实际排班
+			/**
+			 * GPS实时数据更新 线程
+			 * 每8秒和网关HTTP接口同步一次
+			 */
+			scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 8, TimeUnit.SECONDS);
+			
+			/**
+			 * 每天 0点 抓取当天实际排班
+			 */
 			scheduler.scheduleAtFixedRate(getSchedulePlanThread
 					, 0//DateUtils.getTimesnight() + 5 - System.currentTimeMillis() / 1000
 					, 60 * 60 * 24, TimeUnit.SECONDS);
-			//两分钟调度指令入库一次
-			scheduler.scheduleWithFixedDelay(directivePersistenceThread, 20, 60 * 1, TimeUnit.SECONDS);
-			//两小时刷新一次对照数据
+			
+			/**
+			 * 调度指令两分钟入库一次
+			 * 指令会缓存在内存，直到收到所有响应再入库
+			 */
+			scheduler.scheduleWithFixedDelay(directivePersistenceThread, 20, 60 * 2, TimeUnit.SECONDS);
+			
+			/**
+			 * 车辆，设备，公司等常用的映射数据，每两小时刷新一次
+			 */
 			scheduler.scheduleWithFixedDelay(commonRefreshThread, 0, 60 * 60 * 2, TimeUnit.SECONDS);
-			//一分钟持久化一次实际排班
+			
+			/**
+			 * 每分钟将有变更的班次入库（不包括子任务）
+			 * 单纯为了提高 线调操作 的响应速度
+			 */
 			scheduler.scheduleWithFixedDelay(SchedulePersistenceThread, 60 * 1, 60 * 1, TimeUnit.SECONDS);
-			//将实际到离站和排班计划进行匹配 12秒一次
+			
+			/**
+			 * 每15秒从数据库抓取到离站信息和班次匹配
+			 * （网关生成的到离站数据也是延迟批量入库，所以缩短该线程执行周期并不会提高 “实际到离站” 的实时性）
+			 */
 			//scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 5, 1200, TimeUnit.SECONDS);
+			
+			/**
+			 * 首个调度指令下发（2分钟运行一次）
+			 * 每辆车的第一个调度指令由该线程下发
+			 * 后续班次由 “实际终点到达” 事件触发指令下发
+			 */
+			//scheduler.scheduleWithFixedDelay(firstScheduleIssuedThread, 60 , 60 * 2, TimeUnit.SECONDS);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -3,9 +3,10 @@ package com.bsth.entity.realcontrol;
 import com.bsth.entity.sys.SysUser;
 import javax.persistence.*;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
 /**
  * 实际排班计划明细。
@@ -32,10 +33,10 @@ public class ScheduleRealInfo {
 	/** 车辆自编号 */
 	private String clZbh;
-	/** 报道时间（格式 HH:mm） */
-	private String bdTime;
-	/** 出场时间（格式 HH:mm） */
-	private String ccTime;
+	/** 报道时间（格式 HH:mm）
+	private String bdTime; */
+	/** 出场时间（格式 HH:mm） 
+	private String ccTime;*/
 	/** 驾驶员工号 */
 	private String jGh;
@@ -80,15 +81,15 @@ public class ScheduleRealInfo {
 	private Integer bcsj;
 	/**
-	 * 班次类型 TODO：正常班次、出场、进场、加油、临加班次、区间班次、放空班次、放大站班次、两点间空驶
+	 * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
 	 */
 	private String bcType;
 	/** 创建人 */
-	@ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+	@ManyToOne(fetch = FetchType.LAZY)
 	private SysUser createBy;
 	/** 修改人 */
-	@ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+	@ManyToOne(fetch = FetchType.LAZY)
 	private SysUser updateBy;
 	/** 创建日期 */
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
@@ -133,6 +134,9 @@ public class ScheduleRealInfo {
 	@Transient
 	private Long dfsjT;
+	/** 指令下发状态  60: 已发送， 100： 设备确认收到， 200：驾驶员确认   0：失败 */
+	private Integer directiveState;
+	
 	public void addRemarks(String remark){
 		String newRem = this.getRemarks();
 		if(null == newRem)
@@ -189,22 +193,6 @@ public class ScheduleRealInfo {
 		this.clZbh = clZbh;
 	}
-	public String getBdTime() {
-		return bdTime;
-	}
-
-	public void setBdTime(String bdTime) {
-		this.bdTime = bdTime;
-	}
-
-	public String getCcTime() {
-		return ccTime;
-	}
-
-	public void setCcTime(String ccTime) {
-		this.ccTime = ccTime;
-	}
-
 	public String getjGh() {
 		return jGh;
 	}
@@ -476,4 +464,43 @@ public class ScheduleRealInfo {
 	public void setDfsjT(Long dfsjT) {
 		this.dfsjT = dfsjT;
 	}
+	
+	@Transient
+	static SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+	@Transient
+	static SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+	
+	/**
+	 * @throws ParseException 
+	 * 
+	 * @Title: syncTime 
+	 * @Description: TODO(计算时间戳，待发时间为计发时间) 
+	 * @param     设定文件 
+	 * @return void    返回类型 
+	 * @throws
+	 */
+	public void syncTime(){
+		try{
+			this.setDfsj(this.getFcsj());
+			//发车时间戳
+			this.setFcsjT(sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(this.scheduleDate) + " " + this.getFcsj()).getTime());
+			//待发时间
+			this.setDfsjT(this.getFcsjT());
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+	}
+
+	public Integer getDirectiveState() {
+		return directiveState;
+	}
+
+	public void setDirectiveState(Integer directiveState) {
+		this.directiveState = directiveState;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return this.id.equals(((ScheduleRealInfo)obj).getId());
+	}
 }
@@ -11,10 +11,18 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.NamedAttributeNode;
+import javax.persistence.NamedEntityGraph;
+import javax.persistence.NamedEntityGraphs;
 import javax.persistence.Table;
 @Entity
 @Table(name = "bsth_c_sys_module")
+@NamedEntityGraphs({
+    @NamedEntityGraph(name = "module_roles", attributeNodes = {
+            @NamedAttributeNode("roles")
+    })
+})
 public class Module {
 	@Id
@@ -45,7 +53,7 @@ public class Module {
 	 */
 	private String groupType;
-	@ManyToMany(fetch = FetchType.EAGER, mappedBy = "modules")
+	@ManyToMany(mappedBy = "modules", fetch = FetchType.LAZY)
 	private Set<Role> roles = new LinkedHashSet<>();
 	@Column(updatable = false,name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
@@ -3,6 +3,8 @@ package com.bsth.repository;
 import java.util.List;
 import java.util.Set;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -18,4 +20,8 @@ public interface ModuleRepository extends BaseRepository&lt;Module, Integer&gt;{
 	@Query("select m from Module m where m.id in ?1")
 	Set<Module> findByIds(List<Integer> ids);
+	
+	@EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
+	@Override
+	List<Module> findAll(Specification<Module> spec);
 }
@@ -36,9 +36,7 @@ public class GetSchedulePlanThread  extends Thread{
 	@Autowired
 	ScheduleRealInfoRepository scheduleRealInfoRepository;
-	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd")
-				,sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm")
-				,sdf3 = new SimpleDateFormat("HH:mm");
+	SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 	@Override
 	public void run() {
@@ -51,17 +49,12 @@ public class GetSchedulePlanThread  extends Thread{
 			Date zdDate;
 			for(ScheduleRealInfo item : realList){
-				item.setDfsj(item.getFcsj());
-				//发车时间戳
-				item.setFcsjT(sdf2.parse(dateStr + " " + item.getFcsj()).getTime());
-				//待发时间
-				item.setDfsjT(item.getFcsjT());
-				
+				item.syncTime();
 				//计划终点时间
 				if(item.getBcsj() != null){
 					zdDate = new Date(item.getFcsjT() + (item.getBcsj() * 60 * 1000));
 					item.setZdsjT(zdDate.getTime());
-					item.setZdsj(sdf3.format(zdDate));
+					item.setZdsj(sdfHHmm.format(zdDate));
 				}
 			}
@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.LinkedListMultimap;
 /**
  * 
@@ -32,10 +33,17 @@ public class ScheduleBuffer {
 	public static ArrayListMultimap<String, ScheduleRealInfo> schedulListMap;
 	/**
-	 * K: 车辆自编号  V: 班次链表
+	 * K: 车辆自编号  V: 未完成班次链表
 	 */
 	public static Map<String, LinkedList<ScheduleRealInfo>> vehLinkedMap;
+	
+	/**
+	 * K: 车辆自编号  V: 已执行班次链表
+	 */
+	public static LinkedListMultimap<String, ScheduleRealInfo> finishLinkedMap;
+	
+	
 	/**
 	 * 主键 和 排班映射
 	 */
@@ -46,24 +54,22 @@ public class ScheduleBuffer {
 	 */
 	public static LinkedList<ScheduleRealInfo> persistentList;
+	static ScheduleComparator scheduleComparator = new ScheduleComparator();
+	
 	static{
 		schedulListMap = ArrayListMultimap.create();
 		pkSchedulMap = new HashMap<>();
 		persistentList = new LinkedList<>();
 		vehLinkedMap = new HashMap<>();
+		
+		finishLinkedMap = LinkedListMultimap.create();
 	}
 	public static int init(List<ScheduleRealInfo> list){
 		try{
 			//发车时间排序
-			Collections.sort(list, new Comparator<ScheduleRealInfo>() {
-				
-				@Override
-				public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
-					return (int) (o1.getFcsjT() - o2.getFcsjT());
-				}
-			});
+			Collections.sort(list, scheduleComparator);
 			String zbh;
 			for(ScheduleRealInfo schedul : list){
@@ -83,4 +89,65 @@ public class ScheduleBuffer {
 		}
 		return 0;
 	}
+	
+	public static int put(ScheduleRealInfo sch){
+		schedulListMap.put(sch.getXlBm(), sch);
+		pkSchedulMap.put(sch.getId(), sch);
+		
+		String zbh = sch.getClZbh();
+		if(!vehLinkedMap.containsKey(zbh))
+			vehLinkedMap.put(zbh, new LinkedList<ScheduleRealInfo>());
+		vehLinkedMap.get(zbh).add(sch);
+		
+		//重新排序
+		Collections.sort(vehLinkedMap.get(zbh), scheduleComparator);
+		return 0;
+	}
+	
+	public static class ScheduleComparator implements Comparator<ScheduleRealInfo>{
+
+		@Override
+		public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+			return (int) (o1.getFcsjT() - o2.getFcsjT());
+		}
+	}
+	
+	/**
+	 * 
+	 * @Title: finishSch 
+	 * @Description: TODO(完成一个班次) 
+	 * @param @param sch
+	 * @return ScheduleRealInfo  返回 下一个待执行的班次
+	 * @throws
+	 */
+	public static ScheduleRealInfo finishSch(ScheduleRealInfo sch){
+		LinkedList<ScheduleRealInfo> list = vehLinkedMap.get(sch.getClZbh());
+		//状态修改为已执行
+		sch.setStatus(2);
+		persistentList.add(sch);
+		
+		ScheduleRealInfo temp;
+		int len = list.size();
+		for(int i = 0; i < len; i ++){
+			temp = list.poll();
+			if(temp.equals(sch)){
+				//加入已执行
+				finishLinkedMap.put(sch.getClZbh(), sch);
+				break;
+			}
+		}
+		
+		return list.getFirst();
+	}
+	
+	/**
+	 * 
+	 * @Title: getFinishSchNo 
+	 * @Description: TODO(获取车辆已完成的班次数) 
+	 * @param @param nbbm
+	 * @throws
+	 */
+	public static int getFinishSchNo(String nbbm){
+		return finishLinkedMap.get(nbbm) == null ? 0 : finishLinkedMap.get(nbbm).size();
+	}
 }
@@ -8,6 +8,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.transaction.Transactional;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +21,11 @@ import com.bsth.entity.Personnel;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
@@ -167,7 +171,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			if(driver != null){
 				map = new HashMap<>();
 				code = driver.getJobCode();
-				map.put("id", code);
+				map.put("id", code + "/" + driver.getPersonnelName());
 				map.put("text", code + "/" + driver.getPersonnelName());
 				rsList.add(map);
 			}
@@ -190,7 +194,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			if(conductor != null){
 				code = conductor.getJobCode();
 				map = new HashMap<>();
-				map.put("id", code);
+				map.put("id", code + "/" + conductor.getPersonnelName());
 				map.put("text", code + "/" + conductor.getPersonnelName());
 				rsList.add(map);
 			}
@@ -220,4 +224,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		}
 		return rsList;
 	}
+
+	/**
+	 * 临加班次
+	 */
+	@Override
+	public Map<String, Object> save(ScheduleRealInfo t) {
+		SysUser user = SecurityUtils.getCurrentUser();
+		
+		t.setScheduleDate(new Date());
+		t.setCreateBy(user);
+		t.syncTime();
+		
+		Map<String, Object> map = super.save(t);
+		
+		//加入缓存
+		ScheduleBuffer.put(t);
+		return map;
+	}
 }
@@ -11,13 +11,6 @@ public class TestPad {
 	    double Ec;
 	    double Ed;
-	    
-	    public static void main(String[] args) {
- 
-	    	TestPad A = new TestPad(121.60613, 31.270115);
-	    	TestPad B = new TestPad(121.605239 ,31.269705);
-	        System.out.println(TestPad.angle(A, B));
-	    }
 	    public TestPad(double longitude, double latitude)
 	    {
 	      m_LoDeg = (int)longitude;
+package com.bsth.vehicle.directive;
+
+import java.util.LinkedList;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
+import com.bsth.vehicle.directive.service.DirectiveService;
+
+/**
+ * 
+ * @ClassName: ScheduleIssuedThread 
+ * @Description: TODO(首班调度指令下发线程) 
+ * @author PanZhao
+ * @date 2016年6月29日 下午11:09:39 
+ *
+ */
+@Component
+public class FirstScheduleIssuedThread extends Thread{
+
+	@Autowired
+	DirectiveService directiveService;
+	
+	@Override
+	public void run() {
+		
+		Set<String> keys = ScheduleBuffer.vehLinkedMap.keySet();
+		LinkedList<ScheduleRealInfo> linkedList;
+		ScheduleRealInfo sch;
+		for(String nbbm : keys){
+			linkedList = ScheduleBuffer.vehLinkedMap.get(nbbm);
+			
+			sch = linkedList.getFirst();
+			
+			if(sch.getFcsjActual() == null)
+				directiveService.send60Dispatch(sch, 0);
+		}
+	}
+}
@@ -105,13 +105,17 @@ public class DirectiveBuffer {
 			directive.setReply47((short)0);
 			break;
 		}
+		
+		if(directive.isDispatch()){
+			directive.getSch().setDirectiveState(reply.getStatus() * 100);
+		}
 		transientList.add(directive);
 	}
 	/**
 	 * 
 	 * @Title: reply64 
-	 * @Description: TODO(64协议响应) 
+	 * @Description: TODO(64 协议响应) 
 	 * @throws
 	 */
 	public void reply64(JSONObject json){
@@ -4,9 +4,12 @@ import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
 /**
  * 
@@ -62,6 +65,17 @@ public class Directive {
 	 */
 	private Short reply47;
+	/**
+	 * 是否是调度指令
+	 * 目前调度指令和消息短语都是短语下发，所以从协议上无法区分
+	 */
+	private boolean isDispatch;
+	
+	/**
+	 * 如果是调度指令，则关联到相关的班次
+	 */
+	@ManyToOne
+	private ScheduleRealInfo sch;
 	@Embeddable
 	public static class DirectiveData {
@@ -235,4 +249,20 @@ public class Directive {
 	public void setReply47(Short reply47) {
 		this.reply47 = reply47;
 	}
+
+	public boolean isDispatch() {
+		return isDispatch;
+	}
+
+	public void setDispatch(boolean isDispatch) {
+		this.isDispatch = isDispatch;
+	}
+
+	public ScheduleRealInfo getSch() {
+		return sch;
+	}
+
+	public void setSch(ScheduleRealInfo sch) {
+		this.sch = sch;
+	}
 }
 package com.bsth.vehicle.directive.service;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.BaseService;
 import com.bsth.vehicle.directive.entity.Directive;
@@ -17,7 +18,15 @@ public interface DirectiveService extends BaseService&lt;Directive, Integer&gt;{
 	 */
 	int send60Phrase(String nbbm, String text);
-	int send60Dispatch(String nbbm, String text);
+	/**
+	 * 
+	 * @Title: send60Dispatch 
+	 * @Description: TODO(调度指令下发) 
+	 * @param @param sch  要下发的班次
+	 * @param @param finish  已完成的班次数
+	 * @throws
+	 */
+	int send60Dispatch(ScheduleRealInfo sch, int finish);
 	//60营运指令
 	int send60Operation(String nbbm, int state, int upDown);
 package com.bsth.vehicle.directive.service;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -15,6 +17,7 @@ import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.directive.Consts;
@@ -44,13 +47,17 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 	@Autowired
 	LineChangeRepository lineChangeRepository;
+	SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH点mm分");
+	
+	static Long schDiff = 1000 * 60 * 6L;
+	
 	@Override
 	public int send60Phrase(String nbbm, String text) {
 		Directive directive = null;
 		try {
 			directive = create60Data(nbbm, text, DispatchInstruct.PHRASE);
 		} catch (Exception e) {
-			logger.error("生成调度指令时出现异常", e);
+			logger.error("发送消息短语出现异常", e);
 			return -1;
 		}
@@ -70,8 +77,40 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 	}
 	@Override
-	public int send60Dispatch(String nbbm, String text) {
-		return 0;
+	public int send60Dispatch(ScheduleRealInfo sch,  int finish) {
+		Directive directive = null;
+		try {
+			//如果发车时间距当前时间较远，则不发送
+			if(Math.abs(sch.getFcsjT() - System.currentTimeMillis()) > schDiff){
+				return 0;
+			}
+			
+			String text = "已完成" + finish + "个班次，下一发车时间" + sdfHHmm.format(new Date(sch.getFcsjT()))
+					+ "，由" + sch.getQdzName() + "发往" + sch.getZdzName();
+			
+			//目前使用短语协议下发调度指令
+			directive = create60Data(sch.getClZbh(), text, DispatchInstruct.PHRASE);
+		} catch (Exception e) {
+			logger.error("生成调度指令时出现异常", e);
+			return -1;
+		}
+		
+		if(null == directive)
+			return -1;
+		
+		//发送指令
+		int code = postJson(JSON.toJSONString(directive));
+		
+		if(code == 0){
+			sch.setDirectiveState(60);
+			//添加到缓存，等待入库
+			directive.setDispatch(true);
+			directive.setSch(sch);
+			DirectiveBuffer.put(directive);
+		}else{
+			logger.error("send60Phrase error, code: " + code);
+		}
+		return code;
 	}
 	@Override
@@ -13,12 +13,14 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.util.DateUtils;
 import com.bsth.util.db.DBUtils_MS;
+import com.bsth.vehicle.directive.service.DirectiveService;
 import com.bsth.vehicle.gpsdata.buffer.GpsArrivalDataBuffer;
 import com.bsth.vehicle.gpsdata.entity.ArrivalInfo;
@@ -36,6 +38,9 @@ public class GpsArrivalStationThread extends Thread{
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+	@Autowired
+	DirectiveService directiveService;
+	
 	private static int diff = 1000 * 60 * 20;
 	@Override
@@ -53,7 +58,7 @@ public class GpsArrivalStationThread extends Thread{
 		System.out.println("开始...");
 		List<ScheduleRealInfo> schList;
 		for(String key : keySet){
-			schList = ScheduleBuffer.vehLinkedMap.get(key);
+			schList = extractSched(ScheduleBuffer.vehLinkedMap.get(key));
 			if(null != schList)
 				match(GpsArrivalDataBuffer.allMap.get(key), schList);
 		}
@@ -104,7 +109,7 @@ public class GpsArrivalStationThread extends Thread{
 	 */
 	public void matchStart(ScheduleRealInfo scInfo, ArrivalInfo arr){
 		if(scInfo.getFcsjT() == null
-				|| arr.getInOut() != 1)
+				|| arr.getInOut() != 1 || scInfo.getFcsjActual() != null)
 			return;
 		Long ts = arr.getTs();
@@ -115,6 +120,8 @@ public class GpsArrivalStationThread extends Thread{
 			scInfo.setFcsjActual(sdf.format(ts));
 			System.out.println("成功匹配一个起点...");
+			//班次状态改为正在执行
+			scInfo.setStatus(1);
 			ScheduleBuffer.persistentList.add(scInfo);
 		}
 	}
@@ -127,7 +134,7 @@ public class GpsArrivalStationThread extends Thread{
 	 */
 	public void matchEnd(ScheduleRealInfo scInfo, ArrivalInfo arr){
 		if(scInfo.getZdsjT() == null
-				|| arr.getInOut() != 0)
+				|| arr.getInOut() != 0 || scInfo.getZdsjActual() != null)
 			return;
 		Long ts = arr.getTs();
@@ -138,7 +145,10 @@ public class GpsArrivalStationThread extends Thread{
 			scInfo.setZdsjActual(sdf.format(ts));
 			System.out.println("成功匹配一个终点...");
-			ScheduleBuffer.persistentList.add(scInfo);
+			//完成当前班次
+			ScheduleRealInfo nextSch = ScheduleBuffer.finishSch(scInfo);
+			//到达终点，发送下一班次的调度指令
+			directiveService.send60Dispatch(nextSch, ScheduleBuffer.getFinishSchNo(nextSch.getClZbh()));
 		}
 	}
@@ -190,4 +200,26 @@ public class GpsArrivalStationThread extends Thread{
 		}
 		return list;
 	}
+	
+	Long rang = 1000 * 60 * 60L;
+	/**
+	 * 
+	 * @Title: extractSched 
+	 * @Description: TODO(提取当前时间前后一小时的计划) 
+	 * @param @param allList
+	 * @throws
+	 */
+	public List<ScheduleRealInfo> extractSched(List<ScheduleRealInfo> allList){
+		List<ScheduleRealInfo> subList = new ArrayList<>();
+		System.out.println("原计划：" + allList.size());
+		Long t = System.currentTimeMillis();
+		for(ScheduleRealInfo sch : allList){
+			if(Math.abs(sch.getFcsjT() - t) < rang
+					|| Math.abs(sch.getZdsjT()) - t < rang){
+				subList.add(sch);
+			}
+		}
+		System.out.println("按时间提取：" + subList.size());
+		return subList;
+	}
 }
@@ -68,7 +68,6 @@ public class GpsRefreshThread extends Thread{
 				Set<Integer> upLines = new HashSet<>();
 				for(GpsRealData newData : newList){
-					
 					oldGps = deviceMap.get(newData.getDeviceId());
 					//新的GPS点
@@ -99,8 +98,8 @@ public class GpsRefreshThread extends Thread{
 	 * @throws
 	 */
 	public List<GpsRealData> getterRealGpsData() throws Exception{
-		List<GpsRealData> list = new ArrayList<>();
-		
+		List<GpsRealData> list = new ArrayList<>()
+					,rs = new ArrayList<>();
 		CloseableHttpClient httpClient = null;
 		try {
@@ -122,8 +121,14 @@ public class GpsRefreshThread extends Thread{
 					JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
-					if(jsonObj != null)
+					if(jsonObj != null){
 						list = JSON.parseArray(jsonObj.getString("data"), GpsRealData.class);
+						//将无效的经纬度过滤掉
+						for(GpsRealData gps : list){
+							if(gps.getLat() != 0 && gps.getLon() != 0)
+								rs.add(gps);
+						}
+					}
 				}
 				else
 					logger.error("result is null");
@@ -135,6 +140,6 @@ public class GpsRefreshThread extends Thread{
 			if(null != httpClient)
 				httpClient.close();
 		}
-		return list;
+		return rs;
 	}
 }
@@ -2,7 +2,6 @@ package com.bsth.vehicle.gpsdata.buffer;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.List;
 import com.bsth.vehicle.common.CommonMapped;
@@ -34,7 +34,7 @@ public class GpsDataServiceImpl implements GpsDataService{
 			return null;
 		}*/
-		String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE from BSTH_C_GPS_INFO where days_year=? and device_id=? and ts > ? and ts < ?";
+		String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO from BSTH_C_GPS_INFO where days_year=? and device_id=? and ts > ? and ts < ?";
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
@@ -68,6 +68,7 @@ public class GpsDataServiceImpl implements GpsDataService{
 				map.put("lon", location.getLng());
 				map.put("lat", location.getLat());
 				map.put("ts", rs.getLong("TS"));
+				map.put("stopNo", rs.getString("STOP_NO"));
 				map.put("inout_stop", rs.getInt("INOUT_STOP"));
 				//上下行
 				map.put("upDown", upDown);
@@ -99,6 +99,8 @@ form .item select{
 	var inOuts = [outMark, inMark];
+	var stationCodeMap = {};
+	
 	var map = new BMap.Map("mapContainer");
 	map.centerAndZoom(new BMap.Point(121.544336, 31.221315), 15);
 	map.enableScrollWheelZoom();
@@ -123,7 +125,9 @@ form .item select{
 			var array = rs[0].children[0].children
 				,coords,circle, cdsArray, points, polygon;
 			//画出站点
+			console.log(array);
 			$.each(array, function(){
+				stationCodeMap[this.stationStationCod] = this.name;
 				if(this.stationShapesType === 'r'){
 					//画圆
 					coords = this.stationBJwpoints.split(' ');
@@ -158,11 +162,13 @@ form .item select{
 				point = new BMap.Point(this.lon, this.lat);
 				marker = new BMap.Marker(point);
 				state = this.inout_stop;
-				//inOuts
+				
 				if(state == 0 || state == 1){
 					text = state == 0?'出':'进';
 					marker.setIcon(new BMap.Icon(inOuts[this.inout_stop], new BMap.Size(25,25)));
-					label = new BMap.Label(moment(this.ts).format('HH:mm') + ' -'+text, {position: point, offset: new BMap.Size(-5,-18)});
+					label = new BMap.Label(
+							stationCodeMap[this.stopNo] + '/' +moment(this.ts).format('HH:mm') + ' -'+text
+							, {position: point, offset: new BMap.Size(-25,-18)});
 					marker.setLabel(label);
 				}
 				map.addOverlay(marker);
@@ -281,9 +281,9 @@ tr.row-active td {
 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT" data-exclude=1></script>
 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js" data-exclude=1></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js" data-exclude=1></script>
-<script type="text/javascript" src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js ">
-<script src="/assets/js/baidu/TextIconOverlay.js"></script>
-<script src="/assets/js/baidu//MarkerClusterer.js"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js " data-exclude=1></script>
+<script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
+<script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
 <!-- 高德  -->
 <script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda" data-exclude=1></script>
@@ -325,7 +325,6 @@ $(function(){
 		lineInformation = _data.getLineInformation(schedul.xlBm);
 		//线路 ——> 路牌 ——> 班次映射
 		scheduleLineMap = _data.getLineLpMap();
-		
 		//线路下拉框数据
 		lineCodeMaps = _data.getLineIds();
 		for(var lineCode in scheduleLineMap){
@@ -369,8 +368,8 @@ $(function(){
 				refreshMainList();
 			});
 		}
-		
-		jsyAndSpyInit(lineCode);
+		//更新临加表单的车辆和人员下拉框
+		carAndPersInit(lineCode);
 	}
 	/**
@@ -388,7 +387,7 @@ $(function(){
 		var schArray = [];
 		$.each(scheduls, function(){
-			schArray[this.fcno] = this;
+			schArray[this.fcno - 1] = this;
 		});
 		var htmlStr = template('child_task_main_table_temp', {list: schArray});
@@ -407,16 +406,20 @@ $(function(){
 	/** ----------- 临加班次相关 ----------*/
 	//初始化临加班次表单
 	$('#schedulTempAddPabel').append(template('schedul_add_form_temp', {}));
-	//初始化驾驶员和售票员下拉框，每次切换线路时调用
-	var jsyAndSpyInit = function(lineCode){
+	//初始化车辆和人员下拉框，每次切换线路时调用
+	var carAndPersInit = function(lineCode){
 		//驾驶员
 		$.get('/realSchedule/driver', {lineCode: lineCode}, function(rs){
-			initPinYinSelect2('select[name=jGh]', rs);
+			initPinYinSelect2('#schedulTempAddPabel select[name=jGh]', rs);
 		});
 		//售票员
 		$.get('/realSchedule/conductor', {lineCode: lineCode}, function(rs){
-			initPinYinSelect2('select[name=sGh]', rs);
+			initPinYinSelect2('#schedulTempAddPabel select[name=sGh]', rs);
+		});
+		//车辆
+		$.get('/realSchedule/cars', {lineCode: lineCode}, function(rs){
+			$('#schedulTempAddPabel select[name=clZbh]').select2({data: rs});
 		});
 	};
@@ -429,12 +432,11 @@ $(function(){
 	schAddPanel.on('show', function(e, tr){
 		$(this).show();
 		$('input.no', schAddPanel).val($(tr.cells[0]).text());
+		$('select[name=xlDir]', schAddPanel).trigger('change');
 	});
 	//切换上下行
 	$(schAddPanel).on('change', 'select[name=xlDir]', function(){
 		var t = $(this).val();
-		if(!t)
-			return;
 		var arr = stationRoute[t]
 			,ss = arr[0].stationCode
@@ -442,7 +444,6 @@ $(function(){
 			,ops = createSelectOps(arr, 'stationCode', 'stationName');
 		schAddQdz.html(ops).val(ss);
 		schAddZdz.html(ops).val(es);
-		
 		//里程
 		var mileage;
 		if(t == 0)
@@ -452,6 +453,51 @@ $(function(){
 		$('input[name=jhlc]', schAddPanel).val(mileage);
 	});
+	//切换班次类型
+	$(schAddPanel).on('change', 'select[name=bcType]', function(){
+		var type = $(this).val()
+			,upDown = $('select[name=xlDir]', schAddPanel)
+			,routes = stationRoute[upDown];
+		//起点停车场
+		switch (type) {
+		case 'out':
+			schAddQdz.html(parkSelectOps).val(lineInformation.carPark);
+			break;
+		case 'in':
+			schAddZdz.html(parkSelectOps).val(lineInformation.carPark);
+			break;
+		}
+		
+		var zdHtml = createSelectOps(routes, 'stationCode', 'stationName');
+		//schAddZdz.html(zdHtml).val();
+	});
+	
+	//提交临加班次
+	$('.confirm', schAddPanel).on('click', function(){
+		var f = $('form', schAddPanel);
+		var param = f.serializeJSON();
+		/** 页面组装数据 */
+		//线路
+		param.xlBm = lineSelect.val();
+		param.xlName = _data.getLineIds()[param.xlBm];
+		//路牌
+		param.lpName = lpSelect.val();
+		//拆分驾驶员工号和姓名
+		param.jName = param.jGh.split('/')[1];
+		param.jGh = param.jGh.split('/')[0];
+		//拆分售票员工号和姓名
+		param.sName = param.sGh.split('/')[1];
+		param.sGh = param.sGh.split('/')[0];
+		//附加起终点名称
+		var route = stationRoute[param.xlDir];
+		param.qdzName = searchStationName(route, param.qdzCode);
+		param.zdzName = searchStationName(route, param.zdzCode);
+		
+		$post('/realSchedule', param, function(rs){
+			//前端缓存更新
+			scheduleLineMap[param.xlBm][param.lpName].push(rs.t);
+		});
+	});
 	function createSelectOps(selectData, id, text){
 		var ops = '';
@@ -460,5 +506,13 @@ $(function(){
 		});
 		return ops;
 	}
+	
+	//在路由里根据站点编码搜索站点名
+	function searchStationName(route, code){
+		for(var i = 0, r; r = route[i++];){
+			if(r.stationCode == code)
+				return r.stationName;
+		}
+	}
 });
 </script>
@@ -53,7 +53,7 @@ var _alone = (function(){
 				cb && cb();
 			});
 		},
-		//刷新班次
+		//刷新单个班次
 		refreshSchedule: function(schedule){
 			//xlBm
 			var $tr = $('tr[data-id='+schedule.id+']', '#tab_line_' + schedule.xlBm)
@@ -85,16 +85,14 @@ var _data = (function(){
 					$.each(list, function(){
 						//发车时间 + 历时 = 终点时间
 						if(this.bcsj){
-							sm = moment(dateStr + ' ' + this.fcsj, 'YYYY-MM-DD HH:mm');
+							sm = moment(this.fcsjT);
 							em = sm.add(this.bcsj, 'minutes');
-							//发车时间戳
-							this.fcsjT = sm.valueOf();
 							this.zdsj = em.format('HH:mm');
 							//终点时间戳
 							this.zdsjT = em.valueOf();
 						}
-						//缓存实际排班计划
+						//缓存排班计划
 						schedules[this.id] = this;
 						scheduleList.push(this);
@@ -153,8 +153,8 @@
 	<td data-name="clZbh">{{item.clZbh}}</td>
 	<td data-name="zdsj">{{item.zdsj}}</td>
 	<td></td>
-	<td data-name="fcsj">{{item.fcsj}}</td>
-	<td data-name="dfsj">{{item.dfsj}}</td>
+	<td data-name="fcsj" data-time="{{item.fcsjT}}">{{item.fcsj}}</td>
+	<td data-name="dfsj"  data-time="{{item.zdsjT}}">{{item.dfsj}}</td>
 	{{if item.status == -1}}
 		<td class="tl-qrlb">烂班</td>	
@@ -421,20 +421,20 @@
 		<div class="row">
 			<div class="col-md-4">
 				<span class="custom-label">班次类型： </span>
-				<select class="form-control nt-dictionary" data-group="ScheduleType" name="bcType"></select>
+				<select class="form-control nt-dictionary" data-group="ScheduleType" data-code="normal" name="bcType"></select>
 			</div>
 			<div class="col-md-4">
 			</div>
 			<div class="col-md-4">
 				<span class="custom-label">上下行： </span>
-				<select class="form-control nt-dictionary" data-group="LineTrend" name="xlDir" ></select>
+				<select class="form-control nt-dictionary" data-group="LineTrend" name="xlDir" data-code=0></select>
 			</div>
 		</div>
 		<div class="row">
 			<div class="col-md-4">
 				<span class="custom-label">序号： </span>
-				<input class="form-control no" disabled> 
+				<input class="form-control no" readonly name="fcno" > 
 			</div>
 			<div class="col-md-4">
 				<span class="custom-label">开始时间： </span>