Merge branch 'minhang' into pudong

潘钊
2 parents 59ff0553 d91fbcf1
Showing 13 changed files with 116 additions and 23 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/resources/static/pages/summary/work_hours/list.html
src/main/resources/static/real_control_v2/css/handicapped_style.css
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/js/line_schedule/legend.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/utils/ct_table.js
@@ -175,7 +175,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             dayOfSchedule.save(sch);
             //清理应发未发标记
-            LateAdjustHandle.remove(sch);
+            LateAdjustHandle.remove(sch.getClZbh());
             if(!gps.isService() && !dayOfSchedule.emptyService(sch)){
                 //切换成营运状态
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=267";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=285";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -162,6 +162,15 @@ public class PilotReport {
             LineConfig conf = lineConfigData.get(sch.getXlBm());
             if (conf.getOutConfig() == 1) {
+
+                try{
+                    //最大允许时间阈值 2 小时
+                    if(Math.abs(d80.getTimestamp() - sch.getDfsjT()) > 1000 * 60 * 60 * 2)
+                        return;
+                }catch (Exception e){
+                    logger.error("", e);
+                }
+
                 //为相关班次写入请求出场时间
                 sch.setFcsjActualAll(d80.getTimestamp());
@@ -102,12 +102,25 @@ public class LateAdjustHandle implements ApplicationContextAware{
                 sch.setLate2(false);
                 sch.setLateMinute(0);
                 sch.setDfAuto(false);
+
+                logger.info("移除误点调整 -" + sch.getClZbh());
             }
         }catch (Exception e){
             logger.error("", e);
         }
     }
+    public static void remove(String nbbm){
+        if(lateSchMap.containsKey(nbbm)){
+            ScheduleRealInfo sch = lateSchMap.get(nbbm);
+            sch.setLate2(false);
+            sch.setLateMinute(0);
+            sch.setDfAuto(false);
+
+            logger.info("移除误点调整 nbbm -" + nbbm);
+        }
+    }
+
     /**
      * 车辆到站
      * @param gps
@@ -127,10 +140,17 @@ public class LateAdjustHandle implements ApplicationContextAware{
                     /*&& sch.getLateMinute() > 0*/){
                 //自动调整待发 到达时间 + 停靠时间
                 long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-                sch.setDfsjAll(dt);
-                sch.setDfAuto(true);
-                //取消应发未到标记
-                sch.setLate2(false);
+
+                //超过2小时最大阈值，放弃
+                if(Math.abs(dt - sch.getDfsjT()) > 1000 * 60 * 60 * 2){
+                    logger.info(sch.getClZbh() + " 超过误点调整阈值，放弃");
+                }
+                else{
+                    sch.setDfsjAll(dt);
+                    sch.setDfAuto(true);
+                    //取消应发未到标记
+                    sch.setLate2(false);
+                }
                 lateSchMap.remove(sch.getClZbh());
                 logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
@@ -263,8 +263,8 @@
     }
     //日期选择器
-    $('[name=rq_eq]', f).val('2017-09-24');
-    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-09-24', minDate: '2017-07-01'});
+    $('[name=rq_eq]', f).val('2017-10-10');
+    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-10-10', minDate: '2017-07-01'});
     var comps;
     //构建公司级联下拉框
+/** 为残疾人提供的一份样式  , .ct_table.line-schedule-table dl dt*/
+
+.ct_table.line-schedule-table dl dd{
+    border-right-color: #000000 !important;
+    border-top: 1px solid #000000 !important;
+    color: #000000;
+}
+
+.schedule-body .ct_table.line-schedule-table dl:nth-child(even){
+    background: rgba(114, 197, 210, 0.33) !important;
+}
+
+.tl-yzx{
+    background: rgb(151, 151, 223) !important;
+}
+
+.tl-zzzx {
+    background: rgb(152, 217, 54) !important;
+}
+
+.tl-xxfc {
+    background: rgb(15, 220, 220) !important;
+}
+
+.ct_table>.ct_table_body{
+    border-bottom: 1px solid #000000 !important;
+}
@@ -1699,4 +1699,13 @@ dl.active&gt;dd.disabled{
 .display_hide{
     display: none;
+}
+
+.ct_eye_icon{
+    font-size: 16px;
+    cursor: pointer;
+}
+
+.ct_eye_icon.active{
+    color: #444;
 }
 \ No newline at end of file
@@ -197,15 +197,19 @@
                         return;
                     }
