Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 71c8a272 bfe499ac
Showing 84 changed files with 1906 additions and 534 deletions
src/main/java/com/bsth/ServiceStateTest.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/ThreadMonotor.java
src/main/java/com/bsth/data/car_out_info/CarOutInfo.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/car_out_info/UpdateDBThread.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/data/gpsdata/thread/ThreadPollMonitor.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/data/msg_queue/QueueData.java
-package com.bsth;
-
-public class ServiceStateTest {
-
-	public static void main(String[] args) {
-		System.out.println("运营状态：" + getService(603979776));
-		System.out.println("上下行：" + getUpOrDown(603979776));
-	}
-
-	/**
-	 * 获取运营状态
-	 * 
-	 * @return -1无效 0运营 1未运营
-	 */
-	public static byte getService(long serviceState) {
-		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000)
-			return -1;
-		return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
-	}
-
-	/**
-	 * 王通 2016/6/29 9:23:24 获取车辆线路上下行
-	 * 
-	 * @return -1无效 0上行 1下行
-	 */
-	public static byte getUpOrDown(long serviceState) {
-		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
-				|| (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
-			return -1;
-		return (byte) (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
-	}
-}
+package com.bsth;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.ThreadMonotor;
+import com.bsth.data.car_out_info.UpdateDBThread;
+import com.bsth.data.directive.DirectivesPstThread;
+import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
+import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
+import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
+import com.bsth.data.schedule.thread.CalcOilThread;
+import com.bsth.data.schedule.thread.SchedulePstThread;
+import com.bsth.data.schedule.thread.ScheduleRefreshThread;
+import com.bsth.data.schedule.thread.SubmitToTrafficManage;
+import com.bsth.util.DateUtils;
+import com.bsth.util.Tools;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 线调大部分服务都在这里启动
+ * Created by panzhao on 2017/5/14.
+ */
+@Component
+public class XDApplication implements CommandLineRunner {
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    BasicData.BasicDataLoader basicDataLoader;
+    @Autowired
+    UpdateDBThread fcxxUpdateThread;
+    @Autowired
+    GpsDataLoaderThread gpsDataLoader;
+    @Autowired
+    OfflineMonitorThread offlineMonitorThread;
+    @Autowired
+    ScheduleRefreshThread scheduleRefreshThread;
+    @Autowired
+    SchedulePstThread schedulePstThread;
+    @Autowired
+    ScheduleLateThread scheduleLateThread;
+    @Autowired
+    SubmitToTrafficManage submitToTrafficManage;
+    @Autowired
+    CalcOilThread calcOilThread;
+    @Autowired
+    DirectivesPstThread directivesPstThread;
+    @Autowired
+    ThreadMonotor threadMonotor;
+
+    private static long timeDiff;
+
+    static {
+        timeDiff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
+        if (timeDiff < 0)
+            timeDiff += (1000 * 60 * 60 * 24);
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        try {
+            Tools tools = new Tools("application.properties");
+            String environment = tools.getValue("spring.profiles.active");
+            //预先加载基础的对照数据
+            basicDataLoader.loadAllData();
+            switch (environment){
+                case "dev":
+                    devInit();
+                    break;
+                case "prod":
+                    prodInit();
+                    break;
+            }
+        }catch (Exception e){
+            log.error("线调后台启动出现异常！！", e);
+            System.exit(1);
+        }
+    }
+
+    public void devInit(){
+        ScheduledExecutorService sexec = Application.mainServices;
+        //抓取GPS数据
+        gpsDataLoader.setFlag(-1);
+        sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
+        //实际排班更新线程
+        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        //实际排班延迟入库线程
+        sexec.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
+
+        //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
+        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
+    }
+
+    public void prodInit(){
+        ScheduledExecutorService sexec = Application.mainServices;
+        //发车信息
+        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 60, 40, TimeUnit.SECONDS);
+        //抓取GPS数据
+        sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
+        //检查设备掉离线
+        sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
+        //实际排班更新线程
+        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        //实际排班延迟入库线程
+        sexec.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
+        //检查班次误点
+        sexec.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
+        //调度指令延迟入库
+        sexec.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
+
+        //运管处静态数据提交
+        log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
+        sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //计算油、公里加注
+        sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+
+        //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
+        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
+    }
+}
 package com.bsth.controller.realcontrol;
 import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
+import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import org.slf4j.Logger;
@@ -55,4 +58,21 @@ public class anomalyCheckController {
     public void shutdownThreadPool(){
         GpsRealAnalyse.shutdown();
     }
+
+    @RequestMapping(value = "/directivePushQueue")
+    public void directivePushQueue(){
+        DirectivePushQueue.start();
+    }
+
+    @RequestMapping(value = "/webSocketPushQueue")
+    public void webSocketPushQueue(){
+        WebSocketPushQueue.start();
+    }
+
+    @RequestMapping(value = "/setHttpFlag")
+    public void setHttpFlag(@RequestParam int flag){
+        if(flag != 0 && flag != -1)
+            return;
+        GpsDataLoaderThread.setFlag(flag);
+    }
 }
@@ -154,8 +154,6 @@ public class BasicData implements CommandLineRunner {
                 loadLineInfo();
                 //车辆和线路映射信息
                 loadNbbm2LineInfo();
-                //站点路由信息
-                //loadStationRouteInfo();
                 //人员信息
                 loadPersonnelInfo();
                 //公司信息
+package com.bsth.data;
+
+import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
+import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.data.msg_queue.WebSocketPushQueue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by panzhao on 2017/5/11.
+ */
+@Component
+public class ThreadMonotor extends Thread{
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+
+        //线调GPS分析主线程
+        if(GpsRealAnalyse.isBlock()){
+            log.warn("GpsRealAnalyse isBlock true !!!!");
+            GpsRealAnalyse.shutdown();
+        }
+
+        if(GpsRealAnalyse.isIdle()){
+            //尝试使用网关的GPS实时对照数据
+            GpsDataLoaderThread.setFlag(-1);
+        }
+
+        //webSocket 消息推送队列
+        if(WebSocketPushQueue.isIdle()){
+            log.warn("WebSocketPushQueue isIdle true !!!!");
+            WebSocketPushQueue.start();
+        }
+
+        //网关指令推送队列（系统自动发送的）
+        if(DirectivePushQueue.isIdle()){
+            log.warn("DirectivePushQueue isIdle true !!!!");
+            DirectivePushQueue.start();
+        }
+    }
+}
-package com.bsth.data.car_out_info;
-
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-
-import java.util.List;
-
-/**
- * Created by panzhao on 2017/5/7.
- */
-public interface CarOutInfo {
-
-    void updateAll();
-
-    void update(String lineCode);
-
-    void update(List<ScheduleRealInfo> list) ;
-}
@@ -9,15 +9,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import java.sql.PreparedStatement;
@@ -28,14 +25,23 @@ import java.util.*;
  * 发车信息表处理程序
  * Created by panzhao on 2017/5/5.
  */
-@Service
-public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
+@Component
+public class CarOutInfoHandler {
     @Autowired
     DayOfSchedule dayOfSchedule;
     //班次类型对照表
-    Map<String, String> bcTypeMap;
+    static Map<String, String> bcTypeMap;
+
+    static{
+        bcTypeMap = new HashMap<>();
+        bcTypeMap.put("normal", "正常班次");
+        bcTypeMap.put("region", "区间");
+        bcTypeMap.put("venting", "直放");
+        bcTypeMap.put("major", "放站");
+        bcTypeMap.put("ldks", "两点间空驶");
+    }
     private static ScheduleComparator.FCSJ schFCSJComparator = new ScheduleComparator.FCSJ();
@@ -47,7 +53,6 @@ public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
     /**
      * 全量更新发车信息表
      */
-    @Override
     public void updateAll() {
         Set<String> ks = BasicData.lineCode2NameMap.keySet();
         for (String lineCode : ks) {
@@ -55,7 +60,6 @@ public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
         }
     }
-    @Override
     public void update(String lineCode) {
         try {
             ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap = dayOfSchedule.getLpScheduleMap();
@@ -75,8 +79,6 @@ public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
         }
     }
-    @Transactional
-    @Override
     public void update(List<ScheduleRealInfo> list) {
         if (list.size() == 0)
             return;
@@ -194,30 +196,4 @@ public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
         }
         return array;
     }
-
-    @Autowired
-    UpdateInfoThread updateInfoThread;
-
-    @Override
-    public void run(String... strings) throws Exception {
-        bcTypeMap = new HashMap<>();
-        bcTypeMap.put("normal", "正常班次");
-        bcTypeMap.put("region", "区间");
-        bcTypeMap.put("venting", "直放");
-        bcTypeMap.put("major", "放站");
-        bcTypeMap.put("ldks", "两点间空驶");
-        //Application.mainServices.scheduleWithFixedDelay(updateInfoThread, 60, 40, TimeUnit.SECONDS);
-    }
-
-    @Component
-    private static class UpdateInfoThread extends Thread {
-
-        @Autowired
-        CarOutInfo carOutInfoHandler;
-
-        @Override
-        public void run() {
-            carOutInfoHandler.updateAll();
-        }
-    }
 }
+package com.bsth.data.car_out_info;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 数据库发车信息表更新线程
+ * Created by panzhao on 2017/5/14.
+ */
+@Component
+public class UpdateDBThread extends Thread{
+
+    @Autowired
+    CarOutInfoHandler carOutInfoHandler;
+
+    @Override
+    public void run() {
+        carOutInfoHandler.updateAll();
+    }
+}
@@ -57,10 +57,11 @@ public class DayOfDirectives {
 		pstDirectives = new LinkedList<>();
 	}
