Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 73afba1f 57b395ef
Showing 9 changed files with 93 additions and 69 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
src/main/resources/static/real_control_v2/main.html
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
src/main/resources/static/real_control_v2/mapmonitor/real.html
@@ -155,12 +155,32 @@ public class InOutStationSignalHandle extends SignalHandle{
         }
         else if(sch.getBcType().equals("out")){
             ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            //如果下一个班次是区间，并且是环线
+            if(next != null && next.getBcType().equals("region")){
+                next = dayOfSchedule.nextSame(next);
+                if(next == null || !next.getQdzName().equals(next.getZdzName())){
+                    return;
+                }
+            }
             if(next != null && prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
                 dayOfSchedule.addExecPlan(next);
                 outStation(gps, prev);
             }
         }
+        //当前班次是区间
+        else if(sch.getBcType().equals("region")){
+            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            if(next==null || !next.getQdzName().equals(next.getZdzName())){
+                return;
+            }
+            //是环线
+            if(prev.getStopNo().equals(next.getQdzCode())){
+                //发下一个班次
+                dayOfSchedule.addExecPlan(next);
+                outStation(gps, prev);
+            }
+        }
     }
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("SXC-YD012"))
+            /*if(nbbm.equals("W9G-013"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
@@ -150,6 +150,8 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 CircleQueue<GpsEntity> prevs;
                 boolean task;
                 for (GpsEntity gps : list) {
+                    /*if(gps.getTimestamp() > 1491951840000L)
+                        System.out.print("");*/
                     //是否有任务
@@ -46,8 +46,8 @@ public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware
         if(sd.getYczltype().indexOf("A") == -1)
             sd.setYczltype("A" + sd.getYczltype());
