Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

update...

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
update...
潘钊
1 parent 27cda0bc
Showing 17 changed files with 569 additions and 244 deletions
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/service/realcontrol/impl/RealMapServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/tabs.html
src/main/resources/static/real_control_v2/js/common.js
src/main/resources/static/real_control_v2/js/data/data_gps.js
src/main/resources/static/real_control_v2/js/home/context_menu.js
src/main/resources/static/real_control_v2/js/north/tabs.js
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
src/main/resources/static/real_control_v2/mapmonitor/js/config.js
src/main/resources/static/real_control_v2/mapmonitor/js/gps_tree.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/platform/baidu.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/platform/gaode.js
src/main/resources/static/real_control_v2/mapmonitor/js/map_overlay_manager.js
src/main/resources/static/real_control_v2/mapmonitor/real.html
@@ -73,9 +73,13 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 			}
 			//解密RSA
-			userName = RSAUtils.decryptBase64(userName);
-			password = RSAUtils.decryptBase64(password);
-			
+			try {
+				userName = RSAUtils.decryptBase64(userName);
+				password = RSAUtils.decryptBase64(password);
+			} catch (RuntimeException e) {
+				return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
+			}
+
 			SysUser user = sysUserService.findByUserName(userName);
 			if (null == user) 
 				return put(rs, "msg", "不存在的用户");
