Merge branch 'minhang' into pudong

潘钊
2 parents 6422d87e 2f8d0f5f
Showing 29 changed files with 1269 additions and 611 deletions
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/directive/UpstreamEntrance.java
src/main/java/com/bsth/data/directive/DirectiveCreator.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/thread/OfflineMonitorThread.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/directive/DC0_A4.java
src/main/java/com/bsth/repository/directive/DC0A4Repository.java
src/main/java/com/bsth/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/directive/dto/DeviceConfigDto.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/base/timesmodel/css/index.css
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
src/main/resources/static/pages/base/timesmodel/js/d3.relationshipgraph.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/device_config/list.html
src/main/resources/static/real_control_v2/fragments/home/c0_a3.html
@@ -195,4 +195,16 @@ public class DirectiveController {
 		//DC0_A3 c0a3 = JSON.toJavaObject(JSONObject.parseObject(json), DC0_A3.class);
 		return directiveService.sendC0A5(json);
 	}
+
+	/**
+	 * 设备参数查询
+	 * @return
+	 */
+	@RequestMapping(value = "/deviceCofigList", method = RequestMethod.GET)
+	public Map<String, Object> deviceCofigList(
+			@RequestParam Map<String, String> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "10") int size){
+		return directiveService.deviceCofigList(map, page, size);
+	}
 }
 package com.bsth.controller.directive;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +60,8 @@ public class UpstreamEntrance {
 					case 0x26:
 						// 驾驶员上报
 						D80 d80 = JSON.toJavaObject(jsonParam, D80.class);
-						pilotReport.report(d80);
+						if(d80!=null && StringUtils.isNotEmpty(d80.getDeviceId()))
+							pilotReport.report(d80);
 						break;
 					case 0xA4:
@@ -67,9 +69,9 @@ public class UpstreamEntrance {
 						data.put("posPort", data.getString("posPort").trim());
 						data.put("posIpAddress", data.getString("posIpAddress").trim());
 						data.put("ipAddress", data.getString("ipAddress").trim());
-						
+
 						DC0_A4 c0a4 = JSON.toJavaObject(jsonParam, DC0_A4.class);
-						System.out.println(c0a4);
+						pilotReport.report(c0a4);
 						break;
 					}
 package com.bsth.data.directive;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.alibaba.fastjson.JSON;
 import com.bsth.data.BasicData;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D60.D60Data;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.D64.D64Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -81,7 +80,7 @@ public class DirectiveCreator {
 	}
-	public D60 createD60_02(String nbbm, String text, int upDown, int state, Date alarmTime){
+	public D60 createD60_01(String nbbm, String text, int upDown, int state, Date alarmTime){
 		SimpleDateFormat sdfMMddHHmm = new SimpleDateFormat("MMddHHmm");
 		Long timestamp = System.currentTimeMillis();
@@ -102,7 +101,7 @@ public class DirectiveCreator {
 		directive.setMsgId(msgId);
 		// 构造数据
 		data.setDeviceId(deviceId);
-		data.setDispatchInstruct((short) 0x02);
+		data.setDispatchInstruct((short) 0x01);
 		data.setTimestamp(timestamp);
 		data.setCompanyCode(company);
 		data.setMsgId(msgId);
@@ -307,4 +307,28 @@ public class GpsEntity {
 	public void setSource(int source) {
 		this.source = source;
 	}
+
+	public void offline(){
+		this.setAbnormalStatus("offline");
+	}
+
+	public boolean isOnline(){
+		if(isOffline())
+			return false;
+
+		long t = System.currentTimeMillis();
+
+		if((t - this.getTimestamp()) > 1000 * 60){
+			return false;
+		}
+
+		if((this.getTimestamp() - t) > 1000 * 60 * 3){
+			return false;
+		}
+		return true;
+	}
+
+	public boolean isOffline(){
+		return this.getAbnormalStatus() != null && this.getAbnormalStatus().equals("offline");
+	}
 }
@@ -45,7 +45,7 @@ public class OfflineMonitorThread extends Thread{
                     continue;
                 if (t - gps.getTimestamp() > LOSE_TIME){
-                    gps.setAbnormalStatus("offline");
+                    gps.offline();
                     //通知页面有设备掉线
                     sendUtils.deviceOffline(gps);
@@ -8,13 +8,16 @@ import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.directive.D80;
+import com.bsth.entity.directive.DC0_A4;
 import com.bsth.entity.realcontrol.D80ReplyTemp;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D80Repository;
+import com.bsth.repository.directive.DC0A4Repository;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +30,7 @@ import java.util.List;
 /**
  * 
  * @ClassName: PilotReport 
- * @Description: TODO(驾驶员上报) 
+ * @Description: TODO(设备80协议上报处理)
  * @author PanZhao
  * @date 2016年8月14日 下午11:37:51 
  *
@@ -37,31 +40,26 @@ public class PilotReport {
 	@Autowired
 	D80Repository d80Repository;
-	
 	@Autowired
 	DayOfSchedule dayOfSchedule;
-	
 	@Autowired
 	LineConfigData lineConfigData;
-	
 	@Autowired
 	DirectiveService directiveService;
-	
 	@Autowired
 	GpsRealData gpsRealData;
-	
 	@Autowired
 	SendUtils sendUtils;
-	
-	//private static ScheduleComparator.FCNO schComp;
-	
+
+	@Autowired
+	DC0A4Repository dc0A4Repository;
+
 	private static ArrayListMultimap<String, D80> d80MultiMap;
 	Logger logger = LoggerFactory.getLogger(PilotReport.class);
 	static{
 		d80MultiMap = ArrayListMultimap.create();
-		//schComp = new ScheduleComparator.FCNO();
 	}
 	public void report(D80 d80){
@@ -95,22 +93,31 @@ public class PilotReport {
 		case 0xA5:
 			//进场请求
-			ScheduleRealInfo inSch = dayOfSchedule.nextByBcType(nbbm, "in");
+			//ScheduleRealInfo inSch = dayOfSchedule.nextByBcType(nbbm, "in");
 			//如果有对应出场班次
-			if(inSch != null){
-				d80.setRemarks("计划进场时间：" + inSch.getDfsj());
+			//if(inSch != null){
+				/*d80.setRemarks("计划进场时间：" + inSch.getDfsj());
 				//当前GPS位置
 				GpsEntity gps = gpsRealData.get(d80.getDeviceId());
 				if(null != gps)
-					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));
-			}else
-				d80.setRemarks("没有进场计划");
+					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));*/
+			//}/*else
+			//	d80.setRemarks("没有进场计划");*/
 			break;
 		}
 		//推送到页面
 		sendUtils.send80ToPage(d80);
 	}
+
+	public void report(DC0_A4 c0a4){
+		String deviceId = c0a4.getData().getDeviceId();
+		if(StringUtils.isNotEmpty(deviceId))
+			c0a4.setId(deviceId);
+
+		//入库
+		dc0A4Repository.save(c0a4);
+	}
 	/**
 	 * 
@@ -4,9 +4,12 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
+import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -937,7 +940,22 @@ public class DayOfSchedule {
     public void reCalcExecPlan(String nbbm){
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
         Collections.sort(list, schFCSJComparator);
-        carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(list));
+
+        ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
+        carExecutePlanMap.put(nbbm, sch);
+
+        try {
+            GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+            if(gps != null && gps.isOnline()){
+                if(!gps.getLineId().equals(sch.getXlBm())){
+                    //下发线路切换指令
+                    DirectivePushQueue.put64(nbbm, sch.getXlBm(), "系统");
+                    logger.info("车辆" + nbbm + "切换至" + sch.getXlBm() + " -原" + gps.getLineId() + " --重新计算当前执行班次！");
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
     }
     /**
@@ -13,13 +13,21 @@ import javax.persistence.*;
 @Entity
 @Table(name = "bsth_v_C0_A4")
 public class DC0_A4 extends Directive{
-	
+
+
 	@Id
-	@GeneratedValue
-	private Integer id;
+	private String id;
 	private DC0A4Data data;
-	
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
 	@Embeddable
 	public static class DC0A4Data {
 		/**
@@ -164,14 +172,6 @@ public class DC0_A4 extends Directive{
 		}
 	}
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
 	public DC0A4Data getData() {
 		return data;
 	}
+package com.bsth.repository.directive;
+
+import com.bsth.entity.directive.DC0_A4;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * C0_A4 设备回复（设备参数）
+ * Created by panzhao on 2017/6/28.
+ */
+@Repository
+public interface DC0A4Repository extends BaseRepository<DC0_A4, String>{
+}
@@ -95,4 +95,6 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
     int refreshLineFile(String deviceId);
     int stateChange(String nbbm, Integer upDown, Integer state, String userName);
+
+    Map<String,Object> deviceCofigList(Map<String, String> map, int page, int size);
 }
@@ -18,6 +18,7 @@ import com.bsth.repository.directive.D60Repository;
 import com.bsth.repository.directive.D64Repository;
 import com.bsth.repository.directive.D80Repository;
 import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.directive.dto.DeviceConfigDto;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.websocket.handler.RealControlSocketHandler;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -29,6 +30,8 @@ import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import java.util.*;
@@ -36,486 +39,512 @@ import java.util.*;
 @Service
 public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implements DirectiveService {
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	D60Repository d60Repository;
-
-	@Autowired
-	GpsRealData gpsRealDataBuffer;
-
-	@Autowired
-	D64Repository d64Repository;
-
-	@Autowired
-	RealControlSocketHandler socketHandler;
-
-	@Autowired
-	D80Repository d80Repository;
-	
-	@Autowired
-	DayOfDirectives dayOfDirectives;
-	
-	@Autowired
-	PilotReport pilotReport;
-	
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-	
-	//static Long schDiff = 1000 * 60 * 60L;
-
-	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm")
-				,fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分");
-
-	@Override
-	public int send60Phrase(String nbbm, String text, String sender) {
-		D60 d60 = null;
-		try {
-			d60 = create60Data(nbbm, text, (short) 0x00, null);
-		} catch (Exception e) {
-			logger.error("发送消息短语出现异常", e);
-			return -1;
-		}
-
-		if (null == d60)
-			return -1;
-
-		// 发送指令
-		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
-		if(null != sender)
-			d60.setSender(sender);
-		d60.setHttpCode(code);
-
-		if (code == 0) {
-			// 添加到缓存
-			dayOfDirectives.put60(d60, true);
-		}
-		else{
-			d60.setErrorText("网关通讯失败, code: " + code);
-			d60Repository.save(d60);
-			dayOfDirectives.put60(d60, false);
-		}
-		return code;
-	}
-
-	@Override
-	public int send60Dispatch(ScheduleRealInfo sch, int finish, String sender) {
-		D60 d60 = null;
-		try {
-			if(sch.isDestroy()){
-				logger.warn("烂班不允许发送调度指令....");
-				return -1;
-			}
-			String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
-					+ sch.getQdzName() + "发往" + sch.getZdzName();
-
-			//下发0x02指令  调度指令(闹钟有效)
-			Long alarmTime = System.currentTimeMillis() + 1000 * 30;
-			d60 = new DirectiveCreator().createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
-					, 0, new Date(alarmTime));
-		} catch (Exception e) {
-			logger.error("生成调度指令时出现异常", e);
-			return -1;
-		}
-		
-		if (null == d60)
-			return -1;
-		
-		d60.setSender(sender);
-		
-		JSONObject jObj = JSON.parseObject(JSON.toJSONString(d60));
-		
-		//进场或者出场班次时，附加lock 标识
-		if(null != sch.getBcType()
-				&& (sch.getBcType().equals("out") || sch.getBcType().equals("in"))){
-			
-			jObj.put("lock", 1);
-		}
-		
-		// 发送指令
-		int code = GatewayHttpUtils.postJson(jObj.toJSONString());
-
-		d60.setDispatch(true);
-		d60.setSch(sch);
-		d60.setHttpCode(code);
-
-		if (code == 0) {
-			sch.setDirectiveState(60);
-			// 添加到缓存，延迟入库
-			dayOfDirectives.put60(d60, true);
-			// 通知页面
-			sendD60ToPage(sch);
-		}
-		else{
-			d60.setErrorText("网关通讯失败, code: " + code);
-			dayOfDirectives.put60(d60, false);
-			d60Repository.save(d60);
-		}
-		return code;
-	}
-
-	/**
-	 * 
-	 * @Title: sendDirectiveState @Description: TODO(向页面推送班次指令状态) @throws
-	 */
-	@Override
-	public void sendD60ToPage(ScheduleRealInfo sch) {
-		Map<String, Object> map = new HashMap<>();
-		map.put("fn", "directive");
-		map.put("t", sch);
-		
-		ObjectMapper mapper = new ObjectMapper();
-		
-		try {
-			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
-		} catch (JsonProcessingException e) {
-			logger.error("", e);
-		}
-	}
-
-	@Override
-	public int send60Dispatch(Long id, String sender) {
-		ScheduleRealInfo sch = dayOfSchedule.get(id);
-		// 车辆已完成班次
-		int finish = dayOfSchedule.doneSum(sch.getClZbh());
-		return send60Dispatch(sch, finish, sender);
-	}
-
-	@Override
-	public int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender) {
-		logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
-
-		String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
-		D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state);
-
-		if (null == d60)
-			return -1;
-		if(null != sender)
-			d60.setSender(sender);
-		else
-			d60.setSender("系统");
-		// 发送指令
-		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
-		// 添加到缓存，等待入库
-		d60.setHttpCode(code);
-		if (null != sch)
-			d60.setSch(sch);
-
-
-		if (code == 0) {
-			dayOfDirectives.put60(d60, true);
-		}
-		else{
-			d60.setErrorText("网关通讯失败, code: " + code);
-			d60Repository.save(d60);
-			dayOfDirectives.put60(d60, false);
-		}
-		return code;
-	}
-
-	/**
-	 * 线路切换
-	 */
-	@Override
-	public int lineChange(String nbbm, String lineCode, String sender) {
-		return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sender);
-	}
-
-
-	@Override
-	public int lineChangeByDeviceId(String deviceId, String lineCode, String sender){
-		DirectiveCreator crt = new DirectiveCreator();
-		Long t = System.currentTimeMillis();
-		//生成64数据包
-		D64 d64 = crt.create64(deviceId, lineCode, t);
-
-		if(null != sender)
-			d64.setSender(sender);
-		else
-			d64.setSender("系统");
-
-		//String deviceId = d64.getDeviceId();
-		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
-		// 入库
-		d64.setHttpCode(code);
-		d64.getData().setTxtContent("切换线路[" + lineCode + "]");
-		dayOfDirectives.put64(d64);
-
-		// 通知设备刷新线路文件，忽略结果
-		if (code == 0)
-			GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
-		else
-			d64.setErrorText(" 网关通讯失败, code: " + code);
-
-		d64Repository.save(d64);
-		return code;
-	}
-
-	public D60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch) {
-
-		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-		if (null == deviceId) {
-			logger.error("没有设备号对照的车辆：" + nbbm);
-			return null;
-		}
-		// 根据当前GPS确定 上下行和营运状态
-		Byte upDown = null;
-		Integer state = null;
-		if (null == sch) {
-			GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
-			if (null == gpsData) {
-				/*
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    D60Repository d60Repository;
+
+    @Autowired
+    GpsRealData gpsRealDataBuffer;
+
+    @Autowired
+    D64Repository d64Repository;
+
+    @Autowired
+    RealControlSocketHandler socketHandler;
+
+    @Autowired
+    D80Repository d80Repository;
+
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
+    @Autowired
+    PilotReport pilotReport;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    //static Long schDiff = 1000 * 60 * 60L;
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm"), fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分");
+
+    @Override
+    public int send60Phrase(String nbbm, String text, String sender) {
+        D60 d60 = null;
+        try {
+            d60 = create60Data(nbbm, text, (short) 0x00, null);
+        } catch (Exception e) {
+            logger.error("发送消息短语出现异常", e);
+            return -1;
+        }
+
+        if (null == d60)
+            return -1;
+
+        // 发送指令
+        int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
+        if (null != sender)
+            d60.setSender(sender);
+        d60.setHttpCode(code);
+
+        if (code == 0) {
+            // 添加到缓存
+            dayOfDirectives.put60(d60, true);
+        } else {
+            d60.setErrorText("网关通讯失败, code: " + code);
+            d60Repository.save(d60);
+            dayOfDirectives.put60(d60, false);
+        }
+        return code;
+    }
+
+    @Override
+    public int send60Dispatch(ScheduleRealInfo sch, int finish, String sender) {
+        D60 d60 = null;
+        try {
+            if (sch.isDestroy()) {
+                logger.warn("烂班不允许发送调度指令....");
+                return -1;
+            }
+            String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
+                    + sch.getQdzName() + "发往" + sch.getZdzName();
+
+            //下发0x01指令  调度指令(闹钟有效)
+            long t = System.currentTimeMillis(), alarmTime;
+            alarmTime = sch.getDfsjT();
+            if (sch.getDfsjT() < t)
+                alarmTime = t + 1000 * 30;
+
+            d60 = new DirectiveCreator().createD60_01(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
+                    , 0, new Date(alarmTime));
+        } catch (Exception e) {
+            logger.error("生成调度指令时出现异常", e);
+            return -1;
+        }
+
+        if (null == d60)
+            return -1;
+
+        d60.setSender(sender);
+
+        JSONObject jObj = JSON.parseObject(JSON.toJSONString(d60));
+
+        //进场或者出场班次时，附加lock 标识
+        if (null != sch.getBcType()
+                && (sch.getBcType().equals("out") || sch.getBcType().equals("in"))) {
+
+            jObj.put("lock", 1);
+        }
+
+        // 发送指令
+        int code = GatewayHttpUtils.postJson(jObj.toJSONString());
+
+        d60.setDispatch(true);
+        d60.setSch(sch);
+        d60.setHttpCode(code);
+
+        if (code == 0) {
+            sch.setDirectiveState(60);
+            // 添加到缓存，延迟入库
+            dayOfDirectives.put60(d60, true);
+            // 通知页面
+            sendD60ToPage(sch);
+        } else {
+            d60.setErrorText("网关通讯失败, code: " + code);
+            dayOfDirectives.put60(d60, false);
+            d60Repository.save(d60);
+        }
+        return code;
+    }
+
+    /**
+     * @Title: sendDirectiveState @Description: TODO(向页面推送班次指令状态) @throws
+     */
+    @Override
+    public void sendD60ToPage(ScheduleRealInfo sch) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("fn", "directive");
+        map.put("t", sch);
+
+        ObjectMapper mapper = new ObjectMapper();
+
+        try {
+            socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
+        } catch (JsonProcessingException e) {
+            logger.error("", e);
+        }
+    }
+
+    @Override
+    public int send60Dispatch(Long id, String sender) {
+        ScheduleRealInfo sch = dayOfSchedule.get(id);
+        // 车辆已完成班次
+        int finish = dayOfSchedule.doneSum(sch.getClZbh());
+        return send60Dispatch(sch, finish, sender);
+    }
+
+    @Override
+    public int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender) {
+        logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
+
+        String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
+        D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state);
+
+        if (null == d60)
+            return -1;
+        if (null != sender)
+            d60.setSender(sender);
+        else
+            d60.setSender("系统");
+        // 发送指令
+        int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
+        // 添加到缓存，等待入库
+        d60.setHttpCode(code);
+        if (null != sch)
+            d60.setSch(sch);
+
+
+        if (code == 0) {
+            dayOfDirectives.put60(d60, true);
+        } else {
+            d60.setErrorText("网关通讯失败, code: " + code);
+            d60Repository.save(d60);
+            dayOfDirectives.put60(d60, false);
+        }
+        return code;
+    }
+
+    /**
+     * 线路切换
+     */
+    @Override
+    public int lineChange(String nbbm, String lineCode, String sender) {
+        return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sender);
+    }
+
+
+    @Override
+    public int lineChangeByDeviceId(String deviceId, String lineCode, String sender) {
+        DirectiveCreator crt = new DirectiveCreator();
+        Long t = System.currentTimeMillis();
+        //生成64数据包
+        D64 d64 = crt.create64(deviceId, lineCode, t);
+
+        if (null != sender)
+            d64.setSender(sender);
+        else
+            d64.setSender("系统");
+
+        //String deviceId = d64.getDeviceId();
+        int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
+        // 入库
+        d64.setHttpCode(code);
+        d64.getData().setTxtContent("切换线路[" + lineCode + "]");
+        dayOfDirectives.put64(d64);
+
+        // 通知设备刷新线路文件，忽略结果
+        if (code == 0)
+            GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
+        else
+            d64.setErrorText(" 网关通讯失败, code: " + code);
+
+        d64Repository.save(d64);
+        return code;
+    }
+
+    public D60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch) {
+
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        if (null == deviceId) {
+            logger.error("没有设备号对照的车辆：" + nbbm);
+            return null;
+        }
+        // 根据当前GPS确定 上下行和营运状态
+        Byte upDown = null;
+        Integer state = null;
+        if (null == sch) {
+            GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
+            if (null == gpsData) {
+                /*
 				 * 短语指令不会变更设备状态，所以在没有gps状态对照的情况下可以下发
 				 * 其他指令在不确定状态的情况下，一律不允许
 				 */
-				if(dispatchInstruct == 0){
-					upDown = 0;
-					state = 0;
-				}
-				else{
-					logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);
-					return null;
-				}
-			}
-			else{
-				upDown = gpsData.getUpDown();
-				state = gpsData.getState();
-			}
-		} else {
-			upDown = Byte.parseByte(sch.getXlDir());
-			state = 0;
-		}
-
-		return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state);
-	}
-
-	@Override
-	public int upDownChange(String nbbm, Integer upDown, String sender) {
-		return send60Operation(nbbm, 0, upDown, null, sender);
-	}
-
-
-	@Override
-	public Map<String, List<D80>> findNoCofm80(String lineCodes) {
-		List<String> lineList = Splitter.on(",").trimResults().splitToList(lineCodes);
-
-		Map<String, List<D80>> rs = new HashMap<>();
-		for (String code : lineList) 
-			rs.put(code, pilotReport.unconfirmed80(Integer.parseInt(code)));
-
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> reply80(int id, int reply) {
-		Map<String, Object> rs = new HashMap<>();
-
-		D80 d80 = pilotReport.findById(id);
-		if (null == d80) {
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", "服务器没有找到对应数据！");
-		} else if (d80.isConfirm()) {
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", "该数据已经被处理了！");
-		} else {
-			SysUser user = SecurityUtils.getCurrentUser();
-			d80.setC0(reply, user.getUserName());
-			// 入库
-			d80Repository.save(d80);
-			//回复网关
-			int code = GatewayHttpUtils.postJson(JSON.toJSONString(d80.getC0()));
-
-			rs.put("status", ResponseCode.SUCCESS);
-			if (code != 0)
-				rs.put("msg", "发送C0响应指令到车载设备失败，但该操作已经被系统记录！");
-
-			pilotReport.reply(d80);
-			// 通知页面
-			Map<String, Object> sockMap = new HashMap<>();
-			sockMap.put("fn", "d80Confirm");
-			sockMap.put("id", d80.getId());
-			sockMap.put("lineId", d80.getData().getLineId());
-			socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), JSON.toJSONString(sockMap));
-		}
-
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {
-		Map<String, Object> rsMap = new HashMap<>();
-		List<Directive> list = new ArrayList<>();
-		
-		switch (dType) {
-		case -1:
-			//所有指令
-			list = new ArrayList<>(dayOfDirectives.all());
-			break;
-		case 0:
-			//调度指令
-			Collection<D60> dptArray = dayOfDirectives.all60();
-			for(D60 d60 : dptArray){
-				if(d60.isDispatch())
-					list.add(d60);
-			}
-			break;
-		case 1: 
-			//运营指令
-			Collection<D60> yyArray = dayOfDirectives.all60();
-			for(D60 d60 : yyArray){
-				if(d60 != null && d60.getData().getDispatchInstruct() == (short)0x03
-						&& !d60.isDispatch())
-					list.add(d60);
-			}
-			break;
-		case 2:
-			//线路切换指令
-			list.addAll(dayOfDirectives.all64());
-			break;
-		case 3:
-			//消息短语
-			Collection<D60> dyArray = dayOfDirectives.all60();
-			for(D60 d60 : dyArray){
-				if(d60 != null && d60.getData().getDispatchInstruct() == (short)0x00
-						&& !d60.isDispatch())
-					list.add(d60);
-			}
-			break;
-		}
-
-		// 时间倒序
-		Collections.sort(list, new DayOfDirectives.DComparator());
-		if(StringUtils.isNotBlank(nbbm)){
-			String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-			//按车辆过滤
-			List<Directive> subList = new ArrayList<>();
-			for(Directive d : list){
-				if(d.getDeviceId().equals(deviceId)){
-					subList.add(d);
-				}
-			}
-			list = subList;
-		}
-		
-		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(fmtHHmm.print(d.getTimestamp()));
-			if (d.getNbbm() == null)
-				d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
-		}
-
-		rsMap.put("list", rs);
-		rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
-		rsMap.put("page", page);
-		return rsMap;
-	}
-
-	@Override
-	public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {
-		List<D80> d80s = new ArrayList<>();
-		
-		Object nbbm = map.get("nbbm");
-		if(null != nbbm && StringUtils.isNotEmpty(nbbm.toString())){
-			d80s.addAll(pilotReport.findByCar(nbbm.toString()));
-		}
-		else{
-			d80s.addAll(pilotReport.findAll());
-		}
-		
-		Short requestCode = Short.parseShort(map.get("requestCode").toString());
-		if(requestCode != -1){
-			List<D80> temps = new ArrayList<>();
-			for(D80 d80 : d80s){
-				if(d80.getData().getRequestCode().equals(requestCode))
-					temps.add(d80);
-			}
-			d80s = temps;
-		}
-		
-		//排序
-		Collections.sort(d80s, new Comparator<D80>() {
-			@Override
-			public int compare(D80 o1, D80 o2) {
-				return (int) (o2.getTimestamp() - o1.getTimestamp());
-			}
-		});
-		
-		//分页
-		int count = d80s.size();
-		// 分页
-		int s = page * size, e = s + size;
-
-		if (e > count)
-			e = count;
-
-		//SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-		List<D80> rs = d80s.subList(s, e);
-		for(D80 d80 : rs){
-			d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
-		}
-		
-		Map<String, Object> rsMap = new HashMap<>();
-		rsMap.put("list", rs);
-		rsMap.put("totalPages", count % size == 0 ? count / size -1 : count / size);
-		rsMap.put("page", page);
-		
-		return rsMap;
-	}
-
-	@Override
-	public D64 save64(D64 d64) {
-		return d64Repository.save(d64);
-	}
-
-	@Override
-	public int sendC0A4(String nbbm) {
-		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-		
-		Map<String, Object> c0a4 = new HashMap<>();
-		c0a4.put("deviceId", deviceId);
-		c0a4.put("timestamp", System.currentTimeMillis());
-		c0a4.put("operCode", (short)0xC0);
-		
-		Map<String, Object> data = new HashMap<>();
-		data.put("deviceId", deviceId);
-		data.put("operCode2", (short)0xA4);
-		c0a4.put("data", data);
-		
-		return GatewayHttpUtils.postJson(JSON.toJSONString(c0a4));
-	}
-
-	@Override
-	public int sendC0A3(DC0_A3 c0a3) {
-		GatewayHttpUtils.postJson(JSON.toJSONString(c0a3));
-		return 0;
-	}
-
-	@Override
-	public int sendC0A5(String json) {
-		return GatewayHttpUtils.postJson(json);
-	}
-
-	@Override
-	public int refreshLineFile(String deviceId) {
-		GpsEntity gps = gpsRealDataBuffer.get(deviceId);
-		if(gps == null)
-			return -1;
-
-		return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
-	}
-
-	@Override
-	public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
-		return send60Operation(nbbm, state, upDown, null, userName);
-	}
+                if (dispatchInstruct == 0) {
+                    upDown = 0;
+                    state = 0;
+                } else {
+                    logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);
+                    return null;
+                }
+            } else {
+                upDown = gpsData.getUpDown();
+                state = gpsData.getState();
+            }
+        } else {
+            upDown = Byte.parseByte(sch.getXlDir());
+            state = 0;
+        }
+
+        return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state);
+    }
+
+    @Override
+    public int upDownChange(String nbbm, Integer upDown, String sender) {
+        return send60Operation(nbbm, 0, upDown, null, sender);
+    }
+
+
+    @Override
+    public Map<String, List<D80>> findNoCofm80(String lineCodes) {
+        List<String> lineList = Splitter.on(",").trimResults().splitToList(lineCodes);
+
+        Map<String, List<D80>> rs = new HashMap<>();
+        for (String code : lineList)
+            rs.put(code, pilotReport.unconfirmed80(Integer.parseInt(code)));
+
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> reply80(int id, int reply) {
+        Map<String, Object> rs = new HashMap<>();
+        D80 d80 = pilotReport.findById(id);
+        try {
+            if (null == d80) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "服务器没有找到对应数据！");
+            } else if (d80.isConfirm()) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "该数据已经被处理了！");
+            } else {
+                SysUser user = SecurityUtils.getCurrentUser();
+                d80.setC0(reply, user.getUserName());
+                // 入库
+                d80Repository.save(d80);
+                //回复网关
+                int code = GatewayHttpUtils.postJson(JSON.toJSONString(d80.getC0()));
+
+                rs.put("status", ResponseCode.SUCCESS);
+                if (code != 0)
+                    rs.put("msg", "发送C0响应指令到车载设备失败，但该操作已经被系统记录！");
+
+                pilotReport.reply(d80);
+            }
+        } catch (Exception e) {
+            logger.error("80响应出现异常...", e);
+            rs.put("status", ResponseCode.SUCCESS);
+        }
+        // 通知页面
+        Map<String, Object> sockMap = new HashMap<>();
+        sockMap.put("fn", "d80Confirm");
+        sockMap.put("id", d80.getId());
+        sockMap.put("lineId", d80.getData().getLineId());
+        socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), JSON.toJSONString(sockMap));
+
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {
+        Map<String, Object> rsMap = new HashMap<>();
+        List<Directive> list = new ArrayList<>();
+
+        switch (dType) {
+            case -1:
+                //所有指令
+                list = new ArrayList<>(dayOfDirectives.all());
+                break;
+            case 0:
+                //调度指令
+                Collection<D60> dptArray = dayOfDirectives.all60();
+                for (D60 d60 : dptArray) {
+                    if (d60.isDispatch())
+                        list.add(d60);
+                }
+                break;
+            case 1:
+                //运营指令
+                Collection<D60> yyArray = dayOfDirectives.all60();
+                for (D60 d60 : yyArray) {
+                    if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x03
+                            && !d60.isDispatch())
+                        list.add(d60);
+                }
+                break;
+            case 2:
+                //线路切换指令
+                list.addAll(dayOfDirectives.all64());
+                break;
+            case 3:
+                //消息短语
+                Collection<D60> dyArray = dayOfDirectives.all60();
+                for (D60 d60 : dyArray) {
+                    if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x00
+                            && !d60.isDispatch())
+                        list.add(d60);
+                }
+                break;
+        }
+
+        // 时间倒序
+        Collections.sort(list, new DayOfDirectives.DComparator());
+        if (StringUtils.isNotBlank(nbbm)) {
+            String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+            //按车辆过滤
+            List<Directive> subList = new ArrayList<>();
+            for (Directive d : list) {
+                if (d.getDeviceId().equals(deviceId)) {
+                    subList.add(d);
+                }
+            }
+            list = subList;
+        }
+
+        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(fmtHHmm.print(d.getTimestamp()));
+            if (d.getNbbm() == null)
+                d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
+        }
+
+        rsMap.put("list", rs);
+        rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
+        rsMap.put("page", page);
+        return rsMap;
+    }
+
+    @Override
+    public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {
+        List<D80> d80s = new ArrayList<>();
+
+        Object nbbm = map.get("nbbm");
+        if (null != nbbm && StringUtils.isNotEmpty(nbbm.toString())) {
+            d80s.addAll(pilotReport.findByCar(nbbm.toString()));
+        } else {
+            d80s.addAll(pilotReport.findAll());
+        }
+
+        Short requestCode = Short.parseShort(map.get("requestCode").toString());
+        if (requestCode != -1) {
+            List<D80> temps = new ArrayList<>();
+            for (D80 d80 : d80s) {
+                if (d80.getData().getRequestCode().equals(requestCode))
+                    temps.add(d80);
+            }
+            d80s = temps;
+        }
+
+        //排序
+        Collections.sort(d80s, new Comparator<D80>() {
+            @Override
+            public int compare(D80 o1, D80 o2) {
+                return (int) (o2.getTimestamp() - o1.getTimestamp());
+            }
+        });
+
+        //分页
+        int count = d80s.size();
+        // 分页
+        int s = page * size, e = s + size;
+
+        if (e > count)
+            e = count;
+
+        //SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+        List<D80> rs = d80s.subList(s, e);
+        for (D80 d80 : rs) {
+            d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
+        }
+
+        Map<String, Object> rsMap = new HashMap<>();
+        rsMap.put("list", rs);
+        rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
+        rsMap.put("page", page);
+
+        return rsMap;
+    }
+
+    @Override
+    public D64 save64(D64 d64) {
+        return d64Repository.save(d64);
+    }
+
+    @Override
+    public int sendC0A4(String nbbm) {
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+
+        Map<String, Object> c0a4 = new HashMap<>();
+        c0a4.put("deviceId", deviceId);
+        c0a4.put("timestamp", System.currentTimeMillis());
+        c0a4.put("operCode", (short) 0xC0);
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("deviceId", deviceId);
+        data.put("operCode2", (short) 0xA4);
+        c0a4.put("data", data);
+
+        return GatewayHttpUtils.postJson(JSON.toJSONString(c0a4));
+    }
+
+    @Override
+    public int sendC0A3(DC0_A3 c0a3) {
+        GatewayHttpUtils.postJson(JSON.toJSONString(c0a3));
+        return 0;
+    }
+
+    @Override
+    public int sendC0A5(String json) {
+        return GatewayHttpUtils.postJson(json);
+    }
+
+    @Override
+    public int refreshLineFile(String deviceId) {
+        GpsEntity gps = gpsRealDataBuffer.get(deviceId);
+        if (gps == null)
+            return -1;
+
+        return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
+    }
+
+    @Override
+    public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
+        return send60Operation(nbbm, state, upDown, null, userName);
+    }
+
+    @Override
+    public Map<String, Object> deviceCofigList(Map<String, String> map, int page, int size) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            int count = jdbcTemplate.queryForObject("select count(*) from bsth_c_cars", Integer.class);
+            int totalPages = count % size == 0 ? count / size : count / size + 1;
+            int s = page * size;
+
+            String sql = "select * from (select inside_code, equipment_code from bsth_c_cars) t1 left join bsth_v_c0_a4 t2 on t1.equipment_code=t2.id order by t2.`timestamp` desc LIMIT " + s + "," + size;
+            List<DeviceConfigDto> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(DeviceConfigDto.class));
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+            rs.put("totalPages", totalPages);
+            rs.put("page", page);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
 }
