update...

潘钊
1 parent c1bc1070
Showing 4 changed files with 89 additions and 29 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/ThreadMonotor.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/resources/static/pages/base/geo_data_edit/main.html
@@ -146,7 +146,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(schedulePstThread, 120, 10, TimeUnit.SECONDS);//班次延迟入库线程
         sexec.scheduleWithFixedDelay(seiPstThread, 160, 60, TimeUnit.SECONDS);//班次修正日志入库
         sexec.scheduleWithFixedDelay(directivesPstThread, 180, 120, TimeUnit.SECONDS);//调度指令延迟入库
-        //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
+        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
         sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新
         sexec.scheduleWithFixedDelay(autoExecScanThread, 160, 50, TimeUnit.SECONDS);//班次自动执行
 package com.bsth.data;
  
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.bsth.data.gpsdata_v2.DataHandleProcess;
+import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import org.springframework.stereotype.Component;
  
 /**
@@ -10,32 +10,10 @@ import org.springframework.stereotype.Component;
 @Component
 public class ThreadMonotor extends Thread{
  
-    Logger log = LoggerFactory.getLogger(this.getClass());
-
     @Override
     public void run() {
-
-        //线调GPS分析主线程
-        /*if(GpsRealAnalyse.isBlock()){
-            log.warn("GpsRealAnalyse isBlock true !!!!");
-            GpsRealAnalyse.shutdown();
-        }*/
-
-        /*if(GpsRealAnalyse.isIdle()){
-            //切换到备用的网关实时GPS对照数据
+        //切换到备用的网关实时GPS对照数据
+        if(DataHandleProcess.isBlock())
             GpsDataLoaderThread.setFlag(-1);
-        }*/
-
-        //webSocket 消息推送队列
-        /*if(WebSocketPushQueue.isIdle()){
-            log.warn("WebSocketPushQueue isIdle true !!!!");
-            WebSocketPushQueue.start();
-        }*/
-
-        //网关指令推送队列（系统自动发送的）
-        /*if(DirectivePushQueue.isIdle()){
-            log.warn("DirectivePushQueue isIdle true !!!!");
-            DirectivePushQueue.start();
-        }*/
     }
 }
 \ No newline at end of file
@@ -46,8 +46,17 @@ public class DataHandleProcess {
     @Autowired
     GpsRealData gpsRealData;
  
+    static long lastTime;
+
+    public static boolean isBlock() {
+        return System.currentTimeMillis() - lastTime > 1000 * 20;
+    }
+
     public void handle(List<GpsEntity> list) {
         try {
+            if(list.size() == 0)
+                return;
+            lastTime = System.currentTimeMillis();
             //按设备号分组数据（一个设备的多条数据，必须在一个线程里跑）
             ArrayListMultimap multimap = ArrayListMultimap.create();
             for (GpsEntity gps : list) {
@@ -7,26 +7,95 @@
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
     <!-- flatpickr -->
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
+    <!-- tooltip css-->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"  />
+    <link rel="stylesheet" href="/real_control_v2/css/pace.css"  />
     <style>
+        /* ^_^ baidu map hide logo */
+        .anchorBL, .anchorBL, .amap-logo, .amap-copyright {
+            display: none;
+        }
+
         html,body{
             height: 100%;
         }
         .ct_page{
-            padding: 25px 15px;
+            padding: 0;
+            height: 100%;
+        }
+
+        div#map_wrap{
             height: 100%;
-            height: calc(100% - 50px);
         }
  
+        .main_left_panel{
+            position: absolute;
+            z-index: 999;
+            height: calc(100% - 20px);
+            width: 300px;
+            background: #fffffff5;
+            top: 7px;
+            left: 5px;
+            box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+        }
+        .main_lt_search_panel{
+            position: absolute;
+            z-index: 99;
+            top: 10px;
+            left: 330px;
+            background: #fffffff5;
+            box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+        }
+        .main_rt_tools_panel{
+            position: absolute;
+            z-index: 99;
+            top: 7px;
+            right: 7px;
+            background: #ffffff;
+            box-shadow: -5px 4px 15px rgba(90, 90, 90, 0.48);
+            padding: 0 12px;
+            text-align: center;
+            border-radius: 7px;
+            height: 28px;
+        }
  
+        .main_rt_tools_panel>._icon{
+            margin: 0 9px;
+        }
+        .search_input{
+            width: 250px;
+            height: 42px;
+        }
+
+        .search_input::placeholder{
+            color: grey;
+            font-size: 12px;
+        }
     </style>
 </head>
  
 <body>
 <div class="ct_page" >
     <div id="map_wrap">
+    </div>
+    <div class="main_left_panel">
+        <div class="_line_info">
  
+        </div>
+    </div>
+    <div class="main_lt_search_panel">
+        <div class="uk-inline">
+            <span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>
+            <input class="uk-input search_input" placeholder="搜索地图位置" type="text">
+        </div>
+    </div>
+    <div class="main_rt_tools_panel">
+        <a uk-icon="icon: info;ratio: .9" class="_icon"></a>
+        <a uk-icon="icon: expand;ratio: .9" class="_icon"></a>
     </div>
 </div>
+<!-- 百度 -->
+<script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
 <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
 <script src="/assets/plugins/uk3.0/uikit.min.js"></script>
 <script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
@@ -41,7 +110,10 @@
 <!-- flatpickr -->
 <script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
 <script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
+<!-- qtip -->
+<script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" ></script>
 <script>
+    top.document.title = "绘制线路";
     // 关闭左侧栏
     if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();}
  
@@ -58,6 +130,7 @@
     };
  
     map = new BMap.Map($(gb_map_consts.mapContainer)[0]);
+    //map.setMapStyle({style:'dark'});
     //中心点和缩放级别
     map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 13);
     map.enableScrollWheelZoom();