update...

潘钊
1 parent 5a6550d7
Showing 16 changed files with 133 additions and 142 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/ReverseSignalHandle.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/edit_logs/SchEditLogger.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/badge_tooltip.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/dftz.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/js/line_schedule/badge_tooltip.js
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/minute_timer.js
src/main/resources/static/real_control_v2/main.html
@@ -48,8 +48,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
 	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
-										   @RequestParam String dfsj,String bcType) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType);
+										   @RequestParam String dfsj,String bcType,
+										   @RequestParam(defaultValue = "") String opType) {
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType);
 	}
 	/**
@@ -38,7 +38,7 @@ public class ReverseSignalHandle extends SignalHandle {
         if (isReverse(gps, prev)) {
             RouteReverse reverse = reverseSearch(prevs, gps);
-            if (reverse.getCount() >= 3
+            if (reverse != null && reverse.getCount() >= 3
                     && reverse.isClose()
                     && !GeoCacheData.isEndStation(gps.getLineId(), gps.getUpDown(), reverse.getTurned())) {
                 scheduleSignalState.reverseAnalyse(reverse);
@@ -109,7 +109,7 @@ public class DayOfSchedule {
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd"), fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     //数据恢复
-    private void dataRecovery() {
+    public void dataRecovery() {
         GpsDataRecovery.run = true;
         Collection<LineConfig> confs = lineConfigs.getAll();
+package com.bsth.data.schedule.edit_logs;
+
+/**
+ * 班次修正记录
+ * Created by panzhao on 2017/5/16.
+ */
+public class SchEditLogger {
+
+    /**
+     * 待发调整
+     */
+    public static void dftz(Long id, String remarks, String dfsj, String bcType, String opType){
+
+    }
+}
@@ -924,4 +924,8 @@ public class ScheduleRealInfo {
 	public void setFcpSn(int fcpSn) {
 		this.fcpSn = fcpSn;
 	}
+
+	public boolean isInout(){
+		return this.getBcType().equals("out") || this.getBcType().equals("in");
+	}
 }
@@ -16,7 +16,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Collection<ScheduleRealInfo>> findByLines(String lines);
-	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType);
+	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType, String opType);
 	Map<String, Object> destroy(String idsStr/*, int spaceAdjust*/, String  remarks, String reason/*, int spaceNum*/);
