Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 3756d5fe 5a6550d7
Showing 19 changed files with 123 additions and 20 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/ThreadMonotor.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/resources/static/pages/control/lineallot/allot.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/edit.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/form.html
src/main/resources/static/real_control_v2/css/home.css
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/north/second_timer.js
src/main/resources/static/real_control_v2/js/north/tabs.js
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
src/main/resources/static/real_control_v2/main.html
src/test/resources/testdata/problem.properties
@@ -84,6 +84,7 @@ public class XDApplication implements CommandLineRunner {
     }
     public void devInit(){
+        log.info("devInit...");
         ScheduledExecutorService sexec = Application.mainServices;
         //抓取GPS数据
         gpsDataLoader.setFlag(-1);
@@ -98,12 +99,13 @@ public class XDApplication implements CommandLineRunner {
     }
     public void prodInit(){
+        log.info("prodInit...");
         ScheduledExecutorService sexec = Application.mainServices;
         //发车信息
         sexec.scheduleWithFixedDelay(fcxxUpdateThread, 60, 40, TimeUnit.SECONDS);
         //抓取GPS数据
         sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
-        //检查设备掉离线
+        //GPS设备掉离线
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
         //实际排班更新线程
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
@@ -26,7 +26,7 @@ public class ThreadMonotor extends Thread{
         }
         if(GpsRealAnalyse.isIdle()){
-            //尝试使用网关的GPS实时对照数据
+            //切换到备用的网关实时GPS对照数据
             GpsDataLoaderThread.setFlag(-1);
         }
@@ -42,4 +42,4 @@ public class ThreadMonotor extends Thread{
             DirectivePushQueue.start();
         }
     }
-}
+}
 \ No newline at end of file
