update...

潘钊
1 parent 9977b66b
Showing 10 changed files with 202 additions and 62 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_range_turn.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/line_schedule/search.js
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
@@ -253,20 +253,22 @@ public class InOutStationSignalHandle extends SignalHandle{
             //已完成班次数
             int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
             ScheduleRealInfo next = dayOfSchedule.next(sch);
-            //通知客户端
-            sendUtils.sendZdsj(sch, next, doneSum);
             //持久化
             dayOfSchedule.save(sch);
-            //准备执行下一个班次
-            if (next != null) {
+            if(next != null){
                 next.setQdzArrDatesj(sch.getZdsjActual());
                 dayOfSchedule.addExecPlan(next);
                 //进站既进场
                 inStationAndInPark(sch, next);
+            }
+            //通知客户端
+            sendUtils.sendZdsj(sch, next, doneSum);
+
+            //准备执行下一个班次
+            if (next != null) {
                 //将gps转换为下一个班次走向的站内信号
                 transformUpdown(gps, next);
-
                 //下发调度指令
                 directiveService.send60Dispatch(next, doneSum, "到站@系统");
@@ -11,7 +11,10 @@ import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
-import com.bsth.data.schedule.thread.*;
+import com.bsth.data.schedule.thread.CalcOilThread;
+import com.bsth.data.schedule.thread.SchedulePstThread;
+import com.bsth.data.schedule.thread.ScheduleRefreshThread;
+import com.bsth.data.schedule.thread.SubmitToTrafficManage;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -146,7 +149,7 @@ public class DayOfSchedule implements CommandLineRunner {
         //入库
 //        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
         //班次误点扫描
-//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
         //每天凌晨2点20提交数据到运管处
         long diff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
@@ -116,17 +116,20 @@ public class LateAdjustHandle implements ApplicationContextAware{
                 return;
             //进的是班次起点
-            if(gps.getStopNo().equals(sch.getQdzCode())
+            if(gps.getStationName().equals(sch.getQdzName())
                     && sch.getLateMinute() > 0){
                 //自动调整待发 到达时间 + 停靠时间
-                long dt = gps.getTimestamp() + (Long.parseLong(String.valueOf(sch.getLateMinute() * 60 * 1000)));
+                long dt = (long) (gps.getTimestamp() + (sch.getLateMinute() * 60 * 1000));
                 sch.setDfsjAll(dt);
                 sch.setDfAuto(true);
+                //取消应发未到标记
+                sch.setLate2(false);
                 lateSchMap.remove(sch.getClZbh());
                 logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
             }
         }catch (Exception e){
+            e.printStackTrace();
             logger.error("", e);
         }
     }
@@ -44,11 +44,14 @@ public class ScheduleLateThread extends Thread{
 		ScheduleRealInfo sch;
 		for(int i = 0; i < size; i ++){
 			sch = all.get(i);
-			if(sch.getDfsjT() > t || sch.isLate())
+			if(sch.getDfsjT() > t)
 				break;
+			if(sch.isLate())
+				continue;
+
 			if(sch.getStatus() == 0
-					&& sch.getFcsjActual() == null){
+					&& StringUtils.isEmpty(sch.getFcsjActual())){
 				//检查应发未到 当前班次无起点到达时间
 				if(StringUtils.isEmpty(sch.getQdzArrDateSJ())){
@@ -1049,6 +1049,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         ScheduleRealInfo next = dayOfSchedule.next(sch);
                         if (null != next) {
                             next.setQdzArrDateSJ(zdsjActual);
+                            next.setLate2(false);
                             ts.add(next);
                         }
@@ -27,8 +27,11 @@
                             </div>
                         </div>
                     </div>
-                    <div class="uk-width-2-4" style="padding-left: 28px;">
-                        <h6 style="color: #a7a5a5;margin-top: 35px;"><i class="uk-icon-question-circle"> </i>
+                    <div class="uk-width-2-4" style="padding: 20px 0 0 28px;">
+                        <label>
+                            <input type="checkbox" id="emptyTurnCbox"> 调头后空驶回起点
+                        </label>
+                        <h6 style="color: #a7a5a5;margin-top: 0;"><i class="uk-icon-question-circle"> </i>
                             如果“调头站点”在另一个走向不存在，你需要手动选择第二个营运起点</h6>
                     </div>
                 </div>
@@ -178,7 +181,7 @@
                 </div>
             </div>
             <div class="uk-width-7-10 pl5">
-                <input type="time" name="startDate" value="{{sch.dfsj}}" required disabled>
+                <input type="time" name="startDate" value="{{sch.dfsj}}" required >
             </div>
         </div>
         <div class="uk-grid">
@@ -188,7 +191,7 @@
                 </div>
             </div>
             <div class="uk-width-7-10 pl5">
-                <input type="time" name="endDate" value="{{sch.zdsj}}" required>
+                <input type="time" name="endDate" value="{{sch.zdsj}}" >
             </div>
         </div>
     </script>
@@ -295,7 +298,7 @@
                 //营运2
                 nsf.html(template('range_turn_child_service-temp', nextData));
-                disabledField(nsf, 'endDate');
+                disabledField(nsf, 'startDate');
                 //烂班1
                 cdf.html(template('range_turn_child_destroy-temp', currData));
                 disabledField(cdf, 'endStation');
@@ -585,6 +588,21 @@
                     btmDrawer.data('name', id).data('url', url).trigger('drawer_show');
                 }
             }
+
+            /**
+             * 选择空驶调头
+             */
+            $('#emptyTurnCbox', modal).on('click', function () {
+                if(this.checked){
+                    //全程烂班
+                    $('[name=endStation]', ndf).val(nextSch.zdzCode).attr('disabled');
+                    //空驶回起点
+
+                }
+                else{
+
+                }
+            });
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -100,49 +100,12 @@ var gb_schedule_table = (function () {
             gb_ct_table.enableSort($('.ct_table', content), reset_seq_no, gb_schedule_table_dbclick.init);
             //dbclick event
             gb_schedule_table_dbclick.init();
-            //点击实发，show detail
-            fcsjActualCellQtip();
+            //双击实发
+            gb_schedule_table_dbclick.sfsjCellClick($('dd.fcsjActualCell'));
             cb && cb();
         });
     };
-    function fcsjActualCellQtip() {
-        //单击实发单元格显示详细信息
-        $(document).on('click', 'dd.fcsjActualCell', function () {
-            var that = this;
-            $(that).qtip({
-                show: true,
-                content: {
-                    text: function (e) {
-                        var lineCode = $(that).parents('li.line_schedule').data('id')
-                            , id = $(that).parents('dl').data('id')
-                            , sch = line2Schedule[lineCode][id];
-                        return temps['sfsj_sch-detail-temp'](sch);
-                    }
-                }
-                , style: {
-                    classes: 'qtip-dark qtip-rounded qtip-shadow'
-                },
-                hide: {
-                    fixed: true,
-                    delay: 300
-                },
-                position: {
-                    target: that,
-                    my: 'center left',
-                    at: 'center right'
-                },
-                events: {
-                    hidden: function (event, api) {
-                        $(this).qtip('destroy', true);
-                    }
-                }
-            });
-        });
-
-        //双击
-        gb_schedule_table_dbclick.sfsjCellClick($('dd.fcsjActualCell'));
-    }
     //重置序号
     var reset_seq_no = function (dls) {
@@ -174,16 +137,21 @@ var gb_schedule_table = (function () {
     //新增一个班次，附带更新的班次
     var insertSchedule = function (sch, upArr) {
+        var xls = {};
+        xls[sch.xlBm] = 1;
         line2Schedule[sch.xlBm][sch.id] = sch;
         //update
         if (isArray(upArr)) {
             $.each(upArr, function () {
                 line2Schedule[this.xlBm][this.id] = this;
+                xls[this.xlBm] = 1;
             });
         }
         //重新渲染表格
-        reRenderTable(sch.xlBm);
+        for(var xlBm in xls){
+            reRenderTable(sch.xlBm);
+        }
         //定位到新添加的班次
         scroToDl(sch);
     };
@@ -350,6 +318,39 @@ var gb_schedule_table = (function () {
             markerLastSch([sch]);
     };
+    //单击实发单元格显示详细信息
+    $(document).on('click', 'dd.fcsjActualCell', function () {
+        var that = this;
+        $(that).qtip({
+            show: true,
+            content: {
+                text: function (e) {
+                    var lineCode = $(that).parents('li.line_schedule').data('id')
+                        , id = $(that).parents('dl').data('id')
+                        , sch = line2Schedule[lineCode][id];
+                    return temps['sfsj_sch-detail-temp'](sch);
+                }
+            }
+            , style: {
+                classes: 'qtip-dark qtip-rounded qtip-shadow'
+            },
+            hide: {
+                fixed: true,
+                delay: 300
+            },
+            position: {
+                target: that,
+                my: 'center left',
+                at: 'center right'
+            },
+            events: {
+                hidden: function (event, api) {
+                    $(this).qtip('destroy', true);
+                }
+            }
+        });
+    });
+
     //拖拽选中...
     var seq_nos = '.line-schedule-table .ct_table_body>dl>dd.seq_no';
     var drag_strat;
@@ -601,6 +602,14 @@ var gb_schedule_table = (function () {
         return dfCell;
     };
+
+    /**
+     * 刷新页面的所有线路班次
+     */
+    var refreshAll = function () {
+        show();
+    };
+    
     return {
         show: show,
         findScheduleByLine: findScheduleByLine,
@@ -620,6 +629,7 @@ var gb_schedule_table = (function () {
         addRemarks: addRemarks,
         reLoadAndRefresh: reLoadAndRefresh,
         showLateBadge: showLateBadge,
-        cancelLateBadge: cancelLateBadge
+        cancelLateBadge: cancelLateBadge,
+        refreshAll: refreshAll
     };
 })();
@@ -78,6 +78,8 @@ var gb_sch_search = (function() {
         //uikit 会记住上一次搜索值，触发keyup以清空该值
         $('.sch-search-autocom input', cont).val('').trigger('keyup').parent().removeClass('active');
         $('.line-schedule-table .ct_table_body dl._search_hide', cont).removeClass('_search_hide');
+        //更新滚动条高度
+        $('.ct_table_wrap', cont).perfectScrollbar('update');
     }
     function execSch(gps) {
@@ -109,6 +111,9 @@ var gb_sch_search = (function() {
             if (car != $(dds[2]).data('nbbm'))
                 $(this).addClass('_search_hide');
         });
+
+        //滚动条置顶
+        $(tbody).parents('.ct_table_wrap')[0].scrollTop = 0;
     }
     return {
@@ -13,6 +13,10 @@ var gb_sch_websocket = (function () {
     var new_conn = function () {
         schSock = new SockJS('/sockjs/realcontrol');
         schSock.onopen = function (e) {
+            if(reConnCount && reConnCount > 1){
+                gb_schedule_table.refreshAll();
+                console.log('重新连接，刷新班次');
+            }
             reConnCount = 1;
             clearInterval(recInterval);
             console.log('webSocket[realcontrol] onopen');
@@ -101,6 +105,7 @@ var gb_sch_websocket = (function () {
      * @param msg
      */
     var autoWdtz = function (msg) {
+        debugger
         var schId = msg.id;
         var minute = msg.minute;
         var lineCode = msg.lineCode;
@@ -169,7 +169,14 @@
                                     <input type="checkbox" name="stationName"> 站点名称
                                 </label>
                                 <label>
-                                    <a>停车场 <i class="uk-icon-angle-down"></i></a>
+                                    <div class="uk-button-dropdown" data-uk-dropdown>
+                                        <a>停车场 <i class="uk-icon-angle-down"></i></a>
+                                        <div class="uk-dropdown uk-dropdown-scrollable" style="max-height: 300px;">
+                                            <ul class="uk-nav uk-nav-dropdown parks_list">
+
+                                            </ul>
+                                        </div>
+                                    </div>
                                 </label>
                             </form>
                         </div>
@@ -249,6 +256,15 @@
         </dl>
         {{/each}}
     </script>
+
+    <script id="pb_park_list_dropdown-temp" type="text/html">
+        {{each list as p i}}
+        <li data-code="{{p.parkCode}}" ><a>{{p.parkName}}</a></li>
+        {{if i == 0}}
+        <li class="uk-nav-divider"></li>
+        {{/if}}
+        {{/each}}
+    </script>
     <script>
         (function () {
             var modal = '#map-playback2-modal', gpsArray;
@@ -713,6 +729,8 @@
                 var routes;//路段
                 var stations;//站点
                 var parks;//停车场
+                //停车场编码和Polygon对照
+                var parkPolygons={};
                 var initData = function (rs) {
                     var gpsArray = rs.list;
@@ -721,13 +739,70 @@
                     var lineCode = gpsArray[0].lineId;
                     //从地图模块获取站点数据
                     stations = gb_map_spatial_data.getStationArray(lineCode);
-                    //从地图模块获取停车场数据
-                    parks = gb_map_spatial_data.carparkArray();
+                    //停车场下拉菜单
+                    initDropdownList(lineCode);
+
                     //从localStorage 获取路段
                     routes = JSON.parse(storage.getItem(lineCode + '_route'));
                     routes = [routes.up_bd, routes.down_bd];
                 };
+                /**
+                 * 初始化停车场下拉菜单
+                 */
+                var initDropdownList = function (lineCode) {
+                    //从地图模块获取停车场数据
+                    parks = gb_map_spatial_data.carparkArray();
+                    console.log('parksparks', parks);
+                    //将线路标准停车场排在第一个
+                    var information = gb_data_basic.getLineInformation(lineCode);
+                    var index;
+                    for(var i = 0,p; p=parks[i++];){
+                        if(p.parkCode == information.carPark){
+                            index = i - 1;
+                            break;
+                        }
+                    }
+                    parks[index] = parks.splice(0, 1 , parks[index])[0];
+                    //渲染
+                    var htmlStr = template('pb_park_list_dropdown-temp', {list: parks});
+                    $('.buffer_area_form .parks_list', modal).html(htmlStr);
+
+                    //停车场点击
+                    $('.buffer_area_form .parks_list>li', modal).on('click', function () {
+                        var code = $(this).data('code');
+
+                        if(!parkPolygons[code]){
+                            var park;
+                            $.each(parks, function () {
+                                if(this.parkCode==code){park = this;return false;}
+                            });
+
+                            transMultiWGSToBd(park);
+                            var polygon = new BMap.Polygon(park.bdPoints, {strokeColor: 'red', strokeWeight: 1});
+                            map.addOverlay(polygon);
+                            parkPolygons[code] = polygon;
+                            //中心点
+                            var ts = park.gCenterPoint.split(' ')
+                                    ,coord = TransGPS.wgsToBD(parseFloat(ts[1]), parseFloat(ts[0]));
+                            polygon._centerPoint = new BMap.Point(coord.lng, coord.lat);
+                            //绘制名称label
+                            var style = {backgroundColor: "rgba(255, 255, 255, 0.69)",color : "red", borderColor: "red", fontSize : "12px", height : "16px", lineHeight : "16px", fontFamily:"微软雅黑"}
+                            var width = park.parkName.length * 12;
+                            var label = new BMap.Label(park.parkName, {
+                                position:polygon._centerPoint,
+                                offset: new BMap.Size(-(width / 2), -27)
+                            });
+                            label.setStyle(style);
+                            map.addOverlay(label);
+                        }
+
+                        //定位到polygon
+                        var polygon=parkPolygons[code];
+                        map.panTo(polygon._centerPoint);
+                    });
+                };
+
                 /**
                  *  更新车辆位置
@@ -866,8 +941,10 @@
                     map.addOverlay(circle);
                 };
-                var drawPolygon = function () {
-
+                var drawPolygon = function (station) {
+                    transMultiWGSToBd(station);
+                    var polygon = new BMap.Polygon(station.bdPoints, {strokeColor: '#000000', strokeWeight: 1});
+                    map.addOverlay(polygon);
                 };
                 /**
@@ -883,6 +960,7 @@
                     trailArray=[];
                     trailPolyline = null;
                     gpsMarker = null;
+                    parkPolygons = {};
                 };
                 /**
@@ -1012,6 +1090,18 @@
                     reset: reset
                 }
             })();
+
+            function transMultiWGSToBd(obj) {
+                if(!obj._gPoints)
+                    return;
+                var bdPoints = [],coord;
+                $.each(obj._gPoints, function () {
+                    coord = TransGPS.wgsToBD(this.lat, this.lng);
+                    bdPoints.push(new BMap.Point(coord.lng, coord.lat));
+                });
+
+                obj.bdPoints=bdPoints;
+            }
         })();
     </script>
 </div>
 \ No newline at end of file