+package com.bsth.service.directive.dto;
+
+/**
+ * Created by panzhao on 2017/6/28.
+ */
+public class DeviceConfigDto {
+
+    private String id;
+    private String insideCode;
+    private String equipmentCode;
+    /** 网关IP地址 */
+    private String ipAddress;
+    /** 网关端口 */
+    private Integer port;
+    /** 定时定距上报模式 */
+    private Short reportMode;
+    /** 定时上报时间间隔 */
+    private Integer interval;
+    /** 定距上报距离间隔 */
+    private String distance;
+    /** 非线路状态超速阀门 */
+    private Short speedingThreshold;
+    /** 预警阀门 */
+    private Short alarmThreshold;
+    /** pos机IP地址 */
+    private String posIpAddress;
+    /** pos机端口 */
+    private String posPort;
+    /** 延迟机关时间 */
+    private Integer delay;
+    /** 中门视频切换到码表界面速度阀门 默认45 */
+    private Short speedThreshold1;
+    /** 码表界面切换到中门视频速度阀门 默认35 */
+    private Short speedThreshold2;
+    /** 对比度 */
+    private Short contrast;
+    /** 亮度 */
+    private Short brightness;
+    /** 饱和度 */
+    private Short saturation;
+
+    private Long timestamp;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getEquipmentCode() {
+        return equipmentCode;
+    }
+
+    public void setEquipmentCode(String equipmentCode) {
+        this.equipmentCode = equipmentCode;
+    }
+
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+
+    public Short getReportMode() {
+        return reportMode;
+    }
+
+    public void setReportMode(Short reportMode) {
+        this.reportMode = reportMode;
+    }
+
+    public Integer getInterval() {
+        return interval;
+    }
+
+    public void setInterval(Integer interval) {
+        this.interval = interval;
+    }
+
+    public String getDistance() {
+        return distance;
+    }
+
+    public void setDistance(String distance) {
+        this.distance = distance;
+    }
+
+    public Short getSpeedingThreshold() {
+        return speedingThreshold;
+    }
+
+    public void setSpeedingThreshold(Short speedingThreshold) {
+        this.speedingThreshold = speedingThreshold;
+    }
+
+    public Short getAlarmThreshold() {
+        return alarmThreshold;
+    }
+
+    public void setAlarmThreshold(Short alarmThreshold) {
+        this.alarmThreshold = alarmThreshold;
+    }
+
+    public String getPosIpAddress() {
+        return posIpAddress;
+    }
+
+    public void setPosIpAddress(String posIpAddress) {
+        this.posIpAddress = posIpAddress;
+    }
+
+    public String getPosPort() {
+        return posPort;
+    }
+
+    public void setPosPort(String posPort) {
+        this.posPort = posPort;
+    }
+
+    public Integer getDelay() {
+        return delay;
+    }
+
+    public void setDelay(Integer delay) {
+        this.delay = delay;
+    }
+
+    public Short getSpeedThreshold1() {
+        return speedThreshold1;
+    }
+
+    public void setSpeedThreshold1(Short speedThreshold1) {
+        this.speedThreshold1 = speedThreshold1;
+    }
+
+    public Short getSpeedThreshold2() {
+        return speedThreshold2;
+    }
+
+    public void setSpeedThreshold2(Short speedThreshold2) {
+        this.speedThreshold2 = speedThreshold2;
+    }
+
+    public Short getContrast() {
+        return contrast;
+    }
+
+    public void setContrast(Short contrast) {
+        this.contrast = contrast;
+    }
+
+    public Short getBrightness() {
+        return brightness;
+    }
+
+    public void setBrightness(Short brightness) {
+        this.brightness = brightness;
+    }
+
+    public Short getSaturation() {
+        return saturation;
+    }
+
+    public void setSaturation(Short saturation) {
+        this.saturation = saturation;
+    }
+
+    public Long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getInsideCode() {
+        return insideCode;
+    }
+
+    public void setInsideCode(String insideCode) {
+        this.insideCode = insideCode;
+    }
+}
@@ -260,6 +260,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule.setLate2(false);
                 LateAdjustHandle.remove(schedule);
             }