-	public void put60(D60 d60) {
+	public void put60(D60 d60, boolean pst) {
 		d60Map.put(d60.getMsgId(), d60);
 		//等待持久化
-		pstDirectives.add(d60);
+		if(pst)
+			pstDirectives.add(d60);
 	}
 	public void put64(D64 d64) {
@@ -41,8 +41,8 @@ public class GatewayHttpUtils {
 			//超时时间
 			RequestConfig requestConfig = RequestConfig.custom()  
-			        .setConnectTimeout(3000).setConnectionRequestTimeout(1000)
-			        .setSocketTimeout(3000).build();
+			        .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
+			        .setSocketTimeout(1500).build();
 			HttpPost post = new HttpPost(url);
@@ -47,7 +47,7 @@ public class ForecastRealServer implements CommandLineRunner {
 	//车辆 ——> 预测终点时间
 	//static Map<String, Float> forecastMap = new HashMap<>(); 
-	//线路_上下行 ——> 封装耗时数据的路由链
+	//线路_上下行 ——> 耗时数据的路由链
 	public static ArrayListMultimap<String, SimpleRoute> lineSampleMap;
 	//车辆 ——> 预测结果
 	public static Map<String, ForecastResult> forecastMap;
@@ -88,6 +88,13 @@ public class GpsEntity {
 	/** gps是否有效 设备端发送的状态 */
 	private int valid;
+	/**
+	 * 数据来源
+	 * 1：网关
+	 * 0：转发
+	 */
+	private int source;
+
 	public String getDeviceId() {
 		return deviceId;
 	}
@@ -292,4 +299,12 @@ public class GpsEntity {
 	public void setSpeed(Float speed) {
 		this.speed = speed;
 	}
+
+	public int getSource() {
+		return source;
+	}
+
+	public void setSource(int source) {
+		this.source = source;
+	}
 }
@@ -2,9 +2,6 @@ package com.bsth.data.gpsdata;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
-import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
-import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
-import com.bsth.data.gpsdata.thread.ThreadPollMonitor;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.TreeMultimap;
@@ -12,7 +9,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import java.util.*;
@@ -26,7 +22,7 @@ import java.util.concurrent.ConcurrentMap;
  * @date 2016年8月12日 下午2:04:41
  */
 @Component
-public class GpsRealData implements CommandLineRunner {
+public class GpsRealData {
     static Logger logger = LoggerFactory.getLogger(GpsRealData.class);
@@ -36,20 +32,11 @@ public class GpsRealData implements CommandLineRunner {
     private static TreeMultimap<String, String> lineCode2Devices;
     @Autowired
-    GpsDataLoaderThread gpsDataLoader;
-
-    @Autowired
-    OfflineMonitorThread offlineMonitorThread;
-
-    @Autowired
     DayOfSchedule dayOfSchedule;
     @Autowired
     ForecastRealServer forecastRealServer;
-    @Autowired
-    ThreadPollMonitor threadPollMonitor;
-
     /**
      * 构造函数
      */
@@ -58,19 +45,6 @@ public class GpsRealData implements CommandLineRunner {
         lineCode2Devices = TreeMultimap.create();
     }
-    @Override
-    public void run(String... arg0) throws Exception {
-        logger.info("gpsDataLoader,20,3");
-        //http形式获取GPS数据
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 2, TimeUnit.SECONDS);
-        //定时扫描掉离线
-        //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
-
-        //扫描GPS线程池状态
-        //Application.mainServices.scheduleWithFixedDelay(threadPollMonitor, 60, 20, TimeUnit.SECONDS);
-
-    }
-
     public void put(GpsEntity gps) {
         String device = gps.getDeviceId();
@@ -89,19 +63,29 @@ public class GpsRealData implements CommandLineRunner {
                     gps.setExpectStopTime(forecastRealServer.expectStopTime(gps.getNbbm()));
                 }
             }
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-        //刷新对照
-        gpsMap.put(device, gps);
-        if (StringUtils.isNotBlank(gps.getLineId())) {
-            //站点名称
-            gps.setStationName(getStationName(gps));
-            lineCode2Devices.put(gps.getLineId(), device);
+            //刷新对照
+            gpsMap.put(device, gps);
+            if (StringUtils.isNotBlank(gps.getLineId())) {
+                //站点名称
+                gps.setStationName(getStationName(gps));
+                lineCode2Devices.put(gps.getLineId(), device);
+
+                if(old != null && !gps.getLineId().equals(old.getLineId()))
+                    lineCode2Devices.remove(old.getLineId(), device);
+            }
-            if(old != null && !gps.getLineId().equals(old.getLineId()))
-                lineCode2Devices.remove(old.getLineId(), device);
+            //车辆换设备了
+            String nbbm = gps.getNbbm();
+            if(old != null && StringUtils.isNotEmpty(nbbm) && !nbbm.equals(old.getNbbm())){
+                List<GpsEntity> list = findByNbbm(nbbm);
+                for(GpsEntity g : list){
+                    if(!g.getDeviceId().equals(device))
+                        gpsMap.remove(g.getDeviceId());
+                }
+            }
+        } catch (Exception e) {
+            logger.error("", e);
         }
     }
@@ -116,6 +100,16 @@ public class GpsRealData implements CommandLineRunner {
         return gpsMap.get(deviceId);
     }
+    public List<GpsEntity> findByNbbm(String nbbm){
+        Collection<GpsEntity> arr = gpsMap.values();
+        List<GpsEntity> rs = new ArrayList<>();
+        for(GpsEntity g : arr){
+            if(nbbm.equals(g.getNbbm()))
+                rs.add(g);
+        }
+        return rs;
+    }
+
     /**
      * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
      */
@@ -11,10 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -44,15 +41,22 @@ public class GpsRealAnalyse {
     @Autowired
     GpsRealData gpsRealData;
-    static ExecutorService threadPool = Executors.newFixedThreadPool(100);
+    static ExecutorService threadPool = Executors.newFixedThreadPool(20);
     public static long st;
     public static CountDownLatch count;
+    public static boolean isBlock() {
+        return System.currentTimeMillis() - st > 1000 * 20;
+    }
+
+    public static boolean isIdle(){
+        return System.currentTimeMillis() - st > 1000 * 60;
+    }
+
     public void analyse(List<GpsEntity> list) {
         try {
             st = System.currentTimeMillis();
-            //如果正在恢复数据
             if (GpsDataRecovery.run)
                 return;
@@ -63,6 +67,7 @@ public class GpsRealAnalyse {
             }
             Set<String> ks = multimap.keySet();
+
             logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
             count = new CountDownLatch(ks.size());
@@ -125,7 +130,7 @@ public class GpsRealAnalyse {
                     abnormalStateHandle.handle(gps, prevs);
                     if (!task)
-                        return; //无任务的，到这里就结束
+                        continue; //无任务的，到这里就结束
                     //反向处理
                     reverseSignalHandle.handle(gps, prevs);
@@ -6,12 +6,12 @@ import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
 import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
+import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -41,9 +41,6 @@ public class InOutStationSignalHandle extends SignalHandle{
     SendUtils sendUtils;
     @Autowired
-    DirectiveService directiveService;
-
-    @Autowired
     ScheduleSignalState scheduleSignalState;
     @Autowired
@@ -151,7 +148,8 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(sch.getBcType().equals("out")){
                 //出场时，切换成营运状态
-                directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
+                DirectivePushQueue.put6003(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
+                //directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
             }
             //出站既出场
             outStationAndOutPark(sch);
@@ -208,7 +206,8 @@ public class InOutStationSignalHandle extends SignalHandle{
                 if(schPrev.getBcType().equals("out")){
                     //出场时，切换成营运状态
-                    directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
+                    DirectivePushQueue.put6003(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
+                    //directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
                 }
             }
         }
@@ -276,15 +275,19 @@ public class InOutStationSignalHandle extends SignalHandle{
                 //将gps转换为下一个班次走向的站内信号
                 transformUpdown(gps, next);
                 //下发调度指令
-                directiveService.send60Dispatch(next, doneSum, "到站@系统");
+                DirectivePushQueue.put6002(next, doneSum, "到站@系统");
+                //directiveService.send60Dispatch(next, doneSum, "到站@系统");
                 //套跑  -下发线路切换指令
-                if(!next.getXlBm().equals(sch.getXlBm()))
-                    directiveService.lineChange(next.getClZbh(), next.getXlBm(), "套跑@系统");
+                if(!next.getXlBm().equals(sch.getXlBm())){
+                    DirectivePushQueue.put64(next.getClZbh(), next.getXlBm(), "套跑@系统");
+                    //directiveService.lineChange(next.getClZbh(), next.getXlBm(), "套跑@系统");
+                }
             }
             else if(sch.getBcType().equals("in")){
                 //终班进场，切换成非营运状态
-                directiveService.send60Operation(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
+                DirectivePushQueue.put6003(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
+                //directiveService.send60Operation(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
             }
         }
         else {
@@ -164,7 +164,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                     //abnormalStateHandle.handle(gps, prevs);
                     if(!task)
-                        return; //无任务的，到这里就结束
+                        continue; //无任务的，到这里就结束
                     //反向处理
                     reverseSignalHandle.handle(gps, prevs);
@@ -6,7 +6,6 @@ import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
-import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.util.ConfigUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
@@ -38,10 +37,24 @@ public class GpsDataLoaderThread extends Thread {
      */
     public GpsDataLoaderThread() {
         url = ConfigUtil.get("http.gps.real.url");
+        clientUrl = ConfigUtil.get("http.gps.real.cache.url");
     }
     // 网关数据接口地址
     private static String url;
+    // GPS客户端内存数据接口
+    private static String clientUrl;
+
+    //0：从GPS客户端内存获取  -1：从网关获取
+    private static int flag = 0;
+
+    public static void setFlag(int v){
+        flag = v;
+    }
+
+    public static int getFlag(int v){
+        return flag;
+    }
     @Autowired
     GpsRealData gpsRealData;
@@ -52,17 +65,20 @@ public class GpsDataLoaderThread extends Thread {
     @Override
     public void run() {
         try {
-            //如果正在恢复数据
-            if (GpsDataRecovery.run)
-                return;
-
-            load();
+            if(flag == 0)
+                load();
+            else
+                loadByGateway();
         } catch (Exception e) {
             logger.error("", e);
         }
     }
-    public void load() throws Exception {
+    /**
+     * 从网关获取实时GPS数据
+     * @throws Exception
+     */
+    public void loadByGateway() throws Exception {
         List<GpsEntity> list = null;
         List<GpsEntity> updateList = new ArrayList<>();
         CloseableHttpClient httpClient = null;
@@ -72,8 +88,8 @@ public class GpsDataLoaderThread extends Thread {
             HttpGet get = new HttpGet(url);
             //超时时间
             RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(2000).setConnectionRequestTimeout(1000)
-                    .setSocketTimeout(2000).build();
+                    .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
+                    .setSocketTimeout(1500).build();
             get.setConfig(requestConfig);
             response = httpClient.execute(get);
@@ -81,7 +97,7 @@ public class GpsDataLoaderThread extends Thread {
             HttpEntity entity = response.getEntity();
             if (null != entity) {
                 BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
-                StringBuffer stringBuffer = new StringBuffer();
+                StringBuilder stringBuffer = new StringBuilder();
                 String str = "";
                 while ((str = br.readLine()) != null)
                     stringBuffer.append(str);
@@ -128,4 +144,55 @@ public class GpsDataLoaderThread extends Thread {
                 response.close();
         }
     }
+
+    /**
+     * 从客户端内存获取GPS数据
+     */
+    public void load() throws Exception{
+        List<GpsEntity> list = null;
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+
+        try {
+            httpClient = HttpClients.createDefault();
+            HttpGet get = new HttpGet(clientUrl);
+            //超时时间
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setConnectTimeout(2000).setConnectionRequestTimeout(1000)
+                    .setSocketTimeout(3000).build();
+            get.setConfig(requestConfig);
+
+            response = httpClient.execute(get);
+
+            HttpEntity entity = response.getEntity();
+            if (null != entity) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                StringBuilder stringBuffer = new StringBuilder();
+                String str = "";
+                while ((str = br.readLine()) != null)
+                    stringBuffer.append(str);
+
+                list = JSON.parseArray(stringBuffer.toString(), GpsEntity.class);
+                String nbbm;
+                for (GpsEntity gps : list) {
+
+                    nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+                    if (StringUtils.isBlank(nbbm))
+                        gps.setIncomplete(true);//标记为异常数据
+                    else
+                        gps.setNbbm(nbbm);
+                }
+                //分析数据
+                gpsRealAnalyse.analyse(list);
+            } else
+                logger.error("client gps result is null");
+        } catch (Exception e) {
+            logger.error("", e);
+        } finally {
+            if (null != httpClient)
+                httpClient.close();
+            if (null != response)
+                response.close();
+        }
+    }
 }
 \ No newline at end of file
-package com.bsth.data.gpsdata.thread;
-
-import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
-import org.springframework.stereotype.Component;
-
-/**
- * 线程池监听
- * Created by panzhao on 2017/5/10.
- */
-@Component
-public class ThreadPollMonitor extends Thread{
-
-    @Override
-    public void run() {
-        long t = System.currentTimeMillis();
-
-        if(t - GpsRealAnalyse.st > 3000 * 10){
-            GpsRealAnalyse.shutdown();
-        }
-    }
-}
+package com.bsth.data.msg_queue;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.directive.DirectiveService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+
+/**
+ * 到网关的指令推送队列 （系统发送的队列， 用户手动发送的不走这里）
+ * Created by panzhao on 2017/5/11.
+ */
+@Component
+public class DirectivePushQueue implements CommandLineRunner, ApplicationContextAware {
+
+    static LinkedList<QueueData_Directive> linkedList;
+    static DataPushThread thread;
+    static DirectiveService directiveService;
+    static long t;
+    static final int IDLE_TIME = 1000 * 30;
+
+    static {
+        linkedList = new LinkedList<>();
+    }
+
+    public static void put6002(ScheduleRealInfo sch, int finish, String sender){
+        QueueData_Directive qd6002 = new QueueData_Directive();
+        qd6002.setSch(sch);
+        qd6002.setFinish(finish);
+        qd6002.setSender(sender);
+        qd6002.setCode("60_02");
+
+        linkedList.add(qd6002);
+    }
+
+    public static void put6003(String nbbm, int state, int upDown, ScheduleRealInfo sch,  String sender){
+        QueueData_Directive qd6003 = new QueueData_Directive();
+        qd6003.setNbbm(nbbm);
+        qd6003.setState(state);
+        qd6003.setUpDown(upDown);
+        qd6003.setSch(sch);
+        qd6003.setSender(sender);
+
+        qd6003.setCode("60_03");
+
+        linkedList.add(qd6003);
+    }
+
+    public static void put64(String nbbm, String lineCode, String sender){
+        QueueData_Directive qd64 = new QueueData_Directive();
+        qd64.setNbbm(nbbm);
+        qd64.setLineCode(lineCode);
+        qd64.setSender(sender);
+
+        qd64.setCode("64");
+
+        linkedList.add(qd64);
+    }
+
+    public static boolean isIdle(){
+        return System.currentTimeMillis() - t > IDLE_TIME;
+    }
+
+    public static void start(){
+        if(thread != null){
+            thread.interrupt();
+        }
+        thread = new DataPushThread();
+        thread.start();
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        start();
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        directiveService = applicationContext.getBean(DirectiveService.class);
+    }
+
+    public static class DataPushThread extends Thread {
+
+        Logger log = LoggerFactory.getLogger(this.getClass());
+
+        @Override
+        public void run() {
+            boolean sleepFlag = false;
+            QueueData_Directive qd;
+            String code;
+            while (true) {
+                try {
+                    qd = linkedList.pollFirst();
+                    if (qd != null) {
+                        sleepFlag = false;
+                        code = qd.getCode();
+
+                        if(code.equals("60_02")){
+                            directiveService.send60Dispatch(qd.getSch(), qd.getFinish(), qd.getSender());
+                            log.info("directive 60_02 sch id: " + qd.getSch().getId());
+                        }
+                        else if(code.equals("60_03")){
+                            directiveService.send60Operation(qd.getNbbm(), qd.getState(), qd.getUpDown(), null, qd.getSender());
+                            log.info("directive 60_03 nbbm: " + qd.getNbbm());
+                        }
+                        else if(code.equals("64")){
+                            directiveService.lineChange(qd.getNbbm(), qd.getLineCode(), qd.getSender());
+                            log.info("directive 64 nbbm: " + qd.getNbbm() + " lineCode: " + qd.getLineCode());
+                        }
+
+                    } else{
+                        Thread.sleep(500);
+                        if(!sleepFlag){
+                            log.info("sleep...");
+                            sleepFlag = true;
+                        }
+                    }
+                    t = System.currentTimeMillis();
+                }
+                catch(InterruptedException e){
+                    break;
+                }
+                catch (Exception e) {
+                    log.error("", e);
+                }
+
+            }
+        }
+    }
+}
+package com.bsth.data.msg_queue;
+
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+/**
+ * Created by panzhao on 2017/5/11.
+ */
+public class QueueData {
+
+    private TextMessage message;
+
+    private WebSocketSession session;
+
+
+    public WebSocketSession getSession() {
+        return session;
+    }
+
+    public void setSession(WebSocketSession session) {
+        this.session = session;
+    }
+
+    public TextMessage getMessage() {
+        return message;
+    }
+
+    public void setMessage(TextMessage message) {
+        this.message = message;
+    }
+}
+package com.bsth.data.msg_queue;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+/**
+ * Created by panzhao on 2017/5/11.
+ */
+public class QueueData_Directive {
+
+    /**
+     * 指令类型
+     * 60_02
+     * 60_03
+     * 64
+     */
+    private String code;
+
+    /** 60调度指令内容  60_02*/
+    private ScheduleRealInfo sch;
+    private int finish;
+
+    /** 60 营运指令 60_03*/
+    private String nbbm;
+    private int state;
+    private int upDown;
+
+    /** 64指令内容 */
+    private String lineCode;
+
+    private String sender;
+
+
+    public ScheduleRealInfo getSch() {
+        return sch;
+    }
+
+    public void setSch(ScheduleRealInfo sch) {
+        this.sch = sch;
+    }
+
+    public int getFinish() {
+        return finish;
+    }
+
+    public void setFinish(int finish) {
+        this.finish = finish;
+    }
+
+    public String getSender() {
+        return sender;
+    }
+
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+}
+package com.bsth.data.msg_queue;
+
+import com.bsth.common.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+import java.util.LinkedList;
+
+/**
+ * 线调web socket 推送队列
+ * Created by panzhao on 2017/5/11.
+ */
+@Component
+public class WebSocketPushQueue implements CommandLineRunner {
+
+    static LinkedList<QueueData> linkedList;
+    static DataPushThread thread;
+    static Logger log = LoggerFactory.getLogger(WebSocketPushQueue.class);
+    static long t;
+    static final int IDLE_TIME = 1000 * 30;
+
+    static {
+        linkedList = new LinkedList();
+    }
+
+    public static boolean isIdle() {
+        return System.currentTimeMillis() - t > IDLE_TIME;
+    }
+
+    public static void put(WebSocketSession session, TextMessage msg) {
+        QueueData qd = new QueueData();
+        qd.setMessage(msg);
+        qd.setSession(session);
+
+        log.info("put、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + msg.getPayload());
+        linkedList.add(qd);
+    }
+
+    public static void start() {
+        if (thread != null) {
+            thread.interrupt();
+        }
+        thread = new DataPushThread();
+        thread.start();
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        start();
+    }
+
+    public static class DataPushThread extends Thread {
+
+        Logger log = LoggerFactory.getLogger(this.getClass());
+
+        @Override
+        public void run() {
+            QueueData qd;
+            WebSocketSession session;
+
+            boolean sleepFlag = false;
+            while (true) {
+                try {
+                    qd = linkedList.pollFirst();
+                    if (qd != null) {
+                        sleepFlag = false;
+                        session = qd.getSession();
+                        if (session.isOpen()) {
+                            log.info("push start、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + qd.getMessage().getPayload());
+                            session.sendMessage(qd.getMessage());
+                            log.info("push end..");
+                        }
+                    } else {
+                        Thread.sleep(500);
+                        if (!sleepFlag) {
+                            log.info("sleep...");
+                            sleepFlag = true;
+                        }
+                    }
+                    t = System.currentTimeMillis();
+                } catch (InterruptedException e) {
+                    break;
+                } catch (Exception e) {
+                    log.error("", e);
+                }
+            }
+        }
+    }
+}
@@ -4,6 +4,7 @@ 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.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.directive.D80;
@@ -82,9 +83,11 @@ public class PilotReport {
 					outSch = dayOfSchedule.next(outSch);
 				//下发调度指令
-				directiveService.send60Dispatch(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
+				DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
+				//directiveService.send60Dispatch(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
 				//下发线路切换指令
-				directiveService.lineChange(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
+				DirectivePushQueue.put64(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
+				//directiveService.lineChange(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
 			}else
 				d80.setRemarks("没有出场计划");
@@ -2,19 +2,11 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.bsth.Application;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
-import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
-import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
-import com.bsth.data.schedule.thread.CalcOilThread;
-import com.bsth.data.schedule.thread.SchedulePstThread;
-import com.bsth.data.schedule.thread.ScheduleRefreshThread;
-import com.bsth.data.schedule.thread.SubmitToTrafficManage;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -32,8 +24,6 @@ import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
@@ -41,7 +31,6 @@ import org.springframework.stereotype.Component;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 /**
  * @author PanZhao
@@ -50,8 +39,7 @@ import java.util.concurrent.TimeUnit;
  * @date 2016年8月15日 上午10:16:12
  */
 @Component
-@Order(value = 3)
-public class DayOfSchedule implements CommandLineRunner {
+public class DayOfSchedule {
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -94,9 +82,6 @@ public class DayOfSchedule implements CommandLineRunner {
     @Autowired
     GpsRealData gpsRealData;
-    @Autowired
-    BasicData.BasicDataLoader basicDataLoader;
-
     /**
      * 线路当前使用的排班的日期
      */
@@ -116,57 +101,13 @@ public class DayOfSchedule implements CommandLineRunner {
     }
     @Autowired
-    ScheduleRefreshThread scheduleRefreshThread;
-
-    @Autowired
-    SchedulePstThread schedulePstThread;
-
-    @Autowired
-    ScheduleLateThread scheduleLateThread;
-
-    @Autowired
-    SubmitToTrafficManage submitToTrafficManage;
-
-    @Autowired
     LineConfigData lineConfigs;
     @Autowired
     GpsDataRecovery gpsDataRecovery;
-    @Autowired
-    DirectivesPstThread directivesPstThread;
-
-    @Autowired
-    CalcOilThread calcOilThread;
-
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd"), fmtHHmm = DateTimeFormat.forPattern("HH:mm");
-    @Override
-    public void run(String... arg0) throws Exception {
-        basicDataLoader.loadAllData();
-
-        //翻班线程
-//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
-        //入库
-//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
-        //班次误点扫描
-//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
-
-        //每天凌晨2点20提交数据到运管处
-        long diff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
-        if (diff < 0)
-            diff += (1000 * 60 * 60 * 24);
-
-        logger.info(diff / 1000 / 60 + "分钟之后提交到运管处");
-        //Application.mainServices.scheduleAtFixedRate(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
-
-        //计算油、公里加注
-        Application.mainServices.scheduleAtFixedRate(calcOilThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
-
-        //指令持久化线程
-        Application.mainServices.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
-    }
-
     //数据恢复
     private void dataRecovery() {
         GpsDataRecovery.run = true;
@@ -86,6 +86,8 @@ public class TTInfoDetail extends BEntity {
     /** 是否分班（表示这个班次是否是晚班班次，就是换另外一个驾驶员开）*/
     private Boolean isFB;
+    /** 是否停驶（表示此班次执行完成，停在终点站，不进场） */
+    private Boolean isTS;
     /** 是否切换线路 */
     private Boolean isSwitchXl;
@@ -280,4 +282,12 @@ public class TTInfoDetail extends BEntity {
     public void setZdzName(String zdzName) {
         this.zdzName = zdzName;
     }
+
+    public Boolean getIsTS() {
+        return isTS;
+    }
+
+    public void setIsTS(Boolean isTS) {
+        this.isTS = isTS;
+    }
 }
@@ -27,20 +27,22 @@ public class SchedulePlanRuleResult {
     /** 排班规则id */
     private String ruleId;
-    /** 启用日期 */
+    /** 启用日期（用于md5计算） */
     private Date qyrq;
     /** 车辆配置id */
     private String ccId;
     /** 车辆自编号 */
     private String ccZbh;
-    /** 路牌id列表字符串 */
+    /** 路牌id列表字符串（用于md5计算） */
     @Column(length = 1000)
     private String gids;
     /** 路牌名字列表字符串 */
     private String gnames;
     /** 翻到哪个路牌索引 */
     private String gidindex;
+    /** 原始的起始路牌索引（用于md5计算） */
+    private String origingidindex;
     /** 人员配置id列表字符串 */
     @Column(length = 1000)
     private String ecids;
@@ -81,8 +83,8 @@ public class SchedulePlanRuleResult {
                 "(xl_id,xl_name,rule_id,cc_id,cc_zbh," +
                 "gids,gnames,gidindex,ecids,ecdbbms,ecindex," +
                 "ttinfo_id,ttinfo_name,schedule_date," +
-                "sysuser_id,sysuser_name,create_date, qyrq) " +
-                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+                "sysuser_id,sysuser_name,create_date, qyrq, origingidindex) " +
+                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
         return sql;
     }
@@ -106,7 +108,7 @@ public class SchedulePlanRuleResult {
         ps.setString(16, this.getSysuserName());
         ps.setTimestamp(17, new java.sql.Timestamp(this.getCreateDate().getTime()));
         ps.setDate(18, new java.sql.Date(this.getQyrq().getTime()));
-
+        ps.setString(19, this.getOrigingidindex());
     }
@@ -261,4 +263,12 @@ public class SchedulePlanRuleResult {
     public void setQyrq(Date qyrq) {
         this.qyrq = qyrq;
     }
+
+    public String getOrigingidindex() {
+        return origingidindex;
+    }
+
+    public void setOrigingidindex(String origingidindex) {
+        this.origingidindex = origingidindex;
+    }
 }
@@ -113,8 +113,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	/*@Query(value = "SELECT s.b_jwpoints,s.station_name FROM (" +
 						"SELECT b.station FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
 				   "LEFT JOIN bsth_c_station s on r.station = s.id", nativeQuery=true)*/
-	@Query(value = "SELECT s.b_jwpoints,s.station_name,r.station_route_code FROM (" +
-			"SELECT b.station,b.station_route_code FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
+	@Query(value = "SELECT s.b_jwpoints,r.station_name,r.station_route_code FROM (" +
+			"SELECT b.station,b.station_route_code,b.station_name FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
 	   "LEFT JOIN bsth_c_station s on r.station = s.id order by r.station_route_code asc", nativeQuery=true)
 	List<Object[]> getSelectStationRouteCenterPoints(Integer lineId,Integer direction);
@@ -85,12 +85,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		if(null != sender)
 			d60.setSender(sender);
 		d60.setHttpCode(code);
-		// 添加到缓存
-		dayOfDirectives.put60(d60);
-		if (code != 0) {
+		if (code == 0) {
+			// 添加到缓存
+			dayOfDirectives.put60(d60, true);
+		}
+		else{
 			d60.setErrorText("网关通讯失败, code: " + code);
 			d60Repository.save(d60);
+			dayOfDirectives.put60(d60, false);
 		}
 		return code;
 	}
@@ -139,12 +142,13 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		if (code == 0) {
 			sch.setDirectiveState(60);
 			// 添加到缓存，延迟入库
-			dayOfDirectives.put60(d60);
+			dayOfDirectives.put60(d60, true);
 			// 通知页面
 			sendD60ToPage(sch);
 		}
 		else{
 			d60.setErrorText("网关通讯失败, code: " + code);
+			dayOfDirectives.put60(d60, false);
 			d60Repository.save(d60);
 		}
 		return code;
@@ -196,11 +200,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		d60.setHttpCode(code);
 		if (null != sch)
 			d60.setSch(sch);
-		dayOfDirectives.put60(d60);
-		if (code != 0) {
+
+		if (code == 0) {
+			dayOfDirectives.put60(d60, true);
+		}
+		else{
 			d60.setErrorText("网关通讯失败, code: " + code);
 			d60Repository.save(d60);
+			dayOfDirectives.put60(d60, false);
 		}
 		return code;
 	}
@@ -1569,7 +1569,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				jhbc++;
 				jhlc += lc;
-				if(schedule.getStatus() == 2){
+				if(schedule.getStatus() != -1){
 					sjbc++;
 					sjlc += lc;
 				} else if(schedule.getStatus() == -1){
@@ -1622,37 +1622,37 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("lcbfb", df.format(jhlc>0?(double)sjlc/jhlc*100:0)+"%");
 			tempMap.put("lzbc", lzbc);
 			tempMap.put("lzlc", lzlc);
-			tempMap.put("lzbfb", df.format(jhlc>0?(double)lzlc/jhlc*100:0)+"%");
+			tempMap.put("lzbfb", df.format(jhlc>0?(double)lzbc/jhbc*100:0)+"%");
 			tempMap.put("dmbc", dmbc);
 			tempMap.put("dmlc", dmlc);
-			tempMap.put("dmbfb", df.format(jhlc>0?(double)dmlc/jhlc*100:0)+"%");
+			tempMap.put("dmbfb", df.format(jhlc>0?(double)dmbc/jhbc*100:0)+"%");
 			tempMap.put("gzbc", gzbc);
 			tempMap.put("gzlc", gzlc);
-			tempMap.put("gzbfb", df.format(jhlc>0?(double)gzlc/jhlc*100:0)+"%");
+			tempMap.put("gzbfb", df.format(jhlc>0?(double)gzbc/jhbc*100:0)+"%");
 			tempMap.put("jfbc", jfbc);
 			tempMap.put("jflc", jflc);
-			tempMap.put("jfbfb", df.format(jhlc>0?(double)jflc/jhlc*100:0)+"%");
+			tempMap.put("jfbfb", df.format(jhlc>0?(double)jfbc/jhbc*100:0)+"%");
 			tempMap.put("zsbc", zsbc);
 			tempMap.put("zslc", zslc);
-			tempMap.put("zsbfb", df.format(jhlc>0?(double)zslc/jhlc*100:0)+"%");
+			tempMap.put("zsbfb", df.format(jhlc>0?(double)zsbc/jhbc*100:0)+"%");
 			tempMap.put("qrbc", qrbc);
 			tempMap.put("qrlc", qrlc);
-			tempMap.put("qrbfb", df.format(jhlc>0?(double)qrlc/jhlc*100:0)+"%");
+			tempMap.put("qrbfb", df.format(jhlc>0?(double)qrbc/jhbc*100:0)+"%");
 			tempMap.put("qcbc", qcbc);
 			tempMap.put("qclc", qclc);
-			tempMap.put("qcbfb", df.format(jhlc>0?(double)qclc/jhlc*100:0)+"%");
+			tempMap.put("qcbfb", df.format(jhlc>0?(double)qcbc/jhbc*100:0)+"%");
 			tempMap.put("kxbc", kxbc);
 			tempMap.put("kxlc", kxlc);
-			tempMap.put("kxbfb", df.format(jhlc>0?(double)kxlc/jhlc*100:0)+"%");
+			tempMap.put("kxbfb", df.format(jhlc>0?(double)kxbc/jhbc*100:0)+"%");
 			tempMap.put("qhbc", qhbc);
 			tempMap.put("qhlc", qhlc);
-			tempMap.put("qhbfb", df.format(jhlc>0?(double)qhlc/jhlc*100:0)+"%");
+			tempMap.put("qhbfb", df.format(jhlc>0?(double)qhbc/jhbc*100:0)+"%");
 			tempMap.put("wybc", wybc);
 			tempMap.put("wylc", wylc);
-			tempMap.put("wybfb", df.format(jhlc>0?(double)wylc/jhlc*100:0)+"%");
+			tempMap.put("wybfb", df.format(jhlc>0?(double)wybc/jhbc*100:0)+"%");
 			tempMap.put("qtbc", qtbc);
 			tempMap.put("qtlc", qtlc);
-			tempMap.put("qtbfb", df.format(jhlc>0?(double)qtlc/jhlc*100:0)+"%");
+			tempMap.put("qtbfb", df.format(jhlc>0?(double)qtbc/jhbc*100:0)+"%");
 			resList.add(tempMap);
 		}
@@ -248,13 +248,13 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			for(int i = 0;i <stationsArray.size();i++) {
 				// 站点名称
 				String stationName = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("name").toString();
-				Double distance = stationsArray.getJSONObject(i).get("distance").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("distance").toString());
+				Double distance = stationsArray.getJSONObject(i).get("distance").equals("") ? 0.0d : Double.parseDouble(stationsArray.getJSONObject(i).get("distance").toString());
 				// 转成公里
 				distance = distance/1000;
 				BigDecimal d = new BigDecimal(distance);
 				distance = d.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
 				sectionDistance= distance + sectionDistance;
-				Double duration = stationsArray.getJSONObject(i).get("duration").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("duration").toString());
+				Double duration = stationsArray.getJSONObject(i).get("duration").equals("") ? 0.0d : Double.parseDouble(stationsArray.getJSONObject(i).get("duration").toString());
 				// 转成分钟
 				duration = duration/60;
 				BigDecimal t = new BigDecimal(duration);
@@ -792,9 +792,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Station station = repository.findOne(stationId);
 			StationRoute arg0 = new StationRoute();
 			// 距离
-			Double distances =  map.get("distances").equals("") ? null : Double.parseDouble(map.get("distances").toString());
+			Double distances =  map.get("distances").equals("") ? 0.0d : Double.parseDouble(map.get("distances").toString());
 			// 时间
-			Double toTime = map.get("toTime").equals("") ? null : Double.parseDouble(map.get("toTime").toString());
+			Double toTime = map.get("toTime").equals("") ? 0.0d : Double.parseDouble(map.get("toTime").toString());
 			// 站点路由名称
 			String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
 			// 线路ID
@@ -952,8 +952,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			stationRouteCode = stationRouteCode == null ? 100 : stationRouteCode;
 			Integer LineId = map.get("stationRouteLine").equals("") ? null : Integer.parseInt(map.get("stationRouteLine").toString());
 			String stationMark = map.get("stationMark").equals("") ? null : map.get("stationMark").toString();
-			Double distances = map.get("distances").equals("") ? null : Double.parseDouble(map.get("distances").toString());
-			Double toTime = map.get("toTime").equals("") ? null : Double.parseDouble(map.get("toTime").toString());
+			Double distances = map.get("distances").equals("") ? 0.0d : Double.parseDouble(map.get("distances").toString());
+			Double toTime = map.get("toTime").equals("") ? 0.0d : Double.parseDouble(map.get("toTime").toString());
 			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
 			Station station = repository.findOne(stationId);
 			Line line = lineRepository.findOne(LineId);
@@ -10,6 +10,7 @@ import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.controller.realcontrol.dto.LpData;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
+import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.SchAttrCalculator;
 import com.bsth.data.schedule.SchModifyLog;
@@ -1280,9 +1281,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     ts.add(next);
                 }
-                if(!next.getXlBm().equals(sch.getXlBm())){
-                    directiveService.lineChange(next.getClZbh(), next.getXlBm(), "套跑@系统");
-                }
+                try{
+                    //车辆下一个要执行的班次
+                    ScheduleRealInfo carNext = dayOfSchedule.next(sch);
+                    if(carNext != null && !carNext.getXlBm().equals(sch.getXlBm())){
+                        DirectivePushQueue.put64(carNext.getClZbh(), carNext.getXlBm(), "套跑@系统");
+                        //directiveService.lineChange(carNext.getClZbh(), carNext.getXlBm(), "套跑@系统");
+                    }
+                }catch (Exception e){logger.error("", e);}
                 //重新计算车辆执行班次
                 dayOfSchedule.reCalcExecPlan(sch.getClZbh());
 package com.bsth.service.schedule.impl;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.util.ReportUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
-
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -404,20 +403,22 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					}
 				}
-				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out")){
-					String clZbh = schedule.getClZbh();
-					if(!listMap.containsKey(clZbh))
-						listMap.put(clZbh, new ArrayList<ScheduleRealInfo>());
-					listMap.get(clZbh).add(schedule);
+				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out")
+						&& schedule.getFcsjActual() != null){
+//					String clZbh = schedule.getClZbh();
+					String xlDir = schedule.getXlDir();
+					if(!listMap.containsKey(xlDir))
+						listMap.put(xlDir, new ArrayList<ScheduleRealInfo>());
+					listMap.get(xlDir).add(schedule);
 				}
 			}
 			//求首末班准点率
-			for(String clZbh : listMap.keySet()){
+			for(String xlDir : listMap.keySet()){
 				Map<Integer, ScheduleRealInfo> temp = new HashMap<Integer, ScheduleRealInfo>();
 				List <ScheduleRealInfo> tempList = new ArrayList<ScheduleRealInfo>();
 				List<Integer> sort = new ArrayList<Integer>();
-				for(ScheduleRealInfo schedule : listMap.get(clZbh)){
+				for(ScheduleRealInfo schedule : listMap.get(xlDir)){
 					String[] split = schedule.getFcsj().split(":");
 					int min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 					temp.put(min, schedule);
@@ -762,7 +763,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return modelMap;
 	}
-//	@Override
+	@Override
 	public Map<String, Object> scheduleAnaly_sum(Map<String, Object> map) {
 		DecimalFormat df = new DecimalFormat("00");
 		NumberFormat nf = NumberFormat.getNumberInstance();
@@ -867,101 +868,122 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		{
 			Map<String, Object> m0 = new HashMap<String, Object>();
 			m0.put("time", "首~6:30");
-			m0.put("upbc", "0");m0.put("dnbc", "0");
-			m0.put("upys", "--");m0.put("dnys", "--");
-			m0.put("pjys", "--");
+			m0.put("upbc", "0"); m0.put("dnbc", "0");
+			m0.put("upys", "/"); m0.put("dnys", "/");
+			m0.put("pjys", "/");
 			tempList.add(m0);
 			Map<String, Object> m1 = new HashMap<String, Object>();
 			m1.put("time", "6:31~8:30");
-			m1.put("upbc", "0");m1.put("dnbc", "0");
-			m1.put("upys", "--");m1.put("dnys", "--");
-			m1.put("pjys", "--");
+			m1.put("upbc", "0"); m1.put("dnbc", "0");
+			m1.put("upys", "/"); m1.put("dnys", "/");
+			m1.put("pjys", "/");
 			tempList.add(m1);
 			Map<String, Object> m2 = new HashMap<String, Object>();
 			m2.put("time", "8:31~11:00");
-			m2.put("upbc", "0");m2.put("dnbc", "0");
-			m2.put("upys", "--");m2.put("dnys", "--");
-			m2.put("pjys", "--");
+			m2.put("upbc", "0"); m2.put("dnbc", "0");
+			m2.put("upys", "/"); m2.put("dnys", "/");
+			m2.put("pjys", "/");
 			tempList.add(m2);
 			Map<String, Object> m3 = new HashMap<String, Object>();
 			m3.put("time", "11:01~13:30");
-			m3.put("upbc", "0");m3.put("dnbc", "0");
-			m3.put("upys", "--");m3.put("dnys", "--");
-			m3.put("pjys", "--");
+			m3.put("upbc", "0"); m3.put("dnbc", "0");
+			m3.put("upys", "/"); m3.put("dnys", "/");
+			m3.put("pjys", "/");
 			tempList.add(m3);
 			Map<String, Object> m4 = new HashMap<String, Object>();
 			m4.put("time", "13:31~16:00");
-			m4.put("upbc", "0");m4.put("dnbc", "0");
-			m4.put("upys", "--");m4.put("dnys", "--");
-			m4.put("pjys", "--");
+			m4.put("upbc", "0"); m4.put("dnbc", "0");
+			m4.put("upys", "/"); m4.put("dnys", "/");
+			m4.put("pjys", "/");
 			tempList.add(m4);
 			Map<String, Object> m5 = new HashMap<String, Object>();
 			m5.put("time", "16:01~18:00");
-			m5.put("upbc", "0");m5.put("dnbc", "0");
-			m5.put("upys", "--");m5.put("dnys", "--");
-			m5.put("pjys", "--");
+			m5.put("upbc", "0"); m5.put("dnbc", "0");
+			m5.put("upys", "/"); m5.put("dnys", "/");
+			m5.put("pjys", "/");
 			tempList.add(m5);
 			Map<String, Object> m6 = new HashMap<String, Object>();
 			m6.put("time", "18:01~20:30");
-			m6.put("upbc", "0");m6.put("dnbc", "0");
-			m6.put("upys", "--");m6.put("dnys", "--");
-			m6.put("pjys", "--");
+			m6.put("upbc", "0"); m6.put("dnbc", "0");
+			m6.put("upys", "/"); m6.put("dnys", "/");
+			m6.put("pjys", "/");
 			tempList.add(m6);
 			Map<String, Object> m7 = new HashMap<String, Object>();
 			m7.put("time", "20:31~末");
-			m7.put("upbc", "0");m7.put("dnbc", "0");
-			m7.put("upys", "--");m7.put("dnys", "--");
-			m7.put("pjys", "--");
+			m7.put("upbc", "0"); m7.put("dnbc", "0");
+			m7.put("upys", "/"); m7.put("dnys", "/");
+			m7.put("pjys", "/");
 			tempList.add(m7);
 		}
+		String companyName = "";
+		String subCompanyName = "";
+		
 		//按时间段分组
 		for(ScheduleRealInfo schedule : list){
+			if(companyName.length()==0&&schedule.getGsName()!=null
+					&&schedule.getGsName().trim().length()!=0){
+				companyName = schedule.getGsName();
+			}
+			if(subCompanyName.length()==0&&schedule.getFgsName()!=null
+					&&schedule.getFgsName().trim().length()!=0){
+				subCompanyName = schedule.getFgsName();
+			}
+			
 			if(schedule.getFcsjActualTime()!=null && schedule.getZdsjActualTime()!=null){
 				Long fcsjA = schedule.getFcsjActualTime();
-				if(fcsjA <= 6*60+30){
+				if(!schedule.getRealExecDate().equals(schedule.getScheduleDateStr())
+						|| fcsjA > 20*60+30){
+					if(!keyMap.containsKey("20:31~末"))
+						keyMap.put("20:31~末", new ArrayList<ScheduleRealInfo>());
+					keyMap.get("20:31~末").add(schedule);
+					
+				} else if(fcsjA <= 6*60+30){
+					
 					if(!keyMap.containsKey("首~6:30"))
 						keyMap.put("首~6:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("首~6:30").add(schedule);
-				}
-				if(fcsjA > 6*60+30 && fcsjA <= 8*60+30){
+					
+				} else if(fcsjA > 6*60+30 && fcsjA <= 8*60+30){
+					
 					if(!keyMap.containsKey("6:31~8:30"))
 						keyMap.put("6:31~8:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("6:31~8:30").add(schedule);
-				}
-				if(fcsjA > 8*60+30 && fcsjA <= 11*60){
+					
+				} else if(fcsjA > 8*60+30 && fcsjA <= 11*60){
+					
 					if(!keyMap.containsKey("8:31~11:00"))
 						keyMap.put("8:31~11:00", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("8:31~11:00").add(schedule);
-				}
-				if(fcsjA > 11*60 && fcsjA <= 13*60+30){
+					
+				} else if(fcsjA > 11*60 && fcsjA <= 13*60+30){
+					
 					if(!keyMap.containsKey("11:01~13:30"))
 						keyMap.put("11:01~13:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("11:01~13:30").add(schedule);
-				}
-				if(fcsjA > 13*60+30 && fcsjA <= 16*60){
+					
+				} else if(fcsjA > 13*60+30 && fcsjA <= 16*60){
+					
 					if(!keyMap.containsKey("13:31~16:00"))
 						keyMap.put("13:31~16:00", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("13:31~16:00").add(schedule);
-				}
-				if(fcsjA > 16*60 && fcsjA <= 18*60){
+					
+				} else if(fcsjA > 16*60 && fcsjA <= 18*60){
+					
 					if(!keyMap.containsKey("16:01~18:00"))
 						keyMap.put("16:01~18:00", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("16:01~18:00").add(schedule);
-				}
-				if(fcsjA > 18*60 && fcsjA <= 20*60+30){
+					
+				} else if(fcsjA > 18*60 && fcsjA <= 20*60+30){
+					
 					if(!keyMap.containsKey("18:01~20:30"))
 						keyMap.put("18:01~20:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("18:01~20:30").add(schedule);
 				}
-				if(fcsjA > 20*60+30){
-					if(!keyMap.containsKey("20:31~末"))
-						keyMap.put("20:31~末", new ArrayList<ScheduleRealInfo>());
-					keyMap.get("20:31~末").add(schedule);
-				}
 			}
 		}
+		boolean flag = false;
 		for(String key : keyMap.keySet()){
 			Map<String, Object> m = null;
 			for(Map<String, Object> map2 : tempList){
@@ -972,6 +994,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			int upbc = 0, dnbc = 0;
 			long upys = 0, dnys = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				flag = true;
 				if(schedule.getXlDir().equals("0")){
 					upbc++;
 					upys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
@@ -979,15 +1002,25 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					dnbc++;
 					dnys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
 				}
+				
+				if(schedule.getXlName() != null && schedule.getXlName().trim().length() != 0){
+					m.put("line", schedule.getXlName());
+				}
 			}
 			m.put("upbc", upbc);
 			m.put("dnbc", dnbc);
-			m.put("upys", nf.format((float)upys / upbc));
-			m.put("dnys", nf.format((float)dnys / dnbc));
-			m.put("pjys", nf.format((float) (upys + dnys) / (upbc + dnbc)));
+			m.put("upys", upbc > 0 ? nf.format((float)upys / upbc) : "/");
+			m.put("dnys", dnbc > 0 ? nf.format((float)dnys / dnbc) : "/");
+			m.put("pjys", (upbc + dnbc) > 0 ? nf.format((float) (upys + dnys) / (upbc + dnbc)) : "/");
+			m.put("company", companyName.trim());
+			m.put("subCompany", subCompanyName.trim());
 		}
-		modelMap.put("dataList", tempList);
+		if(flag){
+			modelMap.put("dataList", tempList);
+		} else {
+			modelMap.put("dataList", new ArrayList<Map<String, Object>>());
+		}
 		//导出
 		if(type.equals("export")){
@@ -1180,6 +1213,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				}
 			}
+			if(longList0.size() == 0 && longList1.size() == 0){
+				continue;
+			}
+			
 			if(longList0.size() != 0){
 				Collections.sort(longList0);
 				ScheduleRealInfo shouban0 = temp0.get(longList0.get(0));
@@ -1297,7 +1334,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return resList;
 	}
-//	@Override
+	@Override
 	public List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map) {
 		NumberFormat nf = NumberFormat.getNumberInstance();
 		nf.setMinimumFractionDigits(2);
@@ -1330,6 +1367,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
+			Map<String, Object> m = new HashMap<String, Object>();
 			Map<Long, ScheduleRealInfo> temp0 = new HashMap<Long, ScheduleRealInfo>();
 			List<Long> longList0 = new ArrayList<Long>();
 			Map<Long, ScheduleRealInfo> temp1 = new HashMap<Long, ScheduleRealInfo>();
@@ -1355,6 +1393,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				}
 			}
+			if(longList0.size() == 0 && longList1.size() == 0){
+				continue;
+			}
 			int jhbc = 0;
 			int sjbc = 0;
@@ -1370,6 +1411,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					if(delay >= -3 && delay <= 1){
 						sjbc++;
 					}
+					m.put("qdzFirst0", shouban0.getQdzName());
+					m.put("jhfcFirst0", shouban0.getFcsj());
+					m.put("sjfcFirst0", shouban0.getFcsjActual());
+					m.put("delayFirst0", delay>0?"+"+delay:delay);
 				}
 				if(moban0.getFcsjActual() != null){
@@ -1380,7 +1425,20 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					if(delay >= -3 && delay <= 1){
 						sjbc++;
 					}
+					m.put("qdzLast0", moban0.getQdzName());
+					m.put("jhfcLast0", moban0.getFcsj());
+					m.put("sjfcLast0", moban0.getFcsjActual());
+					m.put("delayLast0", delay>0?"+"+delay:delay);
 				}
+			} else {
+				m.put("qdzFirst0", "--");
+				m.put("jhfcFirst0", "/");
+				m.put("sjfcFirst0", "/");
+				m.put("delayFirst0", "/");
+				m.put("qdzLast0", "--");
+				m.put("jhfcLast0", "/");
+				m.put("sjfcLast0", "/");
+				m.put("delayLast0", "/");
 			}
 			if(longList1.size() != 0){
@@ -1395,7 +1453,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					if(delay >= -3 && delay <= 1){
 						sjbc++;
 					}
+					m.put("qdzFirst1", shouban1.getQdzName());
+					m.put("jhfcFirst1", shouban1.getFcsj());
+					m.put("sjfcFirst1", shouban1.getFcsjActual());
+					m.put("delayFirst1", delay>0?"+"+delay:delay);
 				}
+				
 				if(moban1.getFcsjActual() != null){
 					jhbc++;
 					String[] split = moban1.getFcsjActual().split(":");
@@ -1404,9 +1467,24 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					if(delay >= -3 && delay <= 1){
 						sjbc++;
 					}
+					m.put("qdzLast1", moban1.getQdzName());
+					m.put("jhfcLast1", moban1.getFcsj());
+					m.put("sjfcLast1", moban1.getFcsjActual());
+					m.put("delayLast1", delay>0?"+"+delay:delay);
 				}
+			} else {
+				m.put("qdzFirst1", "--");
+				m.put("jhfcFirst1", "/");
+				m.put("sjfcFirst1", "/");
+				m.put("delayFirst1", "/");
+				m.put("qdzLast1", "--");
+				m.put("jhfcLast1", "/");
+				m.put("sjfcLast1", "/");
+				m.put("delayLast1", "/");
 			}
-			
+
+			m.put("line", key);
+			tempMap.put("map", m);
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
 			tempMap.put("zdl", nf.format((float) sjbc / jhbc *100) + "%");
@@ -1415,7 +1493,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("subCompany", subCompanyName);
 			tempMap.put("line", key);
 			resList.add(tempMap);
-			System.out.println(tempMap);
 		}
 		if(type.equals("export")){
@@ -1427,8 +1504,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			try {
 				listI.add(resList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus.xls",
-						path+"export/线路首末班" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus_sum.xls",
+						path+"export/线路首末班准点率" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -21,6 +21,9 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
 import com.bsth.service.schedule.rules.ttinfo.*;
 import com.bsth.service.schedule.rules.ttinfo2.CalcuParam;
 import com.bsth.service.schedule.rules.ttinfo2.Result;
+import com.bsth.service.schedule.rules.validate.ValidateParam;
+import com.bsth.service.schedule.rules.validate.ValidateResults_output;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
@@ -321,6 +324,60 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     }
+    /**
+     * 验证排班结果。
+     * @param planResult
+     * @param schedulePlan
+     */
+    public void validPlanResult(PlanResult planResult, SchedulePlan schedulePlan) {
+        // 1-1、构造drools规则输入数据，输出数据
+        ValidateParam validateParam = new ValidateParam(
+                new DateTime(schedulePlan.getScheduleFromTime()),
+                new DateTime(schedulePlan.getScheduleToTime())
+        );
+        // 规则输出数据
+        ValidateResults_output result = new ValidateResults_output();
+
+        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
+        // 创建session，内部配置的是stateful
+        KieSession session = kieBase.newKieSession();
+
+        // 设置gloable对象，在drl中通过别名使用
+        session.setGlobal("validResult", result);
+        session.setGlobal("log", logger); // 设置日志
+
+        // 载入数据
+        session.insert(validateParam);
+        for (SchedulePlanInfo schedulePlanInfo: planResult.getSchedulePlanInfos()) {
+            session.insert(schedulePlanInfo);
+        }
+
+        // 执行rule
+        session.fireAllRules();
+
+        // 执行完毕销毁，有日志的也要关闭
+        session.dispose();
+
+//        logger.info("错误总数={}", result.getInfos().size());
+//        for (ValidateResults_output.ValidInfo validInfo: result.getInfos()) {
+//            logger.info(validInfo.getDesc());
+//        }
+
+        // 取10条错误
+        int size = result.getInfos().size() > 10 ? 10: result.getInfos().size();
+        List<String> desclist = new ArrayList<>();
+        for (int i = 0; i < size; i++) {
+            desclist.add(result.getInfos().get(i).getDesc());
+        }
+        if (desclist.size() > 0) {
+            schedulePlan.setPlanResult(StringUtils.join(desclist, "</br>"));
+        } else {
+            schedulePlan.setPlanResult("ok");
+        }
+
+        // TODO：设定错误信息
+    }
+
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     public SchedulePlan save(SchedulePlan schedulePlan) {
         // pre、如果排班的数据之前已经有了，删除之前的数据
@@ -341,6 +398,9 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // 3、确定套跑规则
         rerunPlanResult(planResult, schedulePlan);
+        // TODO：3-1、验证排班结果
+        validPlanResult(planResult, schedulePlan);
+
         // 4、保存数据（jdbcTemplate 批量插入）
         Date start4 = new Date();
         scheduleRuleService.generateSchedulePlan(schedulePlan, planResult.getSchedulePlanInfos());
@@ -74,6 +74,9 @@ public class MyDroolsConfiguration {
         kfs.write("src/main/resources/rerun.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
                         "/rules/rerun.drl"), "UTF-8"));
+        kfs.write("src/main/resources/validplan.drl", kieServices.getResources()
+                .newInputStreamResource(this.getClass().getResourceAsStream(
+                        "/rules/validplan.drl"), "UTF-8"));
         // TODO：还有其他drl....
         // 4、创建KieBuilder，使用KieFileSystem构建
@@ -119,6 +119,7 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
                 obj.setScheduleDate(rs.getDate("schedule_date"));
                 obj.setGidindex(rs.getString("gidindex"));
                 obj.setEcindex(rs.getString("ecindex"));
+                obj.setOrigingidindex(rs.getString("origingidindex"));
                 // 其他字段没用
                 return obj;
+package com.bsth.service.schedule.rules.validate;
+
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 计算班次重复错误。
+ * 同一个路牌下，相同发车时间的班次数。
+ * 注意：使用这个函数时，要一天计算一次，多天计算无意义。
+ */
+public class ValidRepeatBcFunction implements AccumulateFunction {
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+    }
+
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+
+    }
+
+    protected static class RepeatBcInfo implements Externalizable {
+        /** 错误描述 */
+        public List<ValidateResults_output.ValidInfo> validInfoList = new ArrayList<>();
+        /** 内部计数Map，key：{路牌Id}_{发车时间}，value：个数 */
+        public Map<String, Integer> lpBcFcsjCount = new HashMap<>();
+
+        public RepeatBcInfo() {
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeObject(validInfoList);
+        }
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            validInfoList = (List<ValidateResults_output.ValidInfo>) in.readObject();
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        System.out.println("create");
+        return new RepeatBcInfo();
+    }
+
+    @Override
+    public void init(Serializable serializable) throws Exception {
+        // TODO：
+        System.out.println("init");
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object o) {
+        RepeatBcInfo repeatBcInfo = (RepeatBcInfo) context;
+        SchedulePlanInfo schedulePlanInfo = (SchedulePlanInfo) o;
+
+        String key = schedulePlanInfo.getLp() + "_" + schedulePlanInfo.getFcsj();
+        SimpleDateFormat sf = new SimpleDateFormat("yyyy年MM月dd日");
+        String infoformat = "日期(%s),路牌(%s),班次(%s),重复(%d)次";
+        if (repeatBcInfo.lpBcFcsjCount.get(key) == null) {
+            repeatBcInfo.lpBcFcsjCount.put(key, 1);
+        } else {
+            int count = repeatBcInfo.lpBcFcsjCount.get(key) + 1;
+            ValidateResults_output.ValidInfo validInfo = new ValidateResults_output.ValidInfo();
+            validInfo.setSd(schedulePlanInfo.getScheduleDate());
+            validInfo.setDesc(String.format(
+                    infoformat,
+                    sf.format(schedulePlanInfo.getScheduleDate()),
+                    schedulePlanInfo.getLpName(),
+                    schedulePlanInfo.getFcsj(),
+                    count));
+            repeatBcInfo.validInfoList.add(validInfo);
+            repeatBcInfo.lpBcFcsjCount.put(key, count);
+        }
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return true;
+    }
+
+    @Override
+    public void reverse(Serializable context, Object o) throws Exception {
+        RepeatBcInfo repeatBcInfo = (RepeatBcInfo) context;
+        SchedulePlanInfo schedulePlanInfo = (SchedulePlanInfo) o;
+
+        String key = schedulePlanInfo.getLp() + "_" + schedulePlanInfo.getFcsj();
+        repeatBcInfo.lpBcFcsjCount.remove(key);
+
+        if (!repeatBcInfo.validInfoList.isEmpty()) { // 全部清空
+            repeatBcInfo.validInfoList.clear();
+        }
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return List.class;
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        RepeatBcInfo repeatBcInfo = (RepeatBcInfo) context;
+        return repeatBcInfo.validInfoList;
+    }
+}
@@ -16,7 +16,9 @@ public class ValidateParam {
     /** 间隔天数 */
     private Integer days;
-    public ValidateParam() {
+    public ValidateParam(DateTime f, DateTime t) {
+        this.fromDate = f;
+        this.toDate = t;
         Period period = new Period(fromDate, toDate, PeriodType.days());
         days = period.getDays() + 1;
     }
@@ -10,7 +10,7 @@ import java.util.List;
 public class ValidateResults_output {
     private List<ValidInfo> infos = new ArrayList<>();
-    static class ValidInfo {
+    public static class ValidInfo {
         /** 日期 */
         private Date sd;
         /** 描述 */
 package com.bsth.websocket.handler;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.common.Constants;
 import com.bsth.data.BasicData;
+import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.google.common.base.Splitter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -103,7 +103,8 @@ public class RealControlSocketHandler implements WebSocketHandler {
 			return;
 		for(WebSocketSession user : list){
-			try {
+			WebSocketPushQueue.put(user, message);
+			/*try {
 				if (user.isOpen()) {
 					user.sendMessage(message);
 				}
@@ -114,7 +115,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 				catch(Exception e2){}
 				logger.error("sendMessageToLine error ...."+msg);
 				logger.error("sendMessageToLine error ....", e);
-			}
+			}*/
 		}
 	}
@@ -11,9 +11,7 @@ spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password=
-#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#spring.datasource.username= root
-#spring.datasource.password= root
+
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -29,7 +27,6 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
 #http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.168.201:9090/transport_server/message/
@@ -828,7 +828,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x4e2d;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x5c;d&#x2b;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x4e2d;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x5c;d&#x2b;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname</name>
         <rename>qdzname</rename>
         <type>String</type>
@@ -853,6 +853,12 @@
         <length>-1</length>
         <precision>-1</precision>
         <replace>N</replace>
+      </field>      <field>        <name>ists</name>
+        <rename>ists</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
       </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
       <xloc>788</xloc>
@@ -1083,6 +1089,11 @@
         <rename>zdzname</rename>
         <update>Y</update>
       </value>
+      <value>
+        <name>ists</name>
+        <rename>ists</rename>
+        <update>Y</update>
+      </value>
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -1224,6 +1235,11 @@
         <rename>zdzname</rename>
         <update>Y</update>
       </value>
+      <value>
+        <name>ists</name>
+        <rename>ists</rename>
+        <update>Y</update>
+      </value>
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -1365,6 +1381,11 @@
         <rename>tn</rename>
         <update>Y</update>
       </value>
+      <value>
+        <name>ists</name>
+        <rename>ists</rename>
+        <update>Y</update>
+      </value>
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -828,7 +828,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x4e2d;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x5c;d&#x2b;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x4e2d;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x5c;d&#x2b;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname</name>
         <rename>qdzname</rename>
         <type>String</type>
@@ -853,6 +853,12 @@
         <length>-1</length>
         <precision>-1</precision>
         <replace>N</replace>
+      </field>      <field>        <name>ists</name>
+        <rename>ists</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
       </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
       <xloc>788</xloc>
@@ -1083,6 +1089,11 @@
         <rename>zdzname</rename>
         <update>Y</update>
       </value>
+      <value>
+        <name>ists</name>
+        <rename>ists</rename>
+        <update>Y</update>
+      </value>
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -1224,6 +1235,11 @@
         <rename>zdzname</rename>
         <update>Y</update>
       </value>
+      <value>
+        <name>ists</name>
+        <rename>ists</rename>
+        <update>Y</update>
+      </value>
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -1365,6 +1381,11 @@
         <rename>tn</rename>
         <update>Y</update>
       </value>
+      <value>
+        <name>ists</name>
+        <rename>ists</rename>
+        <update>Y</update>
+      </value>
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -9,19 +9,22 @@ var fs = require(&#39;fs&#39;)
     , UglifyJS = require("uglify-js");
 ;
+var platform = process.platform;
+var iswin = platform=='win32';
+var separator = platform=='win32'?'\\':'/';
 //不参与的目录
 var pName = 'bsth_control'
     , path = process.cwd()
     //根目录
-    , root = path.substr(0, path.indexOf('\\src\\main'))
-    , workspace = root.substr(0, root.indexOf('\\' + pName))
+    , root = path.substr(0, path.indexOf(separator + 'src'+separator+'main'))
+    , workspace = root.substr(0, root.indexOf(separator + pName))
     //临时目录
-    , dest = (workspace + '\\' + pName + '@fatso_copy').replace(/\//g, '\\')
-    , _static = '\\src\\main\\resources\\static';
+    , dest = (workspace + separator + pName + '@fatso_copy')//.replace(/\//g, '\\')
+    , _static = separator + 'src'+separator+'main'+separator+'resources'+separator+'static';
-var mainFile = dest + _static + '\\real_control_v2\\main.html';
-var mapFile = dest + _static + '\\real_control_v2\\mapmonitor\\real.html';
+var mainFile = dest + _static + separator + 'real_control_v2'+separator+'main.html';
+var mapFile = dest + _static + separator + 'real_control_v2'+separator+'mapmonitor'+separator+'real.html';
 var realCtl = {
     /**
      * 处理线调首页
@@ -81,7 +84,7 @@ var handleCss = function ($, cb) {
             var data = out.styles;
             var fName = (k + '_' + md5(data)) + '.css';
             //写入 assets css 目录下
-            var descFile = dest + _static + '\\real_control_v2\\assets\\css\\' + fName;
+            var descFile = dest + _static + separator + 'real_control_v2'+separator+'assets'+separator+'css' + separator + fName;
             fs.open(descFile, 'a', function (err, fd) {
                 fs.write(fd, data, function () {
@@ -135,7 +138,7 @@ var handleJs = function ($, file, cb) {
         var data = result.code;
         var fName = (k + '_' + md5(data)) + '.js';
         //写入 assets js 目录下
-        var descFile = dest + _static + '\\real_control_v2\\assets\\js\\' + fName;
+        var descFile = dest + _static + separator + 'real_control_v2'+separator+'assets'+separator+'js' + separator + fName;
         fs.open(descFile, 'a', function (err, fd) {
             fs.write(fd, data, function () {
@@ -5,12 +5,15 @@
 var fs = require('fs');
 var UglifyJS = require("uglify-js");
+var platform = process.platform;
+var iswin = platform=='win32';
+var separator = platform=='win32'?'\\':'/';
 var minifier = {
 	mergeAndMini: function(fileArray,scriptString, root, file){
 		var len = fileArray.length;
 		for(var i = 0; i < len; i ++){
-			fileArray[i] = root  + fileArray[i].split('/').join('\\');
+			fileArray[i] = root  + fileArray[i].split('/').join(separator);
 		}
 		var result, indoorRs;
@@ -11,18 +11,22 @@ var fs = require(&#39;fs&#39;)
 	,crypto = require("crypto")
 	,handle_real_ctl = require('./handle_real_ctl');
+
+var platform = process.platform;
+var iswin = platform=='win32';
+var separator = platform=='win32'?'\\':'/';
 //不参与的目录
 var excludes = ['scheduleApp', 'trafficManage', 'control']
 	,ep = new EventProxy()
 	,pName = 'bsth_control'
 	,path = process.cwd()
 	//根目录
-	,root = path.substr(0, path.indexOf('\\src\\main'))
-	,workspace = root.substr(0, root.indexOf('\\' + pName))
+	,root = path.substr(0, path.indexOf(separator + 'src'+separator+'main'))
+	,workspace = root.substr(0, root.indexOf(separator + pName))
 	//临时目录
-	,dest = (workspace + '\\' + pName+'@fatso_copy').replace(/\//g,'\\')
-	,_static = '\\src\\main\\resources\\static'
-	,_pages = dest + _static + '\\pages';
+	,dest = (workspace + separator + pName+'@fatso_copy')
+	,_static = separator + 'src'+separator+'main'+separator+'resources'+separator+'static'
+	,_pages = dest + _static + separator + 'pages';
 //创建临时目录
@@ -41,7 +45,7 @@ ep.tail(&#39;mvn-clean&#39;,function(){
 	//ep.emit('copy-project');
 	//清理target
 	logInfo('mvn clean...');
-	cProcess = child_process.exec("mvn clean",{cwd: workspace + '\\' + pName},function(error){
+	cProcess = child_process.exec("mvn clean",{cwd: workspace + separator + pName},function(error){
 		if(error)
 			logError(error);
@@ -55,8 +59,13 @@ ep.tail(&#39;mvn-clean&#39;,function(){
 //复制项目副本
 ep.tail('copy-project',function(){
 	logInfo('copy project...');
-	var xcopyCom = 'XCOPY '+ root.replace(/\//g,'\\') + ' ' + dest +' /e /exclude:'+path+'\\exclude.txt';
-	cProcess = child_process.exec(xcopyCom,{maxBuffer: 5000*1024},function(error){
+	var xcopyCom;
+	if(iswin)
+		xcopyCom = 'XCOPY '+ root.replace(/\//g,'\\') + ' ' + dest +' /e /exclude:'+path+'\\exclude.txt';
+	else
+		xcopyCom = 'cp -a ' + root + '/. ' + dest;
+
+	cProcess = child_process.exec(xcopyCom,{cwd: workspace, maxBuffer: 5000*1024},function(error){
 		if(error)
 			logError(error);
@@ -79,7 +88,7 @@ ep.tail(&#39;minifier-js&#39;, function(){
 	//再处理首页
 	ep.emit('handle-index', function(){
 		//递归处理片段
-		walk(dest + _static + '\\pages', function(item){
+		walk(dest + _static + separator + 'pages', function(item){
 			ep.emit('handle-fragment', item);
 		},
 		function(){
@@ -103,7 +112,7 @@ ep.tail(&#39;package-jar&#39;, function(file){
 		logSuccess('mvn package success');
-		console.log(('成功打包在 ' + dest + '\\target 目录下').cyan);
+		console.log(('成功打包在 ' + dest + separator + 'target 目录下').cyan);
 	});
 	output(cProcess);
@@ -113,7 +122,7 @@ ep.tail(&#39;package-jar&#39;, function(file){
 ep.tail('handle-fragment', function(file){
 	//要排除的文件
 	for(var i = 0, ex; ex = excludes[i++];){
-		if(file.indexOf(_pages + '\\' + ex) != -1)
+		if(file.indexOf(_pages + separator + ex) != -1)
 			return false;
 	}
 	handleJavascript(file, function(mini, $){
@@ -130,12 +139,12 @@ ep.tail(&#39;handle-fragment&#39;, function(file){
 //处理首页
 ep.tail('handle-index', function(cb){
-	var index = dest + _static + '\\index.html';
+	var index = dest + _static + separator + 'index.html';
 	handleJavascript(index, function(mini, $){
 		var jsMiniText = mini.inside + mini.outside;
 		var code = md5(jsMiniText);
-		fs.open( dest + _static + '\\assets\\js\\' + code + '.js', 'a',  function(err, fd){
+		fs.open( dest + _static + separator + 'assets'+separator+'js' + separator + code + '.js', 'a',  function(err, fd){
 			if(err)
 		    	logError(err);
@@ -210,7 +219,7 @@ function walk(path ,handleFile, over) {
             console.log('read dir error'.red);  
         } else {  
             files.forEach(function(item) {
-                var tmpPath = path + '\\' + item;  
+                var tmpPath = path + separator + item;
                 fs.stat(tmpPath, function(err1, stats) {  
                     if (err1) {  
                         console.log('stat error');  
@@ -182,6 +182,48 @@
 		<appender-ref ref="GPS_COUNT" />
 	</logger>
+	<!-- 消息队列纪录 -->
+	<appender name="QUEUE_WEB_SOCKET"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_BASE}/msg_queue/websocket.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_BASE}/msg_queue/websocket-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
+			</pattern>
+		</layout>
+	</appender>
+	<logger name="com.bsth.data.msg_queue.WebSocketPushQueue"
+			level="INFO" additivity="false">
+		<appender-ref ref="QUEUE_WEB_SOCKET" />
+	</logger>
+	<appender name="QUEUE_DIRECTIVE"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_BASE}/msg_queue/directive.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_BASE}/msg_queue/directive-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
+			</pattern>
+		</layout>
+	</appender>
+	<logger name="com.bsth.data.msg_queue.DirectivePushQueue"
+			level="INFO" additivity="false">
+		<appender-ref ref="QUEUE_DIRECTIVE" />
+	</logger>
+
 	<!--<logger name="org.hibernate.SQL" level="TRACE">-->
 	<!--<appender-ref ref="STDOUT" />-->
 	<!--</logger>-->
@@ -4,4 +4,5 @@ import accumulate com.bsth.service.schedule.rules.ttinfo2.ErrorBcCountFunction e
 import accumulate com.bsth.service.schedule.rules.shiftloop.GidsCountFunction gidscount;
 import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbTimeFunction gidfbtime;
 import accumulate com.bsth.service.schedule.rules.ttinfo.LpInfoResultsFunction lpinforesult;
-import accumulate com.bsth.service.schedule.rules.ttinfo.MinRuleQyrqFunction minruleqyrq
 \ No newline at end of file
+import accumulate com.bsth.service.schedule.rules.ttinfo.MinRuleQyrqFunction minruleqyrq;
+import accumulate com.bsth.service.schedule.rules.validate.ValidRepeatBcFunction vrb;
 \ No newline at end of file
@@ -88,7 +88,9 @@ rule &quot;calcu_days_1_&quot;
         String ruleMd5 = Md5Util.getMd5(
             String.valueOf($qyrq.getMillis()) +
             "_" +
-            $sri.getSelf().getLpIds()
+            $sri.getSelf().getLpIds() +
+            "_" +
+            $sri.getSelf().getLpStart().toString()
         );
         cdrp.setRuleMd5(ruleMd5);
         // 人员范围个数
@@ -136,7 +138,9 @@ rule &quot;calcu_days_2_&quot;
         String ruleMd5 = Md5Util.getMd5(
             String.valueOf($qyrq.getMillis()) +
             "_" +
-            $sri.getSelf().getLpIds()
+            $sri.getSelf().getLpIds() +
+            "_" +
+            $sri.getSelf().getLpStart().toString()
         );
         cdrp.setRuleMd5(ruleMd5);
         // 人员范围个数
@@ -187,7 +191,9 @@ rule &quot;Calcu_SchedulePlanRuleResult_wrap&quot;
         String md5 = Md5Util.getMd5(
             String.valueOf($sprr.getQyrq().getTime()) +
             "_" +
-            $sprr.getGids()
+            $sprr.getGids() +
+            "_" +
+            $sprr.getOrigingidindex()
         );
 //        System.out.println("修改后的md5：" + md5 + "车辆：" + $sprr.getCcZbh());
@@ -350,7 +356,7 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         schedulePlanRuleResult.setRuleId($ruleId);
         schedulePlanRuleResult.setCcId($cid);
         schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
-        schedulePlanRuleResult.setGids($srf.getLpIds());
+        schedulePlanRuleResult.setGids($srf.getLpIds()); // 参与md5计算
         schedulePlanRuleResult.setGnames($srf.getLpNames());
         schedulePlanRuleResult.setGidindex(String.valueOf($lpindex));
         schedulePlanRuleResult.setEcids($srf.getRyConfigIds());
@@ -359,7 +365,8 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         schedulePlanRuleResult.setScheduleDate($csd2.toDate());
         schedulePlanRuleResult.setTtinfoId($ttinfoId);
         schedulePlanRuleResult.setTtinfoName($ttinfoName);
-        schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate());
+        schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate()); // 参与md5计算
+        schedulePlanRuleResult.setOrigingidindex(String.valueOf($sri.getSelf().getLpStart())); // 参与md5计算
         scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
-// TODO：
 \ No newline at end of file
+package com.bsth.service.schedule.rules.validate;
+
+import com.bsth.entity.schedule.SchedulePlanInfo;
+
+import org.joda.time.*;
+import java.util.*;
+
+import org.slf4j.Logger;
+
+// 全局日志类（一般使用调用此规则的service类）
+global Logger log;
+
+// 输出
+global ValidateResults_output validResult;
+
+//------------------------- 第一阶段、构造循环体 ----------------------------//
+
+declare Loop_param
+    start_date: DateTime // 开始日期（这个要不停的更新迭代）
+    end_date: DateTime // 结束日期
+    sdays: Integer // 总共循环的天数
+end
+
+rule "Calcu_Loop_param"
+    salience 1000
+    when
+        ValidateParam(
+            $fd: fromDate,
+            $ed: toDate,
+            $days: days
+        )
+    then
+        Loop_param p = new Loop_param();
+        p.setStart_date($fd);
+        p.setEnd_date($ed);
+        p.setSdays($days);
+
+        insert(p);
+end
+
+//------------------------- 第二阶段、验证计算 ----------------------------//
+
+
+rule "Valid_repeat_bc" // 验证是否存在重复班次
+    salience 600
+    when
+        $lp: Loop_param($sd: start_date, $ed: end_date)
+        eval($sd.isBefore($ed) || $sd.isEqual($ed))
+        $spiList: ArrayList() from collect (SchedulePlanInfo(scheduleDate.getTime() == $sd.getMillis()))
+        $infos: ArrayList() from accumulate ($spi: SchedulePlanInfo() from $spiList, vrb($spi))
+    then
+        // TODO：
+        log.info("日期={}，班次重复错误数={}", $sd, $infos.size());
+
+        validResult.getInfos().addAll($infos);
+
+        // 迭代
+        $lp.setStart_date($sd.plusDays(1));
+        update($lp);
+
+end
+
+
+
+
+
+
+
+
 <!-- 编辑路段 -->
-<div class="modal fade" id="edit_section_mobal" tabindex="-1" role="basic" aria-hidden="true">
+<div class="modal fade" id="edit_section_mobal"  role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -49,7 +49,7 @@
           						上一路段：
                     		</label>
 							<div class="col-md-6">
-								<select name="sectionrouteCode" class="form-control" id="sectionrouteCodeSelect"></select>
+								<select name="sectionrouteCode" class="form-control" id="sectionrouteCodeSelect" style="width:100%"></select>
 								<span class="help-block">说明：选择的路段将作为本路段序号的参考，成为选择路段的下一个路段。 </span>
 							</div>
 						</div>
@@ -162,7 +162,7 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 	var sectionRouteId = Section.sectionRouteId;
 	// 获取路段号元素，并添加下拉属性值
 	ajaxd.getStation(lineId,dir,function(treeData) {
-		var options = '<option value="">请选择...</option>';
+		/* var options = '<option value="">请选择...</option>';
 		var dArray = treeData[0].children[1].children;	
 		var eq_stationRouteCode =  Section.sectionRouteCode;
 		for(var i = 0 ; i<dArray.length; i++){
@@ -181,6 +181,33 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 			}else {
 				$('#sectionrouteCodeSelect').val('');
 			}
+		}); */
+		var array = treeData[0].children[1].children,paramsD =new Array();	
+		var eq_scetionRouteCode =  Section.sectionRouteCode;
+		paramsD.push({'id':'请选择...','text':'请选择...'});
+		// 遍历.
+		$.each(array, function(i, g){
+			// 判断.
+			if(g.sectionName!='' || g.sectionName != null) {
+				var ptions_v = g.sectionrouteCode;
+				if(eq_scetionRouteCode != ptions_v){
+					// 添加拼音检索下拉框格式数据数组.
+					paramsD.push({'id':ptions_v,
+								  'text':g.sectionName + '(' + ptions_v + ')' + '  --' + dirdmToName(g.sectionrouteDirections)});
+				}
+			}
+		});
+		// 初始化上一个路段拼音检索下拉框.
+		initPinYinSelect2($('#sectionrouteCodeSelect'),paramsD,function(selector) {
+			$('#sectionDirSelect').val('');// 设值方向.
+			ajaxd.findUpSectionRouteCode(lineId,dir,eq_scetionRouteCode,function(str) {
+				if(str.length>0){
+					var upStationRouteCode = str[0].sectionrouteCode;
+					$('#sectionrouteCodeSelect').select2('val',upStationRouteCode);
+				}else {
+					$('#sectionrouteCodeSelect').select2('val','请选择...');
+				}
+			});
 		});
 	});
 	function dirdmToName(value) {
@@ -257,6 +284,8 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 			// 设置日期
 			params.createDate =  moment(Section.carParkCreateDate).format(fs);
 			error.hide();
+			if(params.sectionrouteCode=='请选择...')
+				params.sectionrouteCode='';
 			ajaxd.sectionUpdate(params,function(resuntDate) {
 				if(resuntDate.status=='SUCCESS') {
 					// 弹出添加成功提示消息
 <!-- 编辑站点弹出层mobal -->
-<div class="modal fade" id="editPoitsions_station_mobal" tabindex="-1" role="basic" aria-hidden="true">
+<div class="modal fade" id="editPoitsions_station_mobal" role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<!-- 弹出层标题title容器 -->
@@ -209,6 +209,7 @@
 </div>
 <script type="text/javascript">
 $('#editPoitsions_station_mobal').on('editStationMobal_show', function(e, map,fun,stat){
+	layer.closeAll();
 	// 获取站点对象信息
 	var editStation = stat.getAddStation();
 	// 初始化表单值
@@ -297,7 +298,9 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
 	// 站点序号值改变事件
 	$('#stationrouteSelect').on('change',function() {
 		var stationRValue = $('#stationrouteSelect').val();
-		if(stationRValue) {
+		if(stationRValue=='请选择...') {
+			$('#stationMarkSelect').val('B');
+		}else {
 			var tempStr = stationRValue.split('_');
 			if(tempStr[1] == 'E') {
 				$('#stationMarkSelect').val('E');
@@ -318,8 +321,15 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
 					if(g.name!='' || g.name != null) {
 						if(g.stationRouteCode != editStation.stationRouteCode) {
 							// 添加拼音检索下拉框格式数据数组.
-							paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
-										  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+							/* paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
+										  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)}); */
+							if(editStation.stationRouteStationMark=='E' && i == (len_-2)){
+								paramsD.push({'id':g.stationRouteCode + '_' + 'E' + '_' + g.directions,
+									  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+							}else {
+								paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
+									  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+							}
 						}
 					}
 				});
@@ -333,10 +343,17 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
 	}
 	function setZdlyValue() {
 		fun.findUpStationRouteCode(editStation.stationRouteLine,editStation.stationRoutedirections,editStation.stationRouteCode,function(str) {
-			if(str.length>0){
+			/* if(str.length>0){
 				var upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke  + '_' + editStation.stationRoutedirections;
 				$('#stationrouteSelect').select2('val',upStationRouteCode);
+			} */
+			if(str.length>0){
+				var upStationRouteCode = str[0].stationRouteCode + '_' + editStation.stationRouteStationMark  + '_' + editStation.stationRoutedirections;
+				$('#stationrouteSelect').select2('val',upStationRouteCode);
+			}else {
+				$('#stationrouteSelect').select2('val','请选择...');
 			}
+			$('#stationMarkSelect').val(editStation.stationRouteStationMark);
 		});
 	}
 	// 当站点类型为中途站或者终点站时,上一站点为必填项！
 <!-- 新增站点 -->
-<div class="modal fade" id="add_station_mobal" tabindex="-1" role="basic" aria-hidden="true">
+<div class="modal fade" id="add_station_mobal" role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -180,7 +180,7 @@
 					<!-- 描述/说明 -->
 	                <div class="form-group">
-	                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;&nbsp;: </label>
+	                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;: </label>
                  		<div class="col-md-6">
                      		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="描述/说明"></textarea>
                     	</div>
@@ -243,7 +243,9 @@ $(&#39;#add_station_mobal&#39;).on(&#39;AddStationMobal.show&#39;, function(e, addMap,ajaxd,stao
 	// 站点序号值改变事件
 	$('#stationrouteSelect').on('change',function() {
 		var stationRValue = $('#stationrouteSelect').val();
-		if(stationRValue) {
+		if(stationRValue=='请选择...') {
+			$('#stationMarkSelect').val('B');
+		}else {
 			var tempStr = stationRValue.split('_');
 			if(tempStr[1] == 'E') {
 				$('#stationMarkSelect').val('E');
@@ -93,4 +93,39 @@ html,body{
 	box-shadow: 0 12px 15px 0 rgba(204, 204, 204, 0.33),0 17px 50px 0 rgba(204, 204, 204, 0.33)!important;
+}
+
+.defeat-scroll {
+width: 98%;
+height:380px;
+/* overflow:auto; */
+overflow:hidden;
+}
+.defeat-scroll::-webkit-scrollbar {
+width:6px;
+height:6px;
+}
+.defeat-scroll::-webkit-scrollbar-button    {
+/* background-color:#FF7677; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-track     {
+/* background:#FF66D5; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-track-piece {
+/* background:#ff0000; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-thumb{
+background:rgba(197, 196, 196, 0.81);
+border-radius:10px !important;
+}
+.defeat-scroll::-webkit-scrollbar-corner {
+/* background:#82AFFF; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-resizer  {
+/* background:#FF0BEE; */
+background:rgba(255, 255, 255, 0);
 }
 \ No newline at end of file
 <!-- 编辑站点 -->
-<div class="modal fade" id="edit_station_mobal" tabindex="-1" role="basic" aria-hidden="true">
+<div class="modal fade" id="edit_station_mobal"  role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -50,7 +50,7 @@
           						<span class="required"> * </span> 站点编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="stationCod" id="stationCodInput" placeholder="站点编码">
+								<input type="text" class="form-control" name="stationCod" id="stationCodInput" placeholder="站点编码" readonly="readonly">
 							</div>
 						</div>
 					</div>
@@ -177,7 +177,7 @@
 					</div>
 					<!-- 描述/说明 -->
 	                <div class="form-group">
-	                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;: </label>
+	                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;&nbsp;: </label>
                  		<div class="col-md-6">
                      		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="描述/说明"></textarea>
                     	</div>
@@ -194,6 +194,7 @@
 <script type="text/javascript">
 $('#edit_station_mobal').on('editSelectMobal_show', function(e, map_,ajaxd,station_,Line_,fun){
+	layer.closeAll();
  	var editStationParmasObj = station_.getEitdStation();
 	var addLine = Line_.getLineObj();
 	fun.setFormValue(editStationParmasObj);
@@ -290,7 +291,9 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 	// 站点序号值改变事件
 	$('#stationrouteSelect').on('change',function() {
 		var stationRValue = $('#stationrouteSelect').val();
-		if(stationRValue) {
+		if(stationRValue=='请选择...') {
+			$('#stationMarkSelect').val('B');
+		}else {
 			var tempStr = stationRValue.split('_');
 			if(tempStr[1] == 'E') {
 				$('#stationMarkSelect').val('E');
@@ -311,8 +314,13 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 					if(g.name!='' || g.name != null) {
 						if(g.stationRouteCode != editStationParmasObj.stationRouteStationRouteCode) {
 							// 添加拼音检索下拉框格式数据数组.
-							paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
-										  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+							if(editStationParmasObj.stationRouteStationMark=='E' && i == (len_-2)){
+								paramsD.push({'id':g.stationRouteCode + '_' + 'E' + '_' + g.directions,
+									  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+							}else {
+								paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
+									  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+							}
 						}
 					}
 				});
@@ -327,12 +335,14 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 	function setZdlyValue() {
 		ajaxd.findUpStationRouteCode(editStationParmasObj.stationRouteLine,editStationParmasObj.stationRouteDirections,editStationParmasObj.stationRouteStationRouteCode,function(str) {
 			if(str.length>0){
-				var upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke  + '_' + editStationParmasObj.stationRouteDirections;
+				/* var upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke  + '_' + editStationParmasObj.stationRouteDirections; */
+				var upStationRouteCode = str[0].stationRouteCode + '_' + editStationParmasObj.stationRouteStationMark  + '_' + editStationParmasObj.stationRouteDirections;
 				$('#stationrouteSelect').select2('val',upStationRouteCode);
 			}else {
 				$('#stationrouteSelect').select2('val','请选择...');
-				$('#stationMarkSelect').val(editStationParmasObj.stationRouteStationMark);
+				/* $('#stationMarkSelect').val(editStationParmasObj.stationRouteStationMark); */
 			}
+			$('#stationMarkSelect').val(editStationParmasObj.stationRouteStationMark);
 		});
 	}
 	// 当站点类型为中途站或者终点站时,上一站点为必填项！
 <!-- 编辑路段 -->
-<div class="modal fade" id="edit_section_mobal" tabindex="-1" role="basic" aria-hidden="true">
+<div class="modal fade" id="edit_section_mobal" role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -49,7 +49,7 @@
           						上一路段:
                     		</label>
 							<div class="col-md-6">
-								<select name="sectionrouteCode" class="form-control" id="sectionrouteCodeSelect"></select>
+								<select name="sectionrouteCode" class="form-control" id="sectionrouteCodeSelect" style="width:100%"></select>
 								<span class="help-block">说明:选择的路段将作为本站序号的参考，成为选择路段的下一个路段。 </span>
 							</div>
 						</div>
@@ -157,10 +157,9 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 	var lineId = Section.sectionrouteLine;
 	// 获取路段号元素，并添加下拉属性值
 	ajaxd.getStation(lineId,dir,function(treeData) {
-		var options = '<option value="">请选择...</option>';
-		var dArray = treeData[0].children[1].children;	
+		var array = treeData[0].children[1].children,paramsD =new Array();	
 		var eq_scetionRouteCode =  Section.sectionrouteCode;
-		for(var i = 0 ; i<dArray.length; i++){
+		/* for(var i = 0 ; i<dArray.length; i++){
 			var ptions_v = dArray[i].sectionrouteCode;
 			if(eq_scetionRouteCode == ptions_v){
 				continue;
@@ -168,17 +167,32 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 			options += '<option value="'+ ptions_v +'">'+dArray[i].sectionName + ' (' + ptions_v +')'  
 										+ ' --' + fun.dirdmToName(dArray[i].sectionrouteDirections)  + '</option>' ;
 		}
-		$('#sectionrouteCodeSelect').html(options);
-		ajaxd.findUpSectionRouteCode(lineId,dir,eq_scetionRouteCode,function(str) {
-			debugger;
-			console.log(eq_scetionRouteCode);
-			if(str.length>0){
-				var upStationRouteCode = str[0].sectionrouteCode;
-				$('#sectionrouteCodeSelect').val(upStationRouteCode);
-			}else {
-				$('#sectionrouteCodeSelect').val('');
+		$('#sectionrouteCodeSelect').html(options); */
+		paramsD.push({'id':'请选择...','text':'请选择...'});
+		// 遍历.
+		$.each(array, function(i, g){
+			// 判断.
+			if(g.sectionName!='' || g.sectionName != null) {
+				var ptions_v = g.sectionrouteCode;
+				if(eq_scetionRouteCode != ptions_v){
+					// 添加拼音检索下拉框格式数据数组.
+					paramsD.push({'id':ptions_v,
+								  'text':g.sectionName + '(' + ptions_v + ')' + '  --' + fun.dirdmToName(g.sectionrouteDirections)});
+				}
 			}
 		});
+		// 初始化上一个路段拼音检索下拉框.
+		initPinYinSelect2($('#sectionrouteCodeSelect'),paramsD,function(selector) {
+			$('#sectionDirSelect').val('');// 设值方向.
+			ajaxd.findUpSectionRouteCode(lineId,dir,eq_scetionRouteCode,function(str) {
+				if(str.length>0){
+					var upStationRouteCode = str[0].sectionrouteCode;
+					$('#sectionrouteCodeSelect').select2('val',upStationRouteCode);
+				}else {
+					$('#sectionrouteCodeSelect').select2('val','请选择...');
+				}
+			});
+		});
 	});
 	// 显示mobal
 	$('#edit_section_mobal').modal({show : true,backdrop: 'static',keyboard: false});
@@ -238,6 +252,8 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 		submitHandler : function(f) {
 			var params = form.serializeJSON();
 			error.hide();
+			if(params.sectionrouteCode=='请选择...')
+				params.sectionrouteCode='';
 			ajaxd.sectionUpdate(params,function(resuntDate) {
 				if(resuntDate.status=='SUCCESS') {
 					// 弹出添加成功提示消息
@@ -238,4 +238,9 @@ $(function(){
 			}
 		});
 	});
+	$('#scrllmouseEvent').on('mousemove',function() {
+		$('.defeat-scroll').css('overflow','auto');
+	}).on('mouseleave',function() {
+		$('.defeat-scroll').css('overflow','hidden');
+	});
 });
 \ No newline at end of file
@@ -354,7 +354,7 @@ var PublicFunctions = function () {
 				// 获取站点编码元素设值
 				$('#stationCodInput').val(editStationParmas.stationStationCod);
 				// 获取站点类型元素设值
-				$('#stationMarkSelect').val(editStationParmas.stationRouteStationMark);
+				// $('#stationMarkSelect').val(editStationParmas.stationRouteStationMark);
 				// 获取站点方向元素设值
 				$('#stationdirSelect').val(editStationParmas.stationRouteDirections);
 				// 获取站点道路编码元素设值
@@ -4,7 +4,7 @@
 	<div id="bmap_basic" class="bmaps"></div>
 	<div class="portlet box protlet-box" style="top:20px;border-radius: 6px !important;box-shadow: 10px 10px 5px #888888;">
 		<!-- 左边标题栏 -->
-		<div class="portlet-title" style="background-color:#3B3F51">
+		<div class="portlet-title" style="background-color:#12527f;">
 			<div class="caption">
 				<!-- 途径站点  -->
 			</div>
@@ -13,7 +13,7 @@
 			</div>
 		</div>
 		<!-- 左边栏 -->
-		<div class="portlet-body" style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 200px;">
+		<div class="portlet-body" id="scrllmouseEvent"  style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 380px;">
 			<div class="row">
 				<!-- 上下行栏 -->
 				<div class="col-md-3 col-sm-3 col-xs-3">
@@ -83,8 +83,8 @@
 	                                </div>
 	                            </div>
 	                            <!-- 树 -->
-	                            <div class="portlet-body">
-									<div id="station_Up_tree" style="height: auto;max-height: 500px;overflow-y: auto;"></div>
+	                            <div class="portlet-body" >
+									<div id="station_Up_tree" class="defeat-scroll" style="height: auto;max-height: 500px;"></div>
 								</div>
                              </div>
                              <!-- 无上行站点添加方式 -->
@@ -176,7 +176,7 @@
 	                            </div>
 	                            <!-- 树 -->
 	                            <div class="portlet-body">
-									<div id="station_Down_tree" style="height: auto;max-height: 500px;overflow-y: auto;"></div>
+									<div id="station_Down_tree" class="defeat-scroll" style="height: auto;max-height: 500px;"></div>
 								</div>
 	            		</div>
 	            		<!-- 无上行站点添加方式 -->
@@ -109,7 +109,7 @@
 								<!--  线路名称 (* 必填项) START -->
 								<div class="col-md-6">
 									<label class="control-label col-md-5">
-			          					<span class="required"> * </span> 线路名称&nbsp;：
+			          					<span class="required"> * </span> 线路名称&nbsp;&nbsp;&nbsp;&nbsp;：
 			                    	</label>
 				                 	<div class="col-md-6">
 				                 		<select name="lineName" class="form-control input-medium"   id="lineSelect"></select>
@@ -138,7 +138,7 @@
 							 </div>
 							 <!-- 客容总量 -->
 							<div class="form-group" id="krlGroup">
-								<label class="col-md-3 control-label"><span class="required"> * </span>客容总量&nbsp;&nbsp;：</label>
+								<label class="col-md-3 control-label"><span class="required"> * </span>客容总量&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;：</label>
 								<div class="col-md-9">
 									<input type="text" class="form-control input-medium" name="krl" id="krlInput" placeholder="客容总量">
 								</div>
@@ -118,7 +118,7 @@ text.alert-danger {
 .ganttSvgContainer {
     height: 400px;
-    overflow: auto;
+    overflow: hidden;
     position: relative;
 }
@@ -156,3 +156,72 @@ text.alert-danger {
 ::selection {
 	background:rgba(255, 255, 255, 0); 
 }
+
+.tipsdscontinue {
+	width:100%;
+	overflow: hidden;
+}
+
+.tipsdscontinue span {
+	display:block; 
+	float:left;
+	font-size:x-small;
+	line-height:10px;
+	padding: 2px 8px 4px 8px;
+}
+
+.dscrp {
+	width: 28%;
+    height: 6px;
+    padding: 8px 8px 8px 30px;
+    float: left;
+}
+
+.sx {
+	 background-color: #233f5d;
+}
+
+.xx {
+	 background-color: #31394a;
+}
+
+.tipso_bubble {
+	border: 1px #E91E63 solid;
+   /*  box-shadow: 10px 10px 5px #888888; */
+    box-shadow: 4px 4px 2px #888888;
+    background: #ffffff !important;
+}
+.tipso_arrow {
+	    /* border-color: transparent #E91E63 transparent transparent  !important;	 */
+}
+
+ 
+
+.ganttSvgContainer::-webkit-scrollbar {
+width:6px;
+height:6px;
+}
+.ganttSvgContainer::-webkit-scrollbar-button    {
+/* background-color:#FF7677; */
+background:rgba(255, 255, 255, 0);
+}
+.ganttSvgContainer::-webkit-scrollbar-track     {
+/* background:#FF66D5; */
+background:rgba(255, 255, 255, 0);
+}
+.ganttSvgContainer::-webkit-scrollbar-track-piece {
+/* background:#ff0000; */
+background:rgba(255, 255, 255, 0);
+}
+.ganttSvgContainer::-webkit-scrollbar-thumb{
+background:rgba(197, 196, 196, 0.81);
+border-radius:10px !important;
+}
+.ganttSvgContainer::-webkit-scrollbar-corner {
+/* background:#82AFFF; */
+background:rgba(255, 255, 255, 0);
+}
+.ganttSvgContainer::-webkit-scrollbar-resizer  {
+/* background:#FF0BEE; */
+background:rgba(255, 255, 255, 0);
+}
 \ No newline at end of file
@@ -232,6 +232,7 @@
  * @params [obj--甘特图对象;d--当前修改班次对象数据] 
  */
 $('#editDetail_mobal').on('editDetailMobal.show', function(e,obj,nodeContext,bf,map){
+	debugger;
 	// 定义当前班次数据.
 	var dqbcData = nodeContext.dqbcData;
 	var ddbcminztjx = isUpdsgbctzsj(dqbcData.bcType) || isUpdsgbctzsj(nodeContext.nextData.bcType) ? dqbcData.STOPTIME : obj.configuration.dataMap.minztjx,lastminztjx = 0;
@@ -22,13 +22,14 @@
 	<!-- col-md-12 组件START -->
 	<div class="col-md-12">
 		<!-- portlet 组件START -->
-		<div class="portlet light porttlet-fit bordered">
+		<div class="portlet light porttlet-fit bordered" >
 			<!-- portlet-title组件START -->
 			<div class="portlet-title">
 				<!-- caption 组件START  -->
-				<div class="caption">
+				<div class="caption offset">
 					 <i class="fa fa-bar-chart font-dark"></i>
-					 <span class="caption-subject font-dark sbold uppercase">时刻表明细模型</span>
+					 <span class="caption-subject font-dark sbold uppercase skmxTitle"></span>
+					 <i class="fa fa-question-circle tipso-animation" style="color: rgba(158, 158, 158, 0.49);float: right;margin-left: 2px;"></i>
 				</div>
 				<!-- caption 组件END -->
 				<div class="tools" style="margin-left: 20px;margin-top: -10px;">
@@ -92,7 +93,7 @@
 			<!-- portlet-title组件END -->
 			<!-- portlet-body组件START -->
-			<div class="portlet-body">
+			<div class="portlet-body" id="scrllmouseEvent">
 				<!-- ganttSvgContainer SVG组件START -->
 				<div class="ganttSvgContainer">
 					<div id="ganttSvg"></div>
@@ -612,8 +612,9 @@ var SKBFormWizard = function() {
 					function submit(p,argus) {
 						storage.setItem("Gantt_AgursData",JSON.stringify(argus));
 						if(p!=null) {
-							console.log(JSON.stringify(p.rsLp));
 							storage.setItem('isDoDate',JSON.stringify({'rsD':p.rsD,'rsLP':p.rsLp}));
+						}else {
+							storage.setItem('isDoDate','');
 						}
 						loadPage('gantt.html');
 					}
@@ -269,11 +269,11 @@ var BaseFun = function() {
 					for(var a =0;a<carArray.length;a++) {
 						var _mmstartTime = baseF.getDateTime(gatps.earlyStartTime);// 获取早高峰开始时间点，并转为时间对象.
 						var tempTime = new Date(_mmstartTime.setMinutes(_mmstartTime.getMinutes()-(ca.length-parseInt(carArray[a].lpNo))*ma[0].fcjx));
-						var cctag = baseF.getdefaultDir(dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
+						var cctag = gatps.linePlayType=='1' ? 0 : baseF.getdefaultDir(dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
 						var kssj = baseF.getDateTime(time[0]); // 获取该时段的开始时间点，并转为时间对象.
 						var sjAndDir = baseF.getBeganTime(tempTime,kssj,type, ma,dataMap.zgfsjd,dataMap.wgfsjd,dataMap.pcxssjArr,dataMap.gfxxsjArr,cctag, dataMap.ztjxA);// 计算当前路牌第一个首班时间点.
 						kssj = sjAndDir.d1;
-						cctag = sjAndDir.dir;
+						cctag = gatps.linePlayType=='1' ? 0 : sjAndDir.dir;
 						var	endTime = baseF.getDateTime(
 								baseF.getEndStrt(type,dataMap.smbcsjArr,time[1],cctag));// 获取该时段的结束时间点，并转为时间对象.
 						var $_cfn = 0,$_cfw = 0;
@@ -287,7 +287,7 @@ var BaseFun = function() {
 								dataMap.dira[cctag],xhNo++,dataMap.cclcArr[cctag],gatps,0,dataMap.qdzArr[cctag],null,null,0,0));// 出场班次
 						var fxTagDm = 0;
 						while(kssj<=endTime) {
-							cctag = baseF.getfx(fxTagDm,cctag);
+							cctag = gatps.linePlayType=='1' ? 0 : baseF.getfx(fxTagDm,cctag);
 							fxTagDm = 1;
 							if(kssj> new Date (baseF.getCFDate(10,30)) && 
 									kssj<new Date (baseF.getCFDate(12,0)) && $_cfn<1 ) {
@@ -556,7 +556,6 @@ var BaseFun = function() {
 			getRankRule : function(list,clzs,seMap) {
 				// 定义班型人次数据的长度.路牌数组长度.
 				var bxgs = list.data.length,clzslen = clzs.length;
-				
 				/**
 				 * 分配规则：获取总人数与车辆数的关系.返回值[-1-- 总人数小与车辆总数; 0--总人数等于车辆数; 1--总人数大与车辆数]
 				 * 
@@ -570,6 +569,7 @@ var BaseFun = function() {
 				 * */
 				switch(baseF.isrcNumEqualCarNum(list.rsa,clzslen)){
 					case -1:
+						baseF.fprclp(bxgs,list,clzs);
 						break;
 					case 0:
 						// 判断.班型人次是否为一种还是多种情况.
@@ -584,6 +584,7 @@ var BaseFun = function() {
 					case 1:
 						// 定义最大工时值.
 						var maxhoursV = parseFloat((((baseF.getDateTime(seMap.e) - baseF.getDateTime(seMap.s))/60000)/60).toFixed(2));
+						// var maxhoursV = 24;
 						// 定义总人数.
 						var rsdx = 0 ;
 						for(var n = 0 ; n < list.rsa.length;n++) {
@@ -598,9 +599,9 @@ var BaseFun = function() {
 							for(var a = b ; a<bxgs; a++) {
 								var pphours = list.data[a].hoursV;
 								var zhnum = pphours+dqhours;
-								if(zhnum>maxhoursV) 
+								if(zhnum>maxhoursV){
 									continue;
-								else if(zhnum<maxhoursV) {
+								}else if(zhnum<maxhoursV) {
 									zhHoursA.push({'bx1':list.data[b].type,'bx2':list.data[a].type,'countGs':zhnum});
 								}
@@ -608,43 +609,53 @@ var BaseFun = function() {
 						}
 						// 按照工时倒序排序.
 						zhHoursA.sort(function(a,b){return b.countGs-a.countGs});
-						var bxppA = zhHoursA[0],clp = null,dlp = null,pqobj = new Array(),bxpprc= new Array();
-						for(var m = 0 ; m<list.data.length;m++) {
-							if(list.data[m].type==bxppA.bx1 || list.data[m].type==bxppA.bx2) {
-								bxpprc.push(list.data[m].rs);
-								var czDx = list.data[m].rs - _rcDx;
-								if(czDx<0) {
-									var djbctype = null,absInt = Math.abs(czDx);
-									if(list.data[m].type==bxppA.bx1)
-										djbctype = bxppA.bx2;
-									else if(list.data[m].type==bxppA.bx2)
-										djbctype = bxppA.bx1;
-									var bqbc = zhHoursA[1];
-									for(var k  = 0 ; k<bxgs ; k++) {
-										if(list.data[k].type == djbctype)
-											list.data[k].rs = list.data[k].rs + Math.abs(czDx);
-										if(list.data[k].type==bqbc.bx1 || list.data[k].type==bqbc.bx2) {
-											if(bqbc.bx1==bqbc.bx2)
-												list.data[k].rs = list.data[k].rs -  absInt*2;
-											else if(bqbc.bx1!=bqbc.bx2)
-												list.data[k].rs = list.data[k].rs -  absInt;
+						if(zhHoursA.length>0) {
+							var bxppA = zhHoursA[0],clp = null,dlp = null,pqobj = new Array(),bxpprc= new Array();
+							for(var m = 0 ; m<list.data.length;m++) {
+								if(list.data[m].type==bxppA.bx1 || list.data[m].type==bxppA.bx2) {
+									bxpprc.push(list.data[m].rs);
+									var czDx = list.data[m].rs - _rcDx;
+									if(czDx<0) {
+										var djbctype = null,absInt = Math.abs(czDx);
+										if(list.data[m].type==bxppA.bx1)
+											djbctype = bxppA.bx2;
+										else if(list.data[m].type==bxppA.bx2)
+											djbctype = bxppA.bx1;
+										var bqbc = zhHoursA[1];
+										for(var k  = 0 ; k<bxgs ; k++) {
+											if(list.data[k].type == djbctype)
+												list.data[k].rs = list.data[k].rs + Math.abs(czDx);
+											if(list.data[k].type==bqbc.bx1 || list.data[k].type==bqbc.bx2) {
+												if(bqbc.bx1==bqbc.bx2)
+													list.data[k].rs = list.data[k].rs -  absInt*2;
+												else if(bqbc.bx1!=bqbc.bx2)
+													list.data[k].rs = list.data[k].rs -  absInt;
+											}
 										}
+										pqobj.push({'type':bqbc.bx1 + '</br></br>' + bqbc.bx2 ,'minueV':bqbc.countGs,'rs':absInt});
+									}
+									czDx = czDx < 0 ? 0:czDx;
+									list.data[m].rs =  czDx;
+									if(list.data[m].rs<=0) {
+										list.data.splice(m,1);
+										m--;
 									}
-									pqobj.push({'type':bqbc.bx1 + '</br></br>' + bqbc.bx2 ,'minueV':bqbc.countGs,'rs':absInt});
-								}
-								czDx = czDx < 0 ? 0:czDx;
-								list.data[m].rs =  czDx;
-								if(list.data[m].rs<=0) {
-									list.data.splice(m,1);
-									m--;
 								}
 							}
+							list.data.push({'type':bxppA.bx1 + '</br></br>' + bxppA.bx2 , 
+											'minueV' : bxppA.countGs,
+											'rs':Math.min.apply(null, bxpprc) <_rcDx ? Math.min.apply(null, bxpprc) : _rcDx});
+							if(pqobj.length>0)
+								list.data.push(pqobj[0]);
+						}else {
+							list.data.sort(function(a,b){return (b.rs*b.hoursV)-(a.rs*a.hoursV)});
+							var fpchuqugs = Math.abs(_rcDx) * parseFloat(list.data[0].hoursV);
+							var avglp = parseFloat((fpchuqugs / clzslen).toFixed(2));
+							list.data[0].rs = list.data[0].rs - Math.abs(_rcDx);
+							for(var c = 0 ;c <list.data.length;c++) {
+								list.data[c].hoursV = parseFloat(list.data[c].hoursV) + avglp;
+							}
 						}
-						list.data.push({'type':bxppA.bx1 + '</br></br>' + bxppA.bx2 , 
-										'minueV' : bxppA.countGs,
-										'rs':Math.min.apply(null, bxpprc) <_rcDx ? Math.min.apply(null, bxpprc) : _rcDx});
-						if(pqobj.length>0)
-							list.data.push(pqobj[0]);
 						list.data.sort(function(a,b){return b.rs-a.rs});
 						baseF.fprclp(list.data.length,list,clzs);
 						break;
@@ -749,13 +760,13 @@ var BaseFun = function() {
 					var _mmstartTime = baseF.getDateTime(map.earlyStartTime);// 获取早高峰开始时间点，并转为时间对象.
 					var tempTime = new Date(_mmstartTime.setMinutes(_mmstartTime.getMinutes()-(len - cara[c].lpNo)*saa[0].fcjx));
 					var kssj = dataMap.zgfsjd[0].st;
-					var cctag = baseF.getdefaultDir(dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
+					var cctag = map.linePlayType=='1' ? 0 : baseF.getdefaultDir(dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
 					var sjAndDir = baseF.getBeganTime(tempTime,kssj,null, saa,dataMap.zgfsjd,dataMap.wgfsjd,dataMap.pcxssjArr,dataMap.gfxxsjArr,cctag, dataMap.ztjxA);// 计算当前路牌第一个首班时间点.
 					kssj = sjAndDir.d1;
-					cctag = sjAndDir.dir;
+					cctag = map.linePlayType=='1' ? 0 : sjAndDir.dir;
 					var endTime = baseF.getDateTime(seMap.e),fxTagDm = 0 , xhNo = 3,$_cfn = 0,$_cfw = 0;
 					while(kssj<=endTime) {
-						cctag = baseF.getfx(fxTagDm,cctag);
+						cctag = map.linePlayType=='1' ? 0 : baseF.getfx(fxTagDm,cctag);
 						fxTagDm = 1;
 						if(kssj> new Date (baseF.getCFDate(10,30)) && 
 								kssj<new Date (baseF.getCFDate(12,0)) && $_cfn<1 ) {
@@ -783,6 +794,10 @@ var BaseFun = function() {
 				return rs;
 			},
+			/**
+			 * @description : (TODO) 该方法可去除.
+			 * 
+			 * */
 			getGfData : function (type, saa , cara , map, seMap ,dataMap,len,car) {
 				var _mmstartTime = null,kssj = null,end = null ,result = new Array(),fxTagDm = 0 , xhNo = 0;
 				if(type == 'mm') {
@@ -1093,11 +1108,11 @@ var BaseFun = function() {
 				return sortGattArray;
 			},
 			addbc : function(obj,lastObj,kssj,tzsj,xhNo,jsonArray,num) {
-				var cctag = baseF.dirDmToIndex(lastObj.xlDir);
+				var cctag = obj.configuration.dataMap.map.linePlayType=='1' ? 0 :  baseF.dirDmToIndex(lastObj.xlDir);
 				var carArray = {'lp':lastObj.lp,'lpNo':lastObj.lpNo,'lpName':lastObj.lpName,'lpType':lastObj.lpType};
 				var ags =  {'tcc_id':lastObj.tcc,'skbName':lastObj.ttinfo,'lineName':lastObj.xl+'_'};
 				for(var t = 0 ; t<num;t++){
-					cctag = baseF.getfx(1,cctag);
+					cctag = obj.configuration.dataMap.map.linePlayType=='1'? 0: baseF.getfx(1,cctag);
 					var _xxsj = baseF.getxssj(obj.configuration.dataMap.zgfsjd,
 											obj.configuration.dataMap.wgfsjd,
 											kssj,
@@ -1172,7 +1187,7 @@ var BaseFun = function() {
 				var _mmstartTime = new Date(obj.configuration.dataMap.zgfsjd[0].st);
 				var tempTime = new Date(_mmstartTime.setMinutes(_mmstartTime.getMinutes()-
 						((parseInt(obj.configuration.dataMap.map.clzs)-parseInt(theCar)))*obj.configuration.stopAraay[0].fcjx));
-				var cctag = bf.getdefaultDir(obj.configuration.dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
+				var cctag = obj.configuration.dataMap.map.linePlayType=='1' ? 0 : bf.getdefaultDir(obj.configuration.dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
 				var kssj = new Date(obj.configuration.dataMap.zgfsjd[0].st); // 获取该时段的开始时间点，并转为时间对象.
 				var sjAndDir = bf.getBeganTime(tempTime,kssj,null, 
 							obj.configuration.stopAraay,
@@ -1181,7 +1196,7 @@ var BaseFun = function() {
 							obj.configuration.dataMap.pcxssjArr,
 							obj.configuration.dataMap.gfxxsjArr,cctag, obj.configuration.dataMap.ztjxA);// 计算当前路牌第一个首班时间点.
 				kssj = sjAndDir.d1;
-				cctag = sjAndDir.dir;
+				cctag = obj.configuration.dataMap.map.linePlayType=='1' ? 0 : sjAndDir.dir;
 				dqlpbc.push(bf.getbcObj(
 						kssj,obj.configuration.dataMap.ccsjArr[cctag],
 						car,obj.configuration.dataMap.bcTypeArr.bd,
@@ -1196,7 +1211,7 @@ var BaseFun = function() {
 								obj.configuration.dataMap.qdzArr[cctag],null,null,0,0));// 出场班次
 				var fxTagDm = 0;
 				for(var i = 0 ; i<numqs;i++) {
-					cctag = bf.getfx(fxTagDm,cctag);
+					cctag = obj.configuration.dataMap.map.linePlayType=='1' ? 0 : bf.getfx(fxTagDm,cctag);
 					fxTagDm = 1;
 					var _xxsj = bf.getxssj(obj.configuration.dataMap.zgfsjd,
 							obj.configuration.dataMap.wgfsjd,kssj,
@@ -1242,11 +1242,13 @@ var RelationshipGraph = function () {
     		//console.log(tempa);
     		//console.log(tempa.upArr.concat(tempa.downArr).length);
     		// 5、均匀上行班次的发车间距.
-    		BaseFun.jhfcjx(tempa.upArr,upDir,zzsj,$_GlobalGraph.configuration.dataMap);
+    		if(tempa.upArr.length>0)
+    			BaseFun.jhfcjx(tempa.upArr,upDir,zzsj,$_GlobalGraph.configuration.dataMap);
     		//var sxbc = BaseFun.jhfcjx(tempa.upArr,upDir,zzsj,$_GlobalGraph.configuration.dataMap);
     		//console.log('getDirBc---- '+tempa.downArr.length);
     		// 6、均匀下行班次的发车间距.
-    		BaseFun.jhfcjx(tempa.downArr,downDir,zzsj,$_GlobalGraph.configuration.dataMap);
+    		if(tempa.downArr.length>0)
+    			BaseFun.jhfcjx(tempa.downArr,downDir,zzsj,$_GlobalGraph.configuration.dataMap);
     		//var xxbc = BaseFun.jhfcjx(tempa.downArr,downDir,zzsj,$_GlobalGraph.configuration.dataMap);
     		//console.log('jhfcjx---'+ xxbc.length);
     		//console.log(sxbc.concat(xxbc).length);
@@ -10,8 +10,28 @@
 	var objD = window.localStorage.isDoDate; 
 	// 获取表单参数配置数据.
 	var map  = JSON.parse(window.localStorage.Gantt_AgursData);
+	$('.skmxTitle').text( '【' + map.skbmc + '】' + '时刻表明细模型');
 	// 延迟500毫秒执行.
 	setTimeout(function(){
+		var offsetY = -parseInt($('.offset').offset().top)+16;
+		var offsetX = -parseInt($('.offset').offset().left)+50;
+		$('.tipso-animation').tipso({
+		      speed           : 100,
+		      background      : '#E91E63',
+		      color           : '#E91E63',
+		      position		  :'right',
+		      width           : 410,
+		      delay           : 400,
+		      animationIn	  : 'bounceIn',
+		      animationOut	  : 'bounceOut',
+		      offsetX         : offsetX,
+		      offsetY         : offsetY,
+		      content	      :'<div class="tipsdscontinue"> <span>图例：</span> <div class="dscrp sx"></div><span>：上行</span>  <div class="dscrp xx"></div> <span>：下行</span></br><div/></br>' +
+		      				   '<div class="tipsdscontinue"> <span>该模块支持鼠标拖拽、鼠标绘制(鼠标右键按下3S开始)框选功能.</span> <div/>' 
+		    
+		});
+		$('.tipso-animation').tipso('show');
+		setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
 		// 1、定义开始与结束时间点字符串.
 		var seMap = getStartAndEndDate(map);
 		// 2、获取开始与结束时间对象.
@@ -47,8 +67,6 @@
 		}else {
 			var jsonA = JSON.parse(objD);
-			console.log(jsonA.rsD);
-			console.log(jsonA.rsLP);
 			// 使用已有的时刻表明细数据渲染视图.
 			data = {'json':jsonA.rsD,'bxrcgs':null};
 			CSMap = {'gattA':null,'stopSpace': Math.round(map.zzsj/map.clzs),'maxCar':jsonA.rsLP};
@@ -153,8 +171,8 @@
 	 * @return 返回开始与结束时间字符串集合.
 	 * */
 	function getStartAndEndDate(map) {
-		return {'s':getMinDate(map.startStationFirstTime,map.endStationFirstTime),
-				'e':getMaxDate(map.startStationEndTime,map.endStationEndTime)}
+		return {'s': map.linePlayType=='1'? map.startStationFirstTime : getMinDate(map.startStationFirstTime,map.endStationFirstTime),
+				'e': map.linePlayType=='1'? map.startStationEndTime : getMaxDate(map.startStationEndTime,map.endStationEndTime)}
 	}
 	/**
@@ -676,4 +694,10 @@
 		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
@@ -102,7 +102,7 @@ $(&#39;#reladplus_mobal&#39;).on(&#39;reladplusMobal.show&#39;, function(e,obj,bf,cardata){
 			var zhbcA = bf.getLastTime(jsonArray,params.theCar);
 			if(zhbcA.length>0) {
 				var lastObj = zhbcA[0];
-				var cctag = bf.dirDmToIndex(lastObj.xlDir);
+				var cctag = obj.configuration.dataMap.map.linePlayType=='1' ? 0 : bf.dirDmToIndex(lastObj.xlDir);
 				// cctag = baseF.getfx(0,cctag);
 				// 定义停站时间
 				var	tzsj = obj.configuration.dataMap.ztjxA[cctag];
@@ -207,7 +207,6 @@
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['line'] = line;
-			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "query";
 			$(".hidden").removeClass("hidden");
@@ -225,11 +224,14 @@
 		}
 		$("#export").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
 			var params = {};
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['line'] = line;
-			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "export";
 			$get('/pcpc/firstAndLastBus', params, function(result){
@@ -248,22 +250,50 @@
 			<td>{{obj.company}}</td>
 			<td>{{obj.subCompany}}</td>
 			<td>{{obj.line}}</td>
-			<td>{{obj.qdzFirst0}}</td>
-			<td>{{obj.jhfcFirst0}}</td>
-			<td>{{obj.sjfcFirst0}}</td>
-			<td>{{obj.delayFirst0}}</td>
-			<td>{{obj.qdzLast0}}</td>
-			<td>{{obj.jhfcLast0}}</td>
-			<td>{{obj.sjfcLast0}}</td>
-			<td>{{obj.delayLast0}}</td>
-			<td>{{obj.qdzFirst1}}</td>
-			<td>{{obj.jhfcFirst1}}</td>
-			<td>{{obj.sjfcFirst1}}</td>
-			<td>{{obj.delayFirst1}}</td>
-			<td>{{obj.qdzLast1}}</td>
-			<td>{{obj.jhfcLast1}}</td>
-			<td>{{obj.sjfcLast1}}</td>
-			<td>{{obj.delayLast1}}</td>
+			{{if obj.delayFirst0 != '/' && obj.delayFirst0 != '0'}}
+				<td style="background-color: #FF9999">{{obj.qdzFirst0}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcFirst0}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcFirst0}}</td>
+				<td style="background-color: #FF9999">{{obj.delayFirst0}}</td>
+			{{else}}
+				<td>{{obj.qdzFirst0}}</td>
+				<td>{{obj.jhfcFirst0}}</td>
+				<td>{{obj.sjfcFirst0}}</td>
+				<td>{{obj.delayFirst0}}</td>
+			{{/if}}
+			{{if obj.delayLast0 != '/' && obj.delayLast0 != '0'}}
+				<td style="background-color: #FF9999">{{obj.qdzLast0}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcLast0}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcLast0}}</td>
+				<td style="background-color: #FF9999">{{obj.delayLast0}}</td>
+			{{else}}
+				<td>{{obj.qdzLast0}}</td>
+				<td>{{obj.jhfcLast0}}</td>
+				<td>{{obj.sjfcLast0}}</td>
+				<td>{{obj.delayLast0}}</td>
+			{{/if}}
+			{{if obj.delayFirst1 != '/' && obj.delayFirst1 != '0'}}
+				<td style="background-color: #FF9999">{{obj.qdzFirst1}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcFirst1}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcFirst1}}</td>
+				<td style="background-color: #FF9999">{{obj.delayFirst1}}</td>
+			{{else}}
+				<td>{{obj.qdzFirst1}}</td>
+				<td>{{obj.jhfcFirst1}}</td>
+				<td>{{obj.sjfcFirst1}}</td>
+				<td>{{obj.delayFirst1}}</td>
+			{{/if}}
+			{{if obj.delayLast1 != '/' && obj.delayLast1 != '0'}}
+				<td style="background-color: #FF9999">{{obj.qdzLast1}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcLast1}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcLast1}}</td>
+				<td style="background-color: #FF9999">{{obj.delayLast1}}</td>
+			{{else}}
+				<td>{{obj.qdzLast1}}</td>
+				<td>{{obj.jhfcLast1}}</td>
+				<td>{{obj.sjfcLast1}}</td>
+				<td>{{obj.delayLast1}}</td>
+			{{/if}}
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -67,9 +67,42 @@
 						</tbody>
 					</table>
-					<div style="text-align: right;">
-						<ul id="pagination" class="pagination"></ul>
-					</div>
+				</div>
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="map">
+						<thead>
+							<tr class="hidden">
+								<th style="display: none;"></th>
+								<th rowspan="2">线路</th>
+								<th colspan="4">上行首发</th>
+								<th colspan="4">上行末发</th>
+								<th colspan="4">下行首发</th>
+								<th colspan="4">下行末发</th>
+							</tr>
+							<tr class="hidden">
+								<th style="display: none;"></th>
+								<th>站点</th>
+								<th>计发</th>
+								<th>实发</th>
+								<th>快慢</th>
+								<th>站点</th>
+								<th>计发</th>
+								<th>实发</th>
+								<th>快慢</th>
+								<th>站点</th>
+								<th>计发</th>
+								<th>实发</th>
+								<th>快慢</th>
+								<th>站点</th>
+								<th>计发</th>
+								<th>实发</th>
+								<th>快慢</th>
+							</tr>
+						</thead>
+						<tbody>
+							
+						</tbody>
+					</table>
 				</div>
 			</div>
 		</div>
@@ -165,6 +198,18 @@
 			fage=true;
 		}
+		var list;
+		$("#forms tbody").on("click","a",function(){
+			var index = $(this).parent().parent().index();
+			$.each(list, function(i, g){
+				if(index == i){
+					var tbodyHtml = template('list_maps',{list:g.map});
+					$('#map tbody').html(tbodyHtml);
+					$("#map .hidden").removeClass("hidden");
+					$("html,body").animate({scrollTop:$("#map").offset().top},1000);
+				}
+			});
+		});
 		$("#query").on("click",jsDoQuery);
@@ -190,12 +235,15 @@
 			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "query";
-			$(".hidden").removeClass("hidden");
+			$("#forms .hidden").removeClass("hidden");
+			$("#map tr").addClass("hidden");
 			$get('/pcpc/firstAndLastBus_sum', params, function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_firstAndLastBus',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
+				
+				list = result;
 				if(result.length == 0)
 					$("#export").attr('disabled',"true");
@@ -205,6 +253,10 @@
 		}
 		$("#export").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
 			var params = {};
 			params['company'] = company;
 			params['subCompany'] = subCompany;
@@ -212,8 +264,8 @@
 			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "export";
-			$get('/pcpc/firstAndLastBus', params, function(result){
-				window.open("/downloadFile/download?fileName=线路首末班"+moment(date).format("YYYYMMDD"));
+			$get('/pcpc/firstAndLastBus_sum', params, function(result){
+				window.open("/downloadFile/download?fileName=线路首末班准点率"+moment(date).format("YYYYMMDD"));
 			});
 		});
@@ -230,7 +282,7 @@
 			<td>{{obj.line}}</td>
 			<td>{{obj.jhbc}}</td>
 			<td>{{obj.sjbc}}</td>
-			<td>{{obj.zdl}}</td>
+			<td><a id='delay'>{{obj.zdl}}</a></td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -238,4 +290,25 @@
 			<td colspan="20"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
+</script>
+<script type="text/html" id="list_maps">
+		<tr>
+			<td>{{list.line}}</td>
+			<td>{{list.qdzFirst0}}</td>
+			<td>{{list.jhfcFirst0}}</td>
+			<td>{{list.sjfcFirst0}}</td>
+			<td>{{list.delayFirst0}}</td>
+			<td>{{list.qdzLast0}}</td>
+			<td>{{list.jhfcLast0}}</td>
+			<td>{{list.sjfcLast0}}</td>
+			<td>{{list.delayLast0}}</td>
+			<td>{{list.qdzFirst1}}</td>
+			<td>{{list.jhfcFirst1}}</td>
+			<td>{{list.sjfcFirst1}}</td>
+			<td>{{list.delayFirst1}}</td>
+			<td>{{list.qdzLast1}}</td>
+			<td>{{list.jhfcLast1}}</td>
+			<td>{{list.sjfcLast1}}</td>
+			<td>{{list.delayLast1}}</td>
+		</tr>
 </script>
 \ No newline at end of file
@@ -11,14 +11,16 @@
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
-	 
 	 .table > tbody + tbody {
 	   border-top: 1px solid; }
+	#forms > tbody > tr{
+		background-color: #FFFFFF;
+	}
 </style>
 <div class="page-head">
 	<div class="page-title">
-		<h1>时刻表分析</h1>
+		<h1>时刻表分析(汇总)</h1>
 	</div>
 </div>
@@ -70,6 +72,9 @@
 						<thead>
 							<tr class="hidden">
 								<th style="display: none;"></th>
+								<th>公司</th>
+								<th>分公司</th>
+								<th>线路</th>
 								<th>时间段</th>
 								<th>上行班次</th>
 								<th>下行班次</th>
@@ -196,6 +201,8 @@
 			jsDoQuery(true);
 		});
+		var companyName = "";
+		var subCompanyName = "";
 		var line = $("#line").val();
 		var startDate = $("#startDate").val();
 		var endDate = $("#endDate").val();
@@ -232,7 +239,7 @@
 			$(".hidden").removeClass("hidden");
 			$get('/pcpc/scheduleAnaly_sum', params, function(result){
 				// 把数据填充到模版中
-				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList});
+				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList, companyName:companyName, subCompanyName:subCompanyName});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
@@ -362,6 +369,11 @@
 	{{each list as obj i}}
 		<tr>
 			<th style="display: none;"></th>
+			{{if i == 0}}
+				<td rowspan='8'>{{obj.company}}</td>
+				<td rowspan='8'>{{obj.subCompany}}</td>
+				<td rowspan='8'>{{obj.line}}</td>
+			{{/if}}
 			<td>{{obj.time}}</td>
 			<td>{{obj.upbc}}</td>
 			<td>{{obj.dnbc}}</td>
@@ -372,7 +384,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="9"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -9,7 +9,8 @@
                 <th style="width: 100%;">关联时刻表</th>
                 <th style="width: 150px;">排班开始日期</th>
                 <th style="width: 150px;">排班结束日期</th>
-                <th style="width: 250px;">排班人/操作时间</th>
+                <th style="width: 150px;">排班人/操作时间</th>
+                <th style="width: 100px;">状态</th>
                 <th style="width: 180px;">操作</th>
             </tr>
             <tr role="row" class="filter">
@@ -60,6 +61,7 @@
                     </div>
                 </td>
                 <td></td>
+                <td></td>
                 <td>
                     <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
                             ng-click="ctrl.doPage()">
@@ -94,9 +96,28 @@
                     <span ng-bind="info.scheduleToTime | date: 'yyyy-MM-dd '"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.updateBy.userName"></span>
-                    /
-                    <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
+                    <div>
+                        <a href="#">
+                            <i class="fa fa-user"></i>
+                            <span ng-bind="info.updateBy.userName"></span>
+                        </a>
+                    </div>
+                    <div>
+                        <a href="#">
+                            <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
+                        </a>
+                    </div>
+
+                </td>
+                <td>
+                    <a href="#" class="btn btn-success btn-sm" ng-if="info.planResult == 'ok'">
+                        <span>成功</span>
+                    </a>
+                    <a sweetalert
+                       sweet-options="{title: '排班错误信息',text: '线路：' + info.xl.name + '</br>开始时间：' + ctrl.toDateStr(info.scheduleFromTime) + '</br>结束时间：' + ctrl.toDateStr(info.scheduleToTime) + '</br>' + info.planResult, html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"
+                       sweet-on-confirm=""
+                       class="btn btn-danger btn-sm"
+                       ng-if="info.planResult != 'ok'">点击查错</a>
                 </td>
                 <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
@@ -66,6 +66,7 @@
                 <td>
                     <div>
                         <a href="#">
+                            <i class="fa fa-user"></i>
                             <span ng-bind="info.updateBy.userName"></span>
                         </a>
                     </div>
@@ -218,6 +218,14 @@
                     </div>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">是否停驶：</label>
+                        <div class="col-md-3">
+                            <sa-Radiogroup model="ctrl.TimeTableDetailForSave.isTS" dicgroup="truefalseType" name="isTS"></sa-Radiogroup>
+                        </div>
+
+                    </div>
+
                     <div class="form-group">
                         <label class="col-md-2 control-label">备注：</label>
                         <div class="col-md-3">
@@ -172,6 +172,14 @@
                     </div>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">是否停驶：</label>
+                        <div class="col-md-3">
+                            <sa-Radiogroup model="ctrl.tt.isTS" dicgroup="truefalseType" name="isTS"></sa-Radiogroup>
+                        </div>
+
+                    </div>
+
                     <div class="form-group">
                         <label class="col-md-2 control-label">备注：</label>
                         <div class="col-md-3">
@@ -573,6 +573,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 zdzCode: undefined,
                 bcType: undefined,
                 isFB: undefined,
+                isTS: undefined,
                 reSetTTinfoDetail: function(value) {
                     for (var key in this) {
                         if (!angular.isFunction(this[key])) {
@@ -116,10 +116,10 @@
                     <label class="uk-form-label" >调整说明</label>
                     <div class="uk-form-controls">
                         <select name="adjustExps">
-                          <option value="">请选择..</option>
-                          {{each adjustExps as exp i}}
+                            <option value="">请选择..</option>
+                            {{each adjustExps as exp i}}
                             <option value="{{exp}}">{{exp}}</option>
-                          {{/each}}
+                            {{/each}}
                         </select>
                     </div>
                 </div>
@@ -129,7 +129,7 @@
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
                     <div class="uk-form-controls" style="margin-top: 5px;">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" placeholder="备注，不超过50个字符">{{sch.remarks}}</textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" required name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" placeholder="备注，不超过50个字符">{{sch.remarks}}</textarea>
                     </div>
                 </div>
             </div>
@@ -54,7 +54,7 @@
                 <div class="uk-form-row ct-stacked">
                     <label class="uk-form-label" for="form-s-t">调整说明<small class="font-danger">（不超过20个字符）</small></label>
                     <div class="uk-form-controls">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="不超过20个字符。非必填"></textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" required data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="不超过20个字符。必填"></textarea>
                     </div>
                 </div>
             </div>
 <div class="uk-modal ct_move_modal" id="all-devices-modal">
-    <div class="uk-modal-dialog" style="width: 1100px;">
+    <div class="uk-modal-dialog" style="width: 1140px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
             <h2>所有接入平台的设备</h2></div>
@@ -25,6 +25,14 @@
                     <div class="uk-autocomplete uk-form autocomplete-device" >
                         <input type="text" name="deviceId" placeholder="设备号">
                     </div>
+                    <span class="horizontal-field">来源</span>
+                    <div class="uk-autocomplete uk-form" >
+                        <select name="source">
+                            <option value="">全部</option>
+                            <option value="1">网关</option>
+                            <option value="0">转发</option>
+                        </select>
+                    </div>
                     <button class="uk-button">检索</button>
                 </fieldset>
             </form>
@@ -35,12 +43,13 @@
                 <tr>
                     <th style="width: 14%;">线路</th>
                     <th style="width: 14%;">站点</th>
-                    <th style="width: 13%;">车辆</th>
-                    <th style="width: 13%;">设备号</th>
-                    <th style="width: 10%;">速度</th>
-                    <th style="width: 10%;">上下行</th>
+                    <th style="width: 11%;">车辆</th>
+                    <th style="width: 11%;">设备号</th>
+                    <th style="width: 9%;">速度</th>
+                    <th style="width: 9%;">上下行</th>
                     <th style="width: 10%;">程序版本</th>
                     <th>最后GPS时间</th>
+                    <th style="width: 8%;">来源</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -63,6 +72,15 @@
             <td>{{gps.upDown}}</td>
             <td>{{gps.version}}</td>
             <td>{{gps.timeStr}}</td>
+            <td>
+                {{if gps.source==1}}
+                    <span style="color: #1e1ef5;" title="已切换至新网关">网关</span>
+                {{else if gps.source==0}}
+                    <span style="color: #8e8e8e;" title="转接的数据，无法下发指令">转发</span>
+                {{else}}
+                    <span>未知</span>
+                {{/if}}
+            </td>
         </tr>
         {{/each}}
     </script>
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-05-09',
-        text: '<h5>恢复到了最新功能版本，并修复了临加时没有保存售票员的问题。</h5>'
+        date: '2017-05-12',
+        text: '<h5>现在班次调整时，备注是必填项</h5><h5>现在中途更换设备后，需要刷新缓存数据后，再刷新线调页面。</h5><h5>分班套跑车辆将在上午最后一个班次完成后发送线路切换指令。捕捉到出场信号时也会切换至出场班次所在线路，驾驶员请求出场时候也会同步一次状态</h5><h5>修复了一些其他问题。</h5>'
     };
     var storage = window.localStorage
@@ -864,6 +864,8 @@
                     if(typeof(upDown) == "undefined")
                         upDown = roadUpdown;
+                    if(upDown!= 0 && upDown != 1)
+                        return;
                     map.clearOverlays();
                     parkPolygons = {};//清除停车场对照
                     //路段
@@ -2,7 +2,7 @@
 ##2=时刻表明细编辑功能，数据工具移到时刻表里，类似工具栏的样子
 3=时刻表导入，可以选一个已经存在的时刻表导入，而不是excel文件
 ##4=所有的删除，作废，都要有提示框操作
-5=排班计划错误提示，如果选的排班日期之前没有排班，提示错误，排班结果有重复与时刻表不符合，显示错误
+##5=排班计划错误提示，如果选的排班日期之前没有排班，提示错误，排班结果有重复与时刻表不符合，显示错误
 ##6=调度执行日报，显示最近排班日期，修改操作强化
 7=警告功能，如时刻表选择相同的常规有效日，特殊有效日，车辆，人员配置重复等等
 8=时刻表明细编辑，颜色覆盖冲突
@@ -31,4 +31,5 @@
 ##30=时刻表公里数 三位数
 31=规则修改，路牌范围，人员范围可以拖动
-#32=人员配置不存在的情况下，导入规则ktr，找不到的人员不添加，人员范围不存在的，规则不导入
+##32=人员配置不存在的情况下，导入规则ktr，找不到的人员不添加，人员范围不存在的，规则不导入
+33=时刻表明细班次，里添加，是否停驶选项（计算工时使用）
@@ -7,6 +7,13 @@ update bsth_c_s_sp_rule_rst a
 set a.qyrq = (select qyrq from bsth_c_s_sr1_flat where id = a.rule_id)
 where a.qyrq is null;
+select * from bsth_c_s_sp_rule_rst
+where origingidindex is null;
+
+update bsth_c_s_sp_rule_rst a
+set a.origingidindex = (select lp_start from bsth_c_s_sr1_flat where id = a.rule_id)
+where a.origingidindex is null;
+
 970
 789
 604