Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents 7838805f c3898a2d
Showing 29 changed files with 446 additions and 112 deletions
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/AbnormalStateHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/OfflineSignalHandle.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/data/gpsdata/thread/OfflineMonitorThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/static/real_control_v2/css/home.css
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/home/line_panel.html
src/main/resources/static/real_control_v2/fragments/home/tooltip.html
src/main/resources/static/real_control_v2/fragments/north/nav/curr_date_schedule.html
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config.html
@@ -22,6 +22,9 @@ public class BasicDataController {
 	@Autowired
 	BasicData.BasicDataLoader dataLoader;
+	@Autowired
+	BasicData basicData;
+
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@RequestMapping("/cars")
@@ -114,4 +117,13 @@ public class BasicDataController {
 		}
 		return rs;
 	}
+
+	/**
+	 * 车辆自编号和车牌号对照
+	 * @return
+	 */
+	@RequestMapping("/nbbm2PlateNo")
+	public Map<String, String> nbbm2PlateNo(){
+		return basicData.getNbbm2PlateNo();
+	}
 }
@@ -7,6 +7,7 @@ import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.joda.time.format.DateTimeFormat;
@@ -444,9 +445,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * 获取当日计划排班 ， 从计划表抓取数据
 	 * @return
 	 */
-	@RequestMapping(value = "currentSchedulePlan", method = RequestMethod.GET)
-	public Map<String, Object> currentSchedulePlan(@RequestParam String lineCodes){
-		return scheduleRealInfoService.currentSchedulePlan(lineCodes);
+	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
+	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
+		return scheduleRealInfoService.currentSchedulePlan(lineCode);
 	}
-	
 }
