update...

潘钊
1 parent ee338482
Showing 9 changed files with 445 additions and 103 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_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/java/com/bsth/service/gps/entity/HistoryGps_DTO.java
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
src/main/resources/static/real_control_v2/mapmonitor/js/playback.js
 package com.bsth.service.gps;
+import com.bsth.service.gps.entity.GpsSpeed_DTO;
+
 import java.util.List;
 import java.util.Map;
@@ -20,4 +22,6 @@ public interface GpsService {
     Map<String,Object> gpsCompletion(long schId);
 	Map<String,Object> history_v2(String nbbm, long st, long et);
+
+	List<GpsSpeed_DTO> speeds(String nbbm, long st, long et);
 }
@@ -11,6 +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.util.DateUtils;
@@ -192,7 +193,6 @@ public class GpsServiceImpl implements GpsService {
                 return (int) (Long.parseLong(o1.get("ts").toString()) - Long.parseLong(o2.get("ts").toString()));
             }
         });
-        ;
         return list;
     }
@@ -210,7 +210,7 @@ public class GpsServiceImpl implements GpsService {
         Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, 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 < ?";
+                + inv + ") and ts > ? and ts < ? ORDER BY device_id,ts,stop_no";
         try {
             conn = DBUtils_MS.getConnection();
             ps = conn.prepareStatement(sql);
@@ -296,6 +296,9 @@ public class GpsServiceImpl implements GpsService {
                 prefix = lineId + "_" + updown + "_";
                 stationName = BasicData.getStationNameByCode(rs.getString("STOP_NO"), prefix);
+                if(StringUtils.isEmpty(stationName))
+                    continue;
+
                 arr = new ArrivalEntity(rs.getString("DEVICE_ID"), rs.getLong("TS"), lineId,
                         updown, rs.getString("STOP_NO"), rs.getInt("IN_OUT"), rs.getLong("CREATE_DATE"),
                         rs.getInt("WEEKS_YEAR"), stationName);
@@ -534,8 +537,12 @@ public class GpsServiceImpl implements GpsService {
                 }
             }
+            //超速数据
+
+
+
             rs.put("status", ResponseCode.SUCCESS);
-            rs.put("list", list);
+            rs.put("list", removeDuplicate(list));
         }catch (Exception e){
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -543,6 +550,15 @@ public class GpsServiceImpl implements GpsService {
         return rs;
     }
+    @Override
+    public List<GpsSpeed_DTO> speeds(String nbbm, long st, long et) {
+        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;
+    }
+
     private void matchRoadToGps(HistoryGps_DTO gps, List<Road_DTO> roads){
         double min = -1,distance;
         Road_DTO nearRoad = null;
@@ -559,6 +575,19 @@ public class GpsServiceImpl implements GpsService {
         gps.setRoadMinDistance(min);
     }
+    /**
+     * 去重复
+     * @param list
+     * @return
+     */
+    private Set<HistoryGps_DTO> removeDuplicate(List<HistoryGps_DTO> list){
+        Set<HistoryGps_DTO> set = new HashSet<>();
+        for(HistoryGps_DTO gps : list){
+            set.add(gps);
+        }
+        return set;
+    }
+
     private void sortGpsList(final Field f, List<GpsEntity> rs) {
         Collections.sort(rs, new Comparator<GpsEntity>() {
+package com.bsth.service.gps.entity;
+
+/**
+ * 越界异常 dto
+ * Created by panzhao on 2017/4/7.
+ */
+public class GpsOutbound_DTO {
+
+    /**
+     * 设备号
+     */
+    private String deviceId;
+
+    /**
+     * 自编号
+     */
+    private String nbbm;
+
+    /**
+     * 越界开始时间
+     */
+    private long st;
+
+    /**
+     * 越界结束时间
+     */
+    private long et;
+
+    /**
+     * 越界点位集合
+     */
+    private String locations;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public String getLocations() {
+        return locations;
+    }
+
+    public void setLocations(String locations) {
+        this.locations = locations;
+    }
+}
+package com.bsth.service.gps.entity;
+
+/**
+ * 超速异常 -数据库序列化格式
+ * Created by panzhao on 2017/4/7.
+ */
+public class GpsSpeed {
+
+    private String vehicle;
+
+    private String line;
+
+    private int up_down;
+
+    private float lon;
+
+    private float lat;
+
+    private float speed;
+
+    private long timestamp;
+
+    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 float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    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 GpsSpeed_DTO {
+
+    public static List<GpsSpeed_DTO> create(List<Map<String, Object>> mapList){
+        //默认都是一辆车的数据
+        List<GpsSpeed> list = JSONObject.parseArray(JSON.toJSONString(mapList), GpsSpeed.class);
+
+        //排序
+        Collections.sort(list, new Comparator<GpsSpeed>() {
+            @Override
+            public int compare(GpsSpeed o1, GpsSpeed o2) {
+                return (int) (o1.getTimestamp() - o2.getTimestamp());
+            }
+        });
+
+        List<GpsSpeed_DTO> rsList = new ArrayList<>();
+        GpsSpeed_DTO dto = null;
+        //合并连续数据
+        for(GpsSpeed gs : list){
+
+            if(dto == null){
+                dto = new GpsSpeed_DTO();
+                dto.setDeviceId(gs.getVehicle());
+                dto.setNbbm(BasicData.deviceId2NbbmMap.get(gs.getVehicle()));
+                dto.setSt(gs.getTimestamp());
+                dto.setSpeed(gs.getSpeed());
+            }
+            else{
+
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * 设备号
+     */
+    private String deviceId;
+
+    /**
+     * 自编号
+     */
+    private String nbbm;
+
+    /**
+     * 超速开始时间
+     */
+    private long st;
+
+    /**
+     * 超速结束时间
+     */
+    private long et;
+
+    /**
+     * 速度
+     */
+    private float speed;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+}
@@ -17,12 +17,12 @@ import java.util.Map;
  */
 public class HistoryGps_DTO {
-    public static List<HistoryGps_DTO> craete(List<Map<String, Object>> mapList){
+    public static List<HistoryGps_DTO> craete(List<Map<String, Object>> mapList) {
         List<HistoryGps_DTO> list = JSONObject.parseArray(JSON.toJSONString(mapList), HistoryGps_DTO.class);
         GeometryFactory geometryFactory = new GeometryFactory();
         Point point;
-        for(HistoryGps_DTO gps : list){
+        for (HistoryGps_DTO gps : list) {
             point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
             gps.setPoint(point);
         }
@@ -56,11 +56,32 @@ public class HistoryGps_DTO {
     @JsonIgnore
     private Point point;
-    /** 路段 */
+    /**
+     * 路段
+     */
     private Road_DTO road;
-    /** 和路段的最短距离 */
+    /**
+     * 和路段的最短距离
+     */
     private double roadMinDistance;
+    @Override
+    public int hashCode() {
+        return this.toString().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        HistoryGps_DTO g2 = (HistoryGps_DTO) obj;
+        return this.toString().equals(g2.toString());
+    }
+
+
+    @Override
+    public String toString() {
+        return (this.getDeviceId() + "_" + (inout_stop_info==null?this.getStopNo():inout_stop_info.getStopName()) + "_" + this.getTs() + "_" + this.getLon() + "_" + this.getLat());
+    }
+
     public double getGcj_lon() {
         return gcj_lon;
     }
@@ -7,8 +7,10 @@ var gb_safe_driv = (function () {
         'A1': '手部违规',
         'A2': '摄像头偏离',
         'A3': '安全带',
-        'A4': '手臂袖章',
-        'A5': '脸部检测'
+        'A4': '未戴袖章',
+        'A5': '眨眼/疲劳驾驶',
+        'A6': '打哈欠/打瞌睡',
+        'A7': '与人交谈'
     };
     var $wrap = $('.safe_driv_pop_wrap');
@@ -298,14 +298,15 @@
             var modal = '#map-playback2-modal', gpsArray;
             $(modal).on('init', function (e, data) {
-                try{
+                try {
                     //初始化地图
                     map = new BMap.Map($('.map-wrap', modal)[0]);
                     //中心点和缩放级别
                     map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16);
                     map.enableScrollWheelZoom();
-                }catch (e){
-                    console.log(e);}
+                } catch (e) {
+                    console.log(e);
+                }
                 //固定表头
                 gb_ct_table.fixedHead($('.road_table_wrap', modal));
@@ -361,79 +362,86 @@
              */
             var searchForm = (function () {
-                var f = $('.playBackForm', modal);
-
-                var init = function (data) {
-                    //设置初始值
-                    if (data.nbbm)
-                        $('[name=nbbm]', f).val(data.nbbm);
-                    var st = moment().subtract(2, 'hour');
-                    if (data.st)
-                        st = moment(data.st, 'YYYY-MM-DD HH:mm');
-                    $('[name=sDate]', f).val(st.format('YYYY-MM-DD'));
-                    $('[name=sTime]', f).val(st.format('HH:mm'));
-                    var et = moment();
-                    if (data.et)
-                        et = moment(data.et, 'YYYY-MM-DD HH:mm');
-                    $('[name=eDate]', f).val(et.format('YYYY-MM-DD'));
-                    $('[name=eTime]', f).val(et.format('HH:mm'));
-
-                    //搜索事件
-                    $('button[type=submit]', f).on('click', search);
-                };
-
-                var setNbbm = function (v) {
-                    $('[name=nbbm]', f).val(v);
-                };
-
-                var ONE_DAY = 60 * 60 * 24;
-                var MIN_SPACE = 60;
-                var search = function (e) {
-                    e.stopPropagation();
-                    var data = f.serializeJSON();
-
-                    //校验时间间隔
-                    var fs = 'YYYY-MM-DDHH:mm';
-                    var st = parseInt(moment(data.sDate + data.sTime, fs).format('X'));
-                    var et = parseInt(moment(data.eDate + data.eTime, fs).format('X'));
-
-                    if (et < st)
-                        notify_err('结束时间不能小于开始时间');
-                    else if ((et - st) > ONE_DAY)
-                        notify_err('最大间隔24小时！');
-                    else if ((et - st) < MIN_SPACE)
-                        notify_err('最小间隔1分钟！');
-                    else {
-                        $.ajax({
-                            url: '/gps/history_v2/' + data.nbbm,
-                            traditional: true,
-                            data: {st: st, et: et},
-                            success: function (rs) {
-                                gpsArray = rs.list;
-                                if (!rs || rs.length == 0) {
-                                    notify_err('没有搜索到轨迹数据！');
-                                    return;
-                                }
-
-                                //排序
-                                gpsArray.sort(function (a, b) {
-                                    return a.ts - b.ts;
+                        var f = $('.playBackForm', modal);
+
+                        var init = function (data) {
+                            //设置初始值
+                            /*if (data.nbbm)
+                             $('[name=nbbm]', f).val(data.nbbm);
+                             var st = moment().subtract(2, 'hour');
+                             if (data.st)
+                             st = moment(data.st, 'YYYY-MM-DD HH:mm');
+                             $('[name=sDate]', f).val(st.format('YYYY-MM-DD'));
+                             $('[name=sTime]', f).val(st.format('HH:mm'));
+                             var et = moment();
+                             if (data.et)
+                             et = moment(data.et, 'YYYY-MM-DD HH:mm');
+                             $('[name=eDate]', f).val(et.format('YYYY-MM-DD'));
+                             $('[name=eTime]', f).val(et.format('HH:mm'));*/
+
+
+                            $('[name=nbbm]', f).val('W0A-157');
+                            $('[name=sDate]', f).val('2017-04-06');
+                            $('[name=sTime]', f).val('07:49');
+
+                            $('[name=eDate]', f).val('2017-04-06');
+                            $('[name=eTime]', f).val('09:49');
+                            //搜索事件
+                            $('button[type=submit]', f).on('click', search);
+                        };
+
+                        var setNbbm = function (v) {
+                            $('[name=nbbm]', f).val(v);
+                        };
+
+                        var ONE_DAY = 60 * 60 * 24;
+                        var MIN_SPACE = 60;
+                        var search = function (e) {
+                            e.stopPropagation();
+                            var data = f.serializeJSON();
+
+                            //校验时间间隔
+                            var fs = 'YYYY-MM-DDHH:mm';
+                            var st = parseInt(moment(data.sDate + data.sTime, fs).format('X'));
+                            var et = parseInt(moment(data.eDate + data.eTime, fs).format('X'));
+
+                            if (et < st)
+                                notify_err('结束时间不能小于开始时间');
+                            else if ((et - st) > ONE_DAY)
+                                notify_err('最大间隔24小时！');
+                            else if ((et - st) < MIN_SPACE)
+                                notify_err('最小间隔1分钟！');
+                            else {
+                                $.ajax({
+                                    url: '/gps/history_v2/' + data.nbbm,
+                                    traditional: true,
+                                    data: {st: st, et: et},
+                                    success: function (rs) {
+                                        gpsArray = rs.list;
+                                        if (!rs || rs.length == 0) {
+                                            notify_err('没有搜索到轨迹数据！');
+                                            return;
+                                        }
+
+                                        //排序
+                                        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);
+                                    }
                                 });
-                                console.log('gpsArray', gpsArray);
-                                //行车轨迹
-                                trailTableObj.showInitData(gpsArray);
-                                //到离站信息
-                                inOutStationTableObj.showInitData(gpsArray);
                             }
-                        });
-                    }
-                    return false;
-                };
-                return {
-                    init: init,
-                    setNbbm: setNbbm
-                };
-            })();
+                            return false;
+                        };
+                        return {
+                            init: init,
+                            setNbbm: setNbbm
+                        };
+                    })();
             /**
              * 行车轨迹表格
@@ -449,7 +457,8 @@
                             if (i > 0 && array[array.length - 1].road.road_CODE == gps.road.road_CODE)
                                 array.pop();
                         }
-                        catch (e) {}
+                        catch (e) {
+                        }
                         if (gps.road)
                             array.push(gps);
@@ -470,32 +479,40 @@
              */
             var inOutStationTableObj = (function () {
-                var data = [];
+                var data, f, prev;
                 var showInitData = function (list) {
                     clear();
                     data = [];
                     $.each(list, function (i, gps) {
-                        if(gps['inout_stop'] == -1)
+
+                        prev = data[data.length - 1];
+                        if (gps['inout_stop'] == -1)
                             return true;
-                        if(gps['inout_stop'] == 1){
+                        if (gps['inout_stop'] == 0) {
+                            //连续进站信号，取第一个
+                            if(prev['out_ts'] == null
+                                && prev['stopName'] == gps['inout_stop_info'].stopName){
+                                return true;
+                            }
                             data.push(createIn(gps));
                         }
-                        else if(gps['inout_stop'] == 0){
-                            matchOut(data[data.length - 1], gps);
+                        else if (gps['inout_stop'] == 1) {
+                            f = matchOut(prev, gps);
+                            if(f)
+                                data.push(f);
                         }
                     });
                     //格式化时间
                     $.each(data, function () {
-                        if(this.in_ts)
+                        if (this.in_ts)
                             this.in_time_str = moment(this.in_ts).format('HH:mm.ss');
-                        if(this.out_ts)
+                        if (this.out_ts)
                             this.out_time_str = moment(this.out_ts).format('HH:mm.ss');
                     });
-                    console.log('data', data);
                     var htmlStr = template('multi_inout_info_cont_temp', {list: data});
                     $('.inout_table_wrap .ct_table_body', modal).html(htmlStr);
                 };
@@ -523,12 +540,18 @@
                 };
-                var matchOut = function (info, gps) {
-                    if(!info)
-                        return;
-                    var outInfo = gps['inout_stop_info'];
-                    if(info.stopName == outInfo.stopName){
-                        info['out_ts'] = outInfo.ts;
+                var matchOut = function (prevInfo, gps) {
+                    var oi = gps['inout_stop_info'];
+                    if(prevInfo && prevInfo.stopName == oi.stopName){
+                        prevInfo['out_ts'] = oi.ts;
+                        return null;
+                    }
+                    else {
+                        return {
+                            out_ts: oi.ts,
+                            stopNo: oi.stopNo,
+                            stopName: oi.stopName
+                        }
                     }
                 };
@@ -3,7 +3,7 @@
 var gb_map_play_back = (function () {
     var dom;
-    $.get('/real_control_v2/mapmonitor/fragments/playback/main.html', function (rs) {
+    $.get('/real_control_v2/mapmonitor/fragments/playback_v2/main.html', function (rs) {
         dom = rs;
     });
@@ -13,10 +13,11 @@ var gb_map_play_back = (function () {
             gb_map_imap.call('closeWin', deviceId);
         //show modal
-        var modal = '#map-playback-modal';
-        $(document.body).append(dom);
-        UIkit.modal(modal, {bgclose: false}).show();
-        $(modal).trigger('show_form', {deviceId: deviceId, nbbm: nbbm});
+        open_modal_dom(dom, {deviceId: deviceId, nbbm: nbbm});
+        //var modal = '#map-playback2-modal';
+        //$(document.body).append(dom);
+        //UIkit.modal(modal, {bgclose: false}).show();
+        //$(modal).trigger('show_form', {deviceId: deviceId, nbbm: nbbm});
     };
     //导出excel