+
+            try {
+                if(!schedule.getDirectiveState().equals(-1) && schedule.getStatus()==0){
+                    //重新下发调度指令
+                    directiveService.send60Dispatch(schedule.getId(), "待发@系统");
+                }
+            }catch (Exception e){
+                logger.error("", e);
+            }
+
             // 持久化到数据库
             dayOfSchedule.save(schedule);
@@ -118,7 +118,7 @@ text.alert-danger {
 .ganttSvgContainer {
     height: 400px;
-    overflow: hidden;
+    overflow: auto;
     position: relative;
 }
@@ -382,87 +382,171 @@ var BaseFun = function() {
 			 * 								 
 			 * 
 			 **/ 
-			abstractBcByWorkTime : function(bxlpbc , map , dataMap , saa  , cara , bxrcObj , dgminpcs) {
-				var rsultA = new Array();
+			abstractBcByWorkTime : function(bxlpbc , map , dataMap , saa  , cara , bxrcObj , dgminpcs ,deletebcNum) {
+				var rsultA = new Array() , dgzjsj = baseF.getDateTime('13:00');
+				// 定义13:00 ~ 晚高峰开始以前剔除规则. 如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
+				var xwmaxtcbcNum = parseInt(( dataMap.wgfsjd[0].st - dgzjsj) / (60000 *　saa[0].zzsj.dgzzsj));
+				// 定义早高峰结束 ~ 13:00 剔除规则.如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
+				var swmaxtcbcNum = parseInt(( dgzjsj - dataMap.zgfsjd[0].ed) / (60000 *　saa[0].zzsj.dgzzsj));
+				var sumGs = 0;
 				for(var a = 0 ; a < bxlpbc.length ; a++) {
-					/*if(a>0)
-						continue;*/
 					// 定义该版型下对应的路牌的班次数组、班次数组长度、该路牌上是否有首末班车。
 					var lpbc = bxlpbc[a].lpbc, lpbclen_ = lpbc.length;
 					if(lpbclen_<=0)
 						continue;
-					var isFlag = baseF.lpDownIsHaveFirstAndLastBc(lpbc , dataMap.smbcsjArr);
-					// 定义当前路牌的初始工时、班型对应的标准工时
-					var initCountGs = bxlpbc[a].initCountGs , bzgs = bxlpbc[a].bzgs;
-					// 定义初始工时与日平均工时差值
-					var initdx = initCountGs - bxlpbc[a].gsavg;
-					// 定义剔除班次数、剔除的时间段.
-					var deletebcNum = Math.ceil((initCountGs - bxlpbc[a].gsavg) / saa[0].zzsj.dgzzsj) , tcbcgzA = new Array();
-					// var deletebcNum = parseInt((initCountGs - bxlpbc[a].gsavg) / saa[0].zzsj.dgzzsj) , tcbcgzA = new Array();
+					var isFlag = baseF.lpDownIsHaveFirstAndLastBc(lpbc , dataMap.smbcsjArr) , tcbcgzA = new Array();
 					if(bxrcObj.type == '五工二休') {
 						// 定义晚高峰后能剔除多少班次数.
 						var wgfhtcbcNum = parseInt((  dataMap.wgfzhsjd[0].ed - dataMap.wgfsjd[0].ed ) / (60000 *　saa[0].zzsj.dgzzsj));
-						// 定义时间段内剔除班次规则.
-						tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed  , 'maxsj' : dataMap.wgfzhsjd[0].ed ,'order' : 'desc' ,  'deletebcNum' : wgfhtcbcNum},
-								 	 {'minsj': dataMap.zgfsjd[0].ed  , 'maxsj' : dataMap.wgfsjd[0].st ,  'order' : 'asc' , 'deletebcNum' : deletebcNum - wgfhtcbcNum});
-						// 逆序排序剔除.
-						// lpbc.sort(function(r,s){return s.fcno-r.fcno});
+						if(isFlag) {
+							// 定义时间段内剔除班次规则.
+							tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed  , 'maxsj' : dataMap.wgfsjd[0].st ,  'order' : 'asc' , 'deletebcNum' : deletebcNum});
+						}else {
+							// 定义时间段内剔除班次规则.
+							tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed  , 'maxsj' : dataMap.wgfzhsjd[0].ed ,'order' : 'desc' ,  'deletebcNum' : wgfhtcbcNum},
+									 	 {'minsj': dataMap.zgfsjd[0].ed  , 'maxsj' : dataMap.wgfsjd[0].st ,  'order' : 'asc' , 'deletebcNum' : deletebcNum - wgfhtcbcNum});
+						}
 						// 剔除不在高峰时间段内的班次.
 						baseF.spliceBc02(lpbc , tcbcgzA , dataMap , 'desc' , false);
 					}else {
-						/*console.log(bxlpbc[a].lpNo , initCountGs , bzgs , saa[0].zzsj.dgzzsj ,
-								initCountGs - bzgs , (initCountGs - bzgs) /saa[0].zzsj.dgzzsj ,
-								initCountGs - bxlpbc[a].gsavg , (initCountGs - bxlpbc[a].gsavg) / saa[0].zzsj.dgzzsj );*/
 						// 单档 一个路牌一档劳动力
 						if(bxlpbc[a].keepOff==1) {
 							// 如果低谷至少配车数大于零,则该班型下的路牌 存在一些 分班路牌,这里的分班 指的是 这个路牌先满足的前提条件就是 是单档。
 							// 为了满足工时的要求，在低谷断开一段时间.
-							if(dgminpcs>0 && dgminpcs <= bxrcObj.fpcls ) {
-								if( (a + 1) <= dgminpcs) {
-									var dgzjsj = baseF.getDateTime('13:00');
-									/*var zgfyh = dataMap.zgfsjd[0].ed;
-									zgfyh.setMinutes(zgfyh.getMinutes()+ Math.min.apply(null, dataMap.dgxxsjArr));*/
-									if( a % 2 == 0) {
-										// 定义早高峰结束 ~ 12:30 剔除规则.如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
-										var swmaxtcbcNum = parseInt(( dgzjsj - dataMap.zgfsjd[0].ed) / (60000 *　saa[0].zzsj.dgzzsj));
-										if(deletebcNum < swmaxtcbcNum || isFlag) {
-											// tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
-											tcbcgzA.push({'minsj':  dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : swmaxtcbcNum});
-										}else { 
-											tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed, 'maxsj' : dgzjsj , 'order' : 'asc'   , 'deletebcNum' : swmaxtcbcNum},
-														 {'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed, 'order' : 'desc' , 'deletebcNum' : deletebcNum - swmaxtcbcNum});
-										}
-									}else {
-										// 定义12:30 ~ 晚高峰开始以前剔除规则. 如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
-										var xwmaxtcbcNum = parseInt(( dataMap.wgfsjd[0].st - dgzjsj) / (60000 *　saa[0].zzsj.dgzzsj));
-										if(deletebcNum < xwmaxtcbcNum || isFlag) {
-											tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc',  'deletebcNum' : xwmaxtcbcNum});
-										}else {
-											tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum - xwmaxtcbcNum},
-														 {'minsj': dgzjsj  , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum});
-										}
+							if(dgminpcs > 0) {
+								if( a % 2 == 0) {
+									if(deletebcNum < swmaxtcbcNum || isFlag) {
+										tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
+									}else { 
+										tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed, 'maxsj' : dgzjsj , 'order' : 'asc'   , 'deletebcNum' : swmaxtcbcNum},
+													 {'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed, 'order' : 'desc' , 'deletebcNum' : deletebcNum - swmaxtcbcNum});
 									}
-									// 按规则剔除班次.并且分班.路牌班次断开.
-									baseF.spliceBc02(lpbc , tcbcgzA , dataMap , true);
 								}else {
-									// 按规则剔除班次.不分班.路牌班次不会断开.
-									baseF.isdk02(lpbc , dataMap , saa , deletebcNum , false);
+									if(deletebcNum < xwmaxtcbcNum || isFlag) {
+										tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc',  'deletebcNum' : deletebcNum});
+									}else {
+										tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum - xwmaxtcbcNum},
+													 {'minsj': dgzjsj  , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum});
+									}
 								}
+								// 按规则剔除班次.并且分班.路牌班次断开.
+								baseF.spliceBc02(lpbc , tcbcgzA , dataMap , true);
+								baseF.affimBzGs(lpbc , bxlpbc[a].bzgs, dataMap, saa , true , a);
 							// 该班型下的路牌 不存在分班路牌.
 							}else if(dgminpcs == 0){
 								// 按规则剔除班次.不分班.路牌班次不会断开.
 								baseF.isdk02(lpbc , dataMap , saa , deletebcNum , false);
+								//baseF.affimBzGs(lpbc , bxlpbc[a].bzgs, dataMap, saa , false , a);
 							}
 						// 双档 一个路牌两档劳动力
 						}else if(bxlpbc[a].keepOff==2) {
 							// 按规则剔除班次.分班.但是路牌班次不会断开.
 							baseF.isdk02(lpbc , dataMap , saa , deletebcNum , true);
+							//baseF.affimBzGs(lpbc , bxlpbc[a].bzgs , dataMap, saa , false , a);
 						}
 					}