@@ -13,6 +13,7 @@ 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.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import java.util.*;
@@ -89,6 +90,18 @@ public class BasicData implements CommandLineRunner {
         return name != null? name: stationCode2NameMap.get(prefix + code);
     }
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+    public Map<String, String> getNbbm2PlateNo(){
+        List<Map<String, Object>> list = jdbcTemplate.queryForList("select CAR_CODE,CAR_PLATE from bsth_c_cars where CAR_CODE is not null and CAR_PLATE is not null");
+
+        Map<String, String> rs = new HashMap<>();
+        for(Map<String, Object> map : list){
+            rs.put(map.get("CAR_CODE").toString(), map.get("CAR_PLATE").toString());
+        }
+        return rs;
+    }
+
     @Component
     public static class BasicDataLoader extends Thread {
@@ -3,6 +3,7 @@ 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;
@@ -35,6 +36,9 @@ public class GpsRealData implements CommandLineRunner {
     GpsDataLoaderThread gpsDataLoader;
     @Autowired
+    OfflineMonitorThread offlineMonitorThread;
+
+    @Autowired
     DayOfSchedule dayOfSchedule;
     @Autowired
@@ -54,9 +58,10 @@ public class GpsRealData implements CommandLineRunner {
         //定时从网关获取GPS数据
         //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 15, TimeUnit.SECONDS);
         //定时扫描掉离线
-
+        //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 60, 20, TimeUnit.SECONDS);
     }
+
     public void put(GpsEntity gps) {
         String device = gps.getDeviceId();
         GpsEntity old = gpsMap.get(device);
@@ -19,10 +19,22 @@ public abstract class SignalHandle {
         return prevs != null && prevs.size() > 0 && prevs.getTail() != null;
     }
-    protected boolean isDriftSignal(GpsEntity gps) {
+/*    protected boolean isDriftSignal(GpsEntity gps) {
+        return gps.getLat() == 0 || gps.getLon() == 0;
+    }*/
+
+    /**
+     * gps掉线
+     * @param gps
+     * @return
+     */
+    protected boolean isGpsOffline(GpsEntity gps){
         return gps.getLat() == 0 || gps.getLon() == 0;
     }
+    protected boolean isOffline(GpsEntity gps){
+        return gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline");
+    }
     /**
      * 是不是异常信号
      *
@@ -34,7 +46,7 @@ public abstract class SignalHandle {
     /**
      * 连续异常信号个数统计
      *
-     * @param prevs
+     * @param
      * @return protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
      * int count = 0;
      * <p>
@@ -78,9 +90,9 @@ public abstract class SignalHandle {
             return false;
         GpsEntity prev = prevs.getTail();
-        //从漂移状态恢复
-        if (isDriftSignal(prev)
-                && !isDriftSignal(gps)) {
+        //从异常状态恢复
+        if (isGpsOffline(prev)
+                && !isGpsOffline(gps)) {
             return true;
         }
@@ -30,6 +30,9 @@ public class AbnormalStateHandle extends SignalHandle{
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        if(isOffline(gps))
+            return false;
+
         if(overspeed(gps))
             return true;
@@ -48,8 +48,8 @@ public class InOutStationSignalHandle extends SignalHandle{
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //忽略漂移信号
-        if(isDriftSignal(gps))
+        //忽略掉线信号
+        if(isGpsOffline(gps))
             return false;
         //从异常状态恢复的第一个信号
@@ -21,9 +21,10 @@ public class OfflineSignalHandle extends SignalHandle{
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //漂移信号不管
-        if(isDriftSignal(gps)){
+        //掉线信号不管
+        if(isGpsOffline(gps)){
             gps.setSignalState("drift");
+            gps.setAbnormalStatus("gps-offline");
             return true;
         }
@@ -88,6 +88,7 @@ public class GpsDataLoaderThread extends Thread {
                 String nbbm;
                 GpsEntity old;
                 for (GpsEntity gps : list) {
+
                     //没有设备号
                     if (StringUtils.isBlank(gps.getDeviceId()))
                         continue;
@@ -2,7 +2,11 @@ package com.bsth.data.gpsdata.thread;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import java.util.Collection;
@@ -10,35 +14,45 @@ import java.util.Collection;
  * GPS掉离线监控
  * Created by panzhao on 2017/1/11.
  */
+@Component
 public class OfflineMonitorThread extends Thread{
     @Autowired
     GpsRealData gpsRealData;
-    //有任务时 掉线阈值
-    private final static int LOSE_TIME = 1000 * 60 * 2;
+    //掉线阈值
+    private final static int LOSE_TIME = 1000 * 60 * 10;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    SendUtils sendUtils;
     //无任务时 离线阈值
-    private final static int OFFLINE_TIME = 1000 * 60 * 10;
+    //private final static int OFFLINE_TIME = 1000 * 60 * 10;
     @Override
     public void run() {
-        long t = System.currentTimeMillis();
-        Collection<GpsEntity> list = gpsRealData.all();
-
-        String state;
-        for(GpsEntity gps : list){
-            state = gps.getAbnormalStatus();
-
-            if(state.equals("offline"))
-                continue;
-
-
-            //if(state.equals("lose"))
-            //if(!state.equals("lose"))
-            //if(state.equals(""))
-            //if(gps.getTimestamp())
-            //if(gps.getAbnormalStatus().equals("lose"))
+        try{
+            long t = System.currentTimeMillis();
+            Collection<GpsEntity> list = gpsRealData.all();
+
+            String state;
+            for(GpsEntity gps : list){
+                state = gps.getAbnormalStatus();
+
+                if(state != null && state.equals("offline"))
+                    continue;
+
+                if (t - gps.getTimestamp() > LOSE_TIME){
+                    gps.setAbnormalStatus("offline");
+
+                    //通知页面有设备掉线
+                    sendUtils.deviceOffline(gps);
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
         }
     }
 }
@@ -407,7 +407,7 @@ public class DayOfSchedule implements CommandLineRunner {
         new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
     }
-    private List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
+    public List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
         List<SchedulePlanInfo> list = new ArrayList<>();
         SchedulePlanInfo sp;
@@ -3,6 +3,7 @@ package com.bsth.service.realcontrol;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -149,5 +150,5 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Object> exportWaybillMore(Map<String, Object> map);
-    Map<String,Object> currentSchedulePlan(String lineCodes);
+	List<SchedulePlanInfo> currentSchedulePlan(String lineCode);
 }
@@ -24,6 +24,7 @@ import com.bsth.entity.realcontrol.SvgAttribute;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.sys.DutyEmployee;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.LineRepository;
@@ -34,11 +35,11 @@ import com.bsth.repository.realcontrol.SvgAttributeRepository;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.repository.schedule.GuideboardInfoRepository;
-import com.bsth.repository.schedule.SchedulePlanRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.SectionRouteService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
@@ -2176,7 +2177,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         for (ChangePersonCar cpc : cpcs) {
-            if (map.get(cpc.getClZbh()) == null) {
+            if (cpc.getClZbh() != null && map.get(cpc.getClZbh()) == null) {
                 rs.put("msg", "车辆 " + cpc.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
                 rs.put("status", ResponseCode.ERROR);
                 return rs;
@@ -3226,16 +3227,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		return map;
 	}
-
-	@Autowired
-    SchedulePlanRepository schedulePlanRepository;
-
+    @Autowired
+    SchedulePlanInfoService schPlanService;
     @Override
-    public Map<String, Object> currentSchedulePlan(String lineCodes) {
-        List<String> codes = Splitter.on(",").splitToList(lineCodes);
-
-        //List<SchedulePlan> list = schedulePlanRepository.findByMultiLineCode(codes);
-        //System.out.println(list);
-        return null;
+    public List<SchedulePlanInfo> currentSchedulePlan(String lineCode) {
+        List<SchedulePlanInfo> rs = dayOfSchedule.schedulePlanMap.get(lineCode);
+
+        if(rs==null || rs.size()==0){
+            //尝试刷新内存
+            Map<String, Object> data = new HashMap<>();
+            data.put("scheduleDate_eq", dayOfSchedule.currSchDateMap.get(lineCode));
+            data.put("xlBm_eq", lineCode);
+            List<SchedulePlanInfo> planItr = dayOfSchedule.cleanSchPlanItr(schPlanService.list(data).iterator());
+
+            if(planItr.size() > 0){
+                dayOfSchedule.schedulePlanMap.put(lineCode, planItr);
+                return planItr;
+            }
+        }
+        return rs;
     }
 }
 \ No newline at end of file
@@ -3,6 +3,7 @@ package com.bsth.websocket.handler;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.entity.SignalState;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -170,4 +171,17 @@ public class SendUtils{
 		list.add(sch);
 		refreshSch(list);
 	}
+
+	public void deviceOffline(GpsEntity gps){
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "deviceOffline");
+		map.put("gps", gps);;
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessageToLine(gps.getLineId().toString(), mapper.writeValueAsString(map));
+		} catch (JsonProcessingException e) {
+			logger.error("", e);
+		}
+	}
 }
@@ -298,4 +298,8 @@ span.signal-state-speed-limit{
 .qtip-home-rb .uk-list li{
     padding: 4px 2px;
+}
+
+.home-gps-table dl.offline dd:nth-of-type(1) a{
+    color: #a3a2a2;
 }
 \ No newline at end of file
@@ -784,4 +784,30 @@ li.map-panel {
 #cache_data_manage-modal .uk-table td,
 #cache_data_manage-modal .uk-table th{
     padding: 8px 8px 6px;
+}
+
+
+.ps-help-panel{
+    color: grey;
+    padding: 5px 2px;
+}
+
+.ps-help-panel small{
+    display: block;
+}
+
+
+svg text.offline{
+    fill: #534e4e !important;
+}
+
+svg rect.offline{
+    stroke: #abaaaa !important;
+    fill: #b8b8b8 !important;
+}
+
+.tooltip .tooltip-container .title a>.abnormal-text{
+    font-size: 14px;
+    color: #ff5e5e;
+    font-weight: 600;
 }
 \ No newline at end of file
@@ -25,7 +25,7 @@
     </script>
     <script id="home-gps-tbody-temp" type="text/html">
-    <dl id="home_gps_{{deviceId}}" data-device-id="{{deviceId}}">
+    <dl id="home_gps_{{deviceId}}" data-device-id="{{deviceId}}" {{if abnormalStatus=='offline'}}class="offline"{{/if}}>
         <dd title="{{nbbm}}"><a>{{nbbm}}</a></dd>
         <dd>{{speed}}</dd>
         <dd>{{expectStopTime}}</dd>
@@ -3,7 +3,18 @@
       <div class="tooltip" >
         <div class="tooltip-container">
             <div class="title">
-                <a href="javascript:;" data-for="station" class="tip_modal">{{nbbm}}</a>
+                <a href="javascript:;" data-for="station" class="tip_modal">
+                    {{nbbm}}
+                    {{if abnormalStatus == 'outBounds'}}
+                        <span class="abnormal-text">越界</span>
+                    {{else if abnormalStatus == 'overspeed'}}
+                        <span class="abnormal-text">超速</span>
+                    {{else if abnormalStatus == 'gps-offline'}}
+                        <span class="abnormal-text">GPS掉线</span>
+                    {{else if abnormalStatus == 'offline'}}
+                        <span class="abnormal-text">已离线</span>
+                    {{/if}}
+                </a>
             </div>
             <div>
               <span class="field">站点：</span>{{stationName}}
@@ -36,7 +47,9 @@
         <div class="tooltip multi-tooltip" >
         <div class="tooltip-container">
             <div class="title">
-                <a href="javascript:;" data-for="station" class="tip_modal">{{gps.nbbm}}</a>
+                <a href="javascript:;" data-for="station" class="tip_modal">
+                    {{gps.nbbm}}
+                </a>
             </div>
             <div>
               <span class="field">站点：</span>{{gps.stationName}}
@@ -75,6 +75,16 @@
         .curr-schedule-table dl dt:nth-of-type(18), .curr-schedule-table dl dd:nth-of-type(18) {
             width: 5%;
         }
+
+        #curr-date-schedule-modal .line_list_ul li{
+            margin-top:0 !important;
+            padding: 5px;
+            cursor: default;
+        }
+
+        #curr-date-schedule-modal .line_list_ul li.active{
+            background: #93d1ff;
+        }
     </style>
     <div class="uk-modal-dialog uk-modal-dialog-large">
@@ -83,15 +93,12 @@
             <h2>当日计划排班</h2></div>
         <div class="uk-grid uk-grid-collapse">
-            <div class="uk-width-medium-1-10">
-                <ul class="uk-list uk-list-line uk-width-medium-1-1">
-                    <li>219路</li>
-                    <li>784路</li>
-                    <li>166路</li>
+            <div class="uk-width-medium-1-10" style="border-right: 1px solid #81c7fb;border-top: 1px solid #81c7fb;box-shadow: 3px -2px 2px 0 rgba(129, 199, 251, 0.19), 4px -3px 2px 0 rgba(129, 199, 251, 0.2);width: calc(10% - 3px);margin-right: 3px;">
+                <ul class="uk-list uk-list-line uk-width-medium-1-1 line_list_ul">
                 </ul>
             </div>
             <div class="uk-width-medium-9-10">
-                <div class="ct_table_wrap">
+                <div class="ct_table_wrap" style="height: 460px;">
                     <div class="ct_table curr-schedule-table">
                         <div class="ct_table_head">
                             <dl>
@@ -124,6 +131,53 @@
         </div>
     </div>
+    <script id="curr_schedule_tree-temp" type="text/html">
+        {{each list as line i}}
+        <li data-id="{{line.lineCode}}">{{line.name}}</li>
+        {{/each}}
+    </script>
+
+    <script id="curr_schedule_list-temp" type="text/html">
+        {{each list as sch i}}
+            <dl>
+                <dd>{{sch.scheduleDateStr}}</dd>
+                <dd>{{sch.xlBm}}</dd>
+                <dd>{{sch.lpName}}</dd>
+                <dd>{{sch.clZbh}}</dd>
+                <dd>{{sch.plate}}</dd>
+                <dd>营运</dd>
+                <dd>{{sch.personArray[0].jGh}}</dd>
+                <dd>{{sch.personArray[0].jName}}</dd>
+                <dd>{{sch.personArray[0].sGh}}</dd>
+                <dd>{{sch.personArray[0].sName}}</dd>
+
+                {{if sch.personArray.length >= 2}}
+                    <dd>{{sch.personArray[1].jGh}}</dd>
+                    <dd>{{sch.personArray[1].jName}}</dd>
+                    <dd>{{sch.personArray[1].sGh}}</dd>
+                    <dd>{{sch.personArray[1].sName}}</dd>
+                {{else}}
+                    <dd></dd>
+                    <dd></dd>
+                    <dd></dd>
+                    <dd></dd>
+                {{/if}}
+
+
+                {{if sch.personArray.length >= 3}}
+                    <dd>{{sch.personArray[2].jGh}}</dd>
+                    <dd>{{sch.personArray[2].jName}}</dd>
+                    <dd>{{sch.personArray[2].sGh}}</dd>
+                    <dd>{{sch.personArray[2].sName}}</dd>
+                {{else}}
+                    <dd></dd>
+                    <dd></dd>
+                    <dd></dd>
+                    <dd></dd>
+                {{/if}}
+            </dl>
+        {{/each}}
+    </script>
     <script>
         (function () {
@@ -132,13 +186,76 @@
             $(modal).on('init', function (e, data) {
                 e.stopPropagation();
+                //线路列表
+                var htmlStr = template('curr_schedule_tree-temp', {list: gb_data_basic.activeLines});
+                $('.line_list_ul', modal).html(htmlStr);
+                //默认点击第一个
+                $('.line_list_ul li:eq(0)', modal).trigger('click');
             });
+            $(modal).on('click', '.line_list_ul li',  function () {
+                $('.line_list_ul li.active').removeClass('active');
+                $(this).addClass('active');
+                query($(this).data('id'));
+            });
+
+            var query = function (lineCode) {
+                $.get('/realSchedule/currSchedulePlanByLineCode', {lineCode: lineCode}, function (rs) {
+
-            var query = function () {
+                    var data=[];
+                    //先按路牌分组
+                    var lpMapData = gb_common.groupBy(rs, 'lpName');
+                    for(var lp in lpMapData){
+                        data.push(mergeSchData(lpMapData[lp]));
+                    }
+
+                    var htmlStr = template('curr_schedule_list-temp', {list: data});
+                    $('.ct_table_body', modal).html(htmlStr);
+                });
             };
+
+            /**
+             * 合并同一个路牌下的班次
+             * @param list
+             */
+            function mergeSchData(list) {
+                var sch = list[0];
+                sch.scheduleDateStr = moment(sch.scheduleDate).format('YYYY-MM-DD');
+                //车牌号
+                sch.plate = gb_data_basic.nbbm2PlateMap()[sch.clZbh];
+
+                var personArray=[];
+                $.each(list, function () {
+                    if(!isExist(personArray, this)){
+                        personArray.push(getPerson(this));
+                    }
+                });
+
+                sch.personArray=personArray;
+                return sch;
+            }
+
+            function getPerson(sch){
+                return {
+                    jGh: sch.jGh,
+                    jName: sch.jName,
+                    sGh: sch.sGh,
+                    sName: sch.sName
+                }
+            }
+            
+            function isExist(array, sch) {
+                for(var i = 0, person; person=array[i++];){
+                    if(person.jGh == sch.jGh && person.sGh == sch.sGh){
+                        return true;
+                    }
+                }
+
+                return false;
+            }
         })();
     </script>
 </div>
@@ -3,33 +3,37 @@
         <button class="uk-modal-close uk-close" type="button"></button>
         <div class="uk-grid uk-flex-middle" data-uk-grid-margin>
             <div class="uk-width-medium-1-6 uk-height-viewport line-config-tree" data-uk-observe>
-                <h3 class="title" >线路配置</h3>
+                <h3 class="title">线路配置</h3>
                 <div class="uk-accordion" data-uk-accordion="{showfirst:false}"></div>
             </div>
-            <div class="uk-width-medium-5-6 uk-height-viewport right-container" >
+            <div class="uk-width-medium-5-6 uk-height-viewport right-container">
                 <div id="line_config_entity_panel"></div>
                 <div id="buffer_config_panel"></div>
             </div>
         </div>
+
+        <div style="position: absolute;top: 10px;left: 40%;padding: 10px;color: #fe4242;background: #f2f2f2;box-shadow: 3px 1px 4px 0 rgba(0, 0, 0, 0.2), 1px 0px 5px 0 rgba(0, 0, 0, 0.19);font-size: 16px;">
+            功能调试中，当前页面暂不可用！！！
+        </div>
     </div>
     <script id="nav-line_config-modal-tree-temp" type="text/html">
-            {{each array as line i}}
-            <h3 class="uk-accordion-title" data-id="{{line.lineCode}}">{{line.name}}</h3>
-            <div class="uk-accordion-content">
-                <ul class="uk-list uk-list-line">
-                    <li><a>班次更新时间</a></li>
-                    <li><a>出场时间类型</a></li>
-                    <li><a>原线路回场</a></li>
-                    <li><a>到站缓冲区设置</a></li>
-                    <li><a>应急停靠</a></li>
-                    <li><a class="disabled">漂移判定</a></li>
-                    <li><a class="disabled">到离站预测</a></li>
-                    <li><a class="disabled">挂牌时刻表</a></li>
-                </ul>
-            </div>
-            {{/each}}
+        {{each array as line i}}
+        <h3 class="uk-accordion-title" data-id="{{line.lineCode}}">{{line.name}}</h3>
+        <div class="uk-accordion-content">
+            <ul class="uk-list uk-list-line">
+                <li><a>班次更新时间</a></li>
+                <li><a>出场时间类型</a></li>
+                <li><a>原线路回场</a></li>
+                <li><a>到站缓冲区设置</a></li>
+                <li><a>应急停靠</a></li>
+                <li><a class="disabled">漂移判定</a></li>
+                <li><a class="disabled">到离站预测</a></li>
+                <li><a class="disabled">挂牌时刻表</a></li>
+            </ul>
+        </div>
+        {{/each}}
     </script>
     <script>
@@ -37,7 +41,7 @@
             var modal = '#nav-line_config-modal',
                     lineConfig, activeCode;
-            $(modal).on('init', function(e, data) {
+            $(modal).on('init', function (e, data) {
                 e.stopPropagation();
                 var htmlStr = template('nav-line_config-modal-tree-temp', {array: gb_data_basic.activeLines});
                 $('.line-config-tree .uk-accordion', modal).html(htmlStr);
@@ -91,6 +91,11 @@ var gb_data_basic = (function () {
     $.get('/basic/nbbm2deviceId', function (rs) {
         ep.emit('nbbm2deviceId', rs);
     });
+    //nbbm to 车牌号
+    var nbbm2PlateMap;
+    $.get('/basic/nbbm2PlateNo', function (rs) {
+        nbbm2PlateMap = rs;
+    });
     //模拟图属性数据
     gb_common.$get('/realSchedule/svgAttr', {idx: line_idx}, function (rs) {
@@ -190,6 +195,9 @@ var gb_data_basic = (function () {
                 allPersonnel = data;
                 cb && cb();
             });
+        },
+        nbbm2PlateMap: function () {
+            return nbbm2PlateMap;
         }
     };
 })();
 /* gps 数据管理模块 */
-var gb_data_gps = (function() {
+var gb_data_gps = (function () {
     //fixed time refresh delay
     var delay = 1000 * 7;
@@ -9,15 +9,15 @@ var gb_data_gps = (function() {
     //refresh after callback
     var refreshEventCallbacks = [];
     //register callback function
-    var registerCallback = function(cb) {
+    var registerCallback = function (cb) {
         if (cb)
             refreshEventCallbacks.push(cb);
     };
-    var refresh = function(cb) {
+    var refresh = function (cb) {
         $.ajax({
             url: '/gps/real/line',
-            data:{lineCodes: gb_data_basic.line_idx},
+            data: {lineCodes: gb_data_basic.line_idx},
             success: function (rs) {
                 refreshData(rs);
                 cb();
@@ -29,16 +29,16 @@ var gb_data_gps = (function() {
         });
     };
-    var refreshData = function(rs) {
+    var refreshData = function (rs) {
         var old, addArr = [],
             upArr = [],
             upDownChange = [];
         var schArray;
-        $.each(rs, function() {
+        $.each(rs, function () {
             old = realData[this.deviceId];
             if (old) {
-                if (this.timestamp > old.timestamp){
+                if (this.timestamp > old.timestamp) {
                     if (old.upDown != this.upDown)
                         upDownChange.push(this);
                     else
@@ -49,9 +49,9 @@ var gb_data_gps = (function() {
                 addArr.push(this);
             //班次信息
-            if(this.schId){
-                schArray=gb_schedule_table.findScheduleByLine(this.lineId);
-                if(schArray)
+            if (this.schId) {
+                schArray = gb_schedule_table.findScheduleByLine(this.lineId);
+                if (schArray)
                     this.sch = schArray[this.schId];
             }
@@ -62,27 +62,27 @@ var gb_data_gps = (function() {
         //console.log('add array size: ' + addArr.length, 'up array size: ' + upArr.length);
         //CCCallFuncN
-        $.each(refreshEventCallbacks, function(i, cb) {
+        $.each(refreshEventCallbacks, function (i, cb) {
             cb(addArr, upArr, upDownChange);
         });
     };
     var startFixedTime;
-    var fixedTimeRefresh = function() {
+    var fixedTimeRefresh = function () {
         if (startFixedTime)
             return;
         startFixedTime = true;
-        (function() {
+        (function () {
             var f = arguments.callee;
-            refresh(function() {
+            refresh(function () {
                 setTimeout(f, delay);
             });
         })();
     };
-    var gpsByLineCode = function(lineCode) {
+    var gpsByLineCode = function (lineCode) {
         var rs = [];
         for (var device in realData) {
             if (realData[device].lineId == lineCode)
@@ -91,20 +91,38 @@ var gb_data_gps = (function() {
         return rs;
     };
-    var findOne = function(deviceId){
+    var findOne = function (deviceId) {
         return realData[deviceId];
     };
-    var findGpsByNbbm = function(nbbm){
+    var findGpsByNbbm = function (nbbm) {
         return realData[gb_data_basic.nbbm2deviceMap()[nbbm]];
     };
+    /**
+     * 设备掉线事件
+     */
+    var deviceOffline = function (gps) {
+        $.each(offlineCallbacks, function (i, cb) {
+            cb(gps);
+        });
+    };
+
+    //注册掉线事件回调函数
+    var offlineCallbacks = [];
+    var registerOfflineCb = function (cb) {
+        if (cb)
+            offlineCallbacks.push(cb);
+    };
+
     return {
         fixedTimeRefresh: fixedTimeRefresh,
         registerCallback: registerCallback,
         allGps: realData,
         gpsByLineCode: gpsByLineCode,
         findOne: findOne,
-        findGpsByNbbm: findGpsByNbbm
+        findGpsByNbbm: findGpsByNbbm,
+        deviceOffline: deviceOffline,
+        registerOfflineCb: registerOfflineCb
     };
 })();
 /** gps 信号异常状态，无效 | 越界 | 超速
  *
  *
- *  前端计算略微有点卡顿， 交由后端计算
+ *   ########### 这个文件被废弃 ##############
+ *
+ *   前端计算略微有点卡顿， 交由后端计算
  * */
 var gb_gps_abnormal = (function () {
@@ -13,6 +13,11 @@
           "header": 1
         },
         {
+          "id": 1.2,
+          "text": "当日计划排班",
+          "event": "curr_date_schedule"
+        },
+        {
           "id": 1.3,
           "text": "缓存数据管理",
           "event": "cache_data_manage"
@@ -79,6 +79,9 @@ var gb_home_line_panel = (function() {
     };
     var updateRow = function(e, t) {
+        if(e.hasClass('offline'))
+            e.removeClass('offline');
+
         var cells = e.find('dd');
         $(cells[1]).text(t.speed);
         $(cells[2]).html(t.expectStopTime == null ? '' : t.expectStopTime);
@@ -138,6 +141,18 @@ var gb_home_line_panel = (function() {
         return rs;
     }
+    /**
+     * 设备掉线事件
+     */
+    gb_data_gps.registerOfflineCb(deviceOffline);
+    
+    function deviceOffline(gps) {
+        //模拟图掉线
+        gb_svg_chart.deviceOffline(gps);
+        //主页表格掉线
+        $('#home-main-content .data-body .home-gps-table dl#home_gps_'+gps.deviceId).addClass('offline');
+    }
+
     //文件载入完毕
     res_load_ep.emitLater('load_home_line_panel');
@@ -98,11 +98,19 @@ var gb_schedule_context_menu = (function () {
             }, '确定下发指令');
         },
         jgtz: function (schArray) {
-            var idArr = [];
+            //忽略进出场班次
+            schArray =  schArray.filter(function (sch) {
+                return sch.bcType != 'in' && sch.bcType != 'out';
+            });
+
+            var idArr = [], qdz = schArray[0].qdzCode;
             $.each(schArray, function () {
-                idArr.push(this.id);
+                if(this.qdzCode==qdz)
+                    idArr.push(this.id);
             });
-            var elem = UIkit.modal.prompt('请输入间隔（分钟）', 0, function (newValue) {
+
+            var ps = '<div class="ps-help-panel"><small>1、忽略进出场班次</small><small>2、与选中的第一个班次起点站不同的也将被忽略</small></div>';
+            var elem = UIkit.modal.prompt('请输入间隔（分钟）' + ps, 0, function (newValue) {
                 if (!isNaN(newValue) && newValue > 0) {
                     gb_common.$post_arr('/realSchedule/spaceAdjust', {ids: idArr, space: newValue}, function (rs) {
                         //刷新数据
@@ -244,7 +244,9 @@ var gb_svg_chart = (function () {
                 });
             e.classed({'abnormal': function (d) {
                     return d.abnormalClaszz;
-                }});
+                }, 'offline': function (d) {
+                    return d['abnormalStatus']=='offline';
+            }});
             //update tip position
             gb_svg_tooltip.update(e);
         },
@@ -259,23 +261,28 @@ var gb_svg_chart = (function () {
         var svgs = $('.line-chart[data-code=' + lineCode + ']'),
             data = gb_data_gps.gpsByLineCode(lineCode);
-        var list = [], suffix;
+        var list = [], suffix, abmStatus;
         //过滤无站点字段的数据
         $.each(data, function () {
             if (!this.stopNo || this.stopNo == '')
                 return true;
-            suffix = '';
-            this['abnormalClaszz'] = true;
-            if(this['abnormalStatus']=='outBounds'){
-                suffix = '界';
-            }
-            else if(this['abnormalStatus']=='overspeed'){
-                suffix = '速';
+            abmStatus = this['abnormalStatus'];
+            if(abmStatus != 'offline'){
+                suffix = '';
+                this['abnormalClaszz'] = true;
+                if(abmStatus=='outBounds')
+                    suffix = '界';
+                else if(abmStatus=='overspeed')
+                    suffix = '速';
+                else if(abmStatus=='gps-offline')
+                    suffix = '掉';
+                else
+                    this['abnormalClaszz'] = false;
             }
             else
                 this['abnormalClaszz'] = false;
-
+            
             this.suffix = suffix;
             list.push(this);
         });
@@ -350,8 +357,19 @@ var gb_svg_chart = (function () {
             .attr('y', isDown ? y + 24 : y - 14);
     };
+
+    /**
+     * 设备掉线
+     * @param gps
+     */
+    var deviceOffline = function (gps) {
+        $('svg text[_id=tx_'+gps.deviceId+']').addClass('offline');
+        $('svg rect[_id=tx_'+gps.deviceId+']').addClass('offline');
+    };
+
     return {
         draw_line: draw_line,
-        setGps: setGps
+        setGps: setGps,
+        deviceOffline: deviceOffline
     };
 })();
@@ -149,7 +149,8 @@ var gb_sch_websocket = (function () {
         refreshSch: refreshSch,
         d80Confirm: d80Confirm,
         directive: directiveStatus,
-        signal_state: signalState
+        signal_state: signalState,
+        deviceOffline: deviceOffline
     };
     function currentSecond() {
@@ -241,6 +242,14 @@ var gb_sch_websocket = (function () {
         setTimeout(f, 5000);
     }();
+    /**
+     * 设备掉线
+     * @param msg
+     */
+    function deviceOffline(msg) {
+        gb_data_gps.deviceOffline(msg.gps);
+    }
+
     return {
         sock: schSock
     };
@@ -208,11 +208,13 @@
             }
             var toCenterTimer;
-
+            var markerIsVisible;
             function fixedToCenter() {
                 toCenterTimer = setInterval(function () {
-                    map.panTo(marker.getPosition());
-                }, 4000);
+                    var markerIsVisible = BMapLib.GeoUtils.isPointInRect(marker.point,map.getBounds());
+                    if(!markerIsVisible)
+                        map.panTo(marker.getPosition());
+                }, 400);
             }
             //暂停