update...

潘钊
1 parent 6e1bdc9c
Showing 10 changed files with 441 additions and 165 deletions
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/gps/entity/GpsOutbound.java
src/main/java/com/bsth/service/gps/entity/GpsOutbound_DTO.java
src/main/java/com/bsth/service/gps/entity/GpsSpeed.java
src/main/java/com/bsth/service/gps/entity/GpsSpeed_DTO.java
src/main/resources/static/real_control_v2/assets/imgs/icon/pause.png
src/main/resources/static/real_control_v2/assets/imgs/icon/play.png
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
 package com.bsth.service.gps;
+import com.bsth.service.gps.entity.GpsOutbound_DTO;
 import com.bsth.service.gps.entity.GpsSpeed_DTO;
 import java.util.List;
@@ -24,4 +25,6 @@ public interface GpsService {
 	Map<String,Object> history_v2(String nbbm, long st, long et);
 	List<GpsSpeed_DTO> speeds(String nbbm, long st, long et);
+
+	List<GpsOutbound_DTO> outbounds(String nbbm, long st, long et);
 }
@@ -11,9 +11,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.service.gps.entity.GpsSpeed_DTO;
-import com.bsth.service.gps.entity.HistoryGps_DTO;
-import com.bsth.service.gps.entity.Road_DTO;
+import com.bsth.service.gps.entity.*;
 import com.bsth.util.DateUtils;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
