update...

潘钊
1 parent 112c42c9
Showing 22 changed files with 318 additions and 194 deletions
src/main/java/com/bsth/data/BasicData.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/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/ScheduleSignalState.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/home/tooltip.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/bc_type_major.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html
src/main/resources/static/real_control_v2/js/data/data_gps.js
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
src/main/resources/static/real_control_v2/js/line_schedule/dbclick.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/utils/svg_chart.js
src/main/resources/static/real_control_v2/js/utils/svg_chart_map.js
src/main/resources/static/real_control_v2/js/utils/svg_chart_tooltip.js
@@ -13,7 +13,6 @@ 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.stereotype.Component;
 import java.util.*;
@@ -26,7 +25,6 @@ import java.util.concurrent.TimeUnit;
  * @date 2016年8月10日 下午3:27:45
  */
 @Component
-@Order(value = 1)
 public class BasicData implements CommandLineRunner {
     //公司代码和公司名对照(K: 公司编码，V:公司名)
@@ -83,9 +81,13 @@ public class BasicData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(dataLoader, 0, 2, TimeUnit.HOURS);
+        Application.mainServices.scheduleWithFixedDelay(dataLoader, 2, 2, TimeUnit.HOURS);
     }
+    public static String getStationNameByCode(String code, String prefix){
+        String name = stationCode2NameMap.get(code);
+        return name != null? name: stationCode2NameMap.get(prefix + code);
+    }
     @Component
     public static class BasicDataLoader extends Thread {
@@ -86,7 +86,7 @@ public class ForecastRealServer implements CommandLineRunner {
 			//终点站
 			String eStation = null;
 			//当前执行班次
-			ScheduleRealInfo sch = dayOfSchedule.execPlanMap().get(nbbm);
+			ScheduleRealInfo sch = dayOfSchedule.executeCurr(nbbm);
 			if(null != sch)
 				eStation = sch.getZdzCode();
@@ -66,22 +66,41 @@ public class GpsRealData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,5");
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 30, TimeUnit.SECONDS);
     }
     public void put(GpsEntity gps) {
         String device = gps.getDeviceId();
-        gpsMap.put(device, gps);
+        GpsEntity old = gpsMap.get(device);
+
+        try {
+            if (!StringUtils.isEmpty(gps.getStopNo())) {
+                //站点编码改变
+                if (null == old || !gps.getStopNo().equals(old.getStopNo())) {
+                    gps.setArrTime(gps.getTimestamp());
+                    //预测到达终点时间
+                    forecastRealServer.forecast(gps.getNbbm(), gps);
+                } else {
+                    gps.setArrTime(old.getArrTime());
+                    //不预测， 重新计算终点时间
+                    gps.setExpectStopTime(forecastRealServer.expectStopTime(gps.getNbbm()));
+                }
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
-        if (StringUtils.isNotBlank(gps.getLineId())){
+        //刷新对照
+        gpsMap.put(device, gps);
+        if (StringUtils.isNotBlank(gps.getLineId())) {
             //站点名称
             gps.setStationName(getStationName(gps));
             lineCode2Devices.put(gps.getLineId(), device);
         }
     }
-    public String getStationName(GpsEntity gps){
-        return BasicData.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + gps.getStopNo());
+    public String getStationName(GpsEntity gps) {
+        return BasicData.getStationNameByCode(gps.getStopNo(), gps.getLineId() + "_" + gps.getUpDown() + "_");
     }
     /**
@@ -103,7 +122,7 @@ public class GpsRealData implements CommandLineRunner {
         for (String device : set) {
             gps = gpsMap.get(device);
             //过滤异常GPS数据
-            if (gps.isAbnormal())
+            if (gps == null || gps.isAbnormal())
                 continue;
             sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
@@ -206,8 +225,6 @@ public class GpsRealData implements CommandLineRunner {
                             gps.setNbbm(nbbm);
                         //有更新的点位
                         updateList.add(gps);
-                        //实时GPS数据集
-                        gpsRealData.put(gps);
                     }
                     //分析数据
                     gpsRealAnalyse.analyse(updateList);
 package com.bsth.data.gpsdata.arrival;
 import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.arrival.handlers.*;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import org.slf4j.Logger;
@@ -33,6 +34,9 @@ public class GpsRealAnalyse {
     @Autowired
     ReverseSignalHandle reverseSignalHandle;
+    @Autowired
+    GpsRealData gpsRealData;
+
     //50个线程
     static ExecutorService threadPool = Executors.newFixedThreadPool(50);
@@ -45,6 +49,10 @@ public class GpsRealAnalyse {
         try {
             //等待子线程结束
             count.await();
+
+            //加入实时gps对照
+            for(GpsEntity gps: list)
+                gpsRealData.put(gps);
         } catch (InterruptedException e) {
             logger.error("", e);
         }
@@ -181,7 +181,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             //持久化
             dayOfSchedule.save(sch);
             //下发调度指令
-            directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            //directiveService.send60Dispatch(next, doneSum, "到站@系统");
             //准备执行下一个班次
             if (next != null) {
@@ -100,7 +100,8 @@ public class ScheduleSignalState {
             //记录信号状态
             SignalState signalState = SignalState.reverseSignalSTate(sch, reverse);
-            signalStateData.put(signalState);
+            if(signalState != null)
+                signalStateData.put(signalState);
         }
     }
@@ -2,6 +2,8 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.bsth.Application;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.FirstScheduleCheckThread;
 import com.bsth.data.gpsdata.GpsRealData;
@@ -33,6 +35,7 @@ import org.springframework.stereotype.Component;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 /**
  * @author PanZhao
@@ -82,6 +85,9 @@ public class DayOfSchedule implements CommandLineRunner {
     @Autowired
     GpsRealData gpsRealData;
+    @Autowired
+    BasicData.BasicDataLoader basicDataLoader;
+
     /**
      * 线路当前使用的排班的日期
      */
@@ -122,13 +128,14 @@ public class DayOfSchedule implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
+        basicDataLoader.loadAllData();
         //从数据库恢复排班
-        //dataRecovery();
+        dataRecovery();
         //翻班线程
-//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
-//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
         //首班出场指令补发器
 //		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
         //班次误点扫描
@@ -14,7 +14,6 @@ import com.bsth.repository.schedule.*;
 import com.bsth.service.TrafficManageService;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
-import com.bsth.webService.trafficManage.geotool.services.Internal;
 import com.bsth.webService.trafficManage.geotool.services.InternalPortType;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap;
@@ -105,7 +104,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	// 运管处接口
-	private InternalPortType portType = new Internal().getInternalHttpSoap11Endpoint();
+	private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint();
 	private WebServiceSoap ssop ;
 	{
 		try {
@@ -17,65 +17,66 @@ import javax.transaction.Transactional;
 import java.util.Map;
 @Service
-public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService{
+public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService {
 	/*@Autowired
-	ScheduleRealInfoServiceImpl scheduleRealInfoService;*/
-
-	@Autowired
-	ScheduleRealInfoRepository scheduleRealInfoRepository;
-	
-	@Autowired
-	ChildTaskPlanRepository childTaskPlanRepository;
-	
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-	
-	@Autowired
-	Arrival2Schedule arrival2Schedule;
-
-	@Autowired
-	JdbcTemplate jdbcTemplate;
-	
-	@Transactional
-	@Override
-	public Map<String, Object> save(ChildTaskPlan t) {
-		Map<String, Object> rs;
-		//保存起终点名称
-		Map<String, String> map = BasicData.stationCode2NameMap;
-		
-		t.setStartStationName(map.get(t.getStartStation()));
-		t.setEndStationName(map.get(t.getEndStation()));
-		//先持久化子任务
-		rs = super.save(t);
-		//再关联主任务
-		ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
-		sch.getcTasks().add(t);
-		dayOfSchedule.save(sch);
-		
-		rs.put("t", sch);
-		
-		if(sch.getZdsjActual() == null)
-			arrival2Schedule.removeExpect(sch.getClZbh());
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> delete(Long id) {
-		Map<String, Object> rs;
-		
-		ChildTaskPlan cPlan = childTaskPlanRepository.findOne(id);
-		//解除和主任务关联
-		ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
-		sch.getcTasks().remove(cPlan);
-		//删除关联表数据
-		jdbcTemplate.execute("delete from bsth_c_s_sp_info_real_c_tasks where bsth_c_s_sp_info_real="+sch.getId()+" and c_tasks="+cPlan.getId());
-
-		//删除子任务
-		rs = super.delete(id);
-		dayOfSchedule.save(sch);
-
-		rs.put("t", sch);
-		return rs;
-	}
+    ScheduleRealInfoServiceImpl scheduleRealInfoService;*/
+
+    @Autowired
+    ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+    @Autowired
+    ChildTaskPlanRepository childTaskPlanRepository;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    Arrival2Schedule arrival2Schedule;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Transactional
+    @Override
+    public Map<String, Object> save(ChildTaskPlan t) {
+        ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
+        Map<String, Object> rs;
+        //保存起终点名称
+        Map<String, String> map = BasicData.stationCode2NameMap;
+        String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+
+        t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
+        t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
+        //先持久化子任务
+        rs = super.save(t);
+        //再关联主任务
+        sch.getcTasks().add(t);
+        dayOfSchedule.save(sch);
+
+        rs.put("t", sch);
+
+        if (sch.getZdsjActual() == null)
+            arrival2Schedule.removeExpect(sch.getClZbh());
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> delete(Long id) {
+        Map<String, Object> rs;
+
+        ChildTaskPlan cPlan = childTaskPlanRepository.findOne(id);
+        //解除和主任务关联
+        ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
+        sch.getcTasks().remove(cPlan);
+        //删除关联表数据
+        jdbcTemplate.execute("delete from bsth_c_s_sp_info_real_c_tasks where bsth_c_s_sp_info_real=" + sch.getId() + " and c_tasks=" + cPlan.getId());
+
+        //删除子任务
+        rs = super.delete(id);
+        dayOfSchedule.save(sch);
+
+        rs.put("t", sch);
+        return rs;
+    }
 }
@@ -165,8 +165,8 @@ svg.line-chart g.item:nth-last-child(3)&gt;text {
 }
 svg.line-chart g.gps-wrap>rect {
-    width: 28px;
-    height: 24px;
+    width: 34px;
+    height: 18px;
     /*fill: #fff;*/
     rx: 4px;
     cursor: pointer;
@@ -188,7 +188,7 @@ svg.line-chart g.gps-wrap&gt;rect.hover {
 svg.line-chart g.gps-wrap>text {
     font-size: 13px;
-    transform: translate(3px, 17px);
+    transform: translate(2px, 14px);
     pointer-events: none;
 }
@@ -19,11 +19,12 @@
             </div>
             <div>
               <span class="field">速度：</span>{{speed}}</div>
-            <hr>
+            <div>
+                <span class="field">时间：</span>{{dateStr}}</div>
+            {{if expectStopTime!=null}}
             <div>
               预计 {{expectStopTime}} 分钟到达终点</div>
-            <!-- <hr> -->
-            <!-- <div class="subtitle">更新时间: 10:34.26</div> -->
+            {{/if}}
             <div class="tip_map_wrap"></div>
         </div>
       </div>
@@ -43,12 +44,15 @@
             <div>
               <span class="field">设备：</span>{{gps.deviceId}}
             </div>
-            <div>
+            <div style="color: #747272;">
+                {{gps.dateStr}}
+            </div>
+            <!--<div>
               <span class="field">进站时间：</span>?
             </div>
             <div>
               <span class="field">计划发出：</span>?
-            </div>
+            </div>-->
         </div>
         </div>
@@ -15,7 +15,7 @@
                 </div>
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
-                        <label class="uk-form-label" style="width: 75px;">放大站至</label>
+                        <label class="uk-form-label" style="width: 75px;">放站至</label>
                         <div class="uk-form-controls" style="margin-left: 75px;">
                             <select name="endStation">
                             </select>
@@ -53,11 +53,31 @@
             var remarks;
             function refreshDirectiveStr() {
+
+                var $qdz = $('[name=startStation]')
+                        , $zdz = $('[name=endStation]');
                 //指令内容
-                var qdzName = $('[name=startStation]').find("option:selected").text()
-                        , zdzName = $('[name=endStation]').find("option:selected").text();
-                remarks=' 由 ' + qdzName + ' 放站至 ' + zdzName;
-                $('[name=directiveStr]', modal).text('班次：'+sch.dfsj+remarks).trigger('input');
+                var qdzName = $qdz.find("option:selected").text()
+                        , zdzName = $zdz.find("option:selected").text();
+
+                //只修改起点
+                if(sch.qdzCode != $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 待客至 ' + qdzName + ' ，放站至 ' + zdzName;
+                }
+                //只修改终点
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 放站至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都改变
+                else if(sch.qdzCode != $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 放站至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都不改变
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 放站至 ' + zdzName;
+                }
+
+                $('[name=directiveStr]', modal).text('班次：' + sch.dfsj + remarks).trigger('input');
             }
             $('[name=startStation]', modal).on('change', function () {
@@ -6,7 +6,7 @@
             <div class="uk-grid">
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
-                        <label class="uk-form-label" style="width: 75px;">从</label>
+                        <label class="uk-form-label" style="width: 75px;">起点</label>
                         <div class="uk-form-controls" style="margin-left: 75px;">
                             <select name="startStation">
                             </select>
@@ -15,7 +15,7 @@
                 </div>
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
-                        <label class="uk-form-label" style="width: 75px;">直放至</label>
+                        <label class="uk-form-label" style="width: 75px;">终点</label>
                         <div class="uk-form-controls" style="margin-left: 75px;">
                             <select name="endStation">
                             </select>
@@ -53,12 +53,30 @@
             var remarks;
             function refreshDirectiveStr() {
+                var $qdz = $('[name=startStation]')
+                        , $zdz = $('[name=endStation]');
                 //指令内容
-                var qdzName = $('[name=startStation]').find("option:selected").text()
-                        , zdzName = $('[name=endStation]').find("option:selected").text();
+                var qdzName = $qdz.find("option:selected").text()
+                        , zdzName = $zdz.find("option:selected").text();
-                remarks=' 由 ' + qdzName + ' 直放至 ' + zdzName;
-                $('[name=directiveStr]', modal).text('班次：'+sch.dfsj+ remarks).trigger('input');
+                //只修改起点
+                if(sch.qdzCode != $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 待客至 ' + qdzName + ' ，直放至 ' + zdzName;
+                }
+                //只修改终点
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 直放至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都改变
+                else if(sch.qdzCode != $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 直放至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都不改变
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 直放至 ' + zdzName;
+                }
+
+                $('[name=directiveStr]', modal).text('班次：' + sch.dfsj + remarks).trigger('input');
             }
             $('[name=startStation]', modal).on('change', function () {
@@ -98,7 +116,7 @@
                 f.on('success.form.fv', function (e) {
                     e.preventDefault();
                     var data = $(this).serializeJSON();
-                   // notify_wait('准备下发指令')
+                    // notify_wait('准备下发指令')
                     //下发指令
                     $.post('/directive/phrase', {nbbm: sch.clZbh, text: data.directiveStr}, function (rs) {
                         if (rs == 0) {
@@ -128,7 +146,10 @@
             function changeBcType() {
                 //将班次类型调整为直放
-                gb_common.$post('/realSchedule/changeBcType/'+sch.id, {bcType: 'venting', remarks: remarks}, function(rs){
+                gb_common.$post('/realSchedule/changeBcType/' + sch.id, {
+                    bcType: 'venting',
+                    remarks: remarks
+                }, function (rs) {
                     UIkit.modal(modal).hide();
                     gb_schedule_table.updateSchedule(rs.t);
                     //触发父容器刷新事件
@@ -3,7 +3,7 @@
 var gb_data_gps = (function() {
     //fixed time refresh delay
-    var delay = 1000 * 6;
+    var delay = 1000 * 60;
     //deviceId ——> gps
     var realData = {};
     //refresh after callback
@@ -51,8 +51,10 @@ var gb_data_gps = (function() {
             } else
                 addArr.push(this);
             //起终点 拼接方向标识
-            if(this.sEPoint)
-                this.stopNo=this.stopNo+'_'+this.upDown;
+            /*if(this.sEPoint)
+                this.stopNo=this.stopNo+'_'+this.upDown;*/
+            //时间格式化
+            this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
             realData[this.deviceId] = this;
         });
@@ -190,4 +190,6 @@ var gb_schedule_context_menu = (function() {
             }
         }
     });
+
+    return callbackHandler;
 })();
@@ -67,15 +67,23 @@ var gb_schedule_table_dbclick = (function() {
             'cancel': {
                 name: '取消',
                 icon: "delete"
-            },
-            'save': {
-                name: '保存',
-                icon: "edit"
             }
         }
     });
+    
+    var sfsjCellClick = function (elem) {
+        elem.dblclick(function () {
+
+            var id = $(this).parent().data('id'),
+                lineCode = $(this).parents('li.line_schedule').data('id');
+
+            var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
+            gb_schedule_context_menu.fcxxwt(sch);
+        });
+    };
     return {
-        init: init
+        init: init,
+        sfsjCellClick:sfsjCellClick
     };
 })();
@@ -108,6 +108,9 @@ var gb_schedule_table = (function () {
                 }
             });
         });
+
+        //双击
+        gb_schedule_table_dbclick.sfsjCellClick($('dd.fcsjActualCell'));
     }
     //重置序号
@@ -192,20 +195,20 @@ var gb_schedule_table = (function () {
         if (!isArray(schArr))
             schArr = [schArr];
-        var tMaps={};
+        var tMaps = {};
         $.each(schArr, function () {
             line2Schedule[this.xlBm][this.id] = this;
             updateDom(this);
             //线路_车辆 过滤重复数据
-            tMaps[this.xlBm+'_'+this.clZbh]=1;
+            tMaps[this.xlBm + '_' + this.clZbh] = 1;
         });
- /*       //重新标记末班
-        var ts=[];
-        for(var k in tMaps){
-            ts = k.split('_');
-            markerLastByNbbm(ts[0], ts[1]);
-        }*/
+        /*       //重新标记末班
+         var ts=[];
+         for(var k in tMaps){
+         ts = k.split('_');
+         markerLastByNbbm(ts[0], ts[1]);
+         }*/
     };
     //update dom
@@ -218,10 +221,10 @@ var gb_schedule_table = (function () {
         //车辆自编号
         $(dds[2]).replaceWith(temps['line-schedule-nbbm-temp'](sch));
         //if (sch.qdzArrDateJH)
-        $(dds[3]).text(sch.qdzArrDateJH?sch.qdzArrDateJH:'');
+        $(dds[3]).text(sch.qdzArrDateJH ? sch.qdzArrDateJH : '');
         //if (sch.qdzArrDateSJ)
-        $(dds[4]).text(sch.qdzArrDateSJ?sch.qdzArrDateSJ:'');
+        $(dds[4]).text(sch.qdzArrDateSJ ? sch.qdzArrDateSJ : '');
         //计发时间
         $(dds[5]).replaceWith(temps['line-schedule-fcsj-temp'](sch));
@@ -229,7 +232,9 @@ var gb_schedule_table = (function () {
         //实发时间
         calc_sch_real_shift(sch);
-        var sfsjDd = temps['line-schedule-sfsj-temp'](sch);
+        var sfsjDd = $(temps['line-schedule-sfsj-temp'](sch));
+        //双击
+        gb_schedule_table_dbclick.sfsjCellClick(sfsjDd);
         $(dds[7]).replaceWith(sfsjDd);
         if (sch.remarks)
             $(dds[8]).html('<span title="' + sch.remarks + '" data-uk-tooltip="{pos:\'top-left\'}">' + sch.remarks + '</span>');
@@ -239,7 +244,7 @@ var gb_schedule_table = (function () {
         //信号状态标记
         gb_signal_state.marker_sch(sch);
         //班次是车辆的最后一班
-        if(dl.hasClass('dl-last-sch'))
+        if (dl.hasClass('dl-last-sch'))
             markerLastSch([sch]);
     };
@@ -420,13 +425,13 @@ var gb_schedule_table = (function () {
     //清除线路下指定班次的 末班标记
     var removeMarkers = function (lineCode, array) {
-        var idx=[];
+        var idx = [];
         $.each(array, function () {
             idx.push(this.id);
         });
-        $('dl.dl-last-sch','li.line_schedule[data-id=' + lineCode + ']').each(function () {
-            if($(this).hasClass('dl-last-sch') && idx.indexOf($(this).data('id'))){
+        $('dl.dl-last-sch', 'li.line_schedule[data-id=' + lineCode + ']').each(function () {
+            if ($(this).hasClass('dl-last-sch') && idx.indexOf($(this).data('id'))) {
                 $(this).removeClass('dl-last-sch').find('.last-sch-sunken').remove();
             }
         });
 /* 线路模拟图 */
-var gb_svg_chart = (function() {
+var gb_svg_chart = (function () {
     //chart height
     var chart_height = 123;
@@ -11,22 +11,22 @@ var gb_svg_chart = (function() {
     //svg namespace
     var svgns = 'http://www.w3.org/2000/svg';
-    var calc_text_y = function(t) {
+    var calc_text_y = function (t) {
             return (chart_height - (chart_height / t_max_size * t.length)) / 2 + 5;
         },
-        cat_text = function(t) {
+        cat_text = function (t) {
             return t.length > t_max_size ? t.substr(0, t_max_size) : t;
         },
-        get_width = function(wrap) {
+        get_width = function (wrap) {
             return wrap.actual('outerWidth');
         },
-        get_height = function(wrap) {
+        get_height = function (wrap) {
             var h = wrap.actual('outerHeight');
             //隐藏元素取最外层的高度
             return h < 20 ? wrap.parent().actual('outerHeight') - 2 : h;
         }
-    var draw_line = function(lineCode, wrap) {
+    var draw_line = function (lineCode, wrap) {
         var data = gb_svg_data_convert.mergeRoute(gb_data_basic.stationRoutes(lineCode)),
             len = data.length;
@@ -36,22 +36,22 @@ var gb_svg_chart = (function() {
             //x scale
             ,
             xScale = d3.scale.linear().range([x_padd, w - x_padd]).domain([0, len - 1]),
-            cx = function(d, i) {
+            cx = function (d, i) {
                 return xScale(i);
             },
-            cy = function() {
+            cy = function () {
                 return (h - chart_height) / 2;
             },
-            ty = function(d) {
+            ty = function (d) {
                 return cy() + calc_text_y(cat_text(d.name[0]));
             }
             //line generator
             ,
             upLine = d3.svg.line().x(xScale).y(cy),
-            downLine = d3.svg.line().x(xScale).y(function() {
+            downLine = d3.svg.line().x(xScale).y(function () {
                 return cy() + chart_height
             }),
-            multi_text = function(d, i, that) {
+            multi_text = function (d, i, that) {
                 var dText = document.createElementNS(svgns, 'text'),
                     t = cat_text(d.name[1]);
@@ -82,14 +82,14 @@ var gb_svg_chart = (function() {
             'station_link': true
         };
         items.append('path').classed(p_clzz)
-            .attr('d', function(d, i) {
+            .attr('d', function (d, i) {
                 return i < len - 1 ? upLine([i, i + 1]) : '';
             });
         //down station link path
         p_clzz.down = true;
         items.append('path').classed(p_clzz)
-            .attr('d', function(d, i) {
+            .attr('d', function (d, i) {
                 return i < len - 1 ? downLine([i, i + 1]) : '';
             });
@@ -97,40 +97,44 @@ var gb_svg_chart = (function() {
         var c_clzz = {
             'station_circle': true
         };
-        items.select(function (d) {return d.type!=1?this:null;})
+        items.select(function (d) {
+            return d.type != 1 ? this : null;
+        })
             .append('circle').classed(c_clzz)
             .attr('cx', cx)
             .attr('cy', cy)
-            .attr('data-id', function(d) {
+            .attr('data-id', function (d) {
                 return d.id[0];
             });
         //down circle
         c_clzz.down = true;
-        items.select(function (d) {return d.type!=0?this:null;})
+        items.select(function (d) {
+            return d.type != 0 ? this : null;
+        })
             .append('circle').classed(c_clzz)
             .attr('cx', cx)
-            .attr('cy', function(d, i) {
+            .attr('cy', function (d, i) {
                 return cy(d, i) + chart_height;
             })
-            .attr('data-id', function(d) {
-                return d.type==1?d.id[0]:d.id[1];
+            .attr('data-id', function (d) {
+                return d.type == 1 ? d.id[0] : d.id[1];
             });
         //station name text
         items.append('text').classed({
-                'station_text': true,
-                'up': function(d) {
-                    return d.type == 3 ? true : false;
-                }
-            })
-            .text(function(d) {
+            'station_text': true,
+            'up': function (d) {
+                return d.type == 3 ? true : false;
+            }
+        })
+            .text(function (d) {
                 return cat_text(d.name[0]);
             })
-            .attr('title', function(d) {
+            .attr('title', function (d) {
                 return d.name[0];
             })
-            .attr('x', function(d, i) {
+            .attr('x', function (d, i) {
                 return d.type == 3 ? multi_text(d, i, this) : cx(d, i)
             })
             .attr('y', ty);
@@ -149,90 +153,95 @@ var gb_svg_chart = (function() {
     // ----- draw gps ------
     //gps 按线路站点分组后的下标映射
     var line_gps_index = {};
-    var get_circle = function(dataId, svg) {
+    var get_circle = function (dataId, svg) {
             try {
                 var circle = $('.station_circle[data-id=' + dataId + ']', svg);
                 if (circle.length == 0)
                     circle = null;
-            }catch (e){
+            } catch (e) {
                 console.log('get_circle error! station_circle data-id:' + dataId);
                 return null;
             }
             return circle;
         },
-        gx = function(gps, svg) {
-            var circle = get_circle(gps.stopNo, svg);
+        gx = function (gps, svg) {
+            var circle = get_circle(gps.stopNo + '_' + gps.upDown, svg);
             if (!circle) return -100;
             return circle.attr('cx') - 14;
         },
-        gy = function(gps, svg) {
-            var circle = get_circle(gps.stopNo, svg);
+        gy = function (gps, svg) {
+            var circle = get_circle(gps.stopNo + '_' + gps.upDown, svg);
             if (!circle) return -100;
             var cy = parseInt(circle.attr('cy')),
-                index = line_gps_index[gps.lineId][gps.stopNo][gps.deviceId];
+                index = line_gps_index[gps.lineId][gps.stopNo + '_' + gps.upDown][gps.deviceId];
-            return gps.upDown == 0 ? cy - 31 - (index * 28) : cy + 7 + (index * 28);
+            return gps.upDown == 0 ? cy - 25 - (index * 21) : cy + 7 + (index * 21);
         },
-        ups_gps = function(d) {
+        ups_gps = function (d) {
             return d.gpsUps;
         },
-        downs_gps = function(d) {
+        downs_gps = function (d) {
             return d.gpsDowns;
         },
-        gps_index_mapp = function(data) {
+        gps_index_mapp = function (data) {
             var rs = {};
-            var dataGroupStop = gb_common.groupBy(data, 'stopNo');
+            var dataGroupStop = gb_svg_data_convert.groupByStationAndUpdown(data);
             for (var stopNo in dataGroupStop) {
                 rs[stopNo] = {};
-                $.each(dataGroupStop[stopNo], function(i, gps) {
+                $.each(dataGroupStop[stopNo], function (i, gps) {
                     rs[stopNo][gps.deviceId] = i;
                 });
             }
             return rs;
         },
-        g_text = function(d) {
-            var len = (d.nbbm == false ? 0 : d.nbbm.length);
-            return len > 3 ? d.nbbm.substr(len - 3) : d.nbbm;
+        g_text = function (d) {
+            var len = (d.nbbm == false ? 0 : d.nbbm.length)
+                , t = len > 3 ? d.nbbm.substr(len - 3) : d.nbbm;
+
+            if (d.nbbm.indexOf('-') > 1) {
+                t = d.nbbm.substr(d.nbbm.indexOf('-') - 1, 1) + t;
+            }
+            return t;
         },
-        gps_key = function(d) {
+        gps_key = function (d) {
             return d.deviceId;
         },
-        gps_update_point = function(e, svg) {
-            e.transition().attr('x', function(d) {
-                    return gx(d, svg);
-                })
-                .attr('y', function(d) {
+        gps_update_point = function (e, svg) {
+            e.transition().attr('x', function (d) {
+                return gx(d, svg);
+            })
+                .attr('y', function (d) {
                     return gy(d, svg);
                 })
-                .attr('updown', function(d) {
+                .attr('updown', function (d) {
                     return d.upDown;
                 });
             //update tip position
             gb_svg_tooltip.update(e);
         },
-        rct_id = function(d) {
+        rct_id = function (d) {
             return 'rct_' + d.deviceId;
         },
-        tx_id = function(d) {
+        tx_id = function (d) {
             return 'tx_' + d.deviceId;
         }
-    var setGps = function(lineCode) {
+    var setGps = function (lineCode) {
         var svgs = $('.line-chart[data-code=' + lineCode + ']'),
             data = gb_data_gps.gpsByLineCode(lineCode);
-       var list=[];
+        var list = [];
         //过滤无站点字段的数据
-        $.each(data, function(){
-            if(!this.stopNo || this.stopNo=='')
+        $.each(data, function () {
+            if (!this.stopNo || this.stopNo == '')
                 return true;
             list.push(this);
         });
         line_gps_index[lineCode] = gps_index_mapp(list);
-        $.each(svgs, function() {
+        $.each(svgs, function () {
             //绘制gps
             draw_gps(this, list);
             //聚合gps
@@ -241,7 +250,7 @@ var gb_svg_chart = (function() {
     };
-    var draw_gps = function(svg, data) {
+    var draw_gps = function (svg, data) {
         //remove merge_hide class
         $('.merge_hide', svg).removeAttr('class');
@@ -256,22 +265,22 @@ var gb_svg_chart = (function() {
         gps_update_point(ts, svg);
     };
-    var marker_clusterer = function(svg, lineCode) {
-      //debugger
+    var marker_clusterer = function (svg, lineCode) {
+        //debugger
         var gpsArr, idxMapp = line_gps_index[lineCode];
-            //svgs = $('.line-chart[data-code=' + lineCode + ']');
+        //svgs = $('.line-chart[data-code=' + lineCode + ']');
         for (var stopNo in idxMapp) {
             gpsArr = gb_common.get_keys(idxMapp[stopNo]);
             //remove old merger point
             $('g[_id=' + 'merger_' + stopNo + ']', svg).remove();
             if (gpsArr.length <= 2)
-              continue;
+                continue;
             marker_clusterer_merge(svg, stopNo, gpsArr);
         }
     }
-    var marker_clusterer_merge = function(svg, stopNo, gpsArr) {
+    var marker_clusterer_merge = function (svg, stopNo, gpsArr) {
         //stop circle
         var circle = get_circle(stopNo, svg);
         if (!circle) return;
@@ -282,7 +291,7 @@ var gb_svg_chart = (function() {
         var svg = d3.select(svg);
         //hide old element
-        $.each(gpsArr, function(i, d) {
+        $.each(gpsArr, function (i, d) {
             $('rect[_id=rct_' + d + '],text[_id=tx_' + d + ']').attr('class', 'merge_hide');
         });
@@ -292,7 +301,7 @@ var gb_svg_chart = (function() {
             });
         //merge rect
         mergerG.append('rect').attr('x', x - 12)
-            .attr('y', function() {
+            .attr('y', function () {
                 return isDown ? y + 7 : y - 32;
             });
         //merge text
@@ -37,14 +37,15 @@ var gb_svg_map_util = (function () {
     var drawStationMarker = function (routeItem) {
         var station = routeItem.station,
+            name = routeItem.stationName,
             coord = TransGPS.wgsToBD(station.gLaty, station.gLonx);
         var marker = new BMap.Marker(new BMap.Point(coord.lng, coord.lat));
         //label
-        var offsetX = Math.abs(station.stationName.length / 2 * 12),
+        var offsetX = Math.abs(name.length / 2 * 12),
             offsetY = -20,
-            label = new BMap.Label(station.stationName, {
+            label = new BMap.Label(name, {
                 offset: new BMap.Size(-offsetX, offsetY)
             });
@@ -13,6 +13,7 @@ var gb_svg_tooltip = (function () {
         if (rect.attr('aria-describedby'))
             return;
         var gps = gb_data_gps.findOne($(this).attr('_id').split('_')[1]);
+        console.log('gps', gps);
         $(this).qtip({
             show: {
                 ready: true,
@@ -151,7 +152,7 @@ var gb_svg_tooltip = (function () {
     function searchByStop(list, stop) {
         var rs = [];
         $.each(list, function () {
-            if (this.stopNo == stop)
+            if ((this.stopNo + '_' + this.upDown) == stop)
                 rs.push(this);
         });
         return rs;
@@ -103,14 +103,30 @@ var gb_svg_data_convert = (function() {
     };
     var get_station_code=function (station) {
-        if(station.stationMark=='B' || station.stationMark=='E')
+        /*if(station.stationMark=='B' || station.stationMark=='E')
             return station.stationCode+'_'+station.directions;
         else
-            return station.stationCode;
+            return station.stationCode;*/
+        return station.stationCode+'_'+station.directions;
     };
     var nvl_get = function(list, index) {
         return list[index] == null ? {} : list[index];
     };
-    return {mergeRoute: mergeRoute};
+
+    var groupByStationAndUpdown = function (data) {
+        //gb_common.groupBy(data, 'stopNo')
+        var rs = {},
+            key;
+        $.each(data, function () {
+            key = this['stopNo'] + '_' + this['upDown'];
+            if (!rs[key])
+                rs[key] = [];
+
+            rs[key].push(this);
+        });
+
+        return rs;
+    };
+    return {mergeRoute: mergeRoute, groupByStationAndUpdown: groupByStationAndUpdown};
 })();
@@ -394,7 +394,7 @@ var gb_map_baidu = (function(){
 		//线路名
 		gps.lineName = gb_data_basic.lineCode2NameAll()[gps.lineId];
 		//时间
-		gps.dateStr = moment(gps.timestamp).format('YYYY-MM-DD HH:mm:ss');
+		//gps.dateStr = moment(gps.timestamp).format('YYYY-MM-DD HH:mm:ss');
 		marker.infoWindow.setContent(gb_map_overlay_mge.map_gps_win_temp(gps));
 		map.openInfoWindow(marker.infoWindow, marker.point);