@@ -93,7 +93,7 @@ public class GpsEntity {
 	 * 1：网关
 	 * 0：转发
 	 */
-	private int source;
+	private int source = -1;
 	public String getDeviceId() {
 		return deviceId;
@@ -56,9 +56,9 @@ public class GpsRealAnalyse {
     public void analyse(List<GpsEntity> list) {
         try {
-            st = System.currentTimeMillis();
-            if (GpsDataRecovery.run)
+            if(list.size() == 0 || GpsDataRecovery.run)
                 return;
+            st = System.currentTimeMillis();
             //按线路分组gps
             ArrayListMultimap multimap = ArrayListMultimap.create();
@@ -176,6 +176,10 @@ public class GpsDataLoaderThread extends Thread {
                 String nbbm;
                 for (GpsEntity gps : list) {
+                    //没有设备号
+                    if (StringUtils.isBlank(gps.getDeviceId()))
+                        continue;
+
                     nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
                     if (StringUtils.isBlank(nbbm))
                         gps.setIncomplete(true);//标记为异常数据
@@ -21,7 +21,7 @@ import java.util.List;
 @Component
 public class SafeDrivDataLoadThread extends Thread{
-    private final static String url = "http://180.166.5.82:9988//bsth-safedriving/Crlcxb/realtimeInterface.do";
+    private final static String url = "http://118.178.187.115/bsth-safedriving/Crlcxb/realtimeInterface.do";
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -7,7 +7,7 @@
     }
     .line-select.selected {
-        height: 190px;
+        height: 210px;
     }
     .line-select .company {
@@ -73,7 +73,7 @@
                                     icnames="cl.insideCode"
                                     datatype="cci2"
                                     dataassociate="true"
-                                    dataparam="{{ {'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id, 'isCancel_eq': false} | json }}"
+                                    dataparam="{{ {'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id} | json }}"
                                     mlp="true"
                                     required >
                         </sa-Select3>
@@ -73,7 +73,7 @@
                                     icnames="cl.insideCode"
                                     datatype="cci2"
                                     dataassociate="true"
-                                    dataparam="{{ {'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id, 'isCancel_eq': false} | json }}"
+                                    dataparam="{{ {'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id} | json }}"
                                     mlp="true"
                                     required >
                         </sa-Select3>
@@ -306,4 +306,7 @@ span.signal-state-speed-limit{
 .home-gps-table dl.offline dd:nth-of-type(1) a{
     color: #a3a2a2;
+}
+.uk-tab>li:nth-child(n+2)>a{
+    margin-left: 0 !important;
 }
 \ No newline at end of file
@@ -17,12 +17,12 @@
 }
 .line_schedule .footer-chart {
-    height: 243px;
+    height: 233px;
     margin-top: 5px;
 }
 .line_schedule .uk-grid.top-container {
-    height: calc(100% - 260px);
+    height: calc(100% - 250px);
     margin-top: 5px;
     overflow: hidden;
 }
@@ -127,7 +127,7 @@
 }
 .schedule-body {
-    height: calc(100% - 37px);
+    height: calc(100% - 31px);
     background: #fff;
 }
 .north {
-    height: 120px;
+    /*height: 120px;*/
     position: relative;
     transition: all .3s ease;
+    padding-bottom: 0;
 }
 .north.main {
     background: linear-gradient(to right, #082F4A, #125688, #0a3f64);
     /*background-image: url('/assets/img/title-bg.jpg');*/
+    padding-bottom: 0;
 }
 .north.monitor {
@@ -65,10 +67,10 @@
 }
 .north .north-tabs {
-    position: absolute;
     width: 100%;
     bottom: 1px;
     margin-left: -14px;
+    margin-top: 35px;
 }
 .north .north-tabs .uk-tab {
@@ -81,7 +83,7 @@
 }
 .north .north-tabs .uk-tab > li.tab-line > a {
-    padding: 8px 0px 8px 12px;
+    padding: 8px 0px 8px 17px;
 }
 .north .north-tabs .uk-tab > li > a:hover,
@@ -352,4 +354,15 @@
 .user_detail_tip .qtip-content{
     width: 300px;
     height: 220px;
+}
+
+.op-beijingtime-time{
+    padding-left: 0px;
+    width: 107px;
+}
+
+.op-beijingtime-time>span{
+    font-size: 18px !important;
+    font-family: Microsoft Yahei !important;
+    color: blue !important;
 }
 \ No newline at end of file
@@ -55,6 +55,9 @@
               </li>
               {{/each}}
             </ul>
+            <a class="uk-navbar-brand op-beijingtime-time" title="每次秒数到0与服务器同步一次，睡眠状态唤醒会短暂异常，可鼠标右击横幅任意区域立刻同步！">
+                <span></span>
+            </a>
             <div class="uk-navbar-content uk-navbar-flip  uk-hidden-small" style="padding-left: 0;">
                 <div class="uk-button-group">
                     <button class="uk-button uk-button-danger exit-system">退出线调</button>
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-05-12',
-        text: '<h5>现在班次调整时，备注是必填项</h5><h5>现在中途更换设备后，需要刷新缓存数据后，再刷新线调页面。</h5><h5>分班套跑车辆将在上午最后一个班次完成后发送线路切换指令。捕捉到出场信号时也会切换至出场班次所在线路，驾驶员请求出场时候也会同步一次状态</h5><h5>修复了一些其他问题。</h5>'
+        date: '2017-05-16',
+        text: '<h5>菜单栏加入了服务器时间</h5>'
     };
     var storage = window.localStorage
+/**
+ * 工具栏上的时钟
+ * @type {{}}
+ */
+var gb_second_timer = (function () {
+
+    var now;
+    var _this;
+    var secondTimer;
+    var contextFlag;
+
+    var init = function () {
+        _this = $('.op-beijingtime-time>span')[0];
+        getServerTime(function (time) {
+            now = time;
+            $('div.north').bind("contextmenu", function () {
+                contextFlag = true;
+            });
+            setTime();
+
+            secondTimer = window.setInterval(function () {
+                if(0 == now.getSeconds() || true == contextFlag){
+                    minuteTimer();
+                    contextFlag = false;
+                }
+
+                now = new Date(now.getTime() + 1e3);
+                setTime();
+            }, 1e3);
+        });
+    };
+
+    var getServerTime = function (callback) {
+        function oncallback(jqXHR) {
+            var time = jqXHR && jqXHR.getResponseHeader("Date");
+            if (time)
+                callback(new Date(time))
+        }
+
+        if ("function" == typeof callback)
+            $.ajax({
+                url: "/real_control_v2/assets/imgs/time.gif",
+                type: "HEAD"
+            }).done(function (data, textStatus, jqXHR) {
+                oncallback(jqXHR)
+            }).fail(function (jqXHR, textStatus, errorThrown) {
+                oncallback(jqXHR)
+            })
+    };
+
+    var timeFormat = function(str) {
+        return ("0" + str).slice(-2)
+    };
+
+    var setTime = function () {
+        _this.innerHTML = timeFormat(now.getHours()) + ':' + timeFormat(now.getMinutes()) + '.' + timeFormat(now.getSeconds());
+    };
+
+    var minuteTimer = function () {
+        getServerTime(function(time) {
+            now = time;
+            setTime()
+        })
+    };
+
+    window.setTimeout(init, 6000);
+})();
 \ No newline at end of file
@@ -17,6 +17,7 @@ var gb_tabs = (function() {
             $('.north-tabs').html(tabHtmlStr);
             $('.main-container').html(tabContentHtmlStr);
+            setTimeout(renderStyle, 4000);
             //地图选项卡初始点击
             $('#north_tabs_map_btn').one('click', function () {
                 if(typeof(gb_map_overlay_mge)!="undefined"){
@@ -37,6 +38,15 @@ var gb_tabs = (function() {
         });
     };
+    function renderStyle(){
+        var rows = parseInt($('.north-tabs').height() / 32);
+        if(rows > 1){
+            var contHeight = 120 + ((rows - 1) * 36 - 15);
+            $('.main-container').css('height', 'calc(100% - '+contHeight+'px)');
+            $('.north .north-tabs').css('margin-top', '20px');
+        }
+    }
+
     //文件载入完毕
     res_load_ep.emitLater('load_tab');
@@ -13,7 +13,7 @@ var gb_safe_driv = (function () {
         'A7': '与人交谈'
     };
-    var path = 'http://180.166.5.82:9988/CurrentSafeDriving/';
+    var path = 'http://118.178.187.115/CurrentSafeDriving/';
     var $wrap = $('.safe_driv_pop_wrap');
     var max = 5;
@@ -163,6 +163,7 @@
 <!-- north js -->
 <script src="/real_control_v2/js/north/toolbar.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/north/tabs.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/north/second_timer.js" merge="custom_js"></script>
 <!-- home js -->
 <script src="/real_control_v2/js/home/layout.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/home/line_panel.js" merge="custom_js"></script>
@@ -32,4 +32,4 @@
 31=规则修改，路牌范围，人员范围可以拖动
 ##32=人员配置不存在的情况下，导入规则ktr，找不到的人员不添加，人员范围不存在的，规则不导入
-33=时刻表明细班次，里添加，是否停驶选项（计算工时使用）
+##33=时刻表明细班次，里添加，是否停驶选项（计算工时使用）