-        SafeDriv old = safeMap.get(sd.getClzbh());
-        if(old == null || sd.getTs() > old.getTs()){
+        //SafeDriv old = safeMap.get(sd.getClzbh());
+        if(!data.contains(sd)){
             //通知客户端
             sendUtils.sendSafeDriv(sd);
             data.add(sd);
@@ -67,7 +67,7 @@ public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware
     @Override
     public void run(String... strings) throws Exception {
         //定时加载安全驾驶数据
-        //Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 60, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 4, TimeUnit.SECONDS);
     }
     @Override
@@ -291,7 +291,7 @@
 }
 .uk-form-icon i{
-    z-index: 999 !important;
+    z-index: 98 !important;
 }
 .uk-form-icon .uk-autocomplete input{
@@ -424,7 +424,7 @@
                                 name: '加油'
                             },
                             'add_sub_task_in': {
-                                name: '回场'
+                                name: '进场'
                             },
                             'add_sub_task_out': {
                                 name: '出场'
@@ -227,7 +227,7 @@ var gb_schedule_context_menu = (function () {
                         name: '（子任务）加油'
                     },
                     'add_sub_task_in': {
-                        name: '（子任务）回场'
+                        name: '（子任务）进场'
                     },
                     'add_sub_task_out': {
                         name: '（子任务）出场'
@@ -5,27 +5,27 @@
     <meta charset="UTF-8">
     <title>线路调度 v2.0</title>
     <!-- uikit  core style-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" merge="uikit"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" merge="uikit"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" merge="uikit"/>
     <link rel="stylesheet"
-          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css"/>
+          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="uikit"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" merge="uikit"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" merge="uikit"/>
     <!-- main style -->
-    <link rel="stylesheet" href="/real_control_v2/css/main.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/main.css" merge="custom_style"/>
     <!-- north style -->
-    <link rel="stylesheet" href="/real_control_v2/css/north.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/north.css" merge="custom_style"/>
     <!-- home style -->
-    <link rel="stylesheet" href="/real_control_v2/css/home.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/home.css" merge="custom_style"/>
     <!-- line style -->
-    <link rel="stylesheet" href="/real_control_v2/css/line_schedule.css"/>
-    <link rel="stylesheet" href="/real_control_v2/css/sch_autocomp_result.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/line_schedule.css" merge="custom_style"/>
+    <link rel="stylesheet" href="/real_control_v2/css/sch_autocomp_result.css" merge="custom_style"/>
     <!-- custom table -->
-    <link rel="stylesheet" href="/real_control_v2/css/ct_table.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
     <!-- jquery contextMenu style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" />
     <!-- formvalidation style -->
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"/>
     <!-- js tree -->
@@ -34,7 +34,7 @@
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"/>
     <link rel="stylesheet" href="/real_control_v2/css/pace.css"/>
-    <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/>
 </head>
 <body>
@@ -116,14 +116,14 @@
 <!-- main js -->
 <script src="/real_control_v2/js/main.js"></script>
 <!-- uikit core -->
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/pagination.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/timepicker.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/lightbox.min.js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/pagination.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/timepicker.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/lightbox.min.js" merge="uikit_js"></script>
 <!-- jquery contextMenu -->
 <script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"></script>
@@ -140,52 +140,52 @@
 <script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js"></script>
 <!-- 数据 -->
-<script src="/real_control_v2/js/data/data_basic.js"></script>
-<script src="/real_control_v2/js/data/data_gps.js"></script>
-<script src="/real_control_v2/js/data/gps_abnormal.js"></script>
+<script src="/real_control_v2/js/data/data_basic.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/data/data_gps.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/data/gps_abnormal.js" merge="custom_js"></script>
 <!-- 线路模拟图 -->
-<script src="/real_control_v2/js/utils/svg_chart.js"></script>
-<script src="/real_control_v2/js/utils/svg_data_convert.js"></script>
-<script src="/real_control_v2/js/utils/svg_chart_tooltip.js"></script>
-<script src="/real_control_v2/js/utils/svg_chart_map.js"></script>
+<script src="/real_control_v2/js/utils/svg_chart.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/svg_data_convert.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/svg_chart_tooltip.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/svg_chart_map.js" merge="custom_js"></script>
 <!-- custom table js -->
-<script src="/real_control_v2/js/utils/ct_table.js"></script>
+<script src="/real_control_v2/js/utils/ct_table.js" merge="custom_js"></script>
 <!-- north js -->
-<script src="/real_control_v2/js/north/toolbar.js"></script>
-<script src="/real_control_v2/js/north/tabs.js"></script>
+<script src="/real_control_v2/js/north/toolbar.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/north/tabs.js" merge="custom_js"></script>
 <!-- home js -->
-<script src="/real_control_v2/js/home/layout.js"></script>
-<script src="/real_control_v2/js/home/line_panel.js"></script>
-<script src="/real_control_v2/js/home/context_menu.js"></script>
+<script src="/real_control_v2/js/home/layout.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/home/line_panel.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/home/context_menu.js" merge="custom_js"></script>
 <!-- line schedule js -->
-<script src="/real_control_v2/js/line_schedule/legend.js"></script>
-<script src="/real_control_v2/js/line_schedule/layout.js"></script>
-<script src="/real_control_v2/js/line_schedule/sch_table.js"></script>
-<script src="/real_control_v2/js/line_schedule/context_menu.js"></script>
-<script src="/real_control_v2/js/line_schedule/dbclick.js"></script>
-<script src="/real_control_v2/js/line_schedule/search.js"></script>
+<script src="/real_control_v2/js/line_schedule/legend.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/line_schedule/layout.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/line_schedule/sch_table.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/line_schedule/context_menu.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/line_schedule/dbclick.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/line_schedule/search.js" merge="custom_js"></script>
 <!-- 字典相关 -->
-<script src="/assets/js/dictionary.js"></script>
+<script src="/assets/js/dictionary.js" merge="custom_js"></script>
 <!-- websocket -->
 <script src="/assets/js/sockjs.min.js"></script>
-<script src="/real_control_v2/js/websocket/sch_websocket.js"></script>
+<script src="/real_control_v2/js/websocket/sch_websocket.js" merge="custom_js"></script>
 <!-- tts -->
-<script src="/real_control_v2/js/utils/tts.js"></script>
+<script src="/real_control_v2/js/utils/tts.js" merge="custom_js"></script>
 <!-- echart -->
 <script src="/real_control_v2/assets/echarts-3/echarts.js"></script>
 <!-- Geolib -->
 <script src="/real_control_v2/geolib/geolib.js"></script>
-<script src="/real_control_v2/js/signal_state/signal_state.js"></script>
-<script src="/real_control_v2/js/utils/dispatch_pattern.js"></script>
+<script src="/real_control_v2/js/signal_state/signal_state.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/dispatch_pattern.js" merge="custom_js"></script>
 <!-- 处理表单片段嵌入问题 -->
-<script src="/real_control_v2/js/forms/form_embed.js"></script>
+<script src="/real_control_v2/js/forms/form_embed.js" merge="custom_js"></script>
 <!-- 模态框扩展 -->
-<script src="/real_control_v2/js/modal_extend.js"></script>
+<script src="/real_control_v2/js/modal_extend.js" merge="custom_js"></script>
 <!-- #### 安全驾驶 start ###  -->
 <div class="safe_driv_pop_wrap" ></div>
@@ -199,7 +199,7 @@
     </div>
 </script>
-<script src="/real_control_v2/js/safe_driv/safeDriv.js" ></script>
+<script src="/real_control_v2/js/safe_driv/safeDriv.js"  merge="custom_js"></script>
 <!-- #### 安全驾驶 end ###  -->
 </body>
@@ -320,7 +320,7 @@
                 var init = function (data) {
                     //设置初始值
-                    /*if (data.nbbm)
+                    if (data.nbbm)
                         $('[name=nbbm]', f).val(data.nbbm);
                     var st = moment().subtract(2, 'hour');
                     if (data.st)
@@ -331,15 +331,15 @@
                     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=eTime]', f).val(et.format('HH:mm'));
-                    $('[name=nbbm]', f).val('W0A-018');
+                    /*$('[name=nbbm]', f).val('W0A-018');
                      $('[name=sDate]', f).val('2017-04-06');
                      $('[name=sTime]', f).val('04:49');
                      $('[name=eDate]', f).val('2017-04-06');
-                     $('[name=eTime]', f).val('09:49');
+                     $('[name=eTime]', f).val('09:49');*/
                     //搜索事件
                     $('button[type=submit]', f).on('click', search);
                 };
@@ -575,6 +575,8 @@
                 var matchOut = function (prevInfo, gps) {
                     var oi = gps['inout_stop_info'];
+                    if(!oi)
+                        return;
                     if(prevInfo && prevInfo.stopName == oi.stopName){
                         prevInfo['out_ts'] = oi.ts;
                         return null;
@@ -51,14 +51,14 @@
 </div>
 <script src="/real_control_v2/assets/js/GeoUtils_min.js"></script>
-<script src="/real_control_v2/mapmonitor/js/config.js"></script>
-<script src="/real_control_v2/mapmonitor/js/gps_tree.js"></script>
-<script src="/real_control_v2/mapmonitor/js/spatial_data.js"></script>
-<script src="/real_control_v2/mapmonitor/js/map_overlay_manager.js"></script>
-<script src="/real_control_v2/mapmonitor/js/real.js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/iMap.js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/platform/baidu.js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/platform/gaode.js"></script>
+<script src="/real_control_v2/mapmonitor/js/config.js" merge="custom_map_js"></script>
+<script src="/real_control_v2/mapmonitor/js/gps_tree.js" merge="custom_map_js"></script>
+<script src="/real_control_v2/mapmonitor/js/spatial_data.js" merge="custom_map_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map_overlay_manager.js" merge="custom_map_js"></script>
+<script src="/real_control_v2/mapmonitor/js/real.js" merge="custom_map_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map/iMap.js" merge="custom_map_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map/platform/baidu.js" merge="custom_map_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map/platform/gaode.js" merge="custom_map_js"></script>
 <!-- jquery ui -->
 <script src="/real_control_v2/assets/plugins/jquery.ui/core.js"></script>
 <script src="/real_control_v2/assets/plugins/jquery.ui/widget.js"></script>
@@ -67,4 +67,4 @@
 <!-- 颜色选择器 -->
 <script src="/real_control_v2/assets/plugins/spectrum/spectrum.js"></script>
 <!-- play back -->
-<script src="/real_control_v2/mapmonitor/js/playback.js"></script>
 \ No newline at end of file
+<script src="/real_control_v2/mapmonitor/js/playback.js" merge="custom_map_js"></script>
 \ No newline at end of file