update...

panzhaov5
1 parent 43c1ea3c
Showing 5 changed files with 26 additions and 213 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/pages/permission/authorize_all/user_auth.html
src/main/resources/static/real_control_v2/js/utils/svg_data_convert_bf.js
@@ -160,7 +160,7 @@ public class XDApplication implements CommandLineRunner {
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
-        sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 15, TimeUnit.SECONDS);//检查班次误点
+        sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
         sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
         sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
@@ -109,8 +109,18 @@ public class LateAdjustHandle implements ApplicationContextAware {
             if (gps.getInstation() <= 0 || null == sch)
                 return;
-            if (!lateSchMap.containsKey(sch.getId()))
-                return;
+            if (!lateSchMap.containsKey(sch.getId())) {
+                //班次是否误点（可能处于误点线程扫描的空隙，所以再判定一次）
+                if (sch.getDfsjT() <= gps.getTimestamp()) {
+                    putLate(sch);
+
+                    if (!lateSchMap.containsKey(sch.getId()))
+                        return;
+
+                    logger.info("线程空隙漏掉的误点，id: " + sch.getId());
+                } else
+                    return;
+            }
             //可能是延迟信号，gps时间没有误点
@@ -743,11 +743,12 @@ public class GpsServiceImpl implements GpsService {
         row.setHeight((short) (1.5 * 256));
         row.createCell(0).setCellValue("序号");
         row.createCell(1).setCellValue("车辆");
-        row.createCell(2).setCellValue("所在道路");
-        row.createCell(3).setCellValue("经度");
-        row.createCell(4).setCellValue("纬度");
-        row.createCell(5).setCellValue("时间");
-        row.createCell(6).setCellValue("速度");
+        row.createCell(2).setCellValue("牌照号");
+        row.createCell(3).setCellValue("所在道路");
+        row.createCell(4).setCellValue("经度");
+        row.createCell(5).setCellValue("纬度");
+        row.createCell(6).setCellValue("时间");
+        row.createCell(7).setCellValue("速度");
         //数据
         DateTimeFormatter fmtHHmmss = DateTimeFormat.forPattern("HH:mm.ss"),
                 fmt = DateTimeFormat.forPattern("yyyyMMddHHmm");
@@ -757,11 +758,12 @@ public class GpsServiceImpl implements GpsService {
             row = sheet.createRow(i + 1);
             row.createCell(0).setCellValue(i + 1);
             row.createCell(1).setCellValue(nbbm);
-            row.createCell(2).setCellValue(gps.getSection_name());
-            row.createCell(3).setCellValue(gps.getLon());
-            row.createCell(4).setCellValue(gps.getLat());
-            row.createCell(5).setCellValue(fmtHHmmss.print(gps.getTimestamp()));
-            row.createCell(6).setCellValue(gps.getSpeed());
+            row.createCell(2).setCellValue(BasicData.nbbmCompanyPlateMap.get(nbbm));
+            row.createCell(3).setCellValue(gps.getSection_name());
+            row.createCell(4).setCellValue(gps.getLon());
+            row.createCell(5).setCellValue(gps.getLat());
+            row.createCell(6).setCellValue(fmtHHmmss.print(gps.getTimestamp()));
+            row.createCell(7).setCellValue(gps.getSpeed());
         }
         st = st * 1000;
@@ -149,7 +149,7 @@
             var fgs_name_mapp={
                 '55_3': '上南公司（六分公司）', '55_1': '上南公司（二分公司）', '55_2': '上南公司（三分公司）', '55_4': '上南公司（一分公司）', '55_5': '上南公司（培训部）',
                 '22_2': '金高公司（二分公司）', '22_1': '金高公司（四分公司）', '22_3': '金高公司（三分公司）', '22_5': '金高公司（一分公司）',
-                '26_3': '南汇公司（三分公司）', '26_2': '南汇公司（南汇二分）', '26_1': '南汇公司（南汇一分）', '26_4': '南汇公司（南汇维修公司）', '26_5': '南汇公司（南汇公司）', '26_6': '南汇公司（航头枢纽站）',
+                '26_3': '南汇公司（三分公司）', '26_2': '南汇公司（南汇二分）', '26_1': '南汇公司（南汇一分）', '26_4': '南汇公司（南汇维修公司）', '26_5': '南汇公司（南汇公司）', '26_6': '南汇公司（南汇六分）',
                 '05_5': '杨高公司（杨高分公司）', '05_6': '杨高公司（周浦分公司）', '05_3': '杨高公司（芦潮港分公司）', '05_1': '杨高公司（川沙分公司）', '05_2': '杨高公司（金桥分公司）',
                 '77_78': '闵行公司', '99_100': '青浦公交','24_1': '一车队', '24_2': '二车队', '24_3': '三车队'
             };
-var gb_svg_data_convert = (function () {
-
-    /**
-     * 合并上下行路由
-     * type 0 上行 1 下行 2 同名合并  3 异名合并
-     *
-     * enableAttr: 是否启用配置信息
-     */
-    function mergeRoute(routes, enableAttr, lineCode, loopLine) {
-        console.log('routesroutes', routes);
-        //按上下行拆分
-        routes = gb_common.groupBy(routes, 'directions');
-        var up = routes[0],
-            down = routes[1];
-        //排序
-        up.sort(upSort);
-        down.sort(downSort);
-        var data = [];
-
-        //根据配置处理一下数据
-        if (enableAttr) {
-            var svgAttr = gb_data_basic.getSvgAttr(lineCode);
-            if (svgAttr) {
-                up = filterByAttrs(svgAttr, up);
-                down = filterByAttrs(svgAttr, down);
-            }
-        }
-
-        //环线 只画上行
-        if(loopLine){
-            for (var j = 0; j < up.length; j++) {
-                var upS = nvl_get(up, j);
-                op = {
-                    name: [upS.stationName],
-                    id: [get_station_code(upS)],
-                    type: 0,
-                    stationMark: upS.stationMark
-                };
-                data.push(op);
-            }
-
-            //上下行GPS容器
-            $.each(data, function () {
-                this.gpsUps = [];
-                this.gpsDowns = [];
-            });
-
-            return data;
-        }
-
-
-        //同名站点合并
-        for (var j = 0; j < up.length; j++) {
-            var upS = nvl_get(up, j),
-                downS = nvl_get(down, j),
-                op = {
-                    name: [upS.stationName],
-                    id: [get_station_code(upS), get_station_code(downS)],
-                    type: 2,
-                    stationMark: upS.stationMark//站点标记
-                };
-
-            if (upS.stationName != downS.stationName) {
-                //下行站点在上行路由中是否存在
-                var dIndex = station_indexof(down, upS, j);
-                //上行站点在下行路由中是否存在
-                var uIndex = station_indexof(up, downS, j);
-                if (dIndex == -1 || dIndex - j > 4) {
-                    if (uIndex == -1 && dIndex - j < 4) {
-                        op.type = 3;
-                        op.name = [upS.stationName, downS.stationName];
-                    }
-                    else {
-                        op.type = 0;
-                        op.id = [get_station_code(upS), -1];
-                        //占位
-                        down.splice(j, 0, {});
-                    }
-                } else {
-                    for (var t = j; t < dIndex - 1; t++) {
-                        var temp = down[t];
-                        data.push({
-                            name: [temp.stationName],
-                            type: 1,
-                            id: [get_station_code(temp)]
-                        });
-                    }
-                    //delete
-                    down.splice(j, dIndex - 1 - j);
-                    j--;
-                    continue;
-                }
-            }
-            data.push(op);
-        }
-
-        //将上下行挨着的异名站点合并
-        var len = data.length - 1,
-            first, sec;
-        for (var s = 0; s < len; s++) {
-            first = data[s];
-            sec = data[s + 1];
-
-            if (first.type == 0 &&
-                sec.type == 1) {
-                data.splice(s, 2, {
-                    name: [first['name'][0], sec['name'][0]],
-                    type: 3,
-                    id: [first['id'][0], sec['id'][0]]
-                });
-                len--;
-            } else if (first.type == 1 && sec.type == 0) {
-                data.splice(s, 2, {
-                    name: [first['name'][0], sec['name'][0]],
-                    type: 3,
-                    id: [first['id'][0], sec['id'][0]]
-                });
-                len--;
-            }
-        }
-
-        //上下行GPS容器
-        $.each(data, function () {
-            this.gpsUps = [];
-            this.gpsDowns = [];
-        });
-        return data;
-    };
-
-    var filterByAttrs = function (svgAttr, routes) {
-        var hideStations = svgAttr.hideStations ? svgAttr.hideStations : [];
-        var nicknames = svgAttr.nicknames ? svgAttr.nicknames : {};
-        var stationCode;
-        $.each(routes, function (i) {
-            stationCode = this.stationCode
-            //要隐藏的站点
-            $.each(hideStations, function (j, hide) {
-                if (stationCode == hide)
-                    delete routes[i];
-            });
-
-            //要重命名的站点
-            if (nicknames[this.stationName]) {
-                this.stationName = nicknames[this.stationName];
-            }
-        });
-
-        var newRoutes = [];
-        $.each(routes, function (i, station) {
-            if(station)
-                newRoutes.push(station);
-        });
-
-        return newRoutes;
-    };
-
-    var upSort = function (a, b) {
-        return a.stationRouteCode - b.stationRouteCode;
-    };
-
-    var downSort = function (a, b) {
-        return b.stationRouteCode - a.stationRouteCode;
-    };
-
-    var station_indexof = function (array, station, start) {
-        var res = -1;
-        for (var i = start, obj; obj = array[i++];) {
-            if (obj.stationName == station.stationName) {
-                res = i;
-                break;
-            }
-        }
-        return res;
-    };
-
-    var get_station_code = function (station) {
-        return station.stationCode + '_' + station.directions;
-    };
-
-    var nvl_get = function (list, index) {
-        return list[index] == null ? {} : list[index];
-    };
-
-    var groupByStationAndUpdown = function (data) {
-        //gb_common.groupBy(data, 'stopNo')
-        var rs = {},
-            key;
-        $.each(data, function () {
-            key = this['stopNo'] + '_' + this['upDown'];
-            if (!rs[key])
-                rs[key] = [];
-
-            rs[key].push(this);
-        });
-
-        return rs;
-    };
-    return {mergeRoute: mergeRoute, groupByStationAndUpdown: groupByStationAndUpdown};
-})();