Merge branch 'minhang' into pudong

潘钊
2 parents f3f87e47 cb3f9728
Showing 26 changed files with 491 additions and 273 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/forecast/ForecastRealServer.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/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/minifier.js
src/main/resources/fatso/start.js
src/main/resources/static/pages/base/timesmodel/add.html
src/main/resources/static/pages/base/timesmodel/css/index.css
src/main/resources/static/pages/base/timesmodel/edit-detail.html
src/main/resources/static/pages/base/timesmodel/gantt.html
-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;
@@ -67,4 +68,11 @@ public class anomalyCheckController {
     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;
@@ -24,6 +25,11 @@ public class ThreadMonotor extends Thread{
             GpsRealAnalyse.shutdown();
         }
  
+        if(GpsRealAnalyse.isIdle()){
+            //尝试使用网关的GPS实时对照数据
+            GpsDataLoaderThread.setFlag(-1);
+        }
+
         //webSocket 消息推送队列
         if(WebSocketPushQueue.isIdle()){
             log.warn("WebSocketPushQueue isIdle true !!!!");
-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();
+    }
+}
@@ -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;
@@ -2,8 +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.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.TreeMultimap;
@@ -11,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.*;
@@ -25,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);
  
@@ -35,12 +32,6 @@ public class GpsRealData implements CommandLineRunner {
     private static TreeMultimap<String, String> lineCode2Devices;
  
     @Autowired
-    GpsDataLoaderThread gpsDataLoader;
-
-    @Autowired
-    OfflineMonitorThread offlineMonitorThread;
-
-    @Autowired
     DayOfSchedule dayOfSchedule;
  
     @Autowired
@@ -54,15 +45,6 @@ public class GpsRealData implements CommandLineRunner {
         lineCode2Devices = TreeMultimap.create();
     }
  
-    @Override
-    public void run(String... arg0) throws Exception {
-        logger.info("gpsDataLoader,30,2");
-        //http形式获取GPS数据
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
-        //定时扫描掉离线
-        //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
-    }
-
  
     public void put(GpsEntity gps) {
         String device = gps.getDeviceId();
@@ -50,6 +50,10 @@ public class GpsRealAnalyse {
         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();
@@ -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
@@ -2,20 +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.ThreadMonotor;
-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;
@@ -33,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;
@@ -42,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
@@ -51,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());
  
@@ -95,9 +82,6 @@ public class DayOfSchedule implements CommandLineRunner {
     @Autowired
     GpsRealData gpsRealData;
  
-    @Autowired
-    BasicData.BasicDataLoader basicDataLoader;
-
     /**
      * 线路当前使用的排班的日期
      */
@@ -117,63 +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;
-
-    @Autowired
-    ThreadMonotor threadMonotor;
-
     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);
-
-        //监听
-        Application.mainServices.scheduleWithFixedDelay(threadMonotor, 120, 60, TimeUnit.SECONDS);
-    }
-
     //数据恢复
     private void dataRecovery() {
         GpsDataRecovery.run = true;
@@ -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');  
@@ -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];
 <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>