update...

潘钊
1 parent ddc1a933
Showing 3 changed files with 58 additions and 5 deletions
src/main/java/com/bsth/XDApplication.java
src/main/resources/static/real_control_v2/js/safe_driv/CallCenterPluginDemo.html
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
@@ -10,6 +10,7 @@ import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata_v2.thread.OfflineMonitorThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.bsth.data.safe_driv.SafeDrivDataLoadThread;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.auto_exec.AutoExecScanThread;
 import com.bsth.data.schedule.edit_logs.SeiPstThread;
@@ -75,6 +76,9 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     LineVersionsData lineVersionsData;
  
+    @Autowired
+    SafeDrivDataLoadThread safeDrivDataLoadThread;
+
     private static long timeDiff;
     private static long timeDiffTraffic;
  
@@ -122,7 +126,7 @@ public class XDApplication implements CommandLineRunner {
         //实际排班更新线程
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //sexec.scheduleWithFixedDelay(autoExecScanThread, 100, 50, TimeUnit.SECONDS);//班次自动执行
-        //WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
+        WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         //实际排班延迟入库线程
         //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
         //班次修正日志延迟入库
@@ -131,11 +135,16 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
         //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
+
+        //安全驾驶
+        //sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 40, 30, TimeUnit.SECONDS);
     }
  
     public void prodInit(){
         log.info("prodInit...");
         ScheduledExecutorService sexec = Application.mainServices;
+        //安全驾驶
+        sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
  
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+    <script src="http://180.168.57.114:4244/Scripts/CallCenterPlugin.js" type="text/javascript"></script>
+</body>
+</html>
 \ No newline at end of file
@@ -14,7 +14,7 @@ var gb_safe_driv = (function () {
         'A9': '玩手机'
     };
  
-    var path = 'http://118.178.187.115/CurrentSafeDriving/';
+    var path = 'http://180.166.5.82:9005/CurrentSafeDriving/';
  
     var $wrap = $('.safe_driv_pop_wrap');
     var max = 5;
@@ -43,16 +43,24 @@ var gb_safe_driv = (function () {
         $wrap.append(htmlStr);
     };
  
-    var vedioModal = '<div id="ssspVedioModal" class="uk-modal ct_move_modal">' +
+/*    var vedioModal = '<div id="ssspVedioModal" class="uk-modal ct_move_modal">' +
                         '<div class="uk-modal-dialog uk-modal-dialog-large">' +
                         '<button type="button" class="uk-modal-close uk-close"></button>' +
                         '<div class="uk-modal-header"> <h2>实时视频</h2> </div> '+
                         '<p class="loading"><i class="uk-icon-spinner uk-icon-spin"></i> 载入资源...</p><iframe id="vedioIframe" src="http://222.66.0.204:8910/transport_server/dvr_monitor1.jsp?deviceId=229L0650&channel=^^channel^^"></iframe>' +
                         '</div>' +
-                    '</div>';
+                    '</div>';*/
+
+    var phoneModal = '<div id="callPhoneModal" class="uk-modal ct_move_modal">' +
+                                '<div class="uk-modal-dialog">' +
+                                '<button type="button" class="uk-modal-close uk-close"></button>' +
+                                '<div class="uk-modal-header"> <h2>打电话</h2> </div> '+
+                                '<p class="loading"><i class="uk-icon-spinner uk-icon-spin"></i> 载入资源...</p><iframe style="width: 100%;height: 280px;" id="phoneIframe" src="/real_control_v2/js/safe_driv/CallCenterPluginDemo.html"></iframe>' +
+                                '</div>' +
+                            '</div>';
  
     $wrap.on('click', '.safe_driv_pop', function () {
-        var title = $(this).data('title') + '&nbsp;<button data-type="'+$(this).data('type')+'" class="uk-button uk-button-mini uk-button-primary" id="openVedioModalBtn" type="button">查看实时视频</button>';
+        var title = $(this).data('title') + '&nbsp;<button class="uk-button uk-button-mini uk-button-primary" id="openPhoneModalBtn" type="button">打电话</button>';
         var url = $(this).data('url');
         $(this).remove();
         var lightbox = UIkit.lightbox.create([
@@ -89,6 +97,32 @@ var gb_safe_driv = (function () {
     });
  
  
+    var showCallPhoneModal = function () {
+        open_modal_dom(phoneModal ,{}, {modal: false});
+        $('#callPhoneModal #phoneIframe').on('load', function () {
+            var that = this;
+            var iframe = this.contentWindow.document.body;
+            setTimeout(function () {
+                //修改css
+                $(iframe).find('.CallCenterToolBar').css('height', '200px').css('width', '100%').css('top', '10px').css('left', 'calc(50% - 148px)').css('box-shadow', 'none');
+                $(iframe).find('.CallCenterToolBar .top').css('display', 'none');
+
+                $('.toolBar td[data-action=call]', iframe).trigger('click');
+
+                //焦点
+                $('input#telNumber', iframe).focus();
+
+                $(that).show();
+                $('#callPhoneModal p.loading').remove();
+            }, 700);
+        });
+    };
+
+    $(document).on('click', '#openPhoneModalBtn', function () {
+        showCallPhoneModal();
+    });
+
+
     return {
         pop: pop,
         safeCode: codes,