+					// var markAfterGs = baseF.getSumWorkTime(lpbc , dataMap, saa);
+					// sumGs += parseFloat((markAfterGs - bxlpbc[a].bzgs).toFixed(2));
+					// sumGs += markAfterGs;
 					rsultA = rsultA.concat(lpbc);
 				}
+				// onsole.log(sumGs);
 				return rsultA;
 			},
+			
+			affimBzGs : function(lpbc , bzgs , dataMap, saa , isOff , index_) {
+				var tList = lpbc.concat();
+				var markAfterGs = baseF.getSumWorkTime(tList , dataMap, saa);
+				var gsDx = parseFloat((markAfterGs - bzgs).toFixed(2));
+				lpbc.sort(function(m,n){return m.fcno-n.fcno});
+				if(isOff) {
+					if(gsDx > 1.5) {
+						var hoursDx = parseFloat((gsDx - 1.5).toFixed(2));
+						// console.log(gsDx , hoursDx ,Math.ceil(hoursDx*60));
+						var minueDx = Math.ceil(hoursDx*60);
+						var bs = Math.ceil( minueDx / saa[0].zzsj.dgzzsj);
+						for(var s = 0 ; s < lpbc.length; s++) {
+							if(lpbc[s].isfb ==1) {
+								if(index_%2==0) {
+									lpbc.splice( (s+1) , bs*2);
+								}else {
+									lpbc.splice( s , bs*2);
+								}
+								break;
+							}
+						}
+						
+					}
+				}else {
+					
+				}
+			},
+			
+			updTime : function(lpbc , start , end , minueDx ,type ) {
+				var agvMarkTime =  Math.ceil(minueDx / end);
+				for(var u = start ; u < end ; u++) {
+					if(type =='asc'){
+						var tzDx = lpbc[u].STOPTIME - agvMarkTime , tmvalue = 0;
+						if(tzDx < 0) 
+							tmvalue = parseInt(lpbc[u].bcsj*0.1);
+						else 
+							tmvalue = tzDx;
+						lpbc[u].STOPTIME  = tmvalue ; 
+						if( u == start){ 
+							var fcsj =  baseF.getDateTime(lpbc[u].fcsj);
+							fcsj.setMinutes(fcsj.getMinutes() + minueDx);
+							lpbc[u].fcsj = baseF.getTimeStr(fcsj);
+							fcsj.setMinutes(fcsj.getMinutes() + lpbc[u].bcsj);
+							lpbc[u].ARRIVALTIME = baseF.getTimeStr(fcsj);
+						}else {
+							// 定义到达时间.
+							var ddsj_ = baseF.getDateTime(lpbc[u-1].ARRIVALTIME);
+							ddsj_.setMinutes(ddsj_.getMinutes() +  lpbc[u-1].STOPTIME);
+							lpbc[u].fcsj = baseF.getTimeStr(ddsj_);
+							ddsj_.setMinutes(ddsj_.getMinutes() + lpbc[u].bcsj);
+							// 修改最后一个班次的到达时间.
+							lpbc[u].ARRIVALTIME = baseF.getTimeStr(ddsj_);
+						}
+					
+					}else {
+						if( u == start){ 
+							var fcsj =  baseF.getDateTime(lpbc[u].fcsj);
+							fcsj.setMinutes(fcsj.getMinutes() - minueDx);
+							lpbc[u].fcsj = baseF.getTimeStr(fcsj);
+							fcsj.setMinutes(fcsj.getMinutes() + lpbc[u].bcsj);
+							lpbc[u].ARRIVALTIME = baseF.getTimeStr(fcsj);
+						}else {
+							var tzDx = lpbc[u].STOPTIME - agvMarkTime , tmvalue = 0;
+							if(tzDx < 0) 
+								tmvalue = parseInt(lpbc[u].bcsj*0.1);
+							else 
+								tmvalue = tzDx;
+							lpbc[u].STOPTIME  = tmvalue ; 
+							// 定义到达时间.
+							var ddsj_ = baseF.getDateTime(lpbc[u-1].fcsj);
+							ddsj_.setMinutes(ddsj_.getMinutes() -  lpbc[u].STOPTIME);
+							lpbc[u].ARRIVALTIME = baseF.getTimeStr(ddsj_);
+							ddsj_.setMinutes(ddsj_.getMinutes() - lpbc[u].bcsj);
+							// 修改最后一个班次的到达时间.
+							lpbc[u].fcsj = baseF.getTimeStr(ddsj_);
+						}
+					}
+					
+				}
+			},
+			
+			getSumWorkTime : function(lpbc , dataMap , saa) {
+				lpbc.sort(function(x,y){return x.fcno-y.fcno});
+				var sumWorkTime =  dataMap.jcsjArr[baseF.dirDmToIndex(lpbc[0].xlDir)] + 
+	  				  				 dataMap.ccsjArr[baseF.dirDmToIndex(lpbc[lpbc.length-1].xlDir)] +
+	  				  				 saa[0].lbsj*2;
+				for(var t = 0 ; t < lpbc.length ; t++) {
+					sumWorkTime +=  lpbc[t].bcsj + lpbc[t].STOPTIME;
+				}
+				return parseFloat((sumWorkTime/60).toFixed(2));
+			},
+			
+			
 			/**
 			 * @description (TODO) 判断某路牌下是否存在首末班车时间班次.
 			 * @param arr 某路牌下的班次.
@@ -471,7 +555,7 @@ var BaseFun = function() {
 			lpDownIsHaveFirstAndLastBc : function(arr , smbcsjArr) {
 				for(var a = 0 ; a < arr.length ; a++) {
 					for(var s = 0 ; s < smbcsjArr.length ; s++) {
-						if(arr[a].fcsj == smbcsjArr[s].kssj || arr[a].fcsj == smbcsjArr[s].jssj) 
+						if(arr[a].fcsj == smbcsjArr[s].jssj && baseF.dirDmToIndex(arr[a].xlDir) == s) 
 							return true;
 					}
 				}
@@ -487,10 +571,11 @@ var BaseFun = function() {
 				if(lpbc.length > 0 && deletebcNum > 0) {
 					lpbc.sort(function(r,s){return r.fcint-s.fcint});
 					var tcbcgzA = new Array();
-					debugger;
-					if(lpbc[0].fcsj == dataMap.smbcsjArr[0].kssj || lpbc[0].fcsj == dataMap.smbcsjArr[1].kssj) {
+					if( (lpbc[0].fcsj == dataMap.smbcsjArr[0].kssj && baseF.dirDmToIndex(lpbc[0].xlDir) == 0)
+							|| (lpbc[0].fcsj == dataMap.smbcsjArr[1].kssj &&  baseF.dirDmToIndex(lpbc[0].xlDir) == 1)) {
 						tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum});
-					}else if(lpbc[lpbc.length-1].fcsj == dataMap.smbcsjArr[0].jssj || lpbc[0].fcsj == dataMap.smbcsjArr[1].jssj) {
+					}else if((lpbc[lpbc.length-1].fcsj == dataMap.smbcsjArr[0].jssj && baseF.dirDmToIndex(lpbc[0].xlDir) == 0)
+							||  (lpbc[lpbc.length-1].fcsj  == dataMap.smbcsjArr[1].jssj &&  baseF.dirDmToIndex(lpbc[0].xlDir) == 1)) {
 						tcbcgzA.push({'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : deletebcNum});
 					}else {
 						var zgfzqtcbcNum = parseInt((  dataMap.zgfzqsjd[0].ed - dataMap.zgfzqsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj)),
@@ -498,17 +583,9 @@ var BaseFun = function() {
 						tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : wgfhtcbcNum},
 							 	 	 {'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed ,  'order' : 'asc', 'deletebcNum' : zgfzqtcbcNum});
 					}
-					/*if( wgfhtcbcNum  >= deletebcNum) {
-						
-					}else if(zgfzqtcbcNum >= deletebcNum){
-						
-					}else if(deletebcNum >= (zgfzqtcbcNum + wgfhtcbcNum)){
-						
-					}*/
 					baseF.spliceBc02(lpbc ,  tcbcgzA , dataMap , isfb);
 				}
 			},