-                    if(!data.adjustExps && (data.status==-1
-                        || (data.jhlc==0 && sch.bcType != 'in' && sch.bcType != 'out'))){
+                    //正常班次里程修改为0
+                    var normalDestory = data.jhlc==0 && sch.bcType != 'in' && sch.bcType != 'out';
+                    //修改里程
+                    var editJhlc = data.jhlc != sch.jhlc && data.jhlc != 0;
+                    if(!data.adjustExps && (data.status==-1 || normalDestory || editJhlc)){
                         notify_err("当前操作需要选择调整原因！");
                         return;
                     }
                     //里程有修改
-                    if(data.jhlc != sch.jhlc && data.jhlc != 0){
-                        var confHtml = '<h4 style="color: #c04c4c;margin-bottom: 9px;">确认要将班次里程由'+sch.jhlc+' 修改为'+data.jhlc+' </h4><small>备注：</small>';
+                    //if(data.jhlc != sch.jhlc && data.jhlc != 0){
+
+                        /*var confHtml = '<h4 style="color: #c04c4c;margin-bottom: 9px;">确认要将班次里程由'+sch.jhlc+' 修改为'+data.jhlc+' </h4><small>备注：</small>';
                         UIkit.modal.prompt(confHtml, data.remarks, function(remarks){
                             if(remarks){
                                 //在这里写操作日志
@@ -221,10 +225,10 @@
                                 Ok: '确定修改公里并保存',
                                 Cancel: '取消'
                             }
-                        });
-                    }
-                    else
-                        postData(data);
+                        });*/
+                    //}
+                    //else
+                    postData(data);
                 });
                 var postData = function (data) {
@@ -23,6 +23,7 @@
                         </a>
                     </div>
                 </div>
+                <i class="uk-icon-eye uk-icon-hover ct_eye_icon"></i>
                 <div class="search_sch_panel">
                     <form class="uk-form" onsubmit="javascript:return false;">
                         <div class="uk-autocomplete sch-search-autocom">
@@ -8,7 +8,7 @@ var gb_sch_legend = (function () {
     var animationend = 'webkitAnimationEnd animationend';
     var initLegend = function (cont) {
         //双击展开
-        $('.schedule-wrap i.uk-icon-question-circle', cont).dblclick(openLegend);
+        /*$('.schedule-wrap i.uk-icon-question-circle', cont).dblclick(openLegend);
         //关闭事件
         $('.schedule-wrap .fixed_legend_close', cont).on('click', function () {
@@ -35,13 +35,34 @@ var gb_sch_legend = (function () {
         var flag=storage.getItem(locaKey);
         if(flag && flag==1)
-            openLegend();
+            openLegend();*/
+
+        //eye init
+        var eyeState = storage.getItem('eye_state');
+        if(eyeState && eyeState==1)
+            $(eye_dom).eq(0).trigger('click');
     };
+    var eye_dom = '.schedule-wrap i.ct_eye_icon';
+    $(document).on('click', eye_dom, changeHandicappedStyle);
+    function changeHandicappedStyle() {
+        if($(this).hasClass('active')){
+            $(eye_dom).removeClass('active');
+            $('#handicappedStyleLink', 'head').remove();
+            storage.setItem('eye_state', 0);
+        }
+        else{
+            $(eye_dom).addClass('active');
+            $("<link>").attr({rel: "stylesheet", type: "text/css", href: "/real_control_v2/css/handicapped_style.css",
+                    id: 'handicappedStyleLink'
+                }).appendTo("head");
+            storage.setItem('eye_state', 1);
+        }
+    }
     //展开图例
     var openLegend = function () {
-        $('.qtip.sch-tl-tip').qtip('destroy', true);
+        /*$('.qtip.sch-tl-tip').qtip('destroy', true);
         //隐藏ICON
         $('.schedule-wrap i.uk-icon-question-circle').hide();
@@ -58,7 +79,7 @@ var gb_sch_legend = (function () {
         $('.schedule-wrap .fixed_legend').css('display', 'inline-block');
         //记录状态
-        storage.setItem(locaKey, 1);
+        storage.setItem(locaKey, 1);*/
     };
     return {
@@ -105,8 +105,10 @@ var gb_schedule_table = (function () {
                 //标记路牌最后一个班次
                 markerLastByLine(lineCode);
                 //初始化图例相关，dbclick 不能代理事件
-                gb_sch_legend.init(this);
+                //gb_sch_legend.init(this);
             });
+            //初始化图例
+            gb_sch_legend.init();
             var content = $('.line_schedule .ct_table_wrap');
             //初始化滚动条
             content.perfectScrollbar({suppressScrollX: true});
@@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(),
                 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
             }, 1000);
             //弹出更新说明
-            showUpdateDescription();
+            //showUpdateDescription();
         });
         function g_emit(id) {
@@ -49,7 +49,7 @@ var gb_ct_table = (function() {
         $tbody.empty().append(dls);
         //console.log('replaceAfter..', replaceAfter);
         replaceAfter && replaceAfter($tbody);
-    }
+    };
     function toggleOrder(that) {
         var order = $(that).data('order');