@@ -207,7 +207,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     @Override
-    public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType) {
+    public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType, String opType) {
         Map<String, Object> map = new HashMap<>();
         try {
@@ -1155,7 +1155,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     sch = list.get(i);
                     //调整待发
-                    outgoAdjust(sch.getId(), null, fmtHHmm.print(st), null);
+                    outgoAdjust(sch.getId(), null, fmtHHmm.print(st), null, "间隔调整");
                 }
                 rs.put("status", ResponseCode.SUCCESS);
@@ -1325,7 +1325,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (StringUtils.isNotEmpty(jhlc)) {
                 double jhlcNum = Double.parseDouble(jhlc);
                 //烂班
-                if(jhlcNum == 0 && sch.getJhlcOrig() != 0)
+                if(jhlcNum == 0 && sch.getJhlcOrig() != 0 && !sch.isInout())
                     destroy(sch.getId() + "", "", map.get("adjustExps").toString());
                 else if(jhlcNum != sch.getJhlc()){
                     sch.setJhlc(jhlcNum);
@@ -1375,7 +1375,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule = dayOfSchedule.get(id);
                 if(schedule != null)
-                    outgoAdjust(id, null, dfsj, null);
+                    outgoAdjust(id, null, dfsj, null, "批量调整");
             }
             rs.put("status", ResponseCode.SUCCESS);
@@ -3222,7 +3222,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (StringUtils.isEmpty(dc.getOld_dfsj()) || StringUtils.isEmpty(dc.getNew_dfsj()))
                 continue;
-            tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null);
+            tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null, "批量调整");
             if (tempMap.get("status").equals(ResponseCode.SUCCESS)) {
                 list.addAll((Collection<? extends ScheduleRealInfo>) tempMap.get("ts"));
@@ -1158,3 +1158,8 @@ ul.left_tabs_lg li{
     padding: 2px 7px;
     border-radius: 3px;
 }
+
+.uk-badge.sch_ldks{
+    background: #8c8c8c;
+    background-image: linear-gradient(to bottom,#a7a7a7,#8c8c8c);
+}
@@ -61,4 +61,12 @@
             </div>
         </div>
     </script>
+
+    <script id="sch-table-ldks-tootip-temp" type="text/html">
+        <div class="tl-tip-panel">
+            <div style="font-size: 13px;">
+                {{qdzName}} 至 {{zdzName}}
+            </div>
+        </div>
+    </script>
 </div>
@@ -115,6 +115,10 @@
         (function() {
             var modal = '#schedule-dftz-modal'
                     ,sch;
+
+            var isInout = function (code) {
+                return code=='out' || code=='in';
+            };
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
                 sch=data.sch;
@@ -125,12 +129,12 @@
                 var bctypes=dictionaryUtils.getByGroup('ScheduleType')
                         ,opts='';
-                if(sch.bcType == 'out' || sch.bcType == 'in'){
+                if(isInout(sch.bcType)){
                     $('[name=bcType]', modal).html('<option value="'+sch.bcType+'">'+bctypes[sch.bcType]+'</option>');
                 }
                 else{
                     for(var code in bctypes){
-                        if(code!='venting' && code!='major' && code != 'normal')
+                        if(isInout(code))
                             continue;
                         opts+='<option value="'+code+'">'+bctypes[code]+'</option>';
                     }
@@ -166,10 +170,12 @@
                         url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html';
                         detailModal='#bctype-venting-modal';
                     }
-                    else{
+                    else if(type=='major'){
                         detailModal='#bctype-major-modal';
                         url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_major.html';
                     }
+                    else
+                        return;
                     $.get(url, function(htmlStr){
                         $(document.body).append(htmlStr);
@@ -99,6 +99,8 @@
                 <span class="uk-badge uk-badge-danger">放站</span>
                 {{else if sch.bcType == "region"}}
                 <span class="uk-badge">区间</span>
+                {{else if sch.bcType == "ldks"}}
+                <span class="uk-badge sch_ldks">空2</span>
                 {{/if}}
                 {{if sch.sflj}}
                 <span class="uk-badge uk-badge-danger">临加</span>
@@ -74,6 +74,8 @@
                                     <span class="uk-badge uk-badge-danger">放站</span>
                                     {{else if sch.bcType == "region"}}
                                     <span class="uk-badge sch_region">区间</span>
+                                    {{else if sch.bcType == "ldks"}}
+                                    <span class="uk-badge sch_ldks">空2</span>
                                     {{/if}}
                                     {{if sch.sflj}}
                                     <span class="uk-badge uk-badge-danger">临加</span>
@@ -126,12 +128,14 @@
             <span class="uk-badge uk-badge-danger">放站</span>
             {{else if bcType == "region"}}
             <span class="uk-badge sch_region">区间</span>
+            {{else if sch.bcType == "ldks"}}
+            <span class="uk-badge uk-badge-notification sch_ldks">空2</span>
             {{/if}}
             {{if sflj}}
             <span class="uk-badge uk-badge-danger">临加</span>
             {{/if}}
             {{if cTasks.length > 0}}
-            <span class="uk-badge uk-badge-notification c_task">{{cTasks.length}}</span>
+            <span class="uk-badge c_task">{{cTasks.length}}</span>
             {{/if}}
         </dd>
     </script>
@@ -2,6 +2,36 @@
 /** badge 悬停 tip  相关 */
 var gb_schedule_badge_tootip = (function () {
+    var _opts = {
+        show:{
+            ready: true,
+            delay: 300
+        },
+        position: {
+            viewport: $(window),
+            my: 'center left',
+            at: 'center right'
+        },
+        hide: {
+            fixed: true,
+            delay: 300
+        },
+        events: {
+            hidden: function(event, api) {
+                //destroy dom
+                $(this).qtip('destroy', true);
+            }
+        }
+    };
+
+    var getSch = function (e) {
+        var id = $(e).parents('dl').data('id'),
+            lineCode = $(e).parents('li.line_schedule').data('id'),
+            sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
+        return sch;
+    };
+
+    var _badge = '.schedule-wrap .ct_table_body .uk-badge';
     var temps;
     //html 模板
     $.get('/real_control_v2/fragments/line_schedule/badge_tooltip.html', function(dom) {
@@ -9,18 +39,13 @@ var gb_schedule_badge_tootip = (function () {
     });
     //子任务 tootip
-    $(document).on('mouseenter', '.schedule-wrap .ct_table_body .uk-badge.c_task', function() {
+    $(document).on('mouseenter', _badge + '.c_task', function() {
         $(this).qtip({
-            show: {
-                ready: true,
-                delay: 300
-            },
+            show: _opts.show,
             content: {
                 text: function() {
-                    var id = $(this).parents('dl').data('id'),
-                        lineCode = $(this).parents('li.line_schedule').data('id'),
-                        sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
-                    //排序
+                    var sch = getSch(this);
+                    //子任务排序
                     var array = sch.cTasks.sort(function (a, b) {
                         var an = (a.mileageType=='service'?1:0)+''+(a.destroy?0:1);
                         var bn = (b.mileageType=='service'?1:0)+''+(b.destroy?0:1);
@@ -29,134 +54,87 @@ var gb_schedule_badge_tootip = (function () {
                     return temps['sch-table-task-tootip-temp']({tasks: array});
                 }
             },
-            position: {
-                viewport: $(window),
-                my: 'center left',
-                at: 'center right'
-            },
+            position: _opts.position,
             style: {
                 classes: 'qtip-light qtip-rounded qtip-shadow sch-badge-tip'
             },
-            hide: {
-                fixed: true,
-                delay: 300
-            },
-            events: {
-                hidden: function(event, api) {
-                    //destroy dom
-                    $(this).qtip('destroy', true);
-                }
-            }
+            hide: _opts.hide,
+            events: _opts.events
         });
     });
     //区间 tootip
-    $(document).on('mouseenter', '.schedule-wrap .ct_table_body .uk-badge.sch_region', function() {
+    $(document).on('mouseenter', _badge+'.sch_region', function() {
         $(this).qtip({
-            show: {
-                ready: true,
-                delay: 300
-            },
+            show: _opts.show,
             content: {
                 text: function() {
-                    var id = $(this).parents('dl').data('id'),
-                        lineCode = $(this).parents('li.line_schedule').data('id'),
-                        sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
-                    return temps['sch-table-region-tootip-temp'](sch);
+                    return temps['sch-table-region-tootip-temp'](getSch(this));
                 }
             },
-            position: {
-                viewport: $(window),
-                my: 'center left',
-                at: 'center right'
-            },
+            position: _opts.position,
             style: {
                 classes: 'qtip-youtube sch-badge-tip'
             },
-            hide: {
-                fixed: true,
-                delay: 300
-            },
-            events: {
-                hidden: function(event, api) {
-                    //destroy dom
-                    $(this).qtip('destroy', true);
-                }
-            }
+            hide: _opts.hide,
+            events: _opts.events
         });
     });
     //出场 tootip
-    $(document).on('mouseenter', '.schedule-wrap .ct_table_body .uk-badge.out', function() {
+    $(document).on('mouseenter', _badge+'.out', function() {
         $(this).qtip({
-            show: {
-                ready: true,
-                delay: 300
-            },
+            show: _opts.show,
             content: {
                 text: function() {
-                    var id = $(this).parents('dl').data('id'),
-                        lineCode = $(this).parents('li.line_schedule').data('id'),
-                        sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
-                    return temps['sch-table-out-tootip-temp'](sch);
+                    return temps['sch-table-out-tootip-temp'](getSch(this));
                 }
             },
-            position: {
-                viewport: $(window),
-                my: 'center left',
-                at: 'center right'
-            },
+            position: _opts.position,
             style: {
                 classes: 'qtip-youtube sch-badge-tip'
             },
-            hide: {
-                fixed: true,
-                delay: 300
-            },
-            events: {
-                hidden: function(event, api) {
-                    //destroy dom
-                    $(this).qtip('destroy', true);
-                }
-            }
+            hide: _opts.hide,
+            events: _opts.events
         });
     });
     //进场 tootip
-    $(document).on('mouseenter', '.schedule-wrap .ct_table_body .uk-badge.in', function() {
+    $(document).on('mouseenter', _badge+'.in', function() {
         $(this).qtip({
-            show: {
-                ready: true,
-                delay: 300
-            },
+            show: _opts.show,
             content: {
                 text: function() {
-                    var id = $(this).parents('dl').data('id'),
-                        lineCode = $(this).parents('li.line_schedule').data('id'),
-                        sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
-                    return temps['sch-table-in-tootip-temp'](sch);
+                    return temps['sch-table-in-tootip-temp'](getSch(this));
                 }
             },
-            position: {
-                viewport: $(window),
-                my: 'center left',
-                at: 'center right'
-            },
+            position: _opts.position,
             style: {
                 classes: 'qtip-youtube sch-badge-tip'
             },
-            hide: {
-                fixed: true,
-                delay: 300
-            },
-            events: {
-                hidden: function(event, api) {
-                    //destroy dom
-                    $(this).qtip('destroy', true);
+            hide: _opts.hide,
+            events: _opts.events
+        });
+    });
+
+    //2点间空放
+    $(document).on('mouseenter', _badge+'.sch_ldks', function() {
+        $(this).qtip({
+            show: _opts.show,
+            content: {
+                title:'两点间空驶',
+                text: function() {
+                    return temps['sch-table-ldks-tootip-temp'](getSch(this));
                 }
-            }
+            },
+            position: _opts.position,
+            style: {
+                classes: 'qtip-shadow qtip-bootstrap sch-badge-tip'
+            },
+            hide: _opts.hide,
+            events: _opts.events
         });
     });
 })();
 \ No newline at end of file
@@ -170,7 +170,7 @@ function showUpdateDescription() {
     //更新说明
     var updateDescription = {
         date: '2017-05-16',
-        text: '<h5>菜单栏加入了服务器时间</h5>'
+        text: '<h5>修复了进出场班次公里设置为0后自动烂班的问题</h5>'
     };
     var storage = window.localStorage
-/** 时钟 */
-var gb_minute_timer = (function () {
-
-
-    var getServerTime = function (cb) {
-        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)
-            })
-    };
-
-
-    setTimeout(function () {
-        getServerTime(function () {
-            console.log('cb,,', cb);
-        });
-    }, 5000);
-
-})();
 \ No newline at end of file
@@ -184,8 +184,6 @@
 <script src="/real_control_v2/js/websocket/sch_websocket.js" merge="custom_js"></script>
 <!-- tts -->
 <script src="/real_control_v2/js/utils/tts.js" merge="custom_js"></script>
-<!-- minute_timer.js -->
-<script src="/real_control_v2/js/minute_timer.js" merge="custom_js"></script>
 <!-- echart -->
 <script src="/real_control_v2/assets/echarts-3/echarts.js" merge="plugins"></script>