@@ -472,7 +472,6 @@ public class DayOfSchedule implements CommandLineRunner {
 	}
 	public void put(ScheduleRealInfo sch) {
-
 		schAttrCalculator
 			.calcRealDate(sch)
 			.calcAllTimeByFcsj(sch);
 package com.bsth.data.schedule;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import com.bsth.data.LineConfigData;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
@@ -12,9 +10,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import com.bsth.data.LineConfigData;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 /**
  * 
@@ -49,11 +48,30 @@ public class SchAttrCalculator {
 			if (null == sch.getFcsjT())
 				calcFcsjTime(sch);
-			
+			//計發時間
 			if(sch.getFcsj().compareTo(conf.getStartOpt()) < 0){
 				sch.setFcsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsj()) + DAY_TIME);
 			}
-			
+
+			//待發時間
+			if(sch.getDfsj().compareTo(conf.getStartOpt()) < 0){
+				sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()) + DAY_TIME);
+			}
+			else
+				sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()));
+
+			//實發時間
+			if(sch.getFcsjActual() != null &&
+					sch.getFcsjActual().compareTo(conf.getStartOpt()) < 0){
+				sch.setFcsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsjActual()) + DAY_TIME);
+			}
+
+			//實際終點時間
+			if(sch.getZdsjActual() != null &&
+					sch.getZdsjActual().compareTo(conf.getStartOpt()) < 0){
+				sch.setZdsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getZdsjActual()) + DAY_TIME);
+			}
+
 			sch.setRealExecDate(fmtyyyyMMdd.print(sch.getFcsjT()));
 		} catch (Exception e) {
 			logger.error("", e);
@@ -40,7 +40,7 @@ public class RealMapServiceImpl implements RealMapService {
             }
             inStr = " (" + inStr.substring(1) + ")";
-            String sql = "select R.LINE_CODE,R.STATION_NAME,R.STATION_CODE,R.STATION_MARK,R.DIRECTIONS,R.DISTANCES,R.TO_TIME, R.VERSIONS,S.G_LONX,S.G_LATY,S.RADIUS,S.SHAPES_TYPE,ST_AsText(S.G_POLYGON_GRID) as G_POLYGON_GRID, R.STATION_ROUTE_CODE from bsth_c_stationroute r inner join bsth_c_station s on r.station=s.id where r.line_code in "+inStr+" and r.destroy=0";
+            String sql = "select r.LINE_CODE,r.STATION_NAME,r.STATION_CODE,r.STATION_MARK,r.DIRECTIONS,r.DISTANCES,r.TO_TIME, r.VERSIONS,s.G_LONX,s.G_LATY,s.RADIUS,s.SHAPES_TYPE,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID, r.STATION_ROUTE_CODE from bsth_c_stationroute r inner join bsth_c_station s on r.station=s.id where r.line_code in "+inStr+" and r.destroy=0";
             List<StationSpatialData> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper(StationSpatialData.class));
             rs.put("status", ResponseCode.SUCCESS);
@@ -59,7 +59,7 @@ public class RealMapServiceImpl implements RealMapService {
         Map<String, Object> rs = new HashMap();
         try {
-            String sql = "select ID, AREA,PARK_CODE,PARK_NAME,ST_AsText(G_PARK_POINT) as G_PARK_POINT,G_CENTER_POINT,RADIUS,SHAPES_TYPE from bsth_c_car_park WHERE destroy=0";
+            String sql = "select ID, AREA,PARK_CODE,PARK_NAME,ST_AsText(G_PARK_POINT) as G_PARK_POINT,G_CENTER_POINT,RADIUS,SHAPES_TYPE from bsth_c_car_park WHERE destroy=0 and shapes_type='d'";
             List<CarPark> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper(CarPark.class));
             rs.put("status", ResponseCode.SUCCESS);
@@ -2,7 +2,7 @@
   <script id="north-tabs-temp" type="text/html">
     <ul class="uk-tab" data-uk-tab="{connect:'#main-tab-content'}">
         <li class="uk-active" ><a>主页</a></li>
-        <li class=""><a>地图</a></li>
+        <li id="north_tabs_map_btn"><a>地图</a></li>
         {{each list as line i}}
         <li class="tab-line"><a>{{line.name}}（<span id="badge_untreated_num_{{line.lineCode}}">0</span>, <span id="badge_yfwf_num_{{line.lineCode}}">0</span>）</a></li>
         {{/each}}
@@ -12,9 +12,9 @@
   <script id="north-tab-content-temp" type="text/html">
     <ul id="main-tab-content" class="uk-switcher uk-margin ">
         <li class="uk-active home-panel">主页</li>
-        <li class="map-panel">地图</li>
+        <li class="map-panel">地图未渲染</li>
         {{each list as line i}}
-        <li class="line_schedule" data-id="{{line.lineCode}}">{{line.name}}</li>
+        <li class="line_schedule" data-id="{{line.lineCode}}">{{line.name}} 未渲染</li>
         {{/each}}
     </ul>
   </script>
-var gb_common = (function() {
+var gb_common = (function () {
-    var reqCode80 = {0xA1: '请求恢复运营', 0xA2: '申请调档', 0xA3: '出场请求', 0xA5: '进场请求', 0xA7: '加油请求', 0x50: '车辆故障', 0x70: '路阻报告', 0x60: '事故报告', 0x11: '扣证纠纷', 0x12 : '报警'};
+    var reqCode80 = {
+        0xA1: '请求恢复运营',
+        0xA2: '申请调档',
+        0xA3: '出场请求',
+        0xA5: '进场请求',
+        0xA7: '加油请求',
+        0x50: '车辆故障',
+        0x70: '路阻报告',
+        0x60: '事故报告',
+        0x11: '扣证纠纷',
+        0x12: '报警'
+    };
-    var groupBy = function(list, field) {
+    var groupBy = function (list, field) {
         var rs = {},
             key;
-        $.each(list, function() {
+        $.each(list, function () {
             key = this[field];
             if (!rs[key])
                 rs[key] = [];
@@ -16,10 +27,10 @@ var gb_common = (function() {
         return rs;
     }
-    var compileTempByDom = function(dom, opts) {
+    var compileTempByDom = function (dom, opts) {
         var tps = {},
             id;
-        $('script[type="text/html"]', dom).each(function() {
+        $('script[type="text/html"]', dom).each(function () {
             id = $(this).attr('id');
             if (id)
                 tps[id] = template.compile($(this).html(), opts);
@@ -27,46 +38,47 @@ var gb_common = (function() {
         return tps;
     }
-    var $get = function(url, data, successFun) {
+    var $get = function (url, data, successFun) {
         $.ajax({
             url: url,
             data: data,
-            complete: function(xhr, ts) {
+            complete: function (xhr, ts) {
                 ajaxComplete(xhr, ts, successFun);
             }
         });
     }
-    var $post = function(url, data, successFun) {
+    var $post = function (url, data, successFun) {
         $.ajax({
             url: url,
             method: 'POST',
             data: data,
-            complete: function(xhr, ts) {
+            complete: function (xhr, ts) {
                 ajaxComplete(xhr, ts, successFun);
             }
         });
     }
-    var $post_arr = function(url, data, successFun) {
+    var $post_arr = function (url, data, successFun) {
         $.ajax({
             url: url,
             method: 'POST',
             traditional: true,
             data: data,
-            complete: function(xhr, ts) {
+            complete: function (xhr, ts) {
                 ajaxComplete(xhr, ts, successFun);
             }
         });
     }
-    var $del = function(url, successFun){
-      $post(url, {'_method': 'delete'},function(rs){
-        successFun && successFun(rs);
-      });
+    var $del = function (url, successFun) {
+        $post(url, {'_method': 'delete'}, function (rs) {
+            successFun && successFun(rs);
+        });
     }
-    var errorHead='<span style="color:red;">服务器出现异常：</span>';
+    var errorHead = '<span style="color:red;">服务器出现异常：</span>';
+
     function successHandle(json, handle) {
         var status = json.status;
         if (status == 407) {
@@ -81,7 +93,7 @@ var gb_common = (function() {
         }
         if (status == 'ERROR')
-            UIkit.modal.alert(errorHead+ (json.msg ? json.msg : '未知异常'), {labels:{Ok: '确定'}});
+            UIkit.modal.alert(errorHead + (json.msg ? json.msg : '未知异常'), {labels: {Ok: '确定'}});
         else
             handle && handle(json);
     }
@@ -90,11 +102,11 @@ var gb_common = (function() {
         if (ts == 'success') {
             successHandle(JSON.parse(xhr.responseText), succ);
         } else if (ts == 'error') {
-            UIkit.modal.alert(errorHead + xhr.responseText, {labels:{Ok: '确定'}});
+            UIkit.modal.alert(errorHead + xhr.responseText, {labels: {Ok: '确定'}});
         }
     }
-    var get_vals = function(json) {
+    var get_vals = function (json) {
         var array = [];
         for (var key in json) {
             array.push(json[key]);
@@ -103,7 +115,7 @@ var gb_common = (function() {
         return array;
     }
-    var get_keys = function(json) {
+    var get_keys = function (json) {
         var array = [];
         for (var key in json) {
             array.push(key);
@@ -111,29 +123,34 @@ var gb_common = (function() {
         return array;
     }
-    var get_device_tree_data = function() {
+    var get_device_tree_data = function (allGps, idBefore) {
+        if(!idBefore)
+            idBefore='';
         var treeData = [];
-        var data = groupBy(get_vals(gb_data_gps.allGps), 'lineId');
+        //var data = groupBy(get_vals(gb_data_gps.allGps), 'lineId');
+        var data = groupBy(get_vals(allGps), 'lineId');
         var name;
         for (var code in data) {
             name = gb_data_basic.codeToLine[code].name;
             data[name] = groupBy(data[code], 'upDown');
             treeData.push({
                 'text': name,
-                'a_attr':{'type': 'line'},
+                'a_attr': {'type': 'line', 'id': idBefore+'line_'+code},
                 'children': [{
                     'text': '上行',
                     'children': grabs(data[name][0]),
                     'a_attr': {
-                      'type': 'route',
-                      'route': code+'_0'
+                        'type': 'route',
+                        'route': code + '_0',
+                        'id': idBefore+'route_' + code + '_0'
                     }
                 }, {
                     'text': '下行',
                     'children': grabs(data[name][1]),
                     'a_attr': {
-                      'type': 'route',
-                      'route': code+'_1'
+                        'type': 'route',
+                        'route': code + '_1',
+                        'id': idBefore+'route_' + code + '_1'
                     }
                 }]
             });
@@ -143,7 +160,7 @@ var gb_common = (function() {
             if (!array)
                 return;
             var rs = [];
-            $.each(array, function() {
+            $.each(array, function () {
                 rs.push({
                     'text': this.nbbm,
                     'a_attr': {
@@ -160,7 +177,7 @@ var gb_common = (function() {
         return treeData;
     };
-    var lineAutocomplete = function(element) {
+    var lineAutocomplete = function (element) {
         //construction data
         var data = [],
             code2Name = gb_data_basic.lineCode2NameAll(),
@@ -177,42 +194,42 @@ var gb_common = (function() {
         init_autocom_pinyin(element, data);
     };
-    var personAutocomplete = function(element, personMaps) {
+    var personAutocomplete = function (element, personMaps) {
         /*var data = [],name;
-        for(var jobCode in personMaps){
-          name=personMaps[jobCode];
-          data.push({
-              value: jobCode+'/'+name,
-              fullChars: pinyin.getFullChars(name).toUpperCase(),
-              camelChars: pinyin.getCamelChars(name)
-          });
-        }*/
+         for(var jobCode in personMaps){
+         name=personMaps[jobCode];
+         data.push({
+         value: jobCode+'/'+name,
+         fullChars: pinyin.getFullChars(name).toUpperCase(),
+         camelChars: pinyin.getCamelChars(name)
+         });
+         }*/
         //init_autocom_pinyin(element, data);
         init_autocom_pinyin(element, gb_data_basic.allPersonnel());
     };