@@ -207,7 +205,7 @@ public class GpsServiceImpl implements GpsService {
         inv = inv.substring(0, inv.length() - 1);
         // 查询到离站数据
-        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, st, et, inv);
+        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear, st, et, inv);
         String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO,DIRECTION,LINE_ID,SPEED_GPS from bsth_c_gps_info where days_year=? and device_id in ("
                 + inv + ") and ts > ? and ts < ? ORDER BY device_id,ts,stop_no";
@@ -296,7 +294,7 @@ public class GpsServiceImpl implements GpsService {
                 prefix = lineId + "_" + updown + "_";
                 stationName = BasicData.getStationNameByCode(rs.getString("STOP_NO"), prefix);
-                if(StringUtils.isEmpty(stationName))
+                if (StringUtils.isEmpty(stationName))
                     continue;
                 arr = new ArrivalEntity(rs.getString("DEVICE_ID"), rs.getLong("TS"), lineId,
@@ -447,7 +445,7 @@ public class GpsServiceImpl implements GpsService {
                 return rs;
             }
-            if(sch.isReissue()){
+            if (sch.isReissue()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "你不能重复这个操作");
                 return rs;
@@ -456,7 +454,7 @@ public class GpsServiceImpl implements GpsService {
             String sql = "select * from bsth_gps_template where line_id='" + sch.getXlBm() + "' and up_down=" + sch.getXlDir();
             List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
-            if(list.size() == 0){
+            if (list.size() == 0) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "缺少模板数据，请联系系统管理员！！");
                 return rs;
@@ -473,21 +471,20 @@ public class GpsServiceImpl implements GpsService {
             int diff = (int) (sch.getDfsjT() - Long.parseLong(fs.get("ts").toString()) - 1000 * 70);
             String deviceId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
-            for(Map<String, Object> map : list){
+            for (Map<String, Object> map : list) {
                 map.put("device_id", deviceId);
                 map.put("ts", Long.parseLong(map.get("ts").toString()) + diff);
             }
-            String sqlBefore = "insert into bsth_c_template("
-                    ,sqlValues = " values(";
+            String sqlBefore = "insert into bsth_c_template(", sqlValues = " values(";
             Set<String> ks = fs.keySet();
-            for(String k : ks){
+            for (String k : ks) {
                 sqlBefore += (k + ",");
                 sqlValues += "?,";
             }
             sqlBefore = sqlBefore.substring(0, sqlBefore.length() - 1) + ", create_ts)";
-            sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ", "+System.currentTimeMillis()+")";
+            sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ", " + System.currentTimeMillis() + ")";
             sql = sqlBefore + " " + sqlValues;
             Connection conn = DBUtils_MS.getConnection();
@@ -495,9 +492,9 @@ public class GpsServiceImpl implements GpsService {
             ps = conn.prepareStatement(sql);
             int fsize = ks.size();
             List<Object> vs;
-            for(Map<String, Object> map : list){
+            for (Map<String, Object> map : list) {
                 vs = new ArrayList<>(map.values());
-                for(int i = 0; i < fsize; i ++){
+                for (int i = 0; i < fsize; i++) {
                     ps.setObject(i + 1, vs.get(i));
                 }
                 ps.addBatch();
@@ -526,24 +523,27 @@ public class GpsServiceImpl implements GpsService {
         try {
             //获取历史gps 数据
             List<HistoryGps_DTO> list = HistoryGps_DTO.craete(history(new String[]{nbbm}, st, et));
-            if(list!=null && list.size() > 0){
+            if (list != null && list.size() > 0) {
                 //获取路段信息
                 String sql = "select ID, ST_AsText(GROAD_VECTOR) as GROAD_VECTOR,ROAD_CODE,ROAD_NAME,SPEED from bsth_c_road where road_code in(select section_code from bsth_c_sectionroute where line_code=? and destroy=0)";
                 List<Road_DTO> roads = Road_DTO.craete(jdbcTemplate.queryForList(sql, list.get(0).getLineId()));
                 //为GPS数据关联路段信息
-                for(HistoryGps_DTO gps : list){
+                for (HistoryGps_DTO gps : list) {
                     matchRoadToGps(gps, roads);
                 }
             }
             //超速数据
-
-
+            List<GpsSpeed_DTO> speedList = speeds(nbbm, st, et);
+            //越界数据
+            List<GpsOutbound_DTO> outboundList = outbounds(nbbm, st, et);
             rs.put("status", ResponseCode.SUCCESS);
             rs.put("list", removeDuplicate(list));
-        }catch (Exception e){
+            rs.put("speedList", speedList);
+            rs.put("outboundList", outboundList);
+        } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
         }
@@ -555,14 +555,30 @@ public class GpsServiceImpl implements GpsService {
         String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
         String sql = "select vehicle, line, up_down, lon, lat, speed,timestamp from bsth_c_speeding where vehicle=? and timestamp>? and timestamp<?";
-        jdbcTemplate.queryForList(sql, deviceId, st, et);
-        return null;
+        return GpsSpeed_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st * 1000, et * 1000));
     }
-    private void matchRoadToGps(HistoryGps_DTO gps, List<Road_DTO> roads){
-        double min = -1,distance;
+    @Override
+    public List<GpsOutbound_DTO> outbounds(String nbbm, long st, long et) {
+        /**
+         * 如果 st 和 et 跨了周分区，也只查询st 分区的数据。
+         */
+        st = st * 1000;
+        et = et * 1000;
+        //按周分区
+        Calendar weekCal = Calendar.getInstance();
+        weekCal.setTimeInMillis(st);
+        int weekYear = weekCal.get(Calendar.WEEK_OF_YEAR);
+        //设备号
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        String sql = "select vehicle,line,up_down,lon,lat,timestamp from bsth_c_outbound where weeks_year="+weekYear+" and vehicle=? and timestamp>? and timestamp<?";
+        return GpsOutbound_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st, et));
+    }
+
+    private void matchRoadToGps(HistoryGps_DTO gps, List<Road_DTO> roads) {
+        double min = -1, distance;
         Road_DTO nearRoad = null;
-        for(Road_DTO road : roads){
+        for (Road_DTO road : roads) {
             distance = GeoUtils.getDistanceFromLine(road.getLineStr(), gps.getPoint());
             if (min > distance || min == -1) {
@@ -577,12 +593,13 @@ public class GpsServiceImpl implements GpsService {
     /**
      * 去重复
+     *
      * @param list
      * @return
      */
-    private Set<HistoryGps_DTO> removeDuplicate(List<HistoryGps_DTO> list){
+    private Set<HistoryGps_DTO> removeDuplicate(List<HistoryGps_DTO> list) {
         Set<HistoryGps_DTO> set = new HashSet<>();
-        for(HistoryGps_DTO gps : list){
+        for (HistoryGps_DTO gps : list) {
             set.add(gps);
         }
         return set;
+package com.bsth.service.gps.entity;
+
+/**
+ * 越界异常  --ms数据库格式
+ * Created by panzhao on 2017/4/9.
+ */
+public class GpsOutbound {
+
+    private String vehicle;
+
+    private String line;
+
+    private int up_down;
+
+    private float lon;
+
+    private float lat;
+
+    private long timestamp;
+
+    public String location(){
+        return lon + "," + lat;
+    }
+
+    public String getVehicle() {
+        return vehicle;
+    }
+
+    public void setVehicle(String vehicle) {
+        this.vehicle = vehicle;
+    }
+
+    public String getLine() {
+        return line;
+    }
+
+    public void setLine(String line) {
+        this.line = line;
+    }
+
+    public int getUp_down() {
+        return up_down;
+    }
+
+    public void setUp_down(int up_down) {
+        this.up_down = up_down;
+    }
+
+    public float getLon() {
+        return lon;
+    }
+
+    public void setLon(float lon) {
+        this.lon = lon;
+    }
+
+    public float getLat() {
+        return lat;
+    }
+
+    public void setLat(float lat) {
+        this.lat = lat;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+}
 package com.bsth.service.gps.entity;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+
+import java.util.*;
+
 /**
  * 越界异常 dto
  * Created by panzhao on 2017/4/7.
  */
 public class GpsOutbound_DTO {
+    public static List<GpsOutbound_DTO> create(List<Map<String, Object>> mapList){
+        //默认都是一辆车的数据
+        List<GpsOutbound> list = JSONObject.parseArray(JSON.toJSONString(mapList), GpsOutbound.class);
+        GpsOutbound outbound;
+
+        //排序
+        Collections.sort(list, new Comparator<GpsOutbound>() {
+            @Override
+            public int compare(GpsOutbound o1, GpsOutbound o2) {
+                return (int) (o1.getTimestamp() - o2.getTimestamp());
+            }
+        });
+
+        int space = 1000 * 60;
+        int size = list.size();
+        StringBuffer locations = new StringBuffer("");
+
+        List<GpsOutbound_DTO> rsList = new ArrayList<>();
+        GpsOutbound_DTO dto = null;
+
+        for(int i = 0; i < size; i++){
+            outbound = list.get(i);
+            locations.append(outbound.location() + ";");
+            if(dto == null){
+                dto = new GpsOutbound_DTO();
+                dto.setDeviceId(outbound.getVehicle());
+                dto.setNbbm(BasicData.deviceId2NbbmMap.get(outbound.getVehicle()));
+                dto.setSt(outbound.getTimestamp());
+            }
+            else{
+                //越界结束
+                if((i < size - 1 && list.get(i + 1).getTimestamp() - outbound.getTimestamp() > space)){
+                    dto.setEt(outbound.getTimestamp());
+                    dto.setLocations(locations.toString());
+
+                    rsList.add(dto);
+                    dto = null;
+                    locations = new StringBuffer("");
+                    continue;
+                }
+
+                if(i == size - 1)
+                    rsList.add(dto);
+            }
+        }
+
+        return rsList;
+    }
+
     /**
      * 设备号
      */
@@ -31,6 +86,8 @@ public class GpsOutbound_DTO {
      */
     private String locations;
+    private String abnormalType = "outbound";
+
     public String getDeviceId() {
         return deviceId;
     }
@@ -70,4 +127,12 @@ public class GpsOutbound_DTO {
     public void setLocations(String locations) {
         this.locations = locations;
     }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
 }
 package com.bsth.service.gps.entity;
 /**
- * 超速异常 -数据库序列化格式
+ * 超速异常 -ms数据库格式
  * Created by panzhao on 2017/4/7.
  */
 public class GpsSpeed {
@@ -15,7 +15,7 @@ public class GpsSpeed_DTO {
     public static List<GpsSpeed_DTO> create(List<Map<String, Object>> mapList){
         //默认都是一辆车的数据
         List<GpsSpeed> list = JSONObject.parseArray(JSON.toJSONString(mapList), GpsSpeed.class);
-
+        GpsSpeed gs;
         //排序
         Collections.sort(list, new Comparator<GpsSpeed>() {
             @Override
@@ -24,11 +24,14 @@ public class GpsSpeed_DTO {
             }
         });
+        int space = 1000 * 60;
+        int size = list.size();
+
         List<GpsSpeed_DTO> rsList = new ArrayList<>();
         GpsSpeed_DTO dto = null;
-        //合并连续数据
-        for(GpsSpeed gs : list){
+        for(int i = 0; i < size; i++){
+            gs = list.get(i);
             if(dto == null){
                 dto = new GpsSpeed_DTO();
                 dto.setDeviceId(gs.getVehicle());
@@ -37,11 +40,23 @@ public class GpsSpeed_DTO {
                 dto.setSpeed(gs.getSpeed());
             }
             else{
-
+                //超速结束
+                if((i < size - 1 && list.get(i + 1).getTimestamp() - gs.getTimestamp() > space)){
+                    dto.setEt(gs.getTimestamp());
+                    rsList.add(dto);
+                    dto = null;
+                    continue;
+                }
+
+                //记录最大速度
+                if(gs.getSpeed() > dto.getSpeed())
+                    dto.setSpeed(gs.getSpeed());
+
+                if(i == size - 1)
+                    rsList.add(dto);
             }
         }
-
-        return null;
+        return rsList;
     }
     /**
@@ -69,6 +84,8 @@ public class GpsSpeed_DTO {
      */
     private float speed;
+    private String abnormalType = "speed";
+
     public String getDeviceId() {
         return deviceId;
     }
@@ -108,4 +125,12 @@ public class GpsSpeed_DTO {
     public void setSpeed(float speed) {
         this.speed = speed;
     }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
 }
@@ -800,4 +800,103 @@ input[type=checkbox].disabled{
 .cc_info_accordion{
     height: calc(100% - 40px);
     overflow: auto;
+}
+
+.map-wrap-tools{
+    position: absolute;
+    top: 0;
+    width: 100%;
+    background: #ffffff;
+    z-index: 10;
+    box-shadow: 3px 1px 8px 0 rgba(0, 0, 0, 0.12), 1px 0px 8px 0 rgba(0, 0, 0, 0.12);
+    height: 70px;
+    display: none;
+}
+
+.map-container{
+    width: 100%;
+    height: 100%;
+}
+
+#map-playback2-modal .uk-modal-close{
+    z-index: 11;
+}
+
+.map-wrap-tools .ct-progress-bar{
+    position: absolute;
+    height: 11px;
+    width: 100%;
+    bottom: 0;
+    cursor: pointer;
+    /*border-top: 5px solid white;*/
+}
+
+.map-wrap-tools .ct-progress-bar .scale{
+    width: 85%;
+    height: 6px;
+    border-top: 5px solid white;
+    background: #2bc2d5;
+}
+
+.map-wrap-tools .btns{
+    padding: 5px 10px 0 25px;
+}
+
+.map-wrap-tools .btns>span.ct_btn{
+    cursor: pointer;
+}
+
+.map-wrap-tools .btns>.play_btn{
+    width: 48px;
+    height: 48px;
+    display: inline-block;
+    background: url("/real_control_v2/assets/imgs/icon/play.png");
+    margin-right: 10px;
+}
+
+.map-wrap-tools .btns>.play_btn.play{
+    background: url("/real_control_v2/assets/imgs/icon/pause.png");
+}
+
+.map-wrap-tools .btns>.play_btn:hover{
+    box-shadow: 0px 0px 8px 0 rgba(220, 35, 35, 0.61), 0px 0px 8px 0 rgba(206, 50, 50, 0.26);
+    border-radius: 35px;
+}
+
+.map-wrap-tools .btns>.multi-items{
+    display: inline-block;
+    vertical-align: top;
+    background: #e7e4e4;
+    padding: 7px 15px;
+    margin: 12px 5px;
+    border-radius: 5px;
+}
+
+.map-wrap-tools .btns>.multi-items label{
+    margin-right: 10px;
+}
+
+.map-wrap-tools .btns>.multi-items label:last-child{
+    margin-right: 0;
+}
+
+.map-wrap-tools .ct_btn.text-panel{
+    vertical-align: top;
+    display: inline-block;
+    margin-top: 8px;
+    margin-left: 15px;
+    font-size: 13px;
+}
+
+.map-wrap-tools .ct_btn.a.export-excel {
+    color: #F44336;
+}
+
+.map-wrap-tools .ct_btn.clock{
+    display: inline-block;
+    vertical-align: top;
+    margin-top: 22px;
+    font-size: 22px;
+    color: #8b8686;
+    margin-right: 10px;
 }
 \ No newline at end of file
@@ -78,127 +78,6 @@
                                 </dl>
                             </div>
                             <div class="ct_table_body">
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(180)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-
                             </div>
                         </div>
                     </div>
@@ -254,7 +133,55 @@
                     </div>
                 </div>
             </div>
-            <div class="uk-width-medium-7-10 uk-height-viewport map-wrap">
+            <div class="uk-width-medium-7-10 uk-height-viewport map-wrap" style="padding-left: 0;position: relative;">
+                <div class="map-wrap-tools uk-animation-slide-top">
+                    <div class="btns">
+                        <span class="ct_btn play_btn"></span>
+                        <span class="ct_btn clock">
+                            08:20.10
+                        </span>
+                        <div class="multi-items">
+                            <form class="uk-form">
+                                <label>
+                                    <input type="radio" name="playSpeed"> x1
+                                </label>
+                                <label>
+                                    <input type="radio" name="playSpeed"> x5
+                                </label>
+                                <label>
+                                    <input type="radio" name="playSpeed"> x10
+                                </label>
+                                <label>
+                                    <input type="radio" name="playSpeed"> x20
+                                </label>
+                            </form>
+                        </div>
+                        <div class="multi-items">
+                            <form class="uk-form">
+                                <label>
+                                    <input type="checkbox"> 站点
+                                </label>
+                                <label>
+                                    <input type="checkbox"> 缓冲区
+                                </label>
+                                <label>
+                                    <input type="checkbox"> 站点名称
+                                </label>
+                                <label>
+                                    停车场 <i class="uk-icon-angle-down"></i>
+                                </label>
+                            </form>
+                        </div>
+                        <span class="ct_btn text-panel">
+                            <span>约12.58公里，1258个GPS点</span><br>
+                            <a class="export-excel"><i class="uk-icon-file-excel-o"></i> 导出轨迹</a>
+                        </span>
+                    </div>
+                    <div class="ct-progress-bar" >
+                        <div class="scale"></div>
+                    </div>
+                </div>
+                <div class="map-container"></div>
             </div>
         </div>
     </div>
@@ -293,6 +220,23 @@
         </dl>
         {{/each}}
     </script>
+
+    <script id="abnormal_table_cont_temp" type="text/html">
+        {{each array as item i}}
+            <dl>
+                <dd>
+                    {{if item.abnormalType == 'speed'}}
+                        超速({{item.speed}})
+                    {{else if item.abnormalType == 'outbound'}}
+                        越界
+                    {{/if}}
+                </dd>
+                <dd>{{item.st_str}}</dd>
+                <dd>{{item.et_str}}</dd>
+                <dd></dd>
+            </dl>
+        {{/each}}
+    </script>
     <script>
         (function () {
             var modal = '#map-playback2-modal', gpsArray;
@@ -300,7 +244,7 @@
             $(modal).on('init', function (e, data) {
                 try {
                     //初始化地图
-                    map = new BMap.Map($('.map-wrap', modal)[0]);
+                    map = new BMap.Map($('.map-container', modal)[0]);
                     //中心点和缩放级别
                     map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16);
                     map.enableScrollWheelZoom();
@@ -380,9 +324,9 @@
                              $('[name=eTime]', f).val(et.format('HH:mm'));*/
-                            $('[name=nbbm]', f).val('W0A-157');
+                            $('[name=nbbm]', f).val('W0A-018');
                             $('[name=sDate]', f).val('2017-04-06');
-                            $('[name=sTime]', f).val('07:49');
+                            $('[name=sTime]', f).val('04:49');
                             $('[name=eDate]', f).val('2017-04-06');
                             $('[name=eTime]', f).val('09:49');
@@ -427,11 +371,14 @@
                                         gpsArray.sort(function (a, b) {
                                             return parseInt((a.ts - b.ts) + '' + (a.stop_no - b.stop_no));
                                         });
-                                        console.log('gpsArray', gpsArray);
                                         //行车轨迹
                                         trailTableObj.showInitData(gpsArray);
                                         //到离站信息
                                         inOutStationTableObj.showInitData(gpsArray);
+                                        //异常信息
+                                        abnormalTableObj.showInitData(rs['outboundList'], rs['speedList']);
+                                        //show 工具条
+                                        mapTools.show();
                                     }
                                 });
                             }
@@ -492,7 +439,7 @@
                         if (gps['inout_stop'] == 0) {
                             //连续进站信号，取第一个
-                            if(prev['out_ts'] == null
+                            if(prev && prev['out_ts'] == null
                                 && prev['stopName'] == gps['inout_stop_info'].stopName){
                                 return true;
                             }
@@ -519,11 +466,6 @@
                 var add = function (gps) {
-                    /*if (gps.inout_stop == -1)
-                     return;
-
-                     var htmlStr = template('', {obj: gps['inout_stop_info']});
-                     $('.inout_table_wrap .ct_table .ct_table_body', modal).html(htmlStr);*/
                 };
                 var clear = function () {
@@ -559,6 +501,59 @@
                     showInitData: showInitData
                 };
             })();
+
+            /**
+             * 异常信息表格
+             * @type {{showInitData}}
+             */
+            var abnormalTableObj = (function () {
+
+                var showInitData = function () {
+                    var array = [];
+                    for(var i = 0; i < arguments.length; i ++){
+                        array = array.concat(arguments[i]);
+                    }
+                    //格式化时间
+                    $.each(array, function () {
+                       if(this.st)
+                           this.st_str = moment(this.st).format('HH:mm.ss');
+                        if(this.et)
+                            this.et_str = moment(this.et).format('HH:mm.ss');
+                    });
+
+                    var htmlStr = template('abnormal_table_cont_temp', {array: array});
+                    $('.abnormal_table .ct_table_body', modal).html(htmlStr);
+                };
+
+                return {
+                    showInitData: showInitData
+                }
+            })();
+
+            /**
+             * 工具条相关
+             */
+            var mapTools = (function () {
+
+                $('.map-wrap-tools .play_btn', modal).on('click', function () {
+                    if($(this).hasClass('play')){
+                        //暂停
+                        $(this).removeClass('play');
+                    }
+                    else {
+                        //播放
+                        $(this).addClass('play');
+                    }
+                });
+
+                var show = function () {
+                    $('.map-wrap-tools').show();
+                };
+
+                return {
+                    show: show
+                }
+            })();
         })();
     </script>
 </div>
 \ No newline at end of file