Merge branch 'master' of http://222.66.0.204:8090/panzhaov5/bsth_control

徐烜
2 parents 52e8edf4 63cbb0a1
Showing 20 changed files with 718 additions and 629 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/java/com/bsth/vehicle/directive/buffer/DirectiveBuffer.java
src/main/java/com/bsth/vehicle/directive/controller/DirectiveController.java
src/main/java/com/bsth/vehicle/directive/entity/Directive.java
src/main/java/com/bsth/vehicle/directive/entity/Directive60.java
src/main/java/com/bsth/vehicle/directive/entity/Directive64.java
src/main/java/com/bsth/vehicle/directive/repository/Directive60Repository.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveService.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveServiceImpl.java
src/main/java/com/bsth/vehicle/directive/thread/FirstScheduleIssuedThread.java
src/main/java/com/bsth/vehicle/gpsdata/GpsOfflineMonitorThread.java
src/main/java/com/bsth/vehicle/gpsdata/buffer/GpsRealDataBuffer.java
src/main/resources/static/pages/base/stationroute/addstationstemplate.html
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
src/main/resources/static/pages/control/line/child_pages/historyDirective.html
src/main/resources/static/pages/control/line/child_pages/historyMessage.html
src/main/resources/static/pages/control/line/css/lineControl.css
src/main/resources/static/pages/control/line/js/toolbarEvent.js
src/main/resources/static/pages/control/lineallot/allot.html
@@ -82,7 +82,7 @@ public class StartCommand implements CommandLineRunner{
 			commonRefreshThread.start();
 			scheduler.scheduleWithFixedDelay(commonRefreshThread, HOUR_SECOND * 2 , HOUR_SECOND * 2, TimeUnit.SECONDS);
 			//等映射数据加载完......睡一会吧
-			Thread.sleep(3000);
+			Thread.sleep(4000);
 			/**
 			 * GPS实时数据更新 线程
@@ -192,7 +192,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		}
-		if(resultLine.getStartStationName()==null){
+		if(resultLine.getStartStationName().equals("")){
 			for(int k =0;k<sizeL;k++) {
@@ -209,7 +209,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		};
-		if(resultLine.getEndStationName()==null) {
+		if(resultLine.getEndStationName().equals("")) {
 			for(int k =0;k<sizeL;k++) {
@@ -1334,153 +1334,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			if(!stationJSON.equals("")) {
 				// 保存站点与站点路由信息
-				resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine);
-				
-				/*
+				// resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine);
-				JSONArray stationsArray = JSONArray.parseArray(stationJSON);
-				
-				for(int i = 0;i <stationsArray.size();i++) {
-					
-					// 站点名称
-					String stationName = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("name").toString();
-					
-					String distanceStr = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("distance").toString();
-					
-					String durationStr = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("duration").toString();
-					
-					// 百度经纬度坐标
-					String bJwpoints = "";
-					
-					// 百度坐标经度
-					String bLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lng").toString();
-					
-					// 百度坐标纬度
-					String bLatx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lat").toString();
-					
-					// 百度经纬度
-					bJwpoints = bLonx + " " + bLatx;
-					
-					List<Object[]> stationNameList = repository.findStationName(stationName);
-					
-					boolean isHave = isHaveStationname(bJwpoints,stationNameList);
-					
-					// 初始化站点对象
-					Station arg0 =  new Station();
-					
-					// 站点编码
-					long  stationCode = 0L;
-					
-					if(isHave) {
-						
-						Integer stationId = Integer.parseInt(stationNameList.get(0)[1].toString());
-						
-						arg0 = repository.findOne(stationId);
-						
-						stationCode = Integer.parseInt(arg0.getStationCod());
-						
-					}else {
-						
-						stationCode = GetUIDAndCode.getStationId();
-						
-						int stationId = (int) (stationCode);
-						
-						arg0.setId(stationId);
-						
-						arg0.setStationName(stationName);
-						
-						// 原坐标类型
-						arg0.setDbType(dbType);
-						
-						// 站点地理位置WGS坐标经度
-						String gLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lng").toString();
-						arg0.setgLonx(Float.parseFloat(gLonx));
-						
-						// 站点地理位置WGS坐标纬度
-						String gLaty = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lat").toString();
-						arg0.setgLaty(Float.parseFloat(gLaty));
-						
-						// 半径
-						int radius =  map.get("radius").equals("") ? 0 : Integer.parseInt(map.get("radius").toString());
-						arg0.setRadius(radius);
-						
-						// 图形类型
-						String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-						arg0.setShapesType(shapesType);
-						
-						// 站点编码
-						arg0.setStationCod(String.valueOf(stationCode));
-						
-						// 是否想撤销
-						arg0.setDestroy(destroy);
-						
-						// 版本号
-						arg0.setVersions(versions);
-						
-						arg0.setbJwpoints(bJwpoints);
-						
-						// 插入站点信息
-						repository.save(arg0);
-						
-						
-						// 站点路由对象
-						StationRoute route = new StationRoute();
-						
-						// 站点名称
-						route.setStationName(stationName);
-						
-						route.setDistances(distance);
-						
-						route.setToTime(duration);
-						
-						route.setDestroy(destroy);
-						
-						// 站点编码
-						route.setStationCode(arg0.getStationCod());
-						
-						// 站点序号
-						route.setStationRouteCode((i+1)*100);
-						
-						// 站点类型
-						if(i==0) {
-							
-							// 起始站
-							route.setStationMark("B");
-							
-						}else if(i==stationsArray.size()-1) {
-							
-							// 终点站
-							route.setStationMark("E");
-							
-						}else {
-							
-							// 中途站
-							route.setStationMark("Z");
-							
-						}
-						
-						// 版本号
-						route.setVersions(versions);
-						
-						// 站点ID
-						route.setStation(arg0);
-						
-						// 方向
-						route.setDirections(directions);
-						
-						// 线路ID
-						route.setLine(resultLine);
-						
-						// 线路编码
-						route.setLineCode(resultLine.getLineCode());
-						
-						
-						// 插入站点路由信息 
-						routeRepository.save(route);
-						
-					}
-				}
-				*/
 			}
 			// 路段长度
@@ -1492,7 +1347,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 如果路段信息JSON字符串不为空
 			if(!sectionJSON.equals("")) {
-				manualSaveSectionAndSectionRoute(sectionJSON, speedLimitStr, sectionDistance, sectionDuration, dbType, versions, resultLine, destroy, directions);
+				// manualSaveSectionAndSectionRoute(sectionJSON, speedLimitStr, sectionDistance, sectionDuration, dbType, versions, resultLine, destroy, directions);
 			}
@@ -1504,11 +1359,11 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			sumUpOrDownMileage = s.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
 			// 更新里程
