update...

潘钊
1 parent 8f6b2e0f
Showing 9 changed files with 116 additions and 109 deletions
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/resources/static/pages/history_sch/edit/main_page.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sys_mailbox.html
src/main/resources/static/real_control_v2/fragments/north/nav/directive_history.html
src/main/resources/static/real_control_v2/fragments/north/nav/report_80.html
src/main/resources/static/real_control_v2/js/common.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
@@ -165,11 +165,11 @@ public class DirectiveController {
 	 * @throws
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Map<String, Object> findDirective(String nbbm,@RequestParam int dType
+	public Map<String, Object> findDirective(String nbbms,@RequestParam int dType
 							, @RequestParam(defaultValue = "0") int page,
 							@RequestParam(defaultValue = "10") int size){
-		return directiveService.findDirective(nbbm, dType, page, size);
+		return directiveService.findDirective(nbbms, dType, page, size);
 	}
 	@RequestMapping(value = "/c0a4", method = RequestMethod.POST)
@@ -365,11 +365,21 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     }
     @Override
-    public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {
+    public Map<String, Object> findDirective(String nbbms, int dType, int page, int size) {
         Map<String, Object> rsMap = new HashMap<>();
         try{
-            List<Directive> list = new ArrayList<>();
+            List<String> carArray = new ArrayList<>(), deviceArray=new ArrayList<>();
+            if(StringUtils.isNotEmpty(nbbms)){
+                carArray = Splitter.on(",").splitToList(nbbms);
+                //转换成设备号
+                Map<String, String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
+                for(int i = 0, len=carArray.size(); i < len; i++){
+                    deviceArray.add(nbbm2deviceMap.get(carArray.get(i)));
+                }
+            }
+
+            List<Directive> list = new ArrayList<>();
             switch (dType) {
                 case -1:
                     //所有指令
@@ -409,18 +419,22 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             // 时间倒序
             Collections.sort(list, new DayOfDirectives.DComparator());
-            if (StringUtils.isNotBlank(nbbm)) {
-                String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-                //按车辆过滤
+            if(deviceArray.size() > 0){
+                //按设备号过滤
                 List<Directive> subList = new ArrayList<>();
                 for (Directive d : list) {
-                    if (d.getDeviceId().equals(deviceId)) {
+                    if (deviceArray.contains(d.getDeviceId())) {
                         subList.add(d);
                     }
                 }
                 list = subList;
             }
+            for(Directive d : list){
+                d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
+                d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
+            }
+
             int count = list.size();
             // 分页
             int s = page * size, e = s + size;
@@ -429,15 +443,6 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 e = count;
             List<Directive> rs = list.subList(s, e);
-
-            // 时间格式化，车辆自编号转换
-            for (Directive d : rs) {
-                if (d.getTimeHHmm() == null)
-                    d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
-                if (d.getNbbm() == null)
-                    d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
-            }
-
             rsMap.put("list", rs);
             rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
             rsMap.put("page", page);
@@ -450,51 +455,6 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     @Override
     public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {
-        /*List<D80> d80s = new ArrayList<>();
-
-        Object nbbm = map.get("nbbm");
-        if (null != nbbm && StringUtils.isNotEmpty(nbbm.toString())) {
-            d80s.addAll(pilotReport.findByCar(nbbm.toString()));
-        } else {
-            d80s.addAll(pilotReport.findAll());
-        }
-
-        Short requestCode = Short.parseShort(map.get("requestCode").toString());
-        if (requestCode != -1) {
-            List<D80> temps = new ArrayList<>();
-            for (D80 d80 : d80s) {
-                if (d80.getData().getRequestCode().equals(requestCode))
-                    temps.add(d80);
-            }
-            d80s = temps;
-        }
-
-        //排序
-        Collections.sort(d80s, new Comparator<D80>() {
-            @Override
-            public int compare(D80 o1, D80 o2) {
-                return (int) (o2.getTimestamp() - o1.getTimestamp());
-            }
-        });
-
-        //分页
-        int count = d80s.size();
-        // 分页
-        int s = page * size, e = s + size;
-
-        if (e > count)
-            e = count;
-
-        //SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-        List<D80> rs = d80s.subList(s, e);
-        for (D80 d80 : rs) {
-            d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
-        }
-
-        Map<String, Object> rsMap = new HashMap<>();
-        rsMap.put("list", rs);
-        rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
-        rsMap.put("page", page);*/
         List all = ListFilterUtils.filter(pilotReport.findAll(), map, D80.class);
         //排序
@@ -144,6 +144,19 @@
     var hide_wait_modal = function () {
         UIkit.modal('#gb_wait_modal').hide();
     };
+
+    var alt_confirm = function (content, succ, okBtn, noCenter) {
+        var modalEl = UIkit.modal.confirm(content, function () {
+            succ && succ();
+            modalEl.hide();
+        }, {
+            labels: {
+                Ok: okBtn,
+                Cancel: '取消'
+            }
+            , center: !noCenter
+        });
+    };
 </script>
 </body>
 </html>
 \ No newline at end of file
 <div>
     <script id="sys-note-80-temp" type="text/html">
-        <div class="uk-width-medium-1-1 sys-note-80 sys-mail-item" data-id={{id}}>
+        <div class="uk-width-medium-1-1 sys-note-80 sys-mail-item" data-id={{id}} data-schid="{{schId}}">
             <div class="uk-panel uk-panel-box uk-panel-box-primary">
                 <h4 class="uk-panel-title">{{data.nbbm}} {{text}}</h4>
                 <code>{{dateStr}}</code>
@@ -21,9 +21,13 @@
                         <option value="1">运营指令</option>
                         <option value="2">线路切换指令</option>
                     </select>
+                    <span class="horizontal-field">线路</span>
+                    <select name="lineCode" style="width: 140px;">
+                        <option value="">全部</option>
+                    </select>
                     <span class="horizontal-field">车辆</span>
                     <div class="uk-autocomplete uk-form" id="uk-autocomplete-cars">
-                        <input type="text" name="nbbm" placeholder="车辆自编号">
+                        <input type="text" name="nbbms" placeholder="车辆自编号">
                     </div>
                     <button class="uk-button">检索</button>
@@ -81,43 +85,18 @@
             var form = $('.search-form', modal);
             var page = 0;
             var pageSize = 12;
-            //all car nbbm
-            var cars;
-            //custom autocomplete search function
-            var carInput = $('#uk-autocomplete-cars input');
-            var search_nbbm = function(release) {
-                var q = carInput.val().toUpperCase(),
-                        rs = [],
-                        max = 12,
-                        count = 0;
-
-                $.each(cars, function(i, item) {
-                    if (item.indexOf(q) != -1){
-                        rs.push({
-                            value: item,
-                            title: item
-                        });
-                        count ++;
-                    }
-                    if (count >= max)
-                        return false;
-                });
-                release && release(rs);
-            }
+            //线路下拉框
+            var opts = '<option value="">全部</option>';
+            $.each(gb_data_basic.activeLines, function () {
+                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
+            });
+            $('[name=lineCode]', form).html(opts);
             $('#directive-history-modal').on('init', function(e, data) {
                 e.stopPropagation();
-                // autocomplete
-                $.get('/basic/cars', function(rs) {
-                    cars = rs;
-
-                    UIkit.autocomplete('#uk-autocomplete-cars', {
-                        source: search_nbbm,
-                        minLength: 1,
-                        delay: 50
-                    });
-                });
+                //车辆 autocomplete
+                gb_common.carAutocomplete($('#uk-autocomplete-cars', modal), gb_data_basic.carsArray());
                 query();
             });
@@ -133,6 +112,17 @@
                 var data = form.serializeJSON();
                 data.page = page;
                 data.size = pageSize;
+                if(data.lineCode){
+                    //有选择线路，重新设置车辆字符串
+                    var nbbmArray=data.nbbms=gb_schedule_table.findNbbmByLineCode(data.lineCode);
+                    if(nbbmArray.length>0){
+                        data.nbbms='';
+                        for(var i=0,n;n=nbbmArray[i++];){
+                            data.nbbms+=n+',';
+                        }
+                        data.nbbms=data.nbbms.substr(0, data.nbbms.length-1);
+                    }
+                }
                 $.get('/directive/list', data, function(rs) {
                     $.each(rs.list, function(i, e){
@@ -14,10 +14,12 @@
                     <select name="requestCode">
                         <option value="">全部</option>
                     </select>
-                    <span class="horizontal-field">线路</span>
+                    <!--<span class="horizontal-field">线路</span>
                     <div class="uk-autocomplete uk-form autocomplete-line" >
                         <input type="text" name="lineId" placeholder="线路">
-                    </div>
+                    </div>-->
+                    <span class="horizontal-field">线路</span>
+                    <select name="lineId" style="width: 140px;"></select>
                     <span class="horizontal-field">车辆</span>
                     <div class="uk-autocomplete uk-form autocomplete-cars" >
                         <input type="text" name="nbbm" placeholder="车辆自编号">
@@ -80,6 +82,13 @@
             var page = 0;
             var pageSize = 12;
+            //线路下拉框
+            var opts = '<option value="">全部</option>';
+            $.each(gb_data_basic.activeLines, function () {
+                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
+            });
+            $('[name=lineId]', form).html(opts);
+
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
                 var opt='';
@@ -90,7 +99,7 @@
                 //车辆 autocomplete
                 gb_common.carAutocomplete($('.autocomplete-cars', modal), gb_data_basic.carsArray());
                 //线路 autocomplete
-                gb_common.lineAutocomplete($('.autocomplete-line', modal));
+                //gb_common.lineAutocomplete($('.autocomplete-line', modal));
                 query();
             });
@@ -106,12 +115,12 @@
                 var data = form.serializeJSON();
                 data.page = page;
                 data.size = pageSize;
-                //线路转换成编码
+                /*//线路转换成编码
                 if(data.lineId){
                     var lineCode = gb_data_basic.findCodeByLinename(data.lineId);
                     if(lineCode)
                         data.lineId=lineCode;
-                }
+                }*/
                 $.get('/directive/findAll80', data, function(rs) {
                     $.each(rs.list, function(){
                         //命令字转中文
@@ -62,6 +62,18 @@ var gb_common = (function () {
         return rs;
     };
+    /**
+     * 从班次集合里提取车辆
+     * @param list
+     */
+    var extractNbbm = function (list) {
+        var rs = {};
+        $.each(list, function () {
+            rs[this.clZbh]=1;
+        });
+        return rs;
+    };
+
     var compileTempByDom = function (dom, opts) {
         var tps = {},
             id;
@@ -435,7 +447,8 @@ var gb_common = (function () {
         adjustExps: adjustExps,
         inOutExps: inOutExps,
         next_elem: next_elem,
-        getDisabledVal: getDisabledVal
+        getDisabledVal: getDisabledVal,
+        extractNbbm: extractNbbm
         //whichTransitionEvent:whichTransitionEvent
     };
@@ -651,6 +651,17 @@ var gb_schedule_table = (function () {
     var refreshAll = function () {
         show();
     };
+
+    /**
+     * 获取线路下营运的车辆
+     */
+    var findNbbmByLineCode = function (lineCode) {
+        try{
+            return gb_common.get_keys(gb_common.extractNbbm(gb_common.get_vals(line2Schedule[lineCode])));
+        }catch (e){
+            return [];
+        }
+    };
     return {
         show: show,
@@ -673,6 +684,7 @@ var gb_schedule_table = (function () {
         showLateBadge: showLateBadge,
         cancelLateBadge: cancelLateBadge,
         refreshAll: refreshAll,
-        getNextNormalSch: getNextNormalSch
+        getNextNormalSch: getNextNormalSch,
+        findNbbmByLineCode:findNbbmByLineCode
     };
 })();
@@ -235,23 +235,37 @@ var gb_sch_websocket = (function () {
         dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
     });
+    //80消息点击
+    $(document).on('click', '.sys-mailbox .sys-note-80', function () {
+        var lineCode = $(this).parents('li.line_schedule').data('id')
+            , id = $(this).data('schid');
+        var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
+        var dl = gb_schedule_table.scroToDl(sch);
+        //高亮
+        gb_schedule_table.reset_drag_active_all(dl);
+        dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
+    });
     //80同意
-    $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button-primary', function () {
+    $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button-primary', function (e) {
+        e.stopPropagation();
         $(this).attr('disabled', 'disabled');
         var panel = $(this).parents('.sys-note-80')
             , id = panel.data('id');
         reply80({id: id, reply: 0});
+        return false;
     });
     //80不同意
     $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button.reject', function () {
+        e.stopPropagation();
         $(this).attr('disabled', 'disabled');
         var panel = $(this).parents('.sys-note-80')
             , id = panel.data('id');
         reply80({id: id, reply: -1});
+        return false;
     });
     var reply80 = function (data, cb) {
@@ -344,10 +358,6 @@ var gb_sch_websocket = (function () {
             return;
         gb_schedule_context_menu.fcxxwt(sch);
-        var dl = gb_schedule_table.scroToDl(sch);
-        //高亮
-        gb_schedule_table.reset_drag_active_all(dl);
-        dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
     });
     return {