Merge branch 'minhang' into pudong

潘钊
2 parents 1508d0de 43664fe8
Showing 15 changed files with 233 additions and 86 deletions
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/schedule/SchedulePlanInfoService.java
src/main/java/com/bsth/service/schedule/SchedulePlanInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html
src/main/resources/static/real_control_v2/css/home.css
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/home/line_panel.html
src/main/resources/static/real_control_v2/fragments/home/tooltip.html
src/main/resources/static/real_control_v2/js/home/line_panel.js
src/main/resources/static/real_control_v2/js/utils/svg_chart.js
src/main/resources/static/real_control_v2/js/utils/svg_chart_tooltip.js
@@ -5,7 +5,9 @@ import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.SchedulePlanService;
+import com.bsth.service.sys.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,11 +25,23 @@ import java.util.Map;
 public class SchedulePlanController extends BController<SchedulePlan, Long> {
     @Autowired
     private SchedulePlanService schedulePlanService;
+    @Autowired
+    private SysUserService sysUserService;
     @Override
     public Map<String, Object> save(@RequestBody SchedulePlan schedulePlan, HttpSession httpSession) {
+        // 用户信息
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+
+        Date cdate = new Date();
+        schedulePlan.setCreateBy(sysUser);
+        schedulePlan.setCreateDate(cdate);
+        schedulePlan.setUpdateBy(sysUser);
+        schedulePlan.setUpdateDate(cdate);
+
+        // 如果多个公司，选第一个，以后改成页面控制
         List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) httpSession.getAttribute(Constants.COMPANY_AUTHORITYS);
-        // TODO：如果多个公司，选第一个，以后改成页面控制
         if (cmyAuths == null || cmyAuths.size() == 0)
             schedulePlanService.save(schedulePlan, new CompanyAuthority());
         else
@@ -56,9 +56,9 @@ public class GpsRealData implements CommandLineRunner {
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,5");
         //定时从网关获取GPS数据
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 15, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
         //定时扫描掉离线
-        //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 60, 20, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
     }
@@ -157,6 +157,7 @@ public class SchedulePlanInfo {
             Line xl,
             ScheduleResult_output scheduleResult_output,
             TTInfoDetail ttInfoDetail,
+            Boolean isFb,
             CarConfigInfo carConfigInfo,
             List<EmployeeConfigInfo> employeeConfigInfoList,
             SchedulePlan schedulePlan) {
@@ -191,7 +192,7 @@ public class SchedulePlanInfo {
         // TODO：报道时间，出场时间没有
         // 关联的驾驶员
         EmployeeConfigInfo employeeConfigInfo = null;
-        if (ttInfoDetail.getIsFB()) {
+        if (isFb) {
             if (employeeConfigInfoList.size() > 1) {
                 employeeConfigInfo = employeeConfigInfoList.get(1);
             } else {
@@ -33,17 +33,18 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "lp_name as lpName, " +
             "cl as clId, " +
             "cl_zbh as clZbh, " +
-            "group_concat(distinct fcsj) ccsj, " +
+            "group_concat(fcsj) ccsj, " +
+            "group_concat(bc_type) bctype, " +
             "group_concat(distinct j) jsyId, " +
             "group_concat(distinct j_gh) jsyGh, " +
             "group_concat(distinct j_name) jsyName, " +
             "group_concat(distinct s) spyId, " +
             "group_concat(distinct s_gh) spyGh, " +
             "group_concat(distinct s_name) spyName, " +
-            "max(create_date) as createDate " +
+            "max(create_date) as createDate, " +
+            "group_concat(fcno) fcno " +
             "from bsth_c_s_sp_info " +
-            "where bc_type = 'out' and " +
-            "xl = ?1 and " +
+            "where xl = ?1 and " +
             "schedule_date = ?2 " +
             "group by xl_name, schedule_date, lp, lp_name, cl, cl_zbh " +
             "order by xl_name, schedule_date, lp ", nativeQuery = true)
@@ -71,14 +72,16 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "scpinfo.scheduleDate = :p3 and " +
             "scpinfo.lpName = :p4 and " +
             "scpinfo.fcsj = :p5 and " +
-            "scpinfo.bcType = :p6 ")
+            "scpinfo.bcType = :p6 and " +
+            "scpinfo.fcno = :p7 " )
     int updateGroupInfo_type_2_4(
             @Param("p1") String fcsj,
             @Param("p2") Integer xlid,
             @Param("p3") Date scheduleDate,
             @Param("p4") String lpName,
             @Param("p5") String fcsj_src,
-            @Param("p6") String bcType);
+            @Param("p6") String bcType,
+            @Param("p7") Integer fcno);
     @Modifying
     @Query(value = "update " +
@@ -4,6 +4,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
 import org.joda.time.DateTime;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -117,6 +118,11 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
         /** 创建时间 */
         private Date createDate;
+        /** 出场班次1发车的顺序号 */
+        private Integer fcno1;
+        /** 出场班次2发车的顺序号 */
+        private Integer fcno2;
+
         public GroupInfo() {}
         public GroupInfo(Object[] datas) {
@@ -132,19 +138,40 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             this.clId = Integer.valueOf(String.valueOf(datas[4]));
             // 车辆自编号
             this.clZbh = String.valueOf(datas[5]);
-            // 出场时间，如果有多个，需要分开
+            // 出场时间，出场班次，如果有多个，需要分开
             Object ccsj = datas[6];
+            Object bctype = datas[7];
+            Object fcno = datas[15];
+
             if (ccsj != null) {
                 String[] ccsj_array = ((String) ccsj).split(",");
-                if (ccsj_array.length > 1) {
-                    this.ccsj1 = String.valueOf(ccsj_array[0]);
-                    this.ccsj2 = String.valueOf(ccsj_array[1]);
-                } else {
-                    this.ccsj1 = String.valueOf(ccsj_array[0]);
+                String[] bctype_array = ((String) bctype).split(",");
+                String[] fcno_array = ((String) fcno).split(",");
+                List<Integer> bctype_index = new ArrayList<>();
+
+                for (int i = 0; i < bctype_array.length; i++) {
+                    if (bctype_index.size() == 2) { // 只记录2个出场
+                        break;
+                    }
+                    if (bctype_array[i].equals("out")) {
+                        bctype_index.add(i);
+                    }
+                }
+
+                if (bctype_index.size() == 1) {
+                    this.ccsj1 = String.valueOf(ccsj_array[bctype_index.get(0)]);
+                    this.fcno1 = Integer.valueOf(fcno_array[bctype_index.get(0)]);
+                } else if (bctype_index.size() == 2) {
+                    this.ccsj1 = String.valueOf(ccsj_array[bctype_index.get(0)]);
+                    this.ccsj2 = String.valueOf(ccsj_array[bctype_index.get(1)]);
+
+                    this.fcno1 = Integer.valueOf(fcno_array[bctype_index.get(0)]);
+                    this.fcno2 = Integer.valueOf(fcno_array[bctype_index.get(1)]);
                 }
+
             }
             // 驾驶员id，如果有多个，需要分开
-            Object jsyId = datas[7];
+            Object jsyId = datas[8];
             if (jsyId != null) {
                 String[] jsyId_array = ((String) jsyId).split(",");
                 if (jsyId_array.length > 1) {
@@ -155,7 +182,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 驾驶员工号，如果有多个，需要分开
-            Object jsyGh = datas[8];
+            Object jsyGh = datas[9];
             if (jsyGh != null) {
                 String[] jsyGh_array = ((String) jsyGh).split(",");
                 if (jsyGh_array.length > 1) {
@@ -166,7 +193,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 驾驶员名字，如果有多个，需要分开
-            Object jsyName = datas[9];
+            Object jsyName = datas[10];
             if (jsyName != null) {
                 String[] jsyName_array = ((String) jsyName).split(",");
                 if (jsyName_array.length > 1) {
@@ -178,7 +205,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             }
             // 售票员id，如果有多个，需要分开
-            Object spyId = datas[10];
+            Object spyId = datas[11];
             if (spyId != null) {
                 String[] spyId_array = ((String) spyId).split(",");
                 if (spyId_array.length > 1) {
@@ -190,7 +217,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             }
             // 售票员工号，如果有多个，需要分开
-            Object spyGh = datas[11];
+            Object spyGh = datas[12];
             if (spyGh != null) {
                 String[] spyGh_array = ((String) spyGh).split(",");
                 if (spyGh_array.length > 1) {
@@ -201,7 +228,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 售票员名字，如果有多个，需要分开
-            Object spyName = datas[12];
+            Object spyName = datas[13];
             if (spyName != null) {
                 String[] spyName_array = ((String) spyName).split(",");
                 if (spyName_array.length > 1) {
@@ -212,7 +239,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 创建时间
-            this.createDate = new DateTime(datas[13]).toDate();
+            this.createDate = new DateTime(datas[14]).toDate();
             // TODO：可能还有其他字段
         }
@@ -384,5 +411,21 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
         public void setXlId(Integer xlId) {
             this.xlId = xlId;
         }
+
+        public Integer getFcno1() {
+            return fcno1;
+        }
+
+        public void setFcno1(Integer fcno1) {
+            this.fcno1 = fcno1;
+        }
+
+        public Integer getFcno2() {
+            return fcno2;
+        }
+
+        public void setFcno2(Integer fcno2) {
+            this.fcno2 = fcno2;
+        }
     }
 }
@@ -55,7 +55,8 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
                         groupInfoUpdate.getUpdate().getScheduleDate(),
                         groupInfoUpdate.getSrc().getLpName(),
                         groupInfoUpdate.getSrc().getCcsj1(),
-                        "out"
+                        "out",
+                        groupInfoUpdate.getSrc().getFcno1()
                 );
             }
@@ -94,7 +95,8 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
                         groupInfoUpdate.getUpdate().getScheduleDate(),
                         groupInfoUpdate.getSrc().getLpName(),
                         groupInfoUpdate.getSrc().getCcsj2(),
-                        "out"
+                        "out",
+                        groupInfoUpdate.getSrc().getFcno2()
                 );
             }
@@ -119,13 +119,28 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
                 employeeConfigInfoList.add(employeeConfigMaps.get(Long.valueOf(eid)));
             }
             // 排班明细（这个要迭代的）
-            Collection<TTInfoDetail> ttInfoDetails = gbdTTinfoMaps.get(scheduleResult_output.getSd().toDate()).get(
+            Collection<TTInfoDetail> ttInfoDetails_ = gbdTTinfoMaps.get(scheduleResult_output.getSd().toDate()).get(
                     Long.parseLong(scheduleResult_output.getGuideboardId()));
+            List<TTInfoDetail> ttInfoDetails = new ArrayList<>(ttInfoDetails_);
+
+            // 排序ttInfoDetails
+            Collections.sort(ttInfoDetails, new Comparator<TTInfoDetail>() {
+                @Override
+                public int compare(TTInfoDetail o1, TTInfoDetail o2) {
+                    return o1.getFcno().compareTo(o2.getFcno());
+                }
+            });
+
+            Boolean isFb = false; // 是否分班
             for (TTInfoDetail ttInfoDetail : ttInfoDetails) {
+                if (ttInfoDetail.getIsFB())
+                    isFb = ttInfoDetail.getIsFB();
+
                 SchedulePlanInfo schedulePlanInfo = new SchedulePlanInfo(
                         xl,
                         scheduleResult_output,
                         ttInfoDetail,
+                        isFb,
                         configInfo,
                         employeeConfigInfoList,
                         schedulePlan);
@@ -138,6 +153,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
                 schedulePlanInfos.add(schedulePlanInfo);
                 ttInfoMap.put(ttInfoDetail.getTtinfo().getId(), ttInfoDetail.getTtinfo().getName());
+
             }
         }
@@ -12,6 +12,7 @@
                 <th style="width: 150px;">驾驶员（工号）</th>
                 <th style="width: 150px;">售票员（工号）</th>
                 <th style="width: 80px;">班次类型</th>
+                <th style="width: 80px;">上下行</th>
                 <th style="width: 80px;">发车时间</th>
                 <th style="width: 100%">时刻表</th>
@@ -42,6 +43,7 @@
                 <td></td>
                 <td></td>
                 <td></td>
+                <td></td>
             </tr>
             </thead>
@@ -74,6 +76,9 @@
                     <span ng-bind="info.bcType | dict:'ScheduleType':'未知' "></span>
                 </td>
                 <td>
+                    <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
+                </td>
+                <td>
                     <span ng-bind="info.fcsj"></span>
                 </td>
                 <td>
@@ -61,7 +61,7 @@
 }
 .home-gps-table {
-    width: 620px;
+    width: 640px;
 }
 .home-gps-table small {
@@ -74,31 +74,35 @@
 }
 .home-gps-table dl dt:nth-of-type(2), .home-gps-table dl dd:nth-of-type(2) {
-    width: 8%
+    width: 7%
 }
 .home-gps-table dl dt:nth-of-type(3), .home-gps-table dl dd:nth-of-type(3) {
-    width: 8%
+    width: 7%
 }
 .home-gps-table dl dt:nth-of-type(4), .home-gps-table dl dd:nth-of-type(4) {
-    width: 8%;
+    width: 7%
 }
 .home-gps-table dl dt:nth-of-type(5), .home-gps-table dl dd:nth-of-type(5) {
-    width: 17%
+    width: 7%;
 }
 .home-gps-table dl dt:nth-of-type(6), .home-gps-table dl dd:nth-of-type(6) {
-    width: 17%
+    width: 16%
 }
 .home-gps-table dl dt:nth-of-type(7), .home-gps-table dl dd:nth-of-type(7) {
-    width: 10%
+    width: 16%
 }
 .home-gps-table dl dt:nth-of-type(8), .home-gps-table dl dd:nth-of-type(8) {
-    width: 16%;
+    width: 9%
+}
+
+.home-gps-table dl dt:nth-of-type(9), .home-gps-table dl dd:nth-of-type(9) {
+    width: 15%;
     border-right: 0;
 }
@@ -798,12 +798,12 @@ li.map-panel {
 svg text.offline{
-    fill: #534e4e !important;
+    fill: #6f6a6a !important;
 }
 svg rect.offline{
-    stroke: #abaaaa !important;
-    fill: #b8b8b8 !important;
+    stroke: #dbdada !important;
+    fill: #dbdada !important;
 }
 .tooltip .tooltip-container .title a>.abnormal-text{
@@ -9,6 +9,7 @@
                     <div class="ct_table_head">
                         <dl>
                             <dt>车辆编码</dt>
+                            <dt>路牌</dt>
                             <dt>速度</dt>
                             <dt>终点</dt>
                             <dt>状态</dt>
@@ -27,6 +28,7 @@
     <script id="home-gps-tbody-temp" type="text/html">
     <dl id="home_gps_{{deviceId}}" data-device-id="{{deviceId}}" {{if abnormalStatus=='offline'}}class="offline"{{/if}}>
         <dd title="{{nbbm}}"><a>{{nbbm}}</a></dd>
+        <dd></dd>
         <dd>{{speed}}</dd>
         <dd>{{expectStopTime}}</dd>
         <dd>
 <div>
     <script id="tooltip_gps_temp" type="text/html">
-      <div class="tooltip" >
+      <div class="tooltip" data-id="{{deviceId}}">
         <div class="tooltip-container">
-            <div class="title">
-                <a href="javascript:;" data-for="station" class="tip_modal">
-                    {{nbbm}}
-                    {{if abnormalStatus == 'outBounds'}}
+
+            <div class="cont-text-panel">
+                <div class="title">
+                    <a href="javascript:;" data-for="station" class="tip_modal">
+                        {{nbbm}}
+                        {{if abnormalStatus == 'outBounds'}}
                         <span class="abnormal-text">越界</span>
-                    {{else if abnormalStatus == 'overspeed'}}
+                        {{else if abnormalStatus == 'overspeed'}}
                         <span class="abnormal-text">超速</span>
-                    {{else if abnormalStatus == 'gps-offline'}}
+                        {{else if abnormalStatus == 'gps-offline'}}
                         <span class="abnormal-text">GPS掉线</span>
-                    {{else if abnormalStatus == 'offline'}}
+                        {{else if abnormalStatus == 'offline'}}
                         <span class="abnormal-text">已离线</span>
-                    {{/if}}
-                </a>
-            </div>
-            <div>
-              <span class="field">站点：</span>{{stationName}}
-            </div>
-            <!-- <div>
-                {{lineName}} -{{if upDown==0}}上行{{else}}下行{{/if}}
-            </div> -->
-            <div>
-              <span class="field">设备：</span>{{deviceId}}
+                        {{/if}}
+                    </a>
+                </div>
+                <div>
+                    <span class="field">站点：</span>{{stationName}}
+                </div>
+                <!-- <div>
+                    {{lineName}} -{{if upDown==0}}上行{{else}}下行{{/if}}
+                </div> -->
+                <div>
+                    <span class="field">设备：</span>{{deviceId}}
+                </div>
+                <div>
+                    <span class="field">坐标：</span>{{lon}} {{lat}}
+                </div>
+                <div>
+                    <span class="field">速度：</span>{{speed}}</div>
+                <div>
+                    <span class="field">时间：</span>{{dateStr}}</div>
+                {{if expectStopTime!=null}}
+                <div>
+                    预计 {{expectStopTime}} 分钟到达终点</div>
+                {{/if}}
             </div>
-            <div>
-              <span class="field">坐标：</span>{{lon}} {{lat}}
-            </div>
-            <div>
-              <span class="field">速度：</span>{{speed}}</div>
-            <div>
-                <span class="field">时间：</span>{{dateStr}}</div>
-            {{if expectStopTime!=null}}
-            <div>
-              预计 {{expectStopTime}} 分钟到达终点</div>
-            {{/if}}
+
             <div class="tip_map_wrap"></div>
         </div>
       </div>
@@ -60,17 +64,30 @@
             <div style="color: #747272;">
                 {{gps.dateStr}}
             </div>
-            <!--<div>
-              <span class="field">进站时间：</span>?
-            </div>
-            <div>
-              <span class="field">计划发出：</span>?
-            </div>-->
-
         </div>
         </div>
         {{/each}}
         </div>
         <div class="tip_map_wrap multi"></div>
     </script>
+
+
+    <script id="tooltip_multi_gps_cont_temp" type="text/html">
+        <div class="tooltip-container">
+            <div class="title">
+                <a href="javascript:;" data-for="station" class="tip_modal">
+                    {{nbbm}}
+                </a>
+            </div>
+            <div>
+                <span class="field">站点：</span>{{stationName}}
+            </div>
+            <div>
+                <span class="field">设备：</span>{{deviceId}}
+            </div>
+            <div style="color: #747272;">
+                {{gps.dateStr}}
+            </div>
+        </div>
+    </script>
 </div>
@@ -83,21 +83,23 @@ var gb_home_line_panel = (function() {
             e.removeClass('offline');
         var cells = e.find('dd');
-        $(cells[1]).text(t.speed);
-        $(cells[2]).html(t.expectStopTime == null ? '' : t.expectStopTime);
+        $(cells[2]).text(t.speed);
+        $(cells[3]).html(t.expectStopTime == null ? '' : t.expectStopTime);
         //状态
-        $(cells[3]).html(temps['home-gps-abnormal-temp'](t));
+        $(cells[4]).html(temps['home-gps-abnormal-temp'](t));
         if(!t.stationName)
             t.stationName='';
-        $(cells[4]).text(t.stationName).attr('title', t.stationName);
+        $(cells[5]).text(t.stationName).attr('title', t.stationName);
         //班次信息
         if(t.sch){
-            $(cells[5]).text(t.sch.zdzName);
-            $(cells[6]).text(t.sch.zdsj);
-            $(cells[7]).text(t.sch.jGh + '/' + t.sch.jName);
+            //console.log('t.sch', t.sch);
+            $(cells[1]).text(t.sch.lpName);
+            $(cells[6]).text(t.sch.zdzName);
+            $(cells[7]).text(t.sch.zdsj);
+            $(cells[8]).text(t.sch.jGh + '/' + t.sch.jName);
         }
     };
@@ -268,8 +268,8 @@ var gb_svg_chart = (function () {
                 return true;
             abmStatus = this['abnormalStatus'];
+            suffix = '';
             if(abmStatus != 'offline'){
-                suffix = '';
                 this['abnormalClaszz'] = true;
                 if(abmStatus=='outBounds')
                     suffix = '界';
@@ -294,6 +294,9 @@ var gb_svg_chart = (function () {
             //聚合gps
             marker_clusterer(this, lineCode);
         });
+
+        //刷新tooltip
+        gb_svg_tooltip.refresh();
     };
     var draw_gps = function (svg, data) {
@@ -28,7 +28,7 @@ var gb_svg_tooltip = (function () {
                 target: rect
             },
             style: {
-                classes: 'qtip-bootstrap'
+                classes: 'qtip-bootstrap qtip-gps-tooltip'
             },
             hide: {
                 fixed: true,
@@ -54,7 +54,7 @@ var gb_svg_tooltip = (function () {
         var rect = $(this);
         //console.log('111', rect,rect.attr('aria-describedby'));
         /*if (rect.attr('aria-describedby'))
-            return;*/
+         return;*/
         //  var gps = gb_data_gps.findOne($(this).attr('_id').split('_')[1]);
         $('.qtip-multi-gps').qtip('destroy', true);
@@ -146,7 +146,7 @@ var gb_svg_tooltip = (function () {
         });
         //draw line routes
         gb_svg_map_util.drawLine(map, list[0]);
-    }
+    };
     function searchByStop(list, stop) {
         var rs = [];
@@ -168,7 +168,42 @@ var gb_svg_tooltip = (function () {
         });
     }
+    var refresh = function () {
+        //刷新展开的单个tooltip
+        $('.qtip-gps-tooltip .tooltip').each(function () {
+            var deviceId = $(this).data('id')
+                ,wrap = $(this).find('.cont-text-panel');
+            if(deviceId)
+                gb_svg_tooltip.refreshTooltip(deviceId, wrap);
+        });
+
+        //刷新展开的聚合tooltip
+        $('.qtip-multi-gps .multi-tooltip').each(function () {
+
+        });
+    };
+
+
+    /**
+     * 刷新单个tooltip
+     * @param deviceId
+     */
+    var refreshTooltip = function (deviceId, wrap) {
+        var gps = gb_data_gps.findOne(deviceId);
+
+        var cont = temps['tooltip_gps_temp'](gps);
+        var htmlStr = $(cont).find('.cont-text-panel').html();
+
+        $(wrap).html(htmlStr);
+
+        //更新地图点位
+
+        //console.log('refreshTooltip htmlStr', htmlStr, wrap);
+    };
+
     return {
-        update: updateFixedTip
+        update: updateFixedTip,
+        refresh: refresh,
+        refreshTooltip: refreshTooltip
     };
 })();