-			updateLineInfoUpOrDownMileage( resultLine , directions, sumUpOrDownMileage);
+			// updateLineInfoUpOrDownMileage( resultLine , directions, sumUpOrDownMileage);
 			if(directions==0) {
-				lineUpdateStationName(resultLine);
+				// lineUpdateStationName(resultLine);
 			}
@@ -5,6 +5,7 @@ import java.util.Calendar;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -19,6 +20,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.directive.MsgIdGenerator;
+import com.bsth.vehicle.directive.entity.Directive;
 import com.bsth.vehicle.directive.entity.Directive60;
 import com.bsth.vehicle.directive.entity.DirectiveReply;
 import com.bsth.vehicle.directive.entity.Directive80;
@@ -301,6 +303,8 @@ public class DirectiveBuffer {
 			directiveMap.put(d.getMsgId(), d);
 		}
+		System.out.println(directiveMap.values());
+		
 		//恢复80驾驶员上报
 		List<Directive80> d80List = d80Repository.findByGtTime(st);
@@ -341,8 +345,8 @@ public class DirectiveBuffer {
 	 * @Description: TODO(获取缓存里的全部指令) 
 	 * @throws
 	 */
-	public static List<Object> findAll(){
-		List<Object> all = new ArrayList<>();
+	public static List<Directive> findAll(){
+		List<Directive> all = new ArrayList<>();
 		//60
 		all.addAll(directiveMap.values());
 		//64
@@ -350,23 +354,51 @@ public class DirectiveBuffer {
 		return all;
 	}
-	public static class DComparator implements Comparator<Object>{
-
-		@Override
-		public int compare(Object o1, Object o2) {
-			Long t1,t2;
-			if(o1 instanceof Directive60)
-				t1 = ((Directive60)o1).getTimestamp();
-			else
-				t1 = ((Directive64)o1).getTimestamp();
+	/**
+	 * 
+	 * @Title: findDispatch 
+	 * @Description: TODO(获取缓存里的调度指令) 
+	 * @throws
+	 */
+	public static List<Directive> findDispatch(){
+		List<Directive> rs = new ArrayList<>();
+		for(Directive60 d60 : directiveMap.values()){
+			if(d60.isDispatch())
+				rs.add(d60);
+		}
-			if(o2 instanceof Directive60)
-				t2 = ((Directive60)o2).getTimestamp();
-			else
-				t2 = ((Directive64)o2).getTimestamp();
+		return rs;
+	}
+	
+	/**
+	 * 
+	 * @Title: findDispatch 
+	 * @Description: TODO(根据dispatchInstruct获取非调度指令) 
+	 * @throws
+	 */
+	public static List<Directive> findByDispatchInstruct(short dispatchInstruct){
+		List<Directive> rs = new ArrayList<>();
+		for(Directive60 d60 : directiveMap.values()){
+			if(d60.getData() != null && d60.getData().getDispatchInstruct() == dispatchInstruct
+					&& !d60.isDispatch())
+				rs.add(d60);
+		}
-			return (int) (t2 - t1);
+		return rs;
+	}
+	
+	public static class DComparator implements Comparator<Directive>{
+
+		@Override
+		public int compare(Directive o1, Directive o2) {
+			return (int) (o2.getTimestamp() - o1.getTimestamp());
 		}
 	}
+
+	public static List<Directive> findLineChange() {
+		List<Directive> rs = new ArrayList<>();
+		rs.addAll(changeMap.values());
+		return rs;
+	}
 }
@@ -110,7 +110,7 @@ public class DirectiveController {
 	 * @throws
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public List<Object> findDirective(@RequestParam String nbbm,@RequestParam int dType
+	public Map<String, Object> findDirective(String nbbm,@RequestParam int dType
 							, @RequestParam(defaultValue = "0") int page,
 							@RequestParam(defaultValue = "10") int size){
+package com.bsth.vehicle.directive.entity;
+
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
+
+/**
+ * 
+ * @ClassName: Directive 
+ * @Description: TODO(指令基础类) 
+ * @author PanZhao
+ * @date 2016年7月31日 下午8:35:56 
+ *
+ */
+@MappedSuperclass
+public class Directive {
+
+	/**
+	 * 一级协议
+	 */
+	protected short operCode;
+	
+	/**
+	 * 设备号
+	 */
+	protected String deviceId;
+	
+	/**
+	 * 时间戳
+	 */
+	protected Long timestamp;
+	
+	/**
+	 * 时间 HH:mm
+	 */
+	@Transient
+	private String timeHHmm;
+	
+	/**
+	 * 车辆内部编码
+	 */
+	@Transient
+	private String nbbm;
+	
+	private String errorText;
+	
+	private int httpCode;
+
+	public short getOperCode() {
+		return operCode;
+	}
+
+	public void setOperCode(short operCode) {
+		this.operCode = operCode;
+	}
+
+	public String getDeviceId() {
+		return deviceId;
+	}
+
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
+
+	public Long getTimestamp() {
+		return timestamp;
+	}
+
+	public void setTimestamp(Long timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	public String getTimeHHmm() {
+		return timeHHmm;
+	}
+
+	public void setTimeHHmm(String timeHHmm) {
+		this.timeHHmm = timeHHmm;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getErrorText() {
+		return errorText;
+	}
+
+	public void setErrorText(String errorText) {
+		this.errorText = errorText;
+	}
+
+	public int getHttpCode() {
+		return httpCode;
+	}
+
+	public void setHttpCode(int httpCode) {
+		this.httpCode = httpCode;
+	}
+}
@@ -2,14 +2,19 @@ package com.bsth.vehicle.directive.entity;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.NamedAttributeNode;
+import javax.persistence.NamedEntityGraph;
+import javax.persistence.NamedEntityGraphs;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.SysUser;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
@@ -22,35 +27,23 @@ import com.bsth.entity.sys.SysUser;
  */
 @Entity
 @Table(name = "bsth_v_directive_60")
-public class Directive60 {
+@NamedEntityGraphs({
+	@NamedEntityGraph(name = "directive60_sch", attributeNodes = {
+			@NamedAttributeNode("sch")
+	})
+})
+public class Directive60 extends Directive{
 	@Id
     @GeneratedValue
 	private Integer id;
 	/**
-	 * 一级协议
-	 */
-	private short operCode;
-	
-	/**
 	 * 数据
 	 */
 	private DirectiveData data;
 	/**
-	 * 设备号
-	 */
-	@Transient
-	private String deviceId;
-
-	/**
-	 * 时间戳
-	 */
-	@Transient
-	private Long timestamp;
-	
-	/**
 	 * 唯一标识
 	 */
 	@Transient
@@ -75,7 +68,8 @@ public class Directive60 {
 	/**
 	 * 相关联的班次
 	 */
-	@ManyToOne
+	@JsonIgnore
+	@ManyToOne(fetch = FetchType.LAZY)
 	private ScheduleRealInfo sch;
 	/**
@@ -90,9 +84,11 @@ public class Directive60 {
 		private short companyCode;
 		// 设备号
+		@Transient
 		private String deviceId;
 		// 时间戳
+		@Transient
 		private Long timestamp;
 		// 保留 默认0
@@ -217,28 +213,31 @@ public class Directive60 {
 		this.data = data;
 	}
-	public String getDeviceId() {
-		return deviceId;
-	}
-
-	public void setDeviceId(String deviceId) {
-		this.deviceId = deviceId;
+	public Integer getMsgId() {
+		if(this.msgId != null)
+			return this.msgId;
+		else
+			return this.getData().getMsgId();
 	}
-	public Long getTimestamp() {
-		return timestamp;
+	public void setMsgId(Integer msgId) {
+		this.msgId = msgId;
 	}
-
+	
+	@Override
 	public void setTimestamp(Long timestamp) {
+		if(this.data != null)
+			this.data.setTimestamp(timestamp);
+		
 		this.timestamp = timestamp;
 	}
-
-	public Integer getMsgId() {
-		return msgId;
-	}
-
-	public void setMsgId(Integer msgId) {
-		this.msgId = msgId;
+	
+	@Override
+	public void setDeviceId(String deviceId) {
+		if(this.data != null)
+			this.data.setDeviceId(deviceId);
+		
+		this.deviceId = deviceId;
 	}
 	public Short getReply46() {
@@ -17,29 +17,13 @@ import javax.persistence.Id;
  */
 @Entity
 @Table(name = "bsth_v_directive_64")
-public class Directive64 {
+public class Directive64 extends Directive{
 	@Id
 	@GeneratedValue
 	private Integer id;
 	/**
-	 * 设备编号
-	 */
-	@Transient
-	private String deviceId;
-
-	/**
-	 * 时间戳(ms)
-	 */
-	private Long timestamp;
-
-	/**
-	 * 一级协议
-	 */
-	private Short operCode;
-	
-	/**
 	 * 设备响应应答字
 	 * 0x06同意 0x15不同意
 	 */
@@ -52,6 +36,7 @@ public class Directive64 {
 		private Short cityCode;
+		@Transient
 		private String deviceId;
 		private String lineId;
@@ -89,30 +74,6 @@ public class Directive64 {
 		this.id = id;
 	}
-	public String getDeviceId() {
-		return deviceId;
-	}
-
-	public void setDeviceId(String deviceId) {
-		this.deviceId = deviceId;
-	}
-
-	public Long getTimestamp() {
-		return timestamp;
-	}
-
-	public void setTimestamp(Long timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	public Short getOperCode() {
-		return operCode;
-	}
-
-	public void setOperCode(Short operCode) {
-		this.operCode = operCode;
-	}
-
 	public LineChangeData getData() {
 		return data;
 	}
@@ -128,4 +89,12 @@ public class Directive64 {
 	public void setRespAck(Short respAck) {
 		this.respAck = respAck;
 	}
+
+	@Override
+	public void setDeviceId(String deviceId) {
+		if(this.data != null)
+			this.data.setDeviceId(deviceId);
+		
+		this.deviceId = deviceId;
+	}
 }
@@ -2,6 +2,10 @@ package com.bsth.vehicle.directive.repository;
 import java.util.List;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+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;
@@ -11,10 +15,19 @@ import com.bsth.vehicle.directive.entity.Directive60;
 @Repository
 public interface Directive60Repository extends BaseRepository<Directive60, Integer>{
-	
-	@Query("select d from Directive60 d where d.data.timestamp > ?1")
+	@EntityGraph(value = "directive60_sch", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select d from Directive60 d where d.timestamp > ?1")
 	public List<Directive60> findByGtTime(Long ts);
 	@Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(msg_id) as num FROM bsth_v_directive_60) d", nativeQuery = true)
 	Integer maxMsgId();
+	
+	
+    @EntityGraph(value = "directive60_sch", type = EntityGraph.EntityGraphType.FETCH)
+    @Override
+    Page<Directive60> findAll(Specification<Directive60> spec, Pageable pageable);
+
+    @EntityGraph(value = "directive60_sch", type = EntityGraph.EntityGraphType.FETCH)
+    @Override
+    List<Directive60> findAll(Specification<Directive60> spec);
 }
@@ -76,5 +76,5 @@ public interface DirectiveService extends BaseService&lt;Directive60, Integer&gt;{
 	Map<String, Object> reply80(int id, int reply);
-	List<Object> findDirective(String nbbm, int dType, int page, int size);
+	Map<String, Object> findDirective(String nbbm, int dType, int page, int size);
 }
@@ -2,12 +2,12 @@ package com.bsth.vehicle.directive.service;
 import java.text.SimpleDateFormat;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +23,7 @@ import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.directive.Consts;
 import com.bsth.vehicle.directive.MsgIdGenerator;
 import com.bsth.vehicle.directive.buffer.DirectiveBuffer;
+import com.bsth.vehicle.directive.entity.Directive;
 import com.bsth.vehicle.directive.entity.Directive60;
 import com.bsth.vehicle.directive.entity.Directive60.DirectiveData;
 import com.bsth.vehicle.directive.entity.DirectiveC0.DirectiveC0Data;
@@ -40,136 +41,140 @@ import com.bsth.websocket.handler.RealControlSocketHandler;
 import com.google.common.base.Splitter;
 @Service
-public class DirectiveServiceImpl extends BaseServiceImpl<Directive60, Integer> implements DirectiveService{
+public class DirectiveServiceImpl extends BaseServiceImpl<Directive60, Integer> implements DirectiveService {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
-	
+
 	@Autowired
 	Directive60Repository directiveRepository;
-	
+
 	@Autowired
 	GpsRealDataBuffer gpsRealDataBuffer;
-	
+
 	@Autowired
 	LineChangeRepository lineChangeRepository;
-	
+
 	@Autowired
 	RealControlSocketHandler socketHandler;
-	
+
 	@Autowired
 	Directive80Repository d80Repository;
-	
-	SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH点mm分");
-	
+
+	SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH点mm分"), sdfHHmm2 = new SimpleDateFormat("HH:mm");
+
 	static Long schDiff = 1000 * 60 * 60L;
-	
-	//城市代码
+
+	// 城市代码
 	static final short cityCode = 22;
-	
+
 	@Override
 	public int send60Phrase(String nbbm, String text) {
 		Directive60 directive = null;
 		try {
-			directive = create60Data(nbbm, text, (short)0x00, null);
+			directive = create60Data(nbbm, text, (short) 0x00, null);
 		} catch (Exception e) {
 			logger.error("发送消息短语出现异常", e);
 			return -1;
 		}
-		
-		if(null == directive)
+
+		if (null == directive)
 			return -1;
-		
-		//发送指令
+
+		// 发送指令
 		int code = HttpUtils.postJson(JSON.toJSONString(directive));
-		
-		if(code == 0){
-			//添加到缓存，等待入库
-			DirectiveBuffer.put(directive);
-		}else{
-			logger.error("send60Phrase error, code: " + code);
+		directive.setHttpCode(code);
+		// 添加到缓存，等待入库
+		DirectiveBuffer.put(directive);
+
+		if (code != 0) {
+			directive.setErrorText("网关通讯失败, code: " + code);
+			DirectiveBuffer.transientList.add(directive);
 		}
 		return code;
 	}
-	
+
 	@Override
-	public int send60Dispatch(ScheduleRealInfo sch,  int finish) {
+	public int send60Dispatch(ScheduleRealInfo sch, int finish) {
 		Directive60 directive = null;
 		try {
-			//如果发车时间距当前时间较远，则不发送
-			if(Math.abs(sch.getFcsjT() - System.currentTimeMillis()) > schDiff){
+			// 如果发车时间距当前时间较远，则不发送
+			if (Math.abs(sch.getFcsjT() - System.currentTimeMillis()) > schDiff) {
 				return -2;
 			}
-			
-			String text = "已完成" + finish + "个班次，下一发车时间" + sdfHHmm.format(new Date(sch.getFcsjT()))
-					+ "，由" + sch.getQdzName() + "发往" + sch.getZdzName();
-			
-			//目前使用短语协议下发调度指令
-			directive = create60Data(sch.getClZbh(), text, (short)0x00, sch);
+
+			String text = "已完成" + finish + "个班次，下一发车时间" + sdfHHmm.format(new Date(sch.getFcsjT())) + "，由"
+					+ sch.getQdzName() + "发往" + sch.getZdzName();
+
+			// 目前使用短语协议下发调度指令
+			directive = create60Data(sch.getClZbh(), text, (short) 0x00, sch);
 		} catch (Exception e) {
 			logger.error("生成调度指令时出现异常", e);
 			return -1;
 		}
-		
-		if(null == directive)
+
+		if (null == directive)
 			return -1;
-		
-		//发送指令
+
+		// 发送指令
 		int code = HttpUtils.postJson(JSON.toJSONString(directive));
-		
-		if(code == 0){
-			sch.setDirectiveState(60);
-			//添加到缓存，等待入库
-			directive.setDispatch(true);
-			directive.setSch(sch);
-			DirectiveBuffer.put(directive);
-			//通知页面，消息已发出
+
+		sch.setDirectiveState(60);
+		// 添加到缓存，等待入库
+		directive.setDispatch(true);
+		directive.setSch(sch);
+		directive.setHttpCode(code);
+		DirectiveBuffer.put(directive);
+
+		if (code == 0) {
+			// 通知页面，消息已发出
 			sendDirectiveToPage(sch);
-		}else{
-			logger.error("send60Phrase error, code: " + code);
+		} else {
+			directive.setErrorText("网关通讯失败, code: " + code);
+			DirectiveBuffer.transientList.add(directive);
 		}
 		return code;
 	}
-	
+
 	/**
 	 * 
-	 * @Title: sendDirectiveState 
-	 * @Description: TODO(向页面推送班次指令状态) 
-	 * @throws
+	 * @Title: sendDirectiveState @Description: TODO(向页面推送班次指令状态) @throws
 	 */
 	@Override
-	public void sendDirectiveToPage(ScheduleRealInfo sch){
+	public void sendDirectiveToPage(ScheduleRealInfo sch) {
 		JSONObject json = new JSONObject();
 		json.put("fn", "directive");
 		json.put("t", sch);
 		socketHandler.sendMessageToLine(Integer.parseInt(sch.getXlBm()), json.toJSONString());
 	}
-	
 	@Override
 	public int send60Dispatch(Long id) {
 		ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
-		//车辆已完成班次
+		// 车辆已完成班次
 		int finish = ScheduleBuffer.getFinishSchNo(sch.getClZbh());
 		return send60Dispatch(sch, finish);
 	}
-	
+
 	@Override
 	public int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch) {
-		logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown );
-		
-		Directive60 directive = createDirective60(nbbm, nbbm + "_" + upDown, (short) 0x03, upDown, state);
+		logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
+
+		String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
+		Directive60 directive = createDirective60(nbbm, text, (short) 0x03, upDown, state);
-		if(null == directive)
+		if (null == directive)
 			return -1;
-		//发送指令
+		// 发送指令
 		int code = HttpUtils.postJson(JSON.toJSONString(directive));
-		if(code == 0){
-			//添加到缓存，等待入库
-			if(null != sch)
-				directive.setSch(sch);
-			DirectiveBuffer.put(directive);
-		}else{
-			logger.error("send60Phrase error, code: " + code);
+		// 添加到缓存，等待入库
+		directive.setHttpCode(code);
+		if (null != sch)
+			directive.setSch(sch);
+		DirectiveBuffer.put(directive);
+
+		if (code != 0) {
+			directive.setErrorText("网关通讯失败, code: " + code);
+			DirectiveBuffer.transientList.add(directive);
 		}
 		return code;
 	}
@@ -181,80 +186,80 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 	public int lineChange(String nbbm, Integer lineId) {
 		Long t = System.currentTimeMillis();
 		String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
-		
+
 		Directive64 change = new Directive64();
 		LineChangeData data = new LineChangeData();
 		data.setCityCode(cityCode);
 		data.setDeviceId(deviceId);
 		data.setLineId("00" + String.valueOf(lineId));
-		
+
 		change.setDeviceId(deviceId);
 		change.setOperCode((short) 0X64);
 		change.setTimestamp(t);
 		change.setData(data);
-		
+
 		int code = HttpUtils.postJson(JSON.toJSONString(change));
-		if(code == 0){
-			//入库
-			lineChangeRepository.save(change);
-			DirectiveBuffer.changeMap.put(deviceId + '_'  + t , change);
-			//通知设备刷新线路文件，忽略结果
+		// 入库
+		change.setHttpCode(code);
+		DirectiveBuffer.changeMap.put(deviceId + '_' + t, change);
+
+		// 通知设备刷新线路文件，忽略结果
+		if (code == 0)
 			HttpUtils.postJson(createDeviceRefreshData(deviceId, lineId));
-		}else{
-			logger.error("send60Phrase error, code: " + code);
-		}
+		else
+			change.setErrorText("网关通讯失败, code: " + code);
+
+		lineChangeRepository.save(change);
 		return code;
 	}
-	
-	
-	public Directive60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch){
-		
-		/*//向测试设备发送
-		String deviceId = "ABCDFEGH";
-		Short company = 5;*/
-		
+
+	public Directive60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch) {
+
+		/*
+		 * //向测试设备发送 String deviceId = "ABCDFEGH"; Short company = 5;
+		 */
+
 		String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
-		if(null == deviceId){
+		if (null == deviceId) {
 			logger.error("没有设备号对照的车辆：" + nbbm);
 			return null;
 		}
-		//上下行和营运状态
+		// 上下行和营运状态
 		Integer upDown = null, state = null;
-		if(null == sch){
+		if (null == sch) {
 			GpsRealData gpsData = gpsRealDataBuffer.findOneByDeviceId(deviceId);
-			if(null == gpsData){
+			if (null == gpsData) {
 				logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);
 				return null;
 			}
 			upDown = gpsData.getUpDown();
 			state = gpsData.getState();
-		}
-		else{
+		} else {
 			upDown = Integer.parseInt(sch.getXlDir());
 			state = 0;
 		}
-		
+
 		return createDirective60(nbbm, text, dispatchInstruct, upDown, state);
 	}
-	
-	public Directive60 createDirective60(String nbbm, String text, Short dispatchInstruct,int upDown,int state){
+
+	public Directive60 createDirective60(String nbbm, String text, Short dispatchInstruct, int upDown, int state) {
 		Long timestamp = System.currentTimeMillis();
-		
+
 		Short company = Short.parseShort(CommonMapped.vehicCompanyMap.get(nbbm));
 		String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
-		
+
 		int msgId = MsgIdGenerator.getMsgId();
-		
+
 		Directive60 directive = new Directive60();
 		DirectiveData data = new DirectiveData();
-		//一级协议
+		// 一级协议
 		directive.setOperCode((short) 0x60);
-		//设备号
+		// 设备号
 		directive.setDeviceId(deviceId);
-		//时间戳
+		// 时间戳
 		directive.setTimestamp(timestamp);
 		directive.setMsgId(msgId);
-		//构造数据
+		// 构造数据
 		data.setDeviceId(deviceId);
 		data.setDispatchInstruct(dispatchInstruct);
 		data.setTimestamp(timestamp);
@@ -262,50 +267,45 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 		data.setMsgId(msgId);
 		directive.setData(data);
 		long serviceState;
-		try{
+		try {
 			serviceState = Consts.SERVICE_STATE[upDown][state];
-		}catch(IndexOutOfBoundsException e){
-			//未知营运状态的直接默认为上行非营运
+		} catch (IndexOutOfBoundsException e) {
+			// 未知营运状态的直接默认为上行非营运
 			serviceState = Consts.SERVICE_STATE[0][1];
 		}
 		data.setServiceState(serviceState);
 		data.setTxtContent(text);
-		
+
 		return directive;
 	}
-	
+
 	@Override
 	public int upDownChange(String nbbm, Integer upDown) {
-		/*Directive60 directive = createDirective60(nbbm, nbbm + "_" + upDown, (short) 0x03, upDown, 0);
-		
-		if(null == directive)
-			return -1;
-		
-		int code = HttpUtils.postJson(JSON.toJSONString(directive));
-		if(code == 0){
-			//添加到缓存，等待入库
-			DirectiveBuffer.put(directive);
-		}else{
-			logger.error("send60 upDownChange error, code: " + code);
-		}*/
+		/*
+		 * Directive60 directive = createDirective60(nbbm, nbbm + "_" + upDown,
+		 * (short) 0x03, upDown, 0);
+		 * 
+		 * if(null == directive) return -1;
+		 * 
+		 * int code = HttpUtils.postJson(JSON.toJSONString(directive)); if(code
+		 * == 0){ //添加到缓存，等待入库 DirectiveBuffer.put(directive); }else{
+		 * logger.error("send60 upDownChange error, code: " + code); }
+		 */
 		return send60Operation(nbbm, 0, upDown, null);
 	}
-	
+
 	/**
 	 * 
-	 * @Title: createDeviceRefreshData 
-	 * @Description: TODO(生成设备线路刷新数据包) 
-	 * @param @return    设定文件 
-	 * @return String    返回类型 
-	 * @throws
+	 * @Title: createDeviceRefreshData @Description:
+	 *         TODO(生成设备线路刷新数据包) @param @return 设定文件 @return String 返回类型 @throws
 	 */
-	public String createDeviceRefreshData(String deviceId, Integer lineId){
-		Long t =  System.currentTimeMillis();
+	public String createDeviceRefreshData(String deviceId, Integer lineId) {
+		Long t = System.currentTimeMillis();
 		Map<String, Object> param = new HashMap<String, Object>();
 		param.put("deviceId", deviceId);
 		param.put("timestamp", t);
 		param.put("operCode", 0Xc0);
-		
+
 		Map<String, Object> data = new HashMap<String, Object>();
 		data.put("operCode", 0xa1);
 		data.put("cityCode", cityCode);
@@ -316,39 +316,37 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 		data.put("lineVersion", 0);
 		data.put("carparkDataVersion", 0);
 		param.put("data", data);
-		
+
 		return JSON.toJSONString(param);
 	}
 	@Override
 	public Map<String, List<Directive80>> findNoCofm80(String lineCodes) {
 		List<String> lineList = Splitter.on(",").trimResults().splitToList(lineCodes);
-		
+
 		Map<String, List<Directive80>> rs = new HashMap<>();
-		for(String code : lineList){
+		for (String code : lineList) {
 			rs.put(code, DirectiveBuffer.findNoCofm80(Integer.parseInt(code)));
 		}
-		
+
 		return rs;
 	}
 	@Override
 	public Map<String, Object> reply80(int id, int reply) {
 		Map<String, Object> rs = new HashMap<>();
-		
+
 		Directive80 d80 = DirectiveBuffer.findById80(id);
-		if(null == d80){
+		if (null == d80) {
 			rs.put("status", ResponseCode.ERROR);
 			rs.put("msg", "服务器没有找到对应数据！");
-		}
-		else if(d80.isConfirm()){
+		} else if (d80.isConfirm()) {
 			rs.put("status", ResponseCode.ERROR);
 			rs.put("msg", "该数据已经被处理了！");
-		}
-		else{
+		} else {
 			d80.setConfirm(true);
 			d80.setConfirmRs(reply);
-			//封装C0数据包并回复设备
+			// 封装C0数据包并回复设备
 			DirectiveC0 c0 = new DirectiveC0();
 			c0.setDeviceId(d80.getDeviceId());
 			c0.setTimestamp(d80.getTimestamp());
@@ -356,48 +354,85 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 			DirectiveC0Data data = new DirectiveC0Data();
 			data.setOperCode2((short) 0x86);
-			data.setRequestAck((short)(reply==0?0x06:0x15));
-			
+			data.setRequestAck((short) (reply == 0 ? 0x06 : 0x15));
+
 			c0.setData(data);
-			
+
 			d80.setC0(c0);
-			//入库
+			// 入库
 			d80Repository.save(d80);
-			
+
 			int code = HttpUtils.postJson(JSON.toJSONString(c0));
-			
+
 			rs.put("status", ResponseCode.SUCCESS);
-			if(code != 0)
+			if (code != 0)
 				rs.put("msg", "发送C0响应指令到车载设备失败，但该操作已经被系统记录！");
-			
-			//通知页面
+
+			// 通知页面
 			Map<String, Object> sockMap = new HashMap<>();
 			sockMap.put("fn", "d80Confirm");
 			sockMap.put("id", d80.getId());
 			socketHandler.sendMessageToLine(d80.getData().getLineId(), JSON.toJSONString(sockMap));
 		}
-		
+
 		return rs;
 	}
 	@Override
-	public List<Object> findDirective(String nbbm, int dType, int page, int size) {
-		List<Object> list = null;
-		if(dType == -1){
+	public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {
+		Map<String, Object> rsMap = new HashMap<>();
+		List<Directive> list = null;
+		
+		switch (dType) {
+		case -1:
+			//所有指令
 			list = DirectiveBuffer.findAll();
-			//时间倒序
-			Collections.sort(list, new DirectiveBuffer.DComparator());
-			
-			int count = list.size();
-			//分页
-			int s = page * size
-				,e = s + size;
-			
-			if(e > count)
-				e = count;
+			break;
+		case 0:
+			//调度指令
+			list = DirectiveBuffer.findDispatch();
+			break;
+		case 1: 
+			//运营指令
+			list = DirectiveBuffer.findByDispatchInstruct((short)0x03);
+			break;
+		case 2:
+			//线路切换指令
+			list = DirectiveBuffer.findLineChange();
+			break;
+		case 3:
+			//消息短语
+			list = DirectiveBuffer.findByDispatchInstruct((short)0x00);
+			break;
+		}
+
+		// 时间倒序
+		Collections.sort(list, new DirectiveBuffer.DComparator());
+		if(StringUtils.isNotBlank(nbbm)){
+			//按车辆过滤
-			list.subList(s, e);
 		}
-		return list;
+		
+		int count = list.size();
+		// 分页
+		int s = page * size, e = s + size;
+
+		if (e > count)
+			e = count;
+
+		List<Directive> rs = list.subList(s, e);
+
+		// 时间格式化，车辆自编号转换
+		for (Directive d : rs) {
+			if (d.getTimeHHmm() == null)
+				d.setTimeHHmm(sdfHHmm2.format(new Date(d.getTimestamp())));
+			if (d.getNbbm() == null)
+				d.setNbbm(CommonMapped.vehicDeviceBiMap.get(d.getDeviceId()));
+		}
+
+		rsMap.put("list", rs);
+		rsMap.put("totalPages", count % size == 0 ? count / size : count / size + 1);
+		rsMap.put("page", page);
+		return rsMap;
 	}
 }
@@ -57,9 +57,9 @@ public class FirstScheduleIssuedThread extends Thread{
 				sch = list.get(0);
-				if(sch.getOpDirectiveState()!= 100
+				if(sch.getOpDirectiveState() < 100
 						&& sch.getStatus() == 0
-						&& Math.abs(sch.getFcsjT() - t) < space){
+						&& Math.abs(sch.getDfsjT() - t) < space){
 					/*if(sch.getDirectiveState() == -1){
 						//发送调度指令
@@ -30,7 +30,7 @@ public class GpsOfflineMonitorThread extends Thread{
 		for(GpsRealData gps : allGps){
 			if(t - gps.getTimestamp() 
-					> GpsRealDataBuffer.OFFLINE_TIME){
+					> GpsRealDataBuffer.OFFLINE_TIME && gps.isOnline()){
 				gps.setOnline(false);
 				logger.info("设备：" + gps.getDeviceId() + " 掉线");
 			}
@@ -103,7 +103,8 @@ public class GpsRealDataBuffer {
 		//更新GPS点
 		for(GpsRealData newGps : upGpsList){
-			if(t - newGps.getTimestamp() < OFFLINE_TIME){
+			if(t - newGps.getTimestamp() < OFFLINE_TIME
+					&& !newGps.isOnline()){
 				logger.info("设备：" + newGps.getDeviceId() + " 上线");
 				newGps.setOnline(true);
 			}
@@ -33,6 +33,26 @@
 					</div>
 					 <div class="form-group">
+						<label class="col-md-3 control-label">坐标系类型：</label>
+						<div class="col-md-9">
+							<div class="icheck-list">
+								<label>
+										<input type="radio" class="icheck" name="baseRes" value='No'> 暂无坐标系
+								</label>
+								<label>
+										<input type="radio" class="icheck" name="baseRes" value='GCJ-02' > 火星坐标系
+								</label>
+								<label >
+									<input type="radio" class="icheck" name="baseRes" value='BD-09'> 百度坐标系
+								</label>
+								<label >
+									<input type="radio" class="icheck" name="baseRes" value='WGS84' checked> WGS84坐标系
+								</label>
+							</div>
+						</div>
+					 </div>
+					
+					 <div class="form-group">
 					 	<div class="alert alert-info font-blue-chambray" style="background-color: #2C3E50">
                             <h5 class="block"><span class="help-block" style="color:#1bbc9b;"> *　手动添加站点规划说明： </span></h5>
                             <p>
@@ -146,21 +166,135 @@ $(&#39;#add_station_template_mobal&#39;).on(&#39;AddStationTempMobal.show&#39;, function(e,map,a
 			// 弹出正在加载层
 			var i = layer.load(0,{offset:['200px', '280px']});
-			// 表单序列画
+			// 表单序列化
 			var params = form.serializeJSON();
+			var baseResValue = params.baseRes;
+			
 			// 站点名称字符串切割
 			var paramsStationsArray = params.stations.split('\r\n');
-			var stationList = [];
-			
 			var len = paramsStationsArray.length;
-			if(len>0) {
+			if(baseResValue=='No'){
-				for(var k =0;k<len;k++) {
+				debugger;
+				
+				var stationList = [];
+				
+				for(var k =0;k<len;k++)
+					stationList.push({name:paramsStationsArray[k]+'公交车站'});
+				
+				
+				console.log(stationList);
+				
+				return;
+				
+				// 根据站点名称获取百度坐标
+				map.stationsNameToPoints(stationList,function(resultJson) {
-					debugger;
+					// 根据坐标点获取两点之间的时间与距离
+					map.getDistanceAndDuration(resultJson,function(stationdataList) {
+						
+						// 根据坐标点获取两点之间的折线路段
+						map.getSectionListPlonly(stationdataList,function(sectiondata) {
+							
+							var addLine = LineObj.getLineObj();
+							
+							// 设置第一个站的距离
+							stationdataList[0].distance = '';
+	            			
+							// 设置第一个站的时间
+							stationdataList[0].duration = '';
+							
+							// 定义站点信息JSON字符串
+							var stationJSON = JSON.stringify(stationdataList);
+							
+							// 定义路段信息字符串
+							var sectionJSON = JSON.stringify(sectiondata);
+							
+							// 参数集合
+							var params = {};
+							
+							// 站点信息JSON字符串
+							params.stationJSON = stationJSON;
+							
+							// 线路ID
+							params.lineId = addLine.id;
+							
+							// 方向
+							params.directions = directionData;
+							
+							// 原始坐标类型
+							params.dbType = 'b';
+							
+							// 圆形半径
+							params.radius = '100';
+							
+							// 限速
+							params.speedLimit = '60';
+							
+							// 图形类型（r：圆形；p：多边形）
+							params.shapesType = 'r';
+							
+							// destroy：是否撤销
+							params.destroy = '0';
+							
+							// versions：版本号
+							params.versions = '1';
+							
+							// 路段信息JSON字符串
+							params.sectionJSON = sectionJSON;
+							
+							// 保存
+							ajaxd.manualSave(params,function(rd) {
+
+								if(rd.status='SUCCESS') {
+									
+									layer.msg('保存成功！');
+									
+								}else {
+									
+									layer.msg('保存失败！');
+									
+								}
+								
+								// 关闭弹出层
+								layer.closeAll();
+								
+								// 清除地图覆盖物
+								map.clearMarkAndOverlays();
+								
+								// 刷新树
+								fun.resjtreeDate(addLine.id,directionData);
+								
+								// 查询上行路段信息
+								ajaxd.getSectionRouteInfo(addLine.id,directionData,function(data) {
+									
+								// 在地图上画出线路走向
+								fun.linePanlThree(data,directionData);
+									
+								});
+								
+							});
+							 
+						});
+						
+	 				});
+					
+				});
+				
+			}else {
+				
+				
+				
+				
+			}
+			
+			
+			/* if(len>0) {
+				
+				for(var k =0;k<len;k++) {
 					if(paramsStationsArray[k]=="")
 						continue;
@@ -185,102 +319,7 @@ $(&#39;#add_station_template_mobal&#39;).on(&#39;AddStationTempMobal.show&#39;, function(e,map,a
 				return;
-			}
-			console.log(stationList);
-			// 根据站点名称获取百度坐标
-			map.stationsNameToPoints(stationList,function(resultJson) {
-				console.log(resultJson);
-				debugger;
-				// 根据坐标点获取两点之间的时间与距离
-				map.getDistanceAndDuration(resultJson,function(stationdataList) {
-					
-					// 根据坐标点获取两点之间的折线路段
-					map.getSectionListPlonly(stationdataList,function(sectiondata) {
-						
-						var addLine = LineObj.getLineObj();
-						
-						// 设置第一个站的距离
-						stationdataList[0].distance = '';
-            			
-						// 设置第一个站的时间
-						stationdataList[0].duration = '';
-						
-						// 定义站点信息JSON字符串
-						var stationJSON = JSON.stringify(stationdataList);
-						
-						// 定义路段信息字符串
-						var sectionJSON = JSON.stringify(sectiondata);
-						
-						// 参数集合
-						var params = {};
-						
-						// 站点信息JSON字符串
-						params.stationJSON = stationJSON;
-						
-						// 线路ID
-						params.lineId = addLine.id;
-						
-						// 方向
-						params.directions = directionData;
-						
-						// 原始坐标类型
-						params.dbType = 'b';
-						
-						// 圆形半径
-						params.radius = '100';
-						
-						// 限速
-						params.speedLimit = '60';
-						
-						// 图形类型（r：圆形；p：多边形）
-						params.shapesType = 'r';
-						
-						// destroy：是否撤销
-						params.destroy = '0';
-						
-						// versions：版本号
-						params.versions = '1';
-						
-						// 路段信息JSON字符串
-						params.sectionJSON = sectionJSON;
-						
-						// 保存
-						ajaxd.manualSave(params,function(rd) {
-
-							if(rd.status='SUCCESS') {
-								
-								layer.msg('保存成功！');
-								
-							}else {
-								
-								layer.msg('保存失败！');
-								
-							}
-							
-							// 关闭弹出层
-							layer.closeAll();
-							
-							// 清除地图覆盖物
-							map.clearMarkAndOverlays();
-							
-							// 刷新树
-							fun.resjtreeDate(addLine.id,directionData);
-							
-							// 查询上行路段信息
-							ajaxd.getSectionRouteInfo(addLine.id,directionData,function(data) {
-								
-							// 在地图上画出线路走向
-							fun.linePanlThree(data,directionData);
-								
-							});
-							
-						});
-						 
-					});
-					
- 				});
-				
-			});
+			} */
 		}
@@ -301,11 +301,14 @@ var PublicFunctions = function () {
 							// 添加站点坐标
 							tempM.potion = BusLine.getBusStation(k).position;
+							tempM.wgs = {x:'',y:''};
+							
 							// 添加
 							stationInfo.push(tempM);
 						}
-						
+						console.log(stationInfo);
+						debugger;
 						// 获取站点之间的距离与时间
 						WorldsBMap.getDistanceAndDuration(stationInfo,function(json) {
+<div id="historyMessagePanel" style="margin: 17px 0 0 0;">
+
+	<form class="form-inline" >
+		<div class="form-group" style="margin: 18px;">
+			<label class="" for="directiveSelect">指令类型：</label> 
+			<select class="form-control" id="directiveSelect" name="dType">
+				<option value="-1">全部</option>
+				<option value="0">调度指令</option>
+				<option value="1">运营指令</option>
+				<option value="2">线路切换指令</option>
+				<option value="3">消息短语</option>
+			</select>
+		</div>
+	
+		<div class="form-group" >
+			<label class="" for="carSelect">车辆：</label> 
+			<select class="form-control" name="nbbm" id="carSelect" style="width: 170px;"></select>
+		</div>
+	</form>
+
+	<div class="table-scrollable" style="min-height: 468px;">
+		<table class="table table-hover" style="table-layout: fixed;">
+			<thead>
+				<tr>
+					<th width="9%">车辆</th>
+					<th width="7%">时间</th>
+					<th width="47%">内容</th> 
+					<th width="8%">发送人</th>
+					<th width="17%">状态</th>
+				</tr>
+			</thead>
+			<tbody>
+			</tbody>
+		</table>
+	</div>
+		<div style="text-align: right;margin: 15px 15px 5px;">
+			<ul id="pagination" class="pagination"></ul>
+		</div>
+</div>
+<script id="history_directive_list_temp" type="text/html">
+{{each list as item i}}
+<tr>
+	<td>{{item.nbbm}}</td>
+	<td>{{item.timeHHmm}}</td>
+	<td>
+		<div class="text-furl">
+			{{item.data.txtContent}}
+		</div>
+	</td>
+	<td>系统</td>
+	<td>
+		{{if item.errorText != null}}
+			<span class="label label-sm label-danger">{{item.errorText}}</span>
+		{{else}}
+			{{if item.reply46 != 0}}
+				<span class="label label-sm label-danger">设备无响应</span>
+			{{/if}}
+			{{if item.reply47 != 0}}
+				<span class="label label-sm label-warning">驾驶员未确认</span>
+			{{/if}}
+
+			{{if item.reply46 == 0 && item.reply47 == 0}}
+				<span class="label label-sm label-success"> 成功</span>
+			{{/if}}
+		{{/if}}
+	</td>
+</tr>
+{{/each}}
+</script>
+
+<script>
+!function(){
+	var $car = $('#historyMessagePanel #carSelect')
+		,$dType = $('#historyMessagePanel #directiveSelect')
+		,$form = $('#historyMessagePanel form')
+		,$table = $('#historyMessagePanel table')
+		,$layer = $('#historyMessagePanel').parents('.layui-layer.layui-layer-page');
+	//车辆搜索框
+	createVehSearch($car).on('change', function(){
+		jsDoQuery(true);
+	});
+	//分页参数
+	var page=0,pSize=12;
+	//初始加载数据
+	jsDoQuery(true);
+	
+	//指令类型切换
+	$dType.on('change', function(){
+		jsDoQuery(true);
+	});
+	
+	function jsDoQuery(pagination){
+		var params = $form.serializeJSON();
+		params.page = page;
+		params.size = pSize;
+		
+		console.log(params);
+		$.get('/directive/list', params, function(rs){
+			console.log(rs);
+			
+			var htmlStr = template('history_directive_list_temp', rs);
+			$table.find('tbody').html(htmlStr);
+			
+			if(pagination){
+				showPagination(rs, true);
+				toCenter($layer);
+			}
+		});
+	}
+	
+	function showPagination(data, noQuery){
+		//分页
+		$('#pagination').jqPaginator({
+		    totalPages: data.totalPages,
+		    visiblePages: 6,
+		    currentPage: page + 1,
+		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+		    onPageChange: function (num, type) {
+		    	if(noQuery){
+		    		noQuery = false;
+		    		return;
+		    	}
+		    	
+		    	page = num - 1;
+		    	jsDoQuery();
+		    }
+		});
+	}
+	
+	//将元素垂直居中，无视padding, margin等
+	function toCenter($e){
+		var h = $(document.body).height();
+		var eh = $e.height();
+		if(eh < h)
+			$e.css('top', (h - eh) /2);
+	}
+}();
+</script>
 \ No newline at end of file
-<div id="historyMessagePanel" style="margin: 17px 5px 5px;">
-
-	<form class="form-inline" >
-		<div class="form-group" style="margin: 18px;">
-			<label class="" for="directiveSelect">指令类型：</label> 
-			<select class="form-control" id="directiveSelect" name="dType">
-				<option value="-1">全部</option>
-				<option value="0">调度指令</option>
-				<option value="1">运营指令</option>
-				<option value="2">线路切换指令</option>
-				<option value="3">消息短语</option>
-			</select>
-		</div>
-	
-		<div class="form-group" >
-			<label class="" for="carSelect">车辆：</label> 
-			<select class="form-control" name="nbbm" id="carSelect" style="width: 170px;"></select>
-		</div>
-	</form>
-
-	<div class="table-scrollable">
-		<table class="table table-hover" style="table-layout: fixed;">
-			<thead>
-				<tr>
-					<th width="9%">车辆</th>
-					<th width="9%">时间</th>
-					<th width="45%">内容</th> 
-					<th width="8%">发送人</th>
-					<th width="15%">状态</th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<td>B-84256</td>
-					<td>11:32</td>
-					<td>
-						<div class="text-furl">已完成6个班次，下一发车时间19点05分，由兰坪路浦江路发往江南旅游服务有限公司浦西停车保养场</div>
-					</td>
-					<td>系统</td>
-					<td><span class="label label-sm label-success">
-							设备收到，驾驶员确认 </span></td>
-				</tr>
-				<tr>
-					<td>B-84256</td>
-					<td>11:32</td>
-					<td>
-						<div class="text-furl">已完成6个班次，下一发车时间19点05分，由兰坪路浦江路发往江南旅游服务有限公司浦西停车保养场</div>
-					</td>
-					<td>系统</td>
-					<td><span class="label label-sm label-success">
-							设备收到，驾驶员确认 </span></td>
-				</tr>
-				<tr>
-					<td>B-84256</td>
-					<td>11:32</td>
-					<td>
-						<div class="text-furl">已完成6个班次，下一发车时间19点05分，由兰坪路浦江路发往江南旅游服务有限公司浦西停车保养场</div>
-					</td>
-					<td>系统</td>
-					<td><span class="label label-sm label-warning">
-							设备未响应 </span></td>
-				</tr>
-				<tr>
-					<td>B-84256</td>
-					<td>11:32</td>
-					<td>
-						<div class="text-furl">已完成6个班次，下一发车时间19点05分，由兰坪路浦江路发往江南旅游服务有限公司浦西停车保养场</div>
-					</td>
-					<td>系统</td>
-					<td><span class="label label-sm label-danger">
-							 网关通讯失败 </span> <i class="fa fa-link"></i></td>
-				</tr>
-				<tr>
-					<td>B-84256</td>
-					<td>11:32</td>
-					<td>
-						<div class="text-furl">运营指令 - 上行营运</div>
-					</td>
-					<td>系统</td>
-					<td><span class="label label-sm label-success">
-							切换成功 </span></td>
-				</tr>
-				
-				<tr>
-					<td>B-84256</td>
-					<td>11:32</td>
-					<td>
-						<div class="text-furl">线路切换  - 778 路</div>
-					</td>
-					<td>系统</td>
-					<td><span class="label label-sm label-success">
-							切换成功 </span></td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-</div>
-
-<script>
-!function(){
-	var $car = $('#historyMessagePanel #carSelect')
-		,$dType = $('#historyMessagePanel #directiveSelect');
-	createVehSearch($car);
-}();
-</script>
 \ No newline at end of file
@@ -450,6 +450,10 @@ body{
     text-rendering: auto;
 }
+.pagination .page.active a:before{
+	content: none;
+}
+
 .text-load{
 	color:gray;
 	font-size: 12px;
@@ -15,17 +15,17 @@
 	});
 	//调度指令
 	$('#msgAndDirect').on('click', function(){
-		layer.msg('功能测试中...稍后开放！');
-		/*$.get('/pages/control/line/child_pages/historyMessage.html', function(content){
+		$.get('/pages/control/line/child_pages/historyDirective.html', function(content){
 			layer.open({
 			  type: 1,
 			  area: '930px',
 			  content: content,
 			  title : false,
+			  shift: 5,
 			  success: function(){
 			  }
 			});
-		});*/
+		});
 	});
 	//设备上报
@@ -310,7 +310,6 @@ $(function(){
 			}
 			layer.closeAll();
-			//跳转到线路调度
 			loadPage('/pages/control/line/index.html');
 		});
 		//window.location.href = '/pages/control/line/index.html';