update...

潘钊
1 parent fcf32e92
Showing 13 changed files with 435 additions and 28 deletions
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/AbnormalStateProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/overspeed/GpsOverspeed.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/overspeed/OverspeedProcess.java
src/main/java/com/bsth/data/gpsdata_v2/thread/OfflineMonitorThread.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/resources/static/real_control_v2/alone_page/map/alone_data_gps.js
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/js/data/data_gps.js
src/main/resources/static/real_control_v2/mapmonitor/js/gps_tree.js
src/main/resources/static/real_control_v2/mapmonitor/js/map_overlay_manager.js
src/main/resources/static/real_control_v2/mapmonitor/real.html
@@ -3,6 +3,8 @@ package com.bsth.controller.gps;
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.GpsOverspeed;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.service.gps.GpsService;
 import com.bsth.service.gps.entity.GpsSpeed;
 import com.google.common.base.Splitter;
@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +28,9 @@ public class GpsController {
     @Autowired
     GpsService gpsService;
+    @Autowired
+    OverspeedProcess overspeedProcess;
+
     @RequestMapping(value = "/real/all")
     public Map<String, Object> search(@RequestParam Map<String, Object> map,
                                       @RequestParam(defaultValue = "0") int page,
@@ -42,8 +48,17 @@ public class GpsController {
     }
     @RequestMapping(value = "/real/line")
-    public List<GpsEntity> findByLineCodes(@RequestParam String lineCodes) {
-        return gpsRealData.get(Splitter.on(",").splitToList(lineCodes));
+    public Map<String, Object> findByLineCodes(@RequestParam String lineCodes) {
+        Map<String, Object> rs = new HashMap();
+        List<String> lineArray = Splitter.on(",").splitToList(lineCodes);
+        //实时gps
+        List<GpsEntity> gpsList = gpsRealData.get(lineArray);
+
+        //超速信息
+        List<GpsOverspeed> overspeedList = overspeedProcess.findByLines(lineArray);
+        rs.put("gpsList", gpsList);
+        rs.put("overspeedList", overspeedList);
+        return rs;
     }
     @RequestMapping(value = "/allDevices")
 package com.bsth.data.gpsdata_v2;
+import com.alibaba.fastjson.JSON;
 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.handlers.*;
@@ -11,7 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 /**
  * 实时信号数据处理
@@ -38,7 +41,7 @@ public class DataHandleProcess {
     static Logger logger = LoggerFactory.getLogger(DataHandleProcess.class);
-    final static int POOL_SIZE = 25;
+    final static int POOL_SIZE = 20;
     static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
     public static CountDownLatch count;
@@ -73,9 +76,10 @@ public class DataHandleProcess {
             logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
             count = new CountDownLatch(ks.size());
-            List<Future> fRs = new ArrayList<>(ks.size());
+            logger.info(JSON.toJSONString(ks));
             for (Integer index : ks) {
-                threadPool.submit(new SignalHandleThread(dataListMap.get(index), count));
+                //logger.info("execute index: " + index);
+                threadPool.execute(new SignalHandleThread(dataListMap.get(index), count));
             }
@@ -108,7 +112,13 @@ public class DataHandleProcess {
         public void run() {
             try {
                 Collections.sort(list, comp);
-                for (GpsEntity gps : list) {
+                //logger.info("sort end --" + Thread.currentThread().getName() + " -list size: " + list.size());
+
+                GpsEntity gps;
+                for(int i = 0,len = list.size(); i< len ;i ++){
+                    gps = list.get(i);
+
+                    //logger.info("run |--" + Thread.currentThread().getName() + " -i: " + i);
                     try {
                         if (StringUtils.isEmpty(gps.getNbbm()))
                             continue;
@@ -123,16 +133,21 @@ public class DataHandleProcess {
                         inStationProcess.process(gps);//进站
                         outStationProcess.process(gps);//出站
+
+                        //logger.info("put start --" + Thread.currentThread().getName() + " -i: " + i);
                         GpsCacheData.putGps(gps);//历史gps缓存
-                    } catch (Exception e) {
+                        //logger.info("put end --" + Thread.currentThread().getName() + " -i: " + i);
+                    } catch (Throwable e) {
                         logger.error("", e);
                     }
                 }
+                //logger.info("for end --" + Thread.currentThread().getName() + " -list size: " + list.size());
+
             } finally {
                 if (count != null)
                     count.countDown();
-                logger.info(Thread.currentThread().getName() + " -countDown : " + count.getCount());
+                //logger.info(Thread.currentThread().getName() + " -countDown : " + count.getCount());
             }
         }
     }
@@ -3,8 +3,10 @@ package com.bsth.data.gpsdata_v2.handlers;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.entity.CtLineString;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.data.gpsdata_v2.utils.GeoUtils;
 import com.bsth.util.Geo.Point;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.List;
@@ -17,19 +19,18 @@ import java.util.List;
 public class AbnormalStateProcess {
     /**
-     * 默认限速
-     */
-    private static final double DEFAULT_SPEED_LIMIT = 60;
-    /**
      * 越界阈值
      */
     private static final double OUT_BOUNDS_THRESHOLD = 100;
+    @Autowired
+    OverspeedProcess overspeedProcess;
+
     public void process(GpsEntity gps) {
         if (isOffline(gps))
             return;
-        if (overspeed(gps))
+        if (overspeedProcess.process(gps))
             return;
         if (outOfBounds((gps)))
@@ -41,14 +42,14 @@ public class AbnormalStateProcess {
     }
-    /**
+/*    *//**
      * 是否超速
      *
      * @param gps
      * @return
-     */
+
     private boolean overspeed(GpsEntity gps) {
-        double maxSpeed = DEFAULT_SPEED_LIMIT;
+        *//*double maxSpeed = DEFAULT_SPEED_LIMIT;
         if (GeoCacheData.speedLimit(gps.getLineId()) != null)
             maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
@@ -56,8 +57,9 @@ public class AbnormalStateProcess {
             gps.setAbnormalStatus("overspeed");
             return true;
         }
-        return false;
-    }
+        return false;*//*
+        return overspeedProcess.process(gps);
+    }*/
     /**
+package com.bsth.data.gpsdata_v2.handlers.overspeed;
+
+/**
+ * gps 超速信息
+ * Created by panzhao on 2018/1/9.
+ */
+public class GpsOverspeed {
+
+    private String device;
+
+    private String nbbm;
+
+    private String lineCode;
+
+    /**
+     * 开始超速时间 HH:mm
+     */
+    private String sts;
+
+    private long st;
+
+    /**
+     * 结束超速时间 HH:mm
+     */
+    private String ets;
+
+    /**
+     * 最新速度值
+     */
+    private float speed;
+
+    /**
+     * 0：结束超速， 1：离线
+     */
+    private int eType;
+
+    public String getDevice() {
+        return device;
+    }
+
+    public void setDevice(String device) {
+        this.device = device;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getSts() {
+        return sts;
+    }
+
+    public void setSts(String sts) {
+        this.sts = sts;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public String getEts() {
+        return ets;
+    }
+
+    public void setEts(String ets) {
+        this.ets = ets;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public int geteType() {
+        return eType;
+    }
+
+    public void seteType(int eType) {
+        this.eType = eType;
+    }
+}
+package com.bsth.data.gpsdata_v2.handlers.overspeed;
+
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.google.common.collect.ArrayListMultimap;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+/**
+ * 超速处理
+ * Created by panzhao on 2018/1/9.
+ */
+@Component
+public class OverspeedProcess {
+
+
+    private static final double DEFAULT_SPEED_LIMIT = 60;
+
+    private static final double INVALID_SPEED_LIMIT = 110;
+
+    private static final int CONT_SPEED_SIZE = 6;
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    private static GpsOverspeedComp comp = new GpsOverspeedComp();
+    /**
+     * 按线路分组的超速信息
+     */
+    private static ArrayListMultimap<String, GpsOverspeed> multimap;
+
+    /**
+     * 设备号 --> 当前超速
+     */
+    private static Map<String, GpsOverspeed> realOverspeedMap;
+
+    /**
+     * 设备号 --> 连续超速次数
+     */
+    private static Map<String, Integer> contSpeedMap;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    static{
+        multimap = ArrayListMultimap.create();
+        contSpeedMap = new HashMap();
+        realOverspeedMap = new HashMap();
+    }
+
+    public static void clear(){
+        multimap = null;
+        multimap = ArrayListMultimap.create();
+
+        contSpeedMap = null;
+        contSpeedMap = new HashMap();
+
+        realOverspeedMap = null;
+        realOverspeedMap = new HashMap();
+    }
+
+    public boolean process(GpsEntity gps){
+        if(gps.getSpeed() >= INVALID_SPEED_LIMIT){
+            return false;//无效的速度
+        }
+
+        Double maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
+        if(null == maxSpeed)
+            maxSpeed = DEFAULT_SPEED_LIMIT;
+
+        if(gps.getSpeed() > maxSpeed){
+            overspeed(gps, maxSpeed);
+        }
+        else if(realOverspeedMap.containsKey(gps.getDeviceId())){
+            String device = gps.getDeviceId();
+            //结束超速
+            GpsOverspeed sp = realOverspeedMap.get(device);
+            sp.setEts(fmtHHmm.print(gps.getTimestamp()));
+
+            realOverspeedMap.remove(device);
+            contSpeedMap.put(device, 0);
+        }
+        return false;
+    }
+
+    private void overspeed(GpsEntity gps, Double maxSpeed) {
+        String device = gps.getDeviceId();
+        Integer cont = contSpeedMap.get(device);
+
+        if(null == cont)
+            cont = 1;
+
+        cont++;
+
+        if(gps.getSpeed() - maxSpeed > (maxSpeed * 0.1))
+            cont++;
+
+        if(cont >= CONT_SPEED_SIZE){
+            if(realOverspeedMap.containsKey(device)){
+                //正在超速，更新速度
+                realOverspeedMap.get(device).setSpeed(gps.getSpeed());
+            }
+            else{
+                logger.info("开始超速..." + gps.getNbbm());
+                GpsOverspeed sp = new GpsOverspeed();
+                sp.setLineCode(gps.getLineId());
+                sp.setDevice(device);
+                sp.setSpeed(gps.getSpeed());
+                sp.setNbbm(gps.getNbbm());
+                sp.setSts(fmtHHmm.print(gps.getTimestamp()));
+                sp.setSt(gps.getTimestamp());
+
+                realOverspeedMap.put(device, sp);
+                multimap.put(sp.getLineCode(), sp);
+            }
+            //标记gps超速
+            gps.setAbnormalStatus("overspeed");
+        }
+
+        contSpeedMap.put(device, cont);
+    }
+
+    /**
+     * 设备掉线
+     * @param device
+     */
+    public void offline(String device){
+        if(realOverspeedMap.containsKey(device)){
+            //结束超速
+            GpsOverspeed sp = realOverspeedMap.get(device);
+            sp.setEts(fmtHHmm.print(System.currentTimeMillis()));
+            sp.seteType(1);
+
+            realOverspeedMap.remove(device);
+            contSpeedMap.put(device, 0);
+        }
+    }
+
+
+    public List<GpsOverspeed> findByLines(List<String> lineArray){
+        List<GpsOverspeed> rs = new ArrayList<>();
+
+        for(String code : lineArray){
+            rs.addAll(multimap.get(code));
+        }
+
+        //按发送时间排序
+        Collections.sort(rs, comp);
+        if(rs.size() > 50)
+            rs = rs.subList(0, 50);
+
+        return rs;
+    }
+
+
+    public static class GpsOverspeedComp implements Comparator<GpsOverspeed>{
+
+        @Override
+        public int compare(GpsOverspeed o1, GpsOverspeed o2) {
+            return (int) (o2.getSt() - o1.getSt());
+        }
+    }
+}
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata_v2.thread;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.websocket.handler.SendUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +29,9 @@ public class OfflineMonitorThread extends Thread{
     @Autowired
     SendUtils sendUtils;
+    @Autowired
+    OverspeedProcess overspeedProcess;
+
     //无任务时 离线阈值
     //private final static int OFFLINE_TIME = 1000 * 60 * 10;
@@ -47,6 +51,8 @@ public class OfflineMonitorThread extends Thread{
                 if (t - gps.getTimestamp() > LOSE_TIME){
                     gps.offline();
+                    //结束超速
+                    overspeedProcess.offline(gps.getDeviceId());
                     //通知页面有设备掉线
                     sendUtils.deviceOffline(gps);
                 }
 package com.bsth.data.schedule.thread;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.service.oil.DlbService;
 import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.service.oil.YlbService;
@@ -38,6 +39,8 @@ public class CalcOilThread extends Thread{
             logger.info("计算班次准点率结束！");
             //清除安全驾驶数据 先临时蹭这个线程
             SafeDrivCenter.clear();
+            //清除超速缓存数据
+            OverspeedProcess.clear();
         } catch(Exception e){
             logger.error("计算路单里程加注量失败",e);
         }
@@ -41,7 +41,7 @@ var gb_data_gps = (function () {
             upDownChange = [];
         var schArray;
-        $.each(rs, function () {
+        $.each(rs.gpsList, function () {
             old = realData[this.deviceId];
             if (old) {
                 if (this.timestamp > old.timestamp) {
@@ -54,12 +54,12 @@ var gb_data_gps = (function () {
             } else
                 addArr.push(this);
-           /* //班次信息
+            //班次信息
             if (this.schId) {
                 schArray = gb_schedule_table.findScheduleByLine(this.lineId);
                 if (schArray)
                     this.sch = schArray[this.schId];
-            }*/
+            }
             //时间格式化
             this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
@@ -69,9 +69,12 @@ var gb_data_gps = (function () {
         //console.log('add array size: ' + addArr.length, 'up array size: ' + upArr.length);
         //CCCallFuncN
         $.each(refreshEventCallbacks, function (i, cb) {
-            cb(addArr, upArr, upDownChange);
+            cb(addArr, upArr, upDownChange, rs.overspeedList);
         });
+        //超速数据回调
+        //console.log('超速,,,', rs.overspeedList);
+
     };
     var startFixedTime;
@@ -1754,4 +1754,50 @@ dl.active&gt;dd.disabled{
     vertical-align: bottom;
     color: #ff2f2f;
     text-decoration: underline;
+}
+
+.c_b_abnorm_notice {
+    position: absolute;
+    bottom: 0;
+    margin: auto;
+    width: 351px;
+    padding: 7px;
+    background: #ffffff;
+    box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+    max-height: 290px;
+    overflow-y: auto;
+    min-height: 40px;
+}
+
+.c_b_abnorm_notice:before{
+    content: "-超速报警-";
+    color: #000000;
+    font-size: 12px;
+    font-family: 微软雅黑;
+    position: fixed;
+    background: #ffd967;
+    margin-top: -10px;
+    margin-left: -6px;
+    padding: 0 7px;
+    box-shadow: 2px 4px 7px rgba(90, 90, 90, 0.25);
+}
+
+.c_b_item {
+    margin: 7px 0;
+    padding: 7px 12px;
+    box-shadow: 0px 0px 10px rgba(90, 90, 90, 0.29);
+    color: #FF5722;
+    cursor: pointer;
+}
+
+.c_b_abnorm_notice>.c_b_item:first-child{
+    margin-top: 20px;
+}
+
+.c_b_item.over{
+    color: grey;
+}
+
+.c_b_item>span.c_b_over{
+    float: right;
 }
 \ No newline at end of file
@@ -14,6 +14,9 @@ var gb_data_gps = (function () {
             refreshEventCallbacks.push(cb);
     };
+    //超速数据回调
+    //var overspeedEventCallbacks = [];
+
     var refresh = function (cb) {
         $.ajax({
             url: '/gps/real/line',
@@ -43,7 +46,7 @@ var gb_data_gps = (function () {
             upDownChange = [];
         var schArray;
-        $.each(rs, function () {
+        $.each(rs.gpsList, function () {
             old = realData[this.deviceId];
             if (old) {
                 if (this.timestamp > old.timestamp) {
@@ -71,9 +74,12 @@ var gb_data_gps = (function () {
         //console.log('add array size: ' + addArr.length, 'up array size: ' + upArr.length);
         //CCCallFuncN
         $.each(refreshEventCallbacks, function (i, cb) {
-            cb(addArr, upArr, upDownChange);
+            cb(addArr, upArr, upDownChange, rs.overspeedList);
         });
+        //超速数据回调
+        //console.log('超速,,,', rs.overspeedList);
+
     };
     var startFixedTime;
@@ -233,6 +233,10 @@ var gb_map_gps_tree = (function () {
         var deviceId = gb_data_basic.nbbm2deviceMap()[data.value]
             ,gps = gb_data_gps.findOne(deviceId);
+        if(gps.upDown==-1){
+            UIkit.notify(data.value + " 未知上下行！", {pos:'top-center'});
+            return;
+        }
         //展开线路节点
         tree.open_node(tree.get_node('map_tree_line_' + gps.lineId), function () {
             //展开走向节点
@@ -287,6 +291,7 @@ var gb_map_gps_tree = (function () {
         create_node: create_node,
         changeUpDown: changeUpDown,
         update_node: update_node,
-        refresh: refresh
+        refresh: refresh,
+        selectitem: selectitem
     };
 })();
 \ No newline at end of file
@@ -7,7 +7,8 @@ var gb_map_overlay_mge = (function () {
         temps = gb_common.compileTempByDom(dom, {compress: true});
     });
-    var gpsRefresh = function (addArr, upArr, upDownChange) {
+    var $abnormNoticePanel = $('.c_b_abnorm_notice');
+    var gpsRefresh = function (addArr, upArr, upDownChange, overspeedList) {
         if(!$('.main-container .map-panel').is(':visible'))
             return;
         //如果地图正在重绘，暂时不刷新GPS
@@ -16,8 +17,28 @@ var gb_map_overlay_mge = (function () {
         //var all = addArr.concat(upArr).concat(upDownChange);
         gpsRefreshAll(addArr, upArr, upDownChange);
+        //渲染超速信息
+        overspeedList.sort(overspeed_sort);
+        var htmlStr = template('map_abnorm_overspeed_list-temp', {list: overspeedList});
+        $abnormNoticePanel.html(htmlStr).scrollTop($abnormNoticePanel[0].scrollHeight);
     };
+    var overspeed_sort = function (a, b) {
+        if(a.ets && !b.ets)
+            return -1;
+        if(!a.ets && b.ets)
+            return 1;
+        return a.st - b.st;
+    };
+
+    /**
+     * 超速点击
+     */
+    $abnormNoticePanel.on('click', '.c_b_item', function () {
+        var nbbm = $(this).data('nbbm');
+        gb_map_gps_tree.selectitem(null, {value: nbbm});
+    });
+
     var gpsRefreshAll = function (addArr, upArr, upDownChange) {
         //更新设备树菜单
         if(gb_map_gps_tree.readyStatus()){
@@ -87,7 +108,11 @@ var gb_map_overlay_mge = (function () {
         gb_map_imap.call('clearAll');
-        drawAllSection();
+        try{
+            drawAllSection();
+        }catch (e){
+            console.log(e);
+        }
         //重绘GPS
         gb_map_imap.call('drawRealGpsMarker', {gpsList: gb_common.get_vals(gb_data_gps.allGps)});
@@ -53,6 +53,21 @@
     </div>
 </div>
+
+<div class="c_b_abnorm_notice"></div>
+
+<script id="map_abnorm_overspeed_list-temp" type="text/html">
+    {{each list as obj i}}
+    <div class="c_b_item {{obj.ets!=null?'over':''}}" data-nbbm="{{obj.nbbm}}">
+        {{obj.sts}} - {{obj.nbbm}} 开始超速（{{obj.speed}}）
+
+        {{if obj.ets!=null}}
+        <span class="c_b_over"> {{obj.ets}} 结束</span>
+        {{/if}}
+    </div>
+    {{/each}}
+</script>
+
 <script src="/real_control_v2/assets/js/GeoUtils_min.js" merge="map_plugins"></script>
 <script src="/real_control_v2/mapmonitor/js/config.js" merge="map_custom_js"></script>
 <script src="/real_control_v2/mapmonitor/js/gps_tree.js" merge="map_custom_js"></script>