添加误点提示功能，dubbo配置，相关pom.xml修改，后端GpsController调用dubbo服务，前端修改页面和js

徐烜
1 parent d2f2c84d
Showing 12 changed files with 271 additions and 5 deletions
pom.xml
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
src/main/resources/dubbo/config-dev.properties
src/main/resources/dubbo/config-prod.properties
src/main/resources/static/real_control_v2/fragments/home/tooltip.html
src/main/resources/static/real_control_v2/js/data/data_gps.js
src/main/resources/static/real_control_v2/js/north/tabs.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
src/main/resources/static/real_control_v2_mobile/js/utils/svg_chart_tooltip.js
@@ -194,6 +194,12 @@
 			<groupId>net.sourceforge.jexcelapi</groupId>
 			<artifactId>jxl</artifactId>
 			<version>2.6.12</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>rhino</groupId>
@@ -295,6 +301,87 @@
 			<artifactId>jpinyin</artifactId>
 			<version>1.1.8</version>
 		</dependency>
+
+        <!-- dubbo 需要的jar start -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo</artifactId>
+            <!--<version>2.6.3</version>-->
+            <version>2.5.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>3.4.5</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.101tec</groupId>
+            <artifactId>zkclient</artifactId>
+            <version>0.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- plan common工程依赖 -->
+        <dependency>
+            <groupId>com.bsth.control_v2</groupId>
+            <artifactId>plan_module-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <!-- plan common config 工程依赖 -->
+        <dependency>
+            <groupId>com.bsth.control_v2</groupId>
+            <artifactId>plan_module-common-config</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <!-- real common 依赖 -->
+        <dependency>
+            <groupId>com.bsth.control_v3</groupId>
+            <artifactId>real_module-common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+
 	</dependencies>
 	<dependencyManagement>
 package com.bsth.controller.gps;
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.bsth.control_v3.real_module.common.dto.VehicleArrivalStopRealMonitorDto;
+import com.bsth.control_v3.real_module.common.service.LateReminderServiceFacade;
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
@@ -10,6 +13,8 @@ import com.bsth.data.schedule.e_state_check.entity.SCodeInfo;
 import com.bsth.service.gps.GpsService;
 import com.bsth.service.gps.entity.GpsSpeed;
 import com.google.common.base.Splitter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,6 +28,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("gps")
 public class GpsController {
+    /** 日志处理器 */
+    private static final Logger LOG = LoggerFactory.getLogger(GpsController.class);
     @Autowired
     GpsRealData gpsRealData;
@@ -33,6 +40,9 @@ public class GpsController {
     @Autowired
     OverspeedProcess overspeedProcess;
+    @Reference
+    LateReminderServiceFacade lateReminderServiceFacade;
+
     @RequestMapping(value = "/real/all")
     public Map<String, Object> search(@RequestParam Map<String, Object> map,
                                       @RequestParam(defaultValue = "0") int page,
@@ -62,8 +72,21 @@ public class GpsController {
         //班次站点检查信息
         List<SCodeInfo> scis = ScheduleStationCodeChecker.findByLineIdx(lineArray);
+        // 扩展到达站预测时间（使用外部模块处理）
+        Map<String, VehicleArrivalStopRealMonitorDto> arrivalStopRealMonitorMap = new HashMap<>();
+        if (lateReminderServiceFacade == null) {
+            LOG.warn("LateReminderServiceFacade服务未导入，请检查dubbo相关配置！");
+        }
+        try {
+            // 按照车牌作为key，映射map
+            arrivalStopRealMonitorMap.putAll(lateReminderServiceFacade.getVehicleArrivalStopRealMonitorInfo_cph(lineArray));
+        } catch (Exception exp) {
+            LOG.warn("LateReminderServiceFacade远端调用异常，请检查dubbo服务部署情况！", exp);
+        }
+
         rs.put("gpsList", gpsList);
         rs.put("overspeedList", overspeedList);
+        rs.put("arrivalStopRealMonitorMap", arrivalStopRealMonitorMap);
         rs.put("scis", scis);
         return rs;
     }
@@ -2,6 +2,8 @@ server.port=9088
 management.port= 9001
 management.address= 127.0.0.1
+dubbo.use=false
+
 spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
@@ -2,6 +2,8 @@ server.port=9088
 management.port= 9001
 management.address= 127.0.0.1
+dubbo.use=true
+
 spring.jpa.hibernate.ddl-auto= none
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
+# application名字
+spring.dubbo.application.name=bsth_control_v_multi_service
+# zookeeper注册中心地址
+spring.dubbo.registry=zookeeper://127.0.0.1:2181
+# protocol配置
+spring.dubbo.protocol.name=dubbo
+spring.dubbo.protocol.port=30881
+
+#----------- dubbo:consumer 性能调优选项 -------------#
+# 远程服务调用超时时间，单位毫秒，这里设置30分钟
+spring.dubbo.consumer.timeout=1800000
+# 远程服务调用重试次数，0表示不需要重试
+spring.dubbo.consumer.retries=0
+#----------- dubbo:consumer 服务治理选项 -------------#
+# 启动不检查提供者是否存在
+spring.dubbo.consumer.check=false
+# application名字
+spring.dubbo.application.name=bsth_control_v_multi_service
+# zookeeper注册中心地址
+spring.dubbo.registry=zookeeper://127.0.0.1:2181
+# protocol配置
+spring.dubbo.protocol.name=dubbo
+spring.dubbo.protocol.port=30881
+
+#----------- dubbo:consumer 性能调优选项 -------------#
+# 远程服务调用超时时间，单位毫秒，这里设置30分钟
+spring.dubbo.consumer.timeout=1800000
+# 远程服务调用重试次数，0表示不需要重试
+spring.dubbo.consumer.retries=0
+#----------- dubbo:consumer 服务治理选项 -------------#
+# 启动不检查提供者是否存在
+spring.dubbo.consumer.check=false
@@ -17,7 +17,13 @@
                         <span class="abnormal-text">已离线</span>
                         {{/if}}
                     </a>
+
+                    {{if _as_isLate}}
+                    <button class="uk-button uk-button-mini uk-button-primary">预测误点</button>
+                    {{/if}}
                 </div>
+
+
                 <div>
                     <span class="field">车牌号：</span>{{plateNo}}
                 </div>
@@ -47,9 +53,18 @@
                     <span class="field">速度：</span>{{speed>99?'..':speed}}</div>
                 <div>
                     <span class="field">时间：</span>{{dateStr}}</div>
-                {{if expectStopTime!=null}}
-                <div>
-                    预计 {{expectStopTime}} 分钟到达终点</div>
+                <!--{{if expectStopTime!=null}}-->
+                <!--<div>-->
+                    <!--预计 {{expectStopTime}} 分钟到达终点</div>-->
+                <!--{{/if}}-->
+
+
+                {{if _plan_ftime}}
+                    <div>计划 {{_plan_ftime}} 到达终点站</div>
+                {{/if}}
+
+                {{if _as_ftime}}
+                    <div>预计 {{_as_ftime}} 到达终点站</div>
                 {{/if}}
             </div>
@@ -61,6 +61,9 @@ var gb_data_gps = (function () {
                     this.sch = schArray[this.schId];
             }
+            // 误点提示信息
+            refreshData_lateReminder(rs, this);
+
             //时间格式化
             this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
             realData[this.deviceId] = this;
@@ -81,6 +84,36 @@ var gb_data_gps = (function () {
     };
+    var refreshData_lateReminder = function(rs, gps) {
+        // 到站实时数据信息（用于计算误点）
+        var _arrivalStopRealMonitorMap = rs.arrivalStopRealMonitorMap;
+
+        // 获取cph
+        var _cph = gps.nbbm && gb_data_basic.nbbm2PlateMap()[gps.nbbm];
+        // 获取到站提示信息
+        var _info = _cph && _arrivalStopRealMonitorMap[_cph];
+
+        // 获取预计到终点站时间
+        var _future_time = _info && _info.toFutureStopTime && moment(_info.toFutureStopTime);
+        // 获取计划到终点站时间
+        var _plan_time = gps.sch && gps.sch.zdsjT && moment(gps.sch.zdsjT);
+
+        // 设置误点提示
+        if (_future_time && _plan_time) {
+            if (_future_time.isAfter(_plan_time)) {
+                gps._as_isLate = true;
+            }
+        }
+
+        // 设置计划到终点站时间提示
+        gps._plan_ftime = _plan_time && _plan_time.format("HH:mm");
+        // 设置预计到终点站时间提示
+        gps._as_ftime = _future_time && _future_time.format("HH:mm");
+
+        // console.log(gps.sch);
+
+    };
+
     var startFixedTime;
     var fixedTimeRefresh = function () {
         if (startFixedTime)
@@ -68,7 +68,34 @@ var gb_tabs = (function() {
     //文件载入完毕
     res_load_ep.emitLater('load_tab');
+    // 根据gps的相关数据，切换tab页面
+    var _trigger_tab_Fun = function(gps) {
+        // tab跳转
+        var tabIndex = 0;
+        var lineCode = gps.lineId;
+        $('.north-tabs .uk-tab li.tab-line').each(function(index, element) {
+            var _code = $(element).data('code');
+            if (_code == lineCode) {
+                // li.tab-line 是从第3个tab页开始的
+                tabIndex = index + 2;
+                return false;
+            }
+        });
+        UIkit.switcher($('.north-tabs>ul.uk-tab')).show(tabIndex);
+
+        // 班次自动选择
+        var schId = gps.schId;
+        var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
+        var dl = gb_schedule_table.scroToDl(sch);
+        gb_schedule_table.reset_drag_active_all(dl);
+        dl.find('dd:eq(5)').trigger('click');
+
+        // $('.line_schedule[data-id=' + lineCode + '] dl[data-id=' + gps.schId + ']').find('dd:eq(5)').trigger('click');
+
+    };
+
     return {
-        init: init
+        init: init,
+        triggerTab: _trigger_tab_Fun
     };
 })();
@@ -297,7 +297,7 @@ var gb_svg_chart = (function () {
             abmStatus = this['abnormalStatus'];
             suffix = '';
-            if(abmStatus != 'offline'){
+            if(abmStatus != 'offline') {
                 this['abnormalClaszz'] = true;
                 if(abmStatus=='outBounds')
                     suffix = '界';
@@ -307,6 +307,12 @@ var gb_svg_chart = (function () {
                     suffix = '掉';
                 else
                     this['abnormalClaszz'] = false;
+
+                // 误点提示
+                if (this['_as_isLate']) {
+                    this['abnormalClaszz'] = true;
+                    suffix += "误"; // suffix叠加
+                }
             }
             else
                 this['abnormalClaszz'] = false;
@@ -45,6 +45,14 @@ var gb_svg_tooltip = (function () {
                 visible: function () {
                     show_baidu_map($('.tip_map_wrap', this)[0], gps);
                     rect.dblclick(fiexdTip);
+
+                    if (gps._as_isLate) { // 存在误点可点击
+                        var _tool_tip_ = this;
+                        $('button', _tool_tip_).click(function() {
+                            gb_tabs.triggerTab(gps);
+                            $(_tool_tip_).qtip("hide");
+                        });
+                    }
                 }
             }
         });
@@ -14,6 +14,7 @@ var gb_svg_tooltip = (function () {
             return;
         var gps = gb_data_gps.findOne($(this).attr('_id').split('_')[1]);
         addPlateNo(gps);
+        addLateReminder(gps);
         $(this).qtip({
             show: {
                 ready: true,
@@ -219,6 +220,36 @@ var gb_svg_tooltip = (function () {
         }catch (e){}
     }
+    /**
+     * 为GPS附加误点提示功能
+     * @param gpsArray
+     */
+    function addLateReminder(gpsArray) {
+        if (!isArray(gpsArray))
+            gpsArray = [gpsArray];
+        try {
+            $.each(gpsArray, function() {
+                // 计算误点提示的相关字段
+                if (this.plateNo) {
+                    var _info = gb_data_gps.getArrivalStopRealMonitorInfoByCph(this.plateNo);
+                    if (_info) {
+                        var _future_time = moment(_info.toFutureStopTime);
+                        var _plan_time = moment(this.sch.zdsjT);
+                        if (_future_time.isAfter(_plan_time)) {
+                            // 可能误点
+                            this._as_isLate = true;
+                        }
+                        this._as_ftime = _future_time.format("hh:mm");
+                    }
+                }
+
+            });
+        } catch (e) {
+
+        }
+
+    }
+
     return {
         update: updateFixedTip,
         refresh: refresh,