-    var carAutocomplete=function(element, list){
-      var data = [];
-      $.each(list, function(){
-          data.push({value: this});
-      });
-      init_autocomplete(element, data);
+    var carAutocomplete = function (element, list) {
+        var data = [];
+        $.each(list, function () {
+            data.push({value: this});
+        });
+        init_autocomplete(element, data);
     }
-    var init_autocom_pinyin=function(element, data){
+    var init_autocom_pinyin = function (element, data) {
         // init autocomplete
         var autocomplete = UIkit.autocomplete(element, {
             minLength: 1,
             delay: 50,
-            source: function(release) {
+            source: function (release) {
                 var q = $('input', element).val().toUpperCase(),
                     rs = [],
                     count = 0;
-                $.each(data, function() {
-                    if (this.value.indexOf(q) != -1 || this.fullChars.indexOf(q) != -1 || this.camelChars.indexOf(q) != -1){
-                      rs.push(this);
-                      count++;
+                $.each(data, function () {
+                    if (this.value.indexOf(q) != -1 || this.fullChars.indexOf(q) != -1 || this.camelChars.indexOf(q) != -1) {
+                        rs.push(this);
+                        count++;
                     }
                     if (count >= 10)
@@ -224,26 +241,26 @@ var gb_common = (function() {
         });
     }
-    var init_autocomplete=function(element, data){
-      var autocomplete = UIkit.autocomplete(element, {
-          minLength: 1,
-          delay: 50,
-          source: function(release) {
-              var q = $('input', element).val().toUpperCase(),
-                  rs = [],
-                  count = 0;
-
-              $.each(data, function() {
-                  if (this.value.indexOf(q) != -1){
-                    rs.push(this);
-                    count++;
-                  }
-                  if (count >= 10)
-                      return false;
-              });
-              release && release(rs);
-          }
-      });
+    var init_autocomplete = function (element, data) {
+        var autocomplete = UIkit.autocomplete(element, {
+            minLength: 1,
+            delay: 50,
+            source: function (release) {
+                var q = $('input', element).val().toUpperCase(),
+                    rs = [],
+                    count = 0;
+
+                $.each(data, function () {
+                    if (this.value.indexOf(q) != -1) {
+                        rs.push(this);
+                        count++;
+                    }
+                    if (count >= 10)
+                        return false;
+                });
+                release && release(rs);
+            }
+        });
     }
     // function whichTransitionEvent() {
@@ -12,7 +12,7 @@ var gb_data_gps = (function() {
     var registerCallback = function(cb) {
         if (cb)
             refreshEventCallbacks.push(cb);
-    }
+    };
     var refresh = function(cb) {
         $.get('/gps/real/line', {
@@ -68,7 +68,7 @@ var gb_home_context_menu = (function() {
         // show modal
         var elem = show_modal(modal, dom);
         //create tree
-        var treeData = gb_common.get_device_tree_data();
+        var treeData = gb_common.get_device_tree_data(gb_data_gps.allGps);
         var treeObj = $('.device-tree', modal).jstree({
             'core': {
                 'data': treeData
@@ -17,9 +17,16 @@ var gb_tabs = (function() {
             $('.north-tabs').html(tabHtmlStr);
             $('.main-container').html(tabContentHtmlStr);
+            //地图选项卡初始点击
+            $('#north_tabs_map_btn').one('click', function () {
+                if(typeof(gb_map_overlay_mge)!="undefined"){
+                    gb_map_overlay_mge.centerToRational();
+                }
+            });
+
             cb && cb();
         });
-    }
+    };
     //文件载入完毕
     res_load_ep.emitLater('load_tab');
@@ -8,13 +8,61 @@
     top: 20px;
     background: red;
     color: white;
-    padding: 7px;
-    left: calc(50% - 250px);
+    padding: 7px 25px 7px 7px;
+    right: calc(50% - 250px);
     border-radius: 5px;
     font-size: 20px;
     cursor: pointer;
 }
+.map-system-msg.flex-left a{
+    transition: all .3s ease;
+    right: 325px;
+    width: 45px;
+    height: 10px;
+    overflow: hidden;
+    left: auto;
+    top: 3px;
+    box-shadow: none;
+    border-radius: 5px 0 0 5px;
+    border: 1px solid #dedede;
+    border-right: none;
+}
+
+.map-system-msg.flex-left a:before{
+    content: '老版本地图';
+    position: absolute;
+    width: 100%;
+    z-index: 2;
+    height: 100%;
+    background: #ffffff;
+    top: 0;
+    left: 0;
+    text-align: center;
+    font-size: 12px;
+    line-height: 24px;
+    color: #969696;
+}
+
+.map-system-msg a:hover{
+    text-decoration: none;
+}
+
+.map-system-msg i.uk-icon-close{
+    position: absolute;
+    top: 10px;
+    right: 6px;
+    font-size: 12px;
+    color: #ff0000;
+    background: #fcf6f6;
+    padding: 1px 2px;
+    border-radius: 10px;
+}
+
+.map-system-msg i.uk-icon-close:hover{
+    color: #a75c5c;
+}
+
 #real_map_container{
     width: 100%;
     height: 100%;
@@ -41,7 +89,7 @@
 /**/
 .real_bottom_panel{
-    position: absolute !important;
+/*    position: absolute !important;
     height: 180px;
     width: 100%;
     width: calc(100% - 342px);
@@ -49,8 +97,17 @@
     left: 0px !important;
     background: #fff;
     box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-   /* border-radius: 0 60px 0 0;*/
+    border: 1px solid #bfbcbc;*/
+
+    position: absolute !important;
+    height: 180px;
+    bottom: 2px !important;
+    background: #fff;
+    box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
     border: 1px solid #bfbcbc;
+    width: 240px;
+    right: 327px;
+    padding-left: 20px;
 }
@@ -90,8 +147,8 @@
 */
 .real_bottom_panel #handle{
     width: 100%;
-    height: 4px;
-    top: -4px;
+    height: 3px;
+    top: -3px;
     background-color: rgba(136, 137, 138, 0.49);
     cursor: row-resize;
 }
@@ -105,13 +162,22 @@
 }
 .real_bottom_panel .real_br_cont{
-    display: inline-block;
+/*    display: inline-block;
     width: 232px;
     height: 100%;
     height: calc(100% - 7px);
     overflow: auto;
     padding-top: 7px;
     font-size: 13px;
+    position: relative;*/
+
+    display: inline-block;
+    width: 100%;
+    height: 100%;
+    height: calc(100% - 7px);
+    overflow: auto;
+    padding-top: 7px;
+    font-size: 13px;
     position: relative;
 }
@@ -27,13 +27,6 @@
     <script id="map-win-station-detail-temp" type="text/html">
         <div class="gps_info_win">
             <h4>{{stationName}}</h4>
-            <p>方向:
-                {{if directions==0}}
-                    上行
-                {{else if directions==1}}
-                    下行
-                {{/if}}
-            </p>
             <p>站点编码： {{stationCode}}</p>
             <p>站点类型：
                 {{if stationMark=='B'}}
@@ -14,8 +14,8 @@ var gb_map_config = (function () {
             carPark: false
         },
         abnormalPrint: {
-            speeding: true,
-            outBounds: true,
+            speeding: false,
+            outBounds: false,
             largeMargin: false
         },
         carIcon: {
@@ -102,6 +102,7 @@ var gb_map_config = (function () {
                 if (defaultConfig.traffic)
                     gb_map_imap.call('traffic', true);
             }, 1000);
+            gb_map_overlay_mge.centerToRational();
         });
     }
 var gb_map_gps_tree = (function () {
+    var idBefore = 'map_tree_';
+    var _devices;
     var treeObj;
-    
     var jstreeChanged = function (e, node, event) {
         gb_map_overlay_mge.refresh();
     };
     var init = function (cb) {
+        var allGps = gb_data_gps.allGps;
+        _devices = gb_common.get_keys(allGps);
         //设备树
-        var treeData = gb_common.get_device_tree_data();
+        var treeData = gb_common.get_device_tree_data(allGps, idBefore);
         treeObj = $('.real_right_gps_panel .gps_tree_list')
-            //节点初始化完成
+        //节点初始化完成
             .on('ready.jstree', function () {
                 treeObj.jstree(true).open_all();
                 //删掉tree node a标签的 href值（避免鼠标悬停浏览器出现状态条）
@@ -26,14 +29,15 @@ var gb_map_gps_tree = (function () {
             .on('activate_node.jstree', function (e, n) {
                 //console.log('activate_node.jstree', e, n);
                 var node = n.node;
-                if(node.a_attr && node.a_attr.type=='device' && node.state.checked){
+                if (node.a_attr && node.a_attr.type == 'device' && node.state.checked) {
                     var device = node.a_attr.device;
                     gb_map_overlay_mge._focus(device);
                 }
             })
             .jstree({
                 'core': {
-                    'data': treeData
+                    'data': treeData,
+                    'check_callback': true
                 },
                 'checkbox': {
                     'keep_selected_style': false,
@@ -57,17 +61,105 @@ var gb_map_gps_tree = (function () {
                     }
                 },
                 //local storage里的key
-                'state':{
+                'state': {
                     'key': 'jstree_map_devices'
                 },
                 'plugins': ['checkbox', 'contextmenu', 'state']
             });
     };
+    //創建新節點
+    var create_node = function (array, create_end_cb) {
+        if (!isArray(array))
+            array = [array];
+
+        var jstreeInts = treeObj.jstree(true);
+        var len = array.length, i = 0;
+        (function () {
+            var f = arguments.callee;
+            if (i >= len) {
+                create_end_cb && create_end_cb();
+                return;
+            }
+
+            var gps = array[i],
+                pId = idBefore + 'route_' + gps.lineId + '_' + gps.upDown;
+            //上下行节点
+            var routeNode = jstreeInts.get_node(pId);
+            if (!routeNode) {
+                //父节点不存在
+                create_route_node(gps.lineId, function () {
+                    //重新获取上下行节点
+                    routeNode = jstreeInts.get_node(pId);
+                    appendDeviceNode(routeNode, gps, function () {
+                        _devices.push(gps.deviceId);
+                        i++;
+                        f();
+                    });
+                });
+            }
+            else {
+                appendDeviceNode(routeNode, gps, function () {
+                    _devices.push(gps.deviceId);
+                    i++;
+                    f();
+                });
+            }
+        })();
+    }
+
+    //创建线路和上下行节点
+    var create_route_node = function (lineCode, cb) {
+        var lineName = gb_data_basic.codeToLine[lineCode].name;
+        var id = treeObj.jstree(true).create_node('#', {
+            'text': lineName,
+            'a_attr': {'type': 'line', 'id': idBefore + 'line_' + lineCode},
+            'state': {'opened': true},
+            'children': [{
+                'text': '上行',
+                'a_attr': {
+                    'type': 'route',
+                    'route': lineCode + '_0',
+                    'id': idBefore + 'route_' + lineCode + '_0',
+                    'state': {'opened': true}
+                }
+            }, {
+                'text': '下行',
+                'a_attr': {
+                    'type': 'route',
+                    'route': lineCode + '_1',
+                    'id': idBefore + 'route_' + lineCode + '_1',
+                    'state': {'opened': true}
+                }
+            }]
+        }, 'last', cb);
+    }
+
+    var appendDeviceNode = function (routeNode, gps, cb) {
+        if (!routeNode) {
+            return;
+        }
+
+        //添加車輛節點
+        treeObj.jstree(true).create_node(routeNode, {
+            'text': gps.nbbm,
+            'a_attr': {
+                'type': 'device',
+                'device': gps.deviceId
+            },
+            'data': {lineId: gps.lineId, upDown: gps.upDown},
+            'icon': 'uk-icon-bus'
+        }, 'last', cb);
+    }
+
     return {
         init: init,
         getChecked: function () {
             return treeObj.jstree(true).get_checked(true);
-        }
+        },
+        all_devices: function () {
+            return _devices;
+        },
+        create_node: create_node
     };
 })();
 \ No newline at end of file
@@ -88,7 +88,7 @@ var gb_map_baidu = (function(){
 			map.addOverlay(polyline);
 			//延迟居中，避免多次调用时抖动
-			delayToCenter(pos[parseInt(pos.length / 2)]);
+			//delayToCenter(pos[parseInt(pos.length / 2)]);
 			//map.panTo(pos[parseInt(pos.length / 2)]);
 		},
 		traffic: function (enable) {
@@ -110,8 +110,7 @@ var gb_map_baidu = (function(){
 		//定位到线路中间点
 		centerToLine: function (opt) {
 			var pos=polylines[opt.id].getPath();
-			console.log('定位到中心,,,', pos[parseInt(pos.length / 2)]);
-			map.setCenter(pos[parseInt(pos.length / 2)]);
+			delayToCenter(pos[parseInt(pos.length / 2)]);
 		},
 		//绘制GPS信号
 		drawRealGpsMarker: function(opts){
@@ -134,6 +133,12 @@ var gb_map_baidu = (function(){
 						map.addOverlay(marker);
 						//设备号和marker映射
 						realMarkers[gps.deviceId] = marker;
+						/*//新上线的设备，默认隐藏
+						if(gps.newNodeHide){
+							marker.hide();
+							gps.newNodeHide=null;
+							delete gps.newNodeHide;
+						}*/
 					}
 				}
 			});
@@ -186,7 +191,6 @@ var gb_map_baidu = (function(){
 				//info window
 				polygon.infoWin = new BMap.InfoWindow(gb_map_overlay_mge.map_carpark_win_temp(this), {});
 				polygon.addEventListener('click', function(){
-					console.log('aaa', this);
 					map.openInfoWindow(this.infoWin, this._centerPoint);
 				});
 			});
@@ -291,18 +295,6 @@ var gb_map_baidu = (function(){
 			var polygon = new BMap.Polygon(station.bdPoints, {strokeColor: opt.color, strokeWeight: opt.weight});
 			map.addOverlay(polygon);
 			electronicFences[code]=polygon;
-
-/*
-			//计算多边形面积
-			var area=BMapLib.GeoUtils.getPolygonArea(polygon);
-			if(!isNaN(area))
-				polygon._polygonArea=area+'米';
-			else
-				polygon._polygonArea='计算失败';
-
-			polygon.addEventListener('click', function(){
-				map.openInfoWindow(this.infoWin, marker.point);
-			});*/
 		},
 		//删除缓冲区
 		clearBuffArea: function(code){
@@ -407,15 +399,12 @@ var gb_map_baidu = (function(){
 		return marker;
 	}
-	//为每个数字定义宽度
-/*	var icon_num_width=[
-		7,6,7,7,7,7,7,7,7,7
-	];*/
+
 	function calcGpsMarkerWidth(nbbm) {
 		var width=0;
 		$.each(nbbm.split(''), function () {
 			if(!isNaN(this))
-				width += 7;//icon_num_width[this];
+				width += 7;
 			else if(this=='-')
 				width += 10;
 			else
@@ -428,7 +417,7 @@ var gb_map_baidu = (function(){
 		var point = new BMap.Point(statio.bd_lon, statio.bd_lat);
 		var marker = new BMap.Marker(point);
-		//根据编码长度 计算marker 宽度
+		//根据站点名称 计算marker 宽度
 		var w = statio.stationName.length * 12 + 4
 			,iw=w-2;
 		var icon = new BMap.Icon(gb_map_imap.createStationIcon(statio, w), new BMap.Size(iw,24), {anchor: new BMap.Size(iw/2,24)})
@@ -450,34 +439,6 @@ var gb_map_baidu = (function(){
 		return marker;
 	}
-	//隐藏线路线条
-/*	function hideLinePolyline(){
-		if(!linePolyline || linePolyline.length == 0)
-			return;
-
-		layer.msg('隐藏线路图层',{offset: 'ct', shift : 5});
-		$.each(linePolyline, function(){
-			this.setStrokeOpacity(0.1);
-		});
-	}
-
-	//显示线路线条
-	function showLinePolyline(){
-		if(!linePolyline || linePolyline.length == 0)
-			return;
-
-		layer.msg('显示线路图层',{offset: 'ct', shift : 5});
-		$.each(linePolyline, function(){
-			this.setStrokeOpacity(0.5);
-		});
-	}*/
-
-/*	function refreshStation() {
-		//console.log('refreshStation', map.getZoom());
-		var zoom=map.getZoom();
-
-	}*/
-
 	function moveMarker(m, gps){
 		m.setPosition(new BMap.Point(gps.bd_lon, gps.bd_lat));
 		m.gpsData = gps;
@@ -13,13 +13,16 @@ var gb_map_gaode = (function() {
 			+ '<div class="sk-cube sk-cube9"></div>' + '</div>';
 	var map;
-	var topMarkr;
+	//var topMarkr;
 	var realMarkers = {};
 	//线路路由线条
 	var polylines={};
+	var stationMarkers={};
+	var electronicFences={};
+	var carparks={};
 	//实时路况是否显示
-	var traffVisible;
-	var trafficLayer;
+	//var traffVisible;
+	//var trafficLayer;
 	var gaodeInstance = {
 		init : function(cb) {
 			var $mapCon = $(gb_map_consts.mapContainer);
@@ -78,12 +81,7 @@ var gb_map_gaode = (function() {
 			realMarkers = {};
 			polylines={};
 			map.clearMap();
-		}
-		/*clear: function(){
-			realMarkers = {};
-			map.clearMap();
-			linePolyline = [];
-		}*/,
+		},
 		drawLine: function(opt){
 			//linePolyline = [];
 			var pos = [], temps;
@@ -102,9 +100,11 @@ var gb_map_gaode = (function() {
 				polyline.hide();
 			polyline.setMap(map);
-
+		},
+		//定位到线路中间点
+		centerToLine: function (opt) {
+			var pos=polylines[opt.id].getPath();
 			map.setCenter(pos[parseInt(pos.length / 2)]);
-
 		},
 		//根据id 显示polyline
 		refreshPolyline: function (opt) {
@@ -116,6 +116,131 @@ var gb_map_gaode = (function() {
 					polylines[id].hide();
 			}
 		},
+		drawStationMarker: function (opt) {
+			this.hideAllStationMarker();
+
+			var array=opt.list, marker;
+			$.each(array, function () {
+				if(stationMarkers[this.stationCode]){
+					stationMarkers[this.stationCode].show();
+					return true;
+				}
+
+				transCoord(this);
+				marker=createStationMark(this);
+				stationMarkers[this.stationCode]=marker;
+			});
+		},
+		hideAllStationMarker: function () {
+			for(var code in stationMarkers){
+				stationMarkers[code].hide();
+			}
+		},
+		//绘制圆形
+		drawCircle: function(opt){
+			if(electronicFences[opt.id]){
+				electronicFences[opt.id].show();
+				return;
+			}
+
+			var coord = TransGPS.transformFromWGSToGCJ(opt.lat, opt.lon);
+
+			var circle = new AMap.Circle({
+				center: [coord.lng, coord.lat],// 圆心位置
+				radius: opt.radius, //半径
+				strokeColor: opt.color, //线颜色
+				strokeWeight: opt.weight, //线粗细度
+				fillColor: '#fff', //填充颜色
+				fillOpacity: 0.5
+			});
+			circle.setMap(map);
+			electronicFences[opt.id] = circle;
+		},
+		//绘制多边形
+		drawPolygon: function(opt){
+			var station = opt.station
+				,code = station.stationCode;
+			if(electronicFences[code]){
+				electronicFences[code].show();
+				return;
+			}
+
+			transMultiWGSToGCJ(station);
+			var polygon=new AMap.Polygon({
+				map: map,
+				path: station.gcjPoints,
+				strokeColor: opt.color,
+				strokeWeight: opt.weight,
+				fillColor: '#fff',
+				fillOpacity: 0.5
+			});
+
+			electronicFences[code]=polygon;
+		},
+		//绘制停车场
+		drawCarpark: function (opt) {
+			var list = opt.list;
+			var config = gb_map_config.getConfig()
+				,color = config.section.color.up;
+
+			this.hideDrawCarpark();
+			$.each(list, function () {
+				if(carparks[this.parkCode]){
+					carparks[this.parkCode].show();
+					return true;
+				}
+
+				transMultiWGSToGCJ(this);
+				var polygon=new AMap.Polygon({
+					map: map,
+					path: this.gcjPoints,
+					strokeColor: color,
+					strokeWeight: 1,
+					fillColor: '#fff',
+					fillOpacity: 0.5
+				});
+				carparks[this.parkCode]=polygon;
+				//中心点
+				var ts = this.gCenterPoint.split(' ')
+					,coord = TransGPS.transformFromWGSToGCJ(parseFloat(ts[1]), parseFloat(ts[0]));
+				polygon._centerPoint = [coord.lng, coord.lat];
+				//info window
+				polygon.infoWin = new AMap.InfoWindow({
+					content: gb_map_overlay_mge.map_carpark_win_temp(this),
+					size: new AMap.Size(228, 146)
+				});
+				polygon.on('click', function () {
+					this.infoWin.open(map, this._centerPoint);
+				});
+			});
+		},
+		//隐藏停车场
+		hideDrawCarpark: function () {
+			for(var code in carparks){
+				carparks[code].hide();
+			}
+		},
+		hideAllCircles: function () {
+			for(var code in electronicFences){
+				electronicFences[code].hide();
+			}
+		},
+		//定位到站点
+		goToStation: function (stationCode) {
+			var m = stationMarkers[stationCode];
+			if(m){
+				map.setCenter(m.getPosition());
+				m.infoWindow.open(map, m.getPosition());
+			}
+		},
+		//定位到停车场
+		goToCarpark: function (parkCode) {
+			var polygon = carparks[parkCode];
+			if(polygon){
+				map.setCenter(polygon._centerPoint);
+				polygon.infoWin.open(map, polygon._centerPoint);
+			}
+		},
 		drawRealGpsMarker: function(opts){
 			gpsArray = opts.gpsList;
 			var coord;
@@ -136,45 +261,7 @@ var gb_map_gaode = (function() {
 						realMarkers[gps.deviceId] = marker
 					}
 				}
-				
-				/*coord = TransGPS.transformFromWGSToGCJ(gps.lat, gps.lon);
-				gps.gcj_lat = coord.lat;
-				gps.gcj_lon = coord.lng;
-
-				marker = realMarkers[gps.deviceId];
-				if(marker){
-					if(gps.timestamp == marker.gpsData.timestamp)
-						return;
-					else
-						moveMarker(marker, gps);//移动marker
-				}
-				else{
-					var marker = createGDMarkerByGps(gps);
-					realMarkers[gps.deviceId] = marker
-				}*/
 			});
-
-			/*var gpsArray = opts.gpsList;
-			var coord;
-			$.each(gpsArray, function(i, gps){
-				if(opts.coordTransform){
-					coord = TransGPS.transformFromWGSToGCJ(gps.lat, gps.lon);
-					gps.gcj_lat = coord.lat;
-					gps.gcj_lon = coord.lng;
-				}
-
-				marker = realMarkers[gps.deviceId];
-				if(marker){
-					if(gps.timestamp == marker.gpsData.timestamp)
-						return;
-					else
-						moveMarker(marker, gps);//移动marker
-				}
-				else{
-					var marker = createGDMarkerByGps(gps);
-					realMarkers[gps.deviceId] = marker
-				}
-			});*/
 		},
 		showGpsMarker: function (opt) {
 			var chs = opt.chs;
@@ -190,7 +277,7 @@ var gb_map_gaode = (function() {
 				,m = realMarkers[deviceId];
 			if(m){
 				map.setCenter(m.getPosition());
-				setTop(m);
+				//setTop(m);
 			}
 		},
 		openWindow: function(opts){
@@ -208,7 +295,7 @@ var gb_map_gaode = (function() {
 	function createGDMarkerByGps(gps){
 		//根据编码长度 计算marker 宽度
-		var w = gps.nbbm.length * 10;
+		var w = calcGpsMarkerWidth(gps.nbbm);
 		var marker = new AMap.Marker({
 	        map: map,
@@ -217,15 +304,20 @@ var gb_map_gaode = (function() {
 	            size: new AMap.Size(w, 25),  //图标大小
 	            image: gb_map_imap.createCarIcon(gps, w)
 	        }),
-	        offset: new AMap.Pixel(-35, -12)
+	        offset: new AMap.Pixel(-(w/2), -12)
 	    });
+		marker._icon_width=w;
 		//绑定数据
 		marker.gpsData = gps;
 		marker.infoWindow = new AMap.InfoWindow();
+		marker.setzIndex(2);
 		marker.on('mouseover', function(){
-			setTop(this);
+			this.setzIndex(3);
+		});
+		marker.on('mouseout', function () {
+			this.setzIndex(2);
 		});
 		//点击事件
 		marker.on('click', function(){
@@ -235,12 +327,49 @@ var gb_map_gaode = (function() {
 		return marker;
 	}
+	//创建站点marker
+	function createStationMark(statio) {
+		//根据编码长度 计算marker 宽度
+		var w = statio.stationName.length * 12 + 4;
+
+		var marker = new AMap.Marker({
+			map: map,
+			position: [statio.gcj_lon, statio.gcj_lat],
+			icon: new AMap.Icon({
+				size: new AMap.Size(w, 24),  //图标大小
+				image: gb_map_imap.createStationIcon(statio, w)
+			}),
+			offset: new AMap.Pixel(-(w/2), -24)
+		});
+
+		//信息窗口
+		marker.infoWindow = new AMap.InfoWindow({
+			content:gb_map_overlay_mge.map_station_win_temp(statio),
+			size: new AMap.Size(178, 240)
+		});
+
+		//mouseover
+		marker.setzIndex(1);
+		marker.on('mouseover', function(){
+			this.setzIndex(3);
+		});
+		marker.on('mouseout', function () {
+			this.setzIndex(1);
+		});
+
+		//点击事件
+		marker.on('click', function(){
+			this.infoWindow.open(map, this.getPosition());
+		});
+		return marker;
+	}
+
 	function moveMarker(m, gps){
 		m.setPosition(new AMap.LngLat(gps.gcj_lon, gps.gcj_lat));
 		m.gpsData = gps;
+
 		//重新设置icon
-		//根据编码长度 计算marker 宽度
-		var w = gps.nbbm.length * 10;
+		var w = m._icon_width;
 		m.setIcon(new AMap.Icon({
             size: new AMap.Size(w, 25),
             image: gb_map_imap.createCarIcon(gps, w)
@@ -250,26 +379,31 @@ var gb_map_gaode = (function() {
 			openWindow(m);
 	}
-/*	//隐藏线路线条
-	function hideLinePolyline(){
-		if(!linePolyline || linePolyline.length == 0)
-			return;
-		layer.msg('隐藏线路图层',{offset: 'ct', shift : 5});
-		$.each(linePolyline, function(){
-			this.setOptions({strokeOpacity: 0});
+	function calcGpsMarkerWidth(nbbm) {
+		var width=0;
+		$.each(nbbm.split(''), function () {
+			if(!isNaN(this))
+				width += 7;//icon_num_width[this];
+			else if(this=='-')
+				width += 10;
+			else
+				width += 16;
 		});
-	}*/
-
-/*	//显示线路线条
-	function showLinePolyline(){
-		if(!linePolyline || linePolyline.length == 0)
+		return width;
+	}
+	
+	function transMultiWGSToGCJ(obj) {
+		if(!obj._gPoints)
 			return;
+		var gcjPoints=[],coord;
-		layer.msg('显示线路图层',{offset: 'ct', shift : 5});
-		$.each(linePolyline, function(){
-			this.setOptions({strokeOpacity: 0.5});
+		$.each(obj._gPoints, function () {
+			coord = TransGPS.transformFromWGSToGCJ(this.lat, this.lng);
+			gcjPoints.push([coord.lng, coord.lat]);
 		});
-	}*/
+
+		obj.gcjPoints=gcjPoints;
+	}
 	function openWindow(marker){
 		var gps = marker.gpsData;
@@ -282,12 +416,12 @@ var gb_map_gaode = (function() {
 		marker.infoWindow.open(map, marker.getPosition());
 	}
-	function setTop(marker){
+/*	function setTop(marker, index){
 		if(topMarkr)
 			topMarkr.setzIndex(1);
 		marker.setzIndex(2);
 		topMarkr = marker;
-	}
+	}*/
   //文件载入完毕
   mapmonitor_load_ep.emitLater('load_gaode');
@@ -17,7 +17,19 @@ var gb_map_overlay_mge = (function () {
     };
     var gpsRefreshAll = function (allList) {
+        //是否需要添加樹節點
+        var newTreeNodes=[], currArray=gb_map_gps_tree.all_devices();
+        $.each(allList, function () {
+            if(currArray.indexOf(this.deviceId) == -1)
+                newTreeNodes.push(this);
+        });
+
         gb_map_imap.call('drawRealGpsMarker', {gpsList: allList});
+
+        //有新设备上线
+        if(newTreeNodes.length > 0){
+            gb_map_gps_tree.create_node(newTreeNodes, showOverlayByChecks);
+        }
     };
     var deviceFilter = function (node) {
@@ -85,6 +97,9 @@ var gb_map_overlay_mge = (function () {
         reDraw();
         //注册GPS刷新事件
         gb_data_gps.registerCallback(gpsRefresh);
+
+
+        centerToRational();
     };
@@ -185,6 +200,15 @@ var gb_map_overlay_mge = (function () {
         gb_map_imap.call('drawPolygon', opt);
     }
+
+    //地图居中至合理的位置
+    var centerToRational=function () {
+        var chs=gb_map_gps_tree.getChecked();
+        if(chs && chs.length > 0){
+            var id=chs[0].data.lineId+'_'+chs[0].data.upDown;
+            gb_map_imap.call('centerToLine', {id: id});
+        }
+    }
     return {
         init: init,
@@ -205,6 +229,7 @@ var gb_map_overlay_mge = (function () {
         getCheckedDevice: getCheckedDevice,
         drawStation: drawStation,
         drawElectronicFence: drawElectronicFence,
-        drawCarpark: drawCarpark
+        drawCarpark: drawCarpark,
+        centerToRational:centerToRational
     };
 })();
 \ No newline at end of file
@@ -5,8 +5,19 @@
 <link rel="stylesheet" href="/real_control_v2/mapmonitor/css/real.css"/>
 <div class="map-system-msg">
-    <a class="z-depth-2" href="/pages/mapmonitor/alone/wrap.html" target="_blank"><i style="transform: rotate(90deg);" class="uk-icon-hand-pointer-o"></i>  当前地图模块正在维护升级中，请点这里打开原版地图。</a>
+    <a class="z-depth-2" href="/pages/mapmonitor/alone/wrap.html" target="_blank">
+        当前地图模块正在维护升级中，请点这里打开原版地图
+
+        <i class="uk-icon-close map-system-msg-close"></i>
+    </a>
 </div>
+<script>
+    $('.map-system-msg-close').on('click', function (e) {
+        e.stopPropagation();
+        $('.map-system-msg').addClass('flex-left');
+        return false;
+    });
+</script>
 <div id="real_map_container"></div>
 <div class="real_right_gps_panel">
@@ -22,9 +33,6 @@
 <div class="real_bottom_panel">
     <div id="handle" class="ui-resizable-handle ui-resizable-n"></div>
-    <div class="real_bl_cont">
-
-    </div>
     <div class="real_br_cont map_config_wrap"></div>
 </div>