-			
 			/**
 			 * @description (TODO) 根据定义规则剔除班次.
 			 * @param  arr 班次数组.
@@ -558,7 +635,8 @@ var BaseFun = function() {
 				var dgmaxfcjx = parseInt(map.dgmaxfcjx),
 					dgmaxtzsj = parseInt(map.dgmaxtzsj);
 				// 计算低谷最少配车数 (低谷上行行驶时间 + 低谷下行行驶时间 +  低谷最大停站时间*2) / 低谷最大发车间隙.
-				var dgminpcs = Math.round((dataMap.dgxxsjArr[0] + dataMap.dgxxsjArr[1] + dgmaxtzsj*2) / dgmaxfcjx);
+				var dgminpcs = Math.round((dataMap.dgxxsjArr[0] + dataMap.dgxxsjArr[1] + dataMap.dgtzsj[0] +  dataMap.dgtzsj[1]) / dgmaxfcjx);
+				// var dgminpcs = 4;
 				// 定义返回数组.
 				var rs = new Array();
 				for(var x = 0 ; x < bxrclist.length; x++) {
@@ -619,15 +697,20 @@ var BaseFun = function() {
 							bxlpbc.push({'bxtyp' : bxrclist[x].type , 'lpNo' : lpNo , 
 								 'lpbc' : lpbc , 'dygbcfcsj' : lpbc[lpbc.length-1].fcsj,
 								 'initCountGs' : initCountGs ,
-								 'keepOff' : keepOff , 'bzgs' : parseInt(hoursV*60) , 'gsavg' :  parseInt(bxrclist[x].gsavg*60) ,
+								 'keepOff' : keepOff , 'bzgs' : parseFloat(hoursV.toFixed(1)) , 'gsavg' :  parseInt(bxrclist[x].gsavg*60) ,
 								 'fcint' :  baseF.getDateTime(lpbc[lpbc.length-1].fcsj).getTime()});
 						}
 					}
 					if(bxlpbc.length > 0 ) {
 						bxlpbc.sort(function(x,y){return x.fcint-y.fcint});
+						var avgMakerCarNum = 0;
+						for(var v = 0 ; v<bxlpbc.length ; v++) {
+							avgMakerCarNum += Math.ceil((bxlpbc[v].initCountGs - bxlpbc[v].gsavg) / saa[0].zzsj.dgzzsj);
+						}
+						avgMakerCarNum = parseInt(avgMakerCarNum / bxlpbc.length);
 						// console.log(bxlpbc);
 						// 调整某班型下的各个路牌对应的班次以及工时、停站时间、是否分班.
-						rs = rs.concat(baseF.abstractBcByWorkTime(bxlpbc , map , dataMap , saa  , cara , bxrclist[x] , dgminpcs));
+						rs = rs.concat(baseF.abstractBcByWorkTime(bxlpbc , map , dataMap , saa  , cara , bxrclist[x] , dgminpcs , avgMakerCarNum));
 					}
 				}
 				return rs;
@@ -697,7 +780,9 @@ var BaseFun = function() {
 				var markArray = baseF.markFirstAndLastBusAlsoDietNotInRangeBc(jsonArray , dataMap);
 				// 第四步 横向调整 
-				baseF.resizeByPitStopTime(cara , jsonArray , dataMap);
+				baseF.resizeByPitStopTime(cara , markArray , dataMap);
+				
+				// return {'json':markArray,'bxrcgs':null};
 				/**
 				 * 第五步 把班型合理的分配到各个路牌上.
@@ -1134,7 +1134,7 @@ var RelationshipGraph = function () {
         		// 3.2、定义鼠标按下的x、y坐标 .
         		var d3MouseDown_x = parseInt(d3.mouse(this)[0]),d3MouseDown_y = parseInt(d3.mouse(this)[1]);
         		// 3.3、计时鼠标是否按下已有300ms,并且在300ms中鼠标未曾移动，则打开开关,进入鼠标操作过程.
-        		stop = setTimeout(function(e) {
+        		stop = setTimeout(function() {
         			// 3.4、打开鼠标移动和松开事件开关.
         			flag = true;
         			// 3.5、记录当前选择框数 .
@@ -1160,6 +1160,7 @@ var RelationshipGraph = function () {
         		},200);
         	//  4、给svg容器元素对象 添加鼠标移动事件 . 这里等同于绘制选择框.
         	}).on('mousemove',function(e){
+        		// $('.ganttSvgContainer').css('overflow','auto');
         		// 4.1 判断开关是否打开状态.
         		if(flag) {
         			// 4.1.1、定义鼠标移动的x、y坐标.
@@ -1183,6 +1184,7 @@ var RelationshipGraph = function () {
         		}
     		// 6、给svg容器元素对象 添加鼠标移出事件.解决鼠标在其他元素上松开而不关闭开关问题.只有在绑定 mouseleave 事件的元素上，将鼠标移出时，才会触发该事件。
         	}).on('mouseleave',function() {
+        		// $('.ganttSvgContainer').css('overflow','hidden');
         		if(flag) {
         			layer.closeAll();// 关闭弹出层.
             		RelationshipGraph.mouseUpEvent(flag);
@@ -747,10 +747,4 @@
 		layer.closeAll();
 		layer.msg('操作成功!已【'+ msg + '】!');
 	}
-	
-	$('#scrllmouseEvent').on('mousemove',function() {
-		$('.ganttSvgContainer').css('overflow','auto');
-	}).on('mouseleave',function() {
-		$('.ganttSvgContainer').css('overflow','hidden');
-	});
 })();
 \ No newline at end of file
@@ -1174,3 +1174,78 @@ ul.left_tabs_lg li{
     background: #8c8c8c;
     background-image: linear-gradient(to bottom,#a7a7a7,#8c8c8c);
 }
+
+.ct_layer_modal{
+    background: #e5e5e5;
+    height: 100%;
+    width: 100%;
+    overflow: auto;
+}
+
+.layui-layer-setwin{
+
+}
+
+.device_config_table dl dt:nth-of-type(1), .device_config_table dl dd:nth-of-type(1){
+    width: 6%;
+}
+.device_config_table dl dt:nth-of-type(2), .device_config_table dl dd:nth-of-type(2){
+    width: 6%;
+}
+.device_config_table dl dt:nth-of-type(3), .device_config_table dl dd:nth-of-type(3){
+    width: 8%;
+}
+.device_config_table dl dt:nth-of-type(4), .device_config_table dl dd:nth-of-type(4){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(5), .device_config_table dl dd:nth-of-type(5){
+    width: 3%;
+}
+.device_config_table dl dt:nth-of-type(6), .device_config_table dl dd:nth-of-type(6){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(7), .device_config_table dl dd:nth-of-type(7){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(8), .device_config_table dl dd:nth-of-type(8){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(9), .device_config_table dl dd:nth-of-type(9){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(10), .device_config_table dl dd:nth-of-type(10){
+    width: 9%;
+}
+.device_config_table dl dt:nth-of-type(11), .device_config_table dl dd:nth-of-type(11){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(12), .device_config_table dl dd:nth-of-type(12){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(13), .device_config_table dl dd:nth-of-type(13){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(14), .device_config_table dl dd:nth-of-type(14){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(15), .device_config_table dl dd:nth-of-type(15){
+    width: 4%;
+}
+.device_config_table dl dt:nth-of-type(16), .device_config_table dl dd:nth-of-type(16){
+    width: 3%;
+}
+.device_config_table dl dt:nth-of-type(17), .device_config_table dl dd:nth-of-type(17){
+    width: 4%;
+}
+.device_config_table dl dt:nth-of-type(18), .device_config_table dl dd:nth-of-type(18){
+    width: 11%;
+}
+
+.uk-tooltip{
+    z-index: 29999999;
+}
+
+.device_config_table.ct_table dl dd,
+.device_config_table.ct_table dl dt{
+    border-right: 1px solid #dedede !important;
+}
 \ No newline at end of file
+<div class="ct_layer_modal device_configs_manager">
+
+    <div style="height: calc(100% - 20px);">
+        <div class="ct_table_wrap ct_table_no_border" style="height: 100%;overflow: hidden;">
+            <div class="ct_table device_config_table">
+                <div class="ct_table_head" style="top: 0px;">
+                    <dl>
+                        <dt data-uk-tooltip title="车辆">车辆</dt>
+                        <dt data-uk-tooltip title="设备号">设备号</dt>
+                        <dt data-uk-tooltip title="网关IP">网关IP</dt>
+                        <dt data-uk-tooltip title="网关端口">网关端口</dt>
+                        <dt data-uk-tooltip title="定时定距上报模式">模式</dt>
+                        <dt data-uk-tooltip title="定时上报时间间隔">时间间隔</dt>
+                        <dt data-uk-tooltip title="定距上报距离间隔">距离间隔</dt>
+                        <dt data-uk-tooltip title="非线路状态超速阀门">超速阀门</dt>
+                        <dt data-uk-tooltip title="预警阀门">预警阀门</dt>
+                        <dt data-uk-tooltip title="pos机IP地址">POS机IP</dt>
+                        <dt data-uk-tooltip title="pos机端口">POS端口</dt>
+                        <dt data-uk-tooltip title="延迟关机时间">延迟关机</dt>
+                        <dt data-uk-tooltip title="中门视频切换到码表界面速度阀门">中码阀门</dt>
+                        <dt data-uk-tooltip title="码表界面切换到中门视频速度阀门">码中阀门</dt>
+                        <dt data-uk-tooltip title="对比度">对比度</dt>
+                        <dt data-uk-tooltip title="亮度">亮度</dt>
+                        <dt data-uk-tooltip title="饱和度">饱和度</dt>
+                        <dt data-uk-tooltip title="参数上报时间">参数上报时间</dt>
+                    </dl>
+                </div>
+                <div class="ct_table_body"></div>
+            </div>
+        </div>
+    </div>
+
+    <script id="device_configs_table-temp" type="text/html">
+        {{each list as c i}}
+            <dl>
+                <dd>{{c.insideCode}}</dd>
+                <dd>{{c.id}}</dd>
+                <dd>{{c.ipAddress}}</dd>
+                <dd>{{c.port}}</dd>
+                <dd>{{c.reportMode}}</dd>
+                <dd>{{c.interval}}</dd>
+                <dd>{{c.distance}}</dd>
+                <dd>{{c.speedingThreshold}}</dd>
+                <dd>{{c.alarmThreshold}}</dd>
+                <dd>{{c.posIpAddress}}</dd>
+                <dd>{{c.posPort}}</dd>
+                <dd>
+                    {{if c.delay != null}}
+                    {{c.delay}}分钟
+                    {{/if}}
+                </dd>
+                <dd>{{c.speedThreshold1}}</dd>
+                <dd>{{c.speedThreshold2}}</dd>
+                <dd>{{c.contrast}}</dd>
+                <dd>{{c.brightness}}</dd>
+                <dd>{{c.saturation}}</dd>
+                <dd>{{c.timeStr}}</dd>
+            </dl>
+        {{/each}}
+    </script>
+    <script>
+        (function () {
+            var modal = $('.ct_layer_modal.device_configs_manager');
+
+            var page=0,size=12;
+            gb_common.$get('/directive/deviceCofigList', {page:page,size:size}, function (rs) {
+                var f = 'YYYY-MM-DD HH:mm';
+                $.each(rs.list, function () {
+                    if(this.timestamp){
+                        this.timeStr = moment(this.timestamp).format(f);
+                    }
+                });
+
+                var htmlStr = template('device_configs_table-temp', {list: rs.list});
+                $('.device_config_table .ct_table_body', modal).html(htmlStr);
+            });
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -84,8 +84,9 @@
             var modal = '#home-c0a3-modal';
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
-                $.post('/directive/c0a4', {nbbm: 'B-99999'});
-                //console.log('init...');
+                console.log('data', data);
+                $.post('/directive/c0a4', {nbbm: data.nbbm});
+
                 setTimeout(function() {
                     $('.modal-loading .text', modal).text('等待设备响应数据...');
                 }, 1500);
@@ -174,6 +174,16 @@
                 })
             };
+            var state_up_0 = function(device) {
+                var nbbm = gb_data_basic.device2nbbmMap()[device];
+                stateChange(nbbm, 0, 0);
+            };
+
+            var state_down_0 = function(device) {
+                var nbbm = gb_data_basic.device2nbbmMap()[device];
+                stateChange(nbbm, 1, 0);
+            };
+
             var resetPagination = true;
             var pagination = function(pages, currentPage) {
                 var wrap = $('.pagination-wrap', modal).empty()
@@ -238,8 +248,25 @@
                             query();
                         });
                     }, '确定从清册中移除');
-                }
-            }
+                },
+                state_up_0: state_up_0,
+                state_down_0: state_down_0
+            };
+
+
+            //营运状态和上下行切换
+            var stateChange = function (nbbm, updown, state) {
+                $.post('/directive/stateChange', {
+                    nbbm: nbbm,
+                    upDown: updown,
+                    state: state
+                }, function(rs) {
+                    if (rs == 0)
+                        notify_succ('指令已发出');
+                    else
+                        notify_err('发送失败，原因参考【指令下发记录】');
+                });
+            };
             $.contextMenu({
                 selector: '#all-devices-modal table>tbody>tr',
@@ -252,6 +279,17 @@
                     'change_line': {
                         name: '切换线路'
                     },
+                    'change_up_down': {
+                        name: '切换上下行',
+                        items: {
+                            'state_up_0': {
+                                'name': '上行营运'
+                            },
+                            'state_down_0': {
+                                'name': '下行营运'
+                            }
+                        }
+                    },
                     'refresh_line_file':{
                         name: '刷新线路文件'
                     },
@@ -363,6 +363,15 @@ var gb_common = (function () {
         return result;
     };
+    var inverse = function (map) {
+        var rs = {};
+        for(var k in map){
+            rs[map[k]] = k;
+        }
+
+        return rs;
+    };
+    
     return {
         reqCode80: reqCode80,
         groupBy: groupBy,
@@ -385,7 +394,8 @@ var gb_common = (function () {
         numSubtr: numSubtr,
         trim: trim,
         remarksAutocomplete: remarksAutocomplete,
-        flatpickrDateTimeConfig: flatpickrDateTimeConfig
+        flatpickrDateTimeConfig: flatpickrDateTimeConfig,
+        inverse: inverse
         //whichTransitionEvent:whichTransitionEvent
     };
@@ -2,13 +2,14 @@
 var gb_data_basic = (function () {
-    var stationRoutes, lineCode2NameAll, lineInformations, nbbm2deviceMap, allPersonnel, svgAttrs;
+    var stationRoutes, lineCode2NameAll, lineInformations, nbbm2deviceMap, device2nbbmMap, allPersonnel, svgAttrs;
     var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", "nbbm2deviceId", "all_personnel", "svg_attrs"
         , function (routes, code2Name, informations, nbbm2device, all_personnel, svgAttrMap) {
             stationRoutes = routes;
             lineCode2NameAll = code2Name;
             lineInformations = informations;
             nbbm2deviceMap = nbbm2device;
+            device2nbbmMap = gb_common.inverse(nbbm2deviceMap);
             allPersonnel = all_personnel;
             svgAttrs = svgAttrMap;
             gb_main_ep.emitLater('data-basic');
@@ -167,6 +168,9 @@ var gb_data_basic = (function () {
         nbbm2deviceMap: function () {
             return nbbm2deviceMap;
         },
+        device2nbbmMap: function () {
+            return device2nbbmMap;
+        },
         getLineInformation: getLineInformation,
         allInformations: function () {
             return lineInformations;
@@ -101,8 +101,8 @@
                     sd=d.subtract(3, 'days').format(f);
             $('#date', '.form-page-content').data('DateTimePicker')
-                    .defaultDate(d)
-                    .maxDate(ed).minDate(sd);
+                    .defaultDate(d);
+                    //.maxDate(ed).minDate(sd);
             if($("#ddrbBody").length > 0){
                 $("#ddrbBody").height("620px");
@@ -205,7 +205,8 @@ var gb_home_context_menu = (function() {
     };
     var C0_A3 = function(){
-      open_modal('/real_control_v2/fragments/home/c0_a3.html', {}, {center: false, bgclose: false});
+      //open_modal('/real_control_v2/fragments/home/c0_a3.html', {nbbm: active_car}, {center: false, bgclose: false});
+        open_layer_modal('/real_control_v2/fragments/device_config/list.html', {}, 1288, 600, '设备参数管理（功能调试中...）');
     };
     var callbackHandler = {
@@ -256,12 +257,7 @@ var gb_home_context_menu = (function() {
             },
             'sep2': '---------',
             'C0_A3': {
-              name: '设备参数管理',
-              disabled:true
-            },
-            'C0_A5': {
-              name: '程序更新',
-              disabled:true
+              name: '设备参数管理'
             }
         }
     });
@@ -30,6 +30,28 @@ var open_modal = function (pageUrl, data, opt) {
     });
 };
+var open_layer_modal = function (pageUrl, data, w, h, t) {
+    if(!w) w = 1200;
+    if(!h) h = 650;
+    $.get(pageUrl, function (dom) {
+        var index = layer.open({
+            type: 1,
+            title: t,
+            shadeClose: true,
+            shade: false,
+            maxmin: true, //开启最大化最小化按钮
+            area: [w+'px', h+'px'],
+            skin:'layui-layer-molv play_back-layer',
+            content: dom,
+            //zIndex: layer.zIndex,
+            success: function(layero){
+                layer.setTop(layero);
+                //$('.gps-play-back-panel-v3').trigger('init', {deviceId: deviceId, nbbm: nbbm});
+            }
+        });
+    });
+};
+
 var open_modal_dom = function (dom, data, opt) {
     if (!$(dom).hasClass('uk-modal')) {
         alert('无效的dom片段！');
@@ -1409,4 +1409,17 @@ span.flatpickr-weekday{
     right: 15px;
     top: 20px;
     font-size: 12px;
+}
+
+ul.base_line_list>li:nth-child(odd)>a {
+    color: #60a6dd;
+}
+
+ul.base_line_list>li:nth-child(even)>a {
+    color: #ac443d;
+}
+
+ul.base_line_list>li>a:hover{
+    color: #fff !important;
+    background: #848686 !important;
 }
 \ No newline at end of file
@@ -30,6 +30,15 @@
                         </div>
                     </div>
                 </label>
+                <label>
+                    <div class="uk-button-dropdown" data-uk-dropdown="">
+                        <a title="默认跟随GPS，选择后将固定底图。每次搜索会重置">线路底图 <i class="uk-icon-angle-down"></i></a>
+                        <div class="uk-dropdown uk-dropdown-scrollable" style="max-height: 300px;">
+                            <ul class="uk-nav uk-nav-dropdown base_line_list">
+                            </ul>
+                        </div>
+                    </div>
+                </label>
             </form>
         </div>
@@ -102,6 +111,7 @@
             trailPolyline=null;
             map.clearOverlays();
             parkPolygons={};
+            autoChange=true;
         }
         function replaceSymbol(s){
@@ -262,12 +272,13 @@
                 gpsMarker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(gps, width), new BMap.Size(width, 75)));
             }
-            if(gps.lineId!=xlPolyline.lineId || gps.upDown!=xlPolyline.upDown){
+            if(autoChange && (gps.lineId!=xlPolyline.lineId || gps.upDown!=xlPolyline.upDown)){
                 drawXlPolyline(gps.lineId, gps.upDown);
             }
         }
         var bform = $('.buffer_area_form', rightWrap);
+        var autoChange=true;
         function drawXlPolyline(lineCode, upDown) {
             if(upDown!=0 && upDown!=1){
                 //upDown = xlPolyline.upDown?xlPolyline.upDown:0;
@@ -657,6 +668,23 @@
             });
         })();
+        //初始化线路地图下拉菜单
+        (function () {
+            var opts='';
+            $.each(gb_data_basic.activeLines, function () {
+                opts+='<li data-code="'+this.lineCode+'" data-dir="0"><a>'+this.name+'上行</a></li><li data-code="'+this.lineCode+'" data-dir="1"><a>'+this.name+'下行</a></li>';
+            });
+            $('.base_line_list', rightWrap).html(opts);
+
+            //切换线路底图
+            $(rightWrap).on('click', '.base_line_list>li', function () {
+                var code = $(this).data('code');
+                var updown = $(this).data('dir');
+                autoChange = false;
+                drawXlPolyline(code, updown);
+            });
+        })();
+
         function formData() {
             var fs = 'YYYY-MM-DD HH:mm';
@@ -27,7 +27,7 @@ var gb_map_play_back = (function () {
             shadeClose: true,
             shade: false,
             maxmin: true, //开启最大化最小化按钮
-            area: ['1214px', '754px'],
+            area: ['1299px', '754px'],
             //moveOut: true,
             skin:'layui-layer-molv play_back-layer',
             content: dom,