update...

潘钊
1 parent 949a8039
Showing 15 changed files with 246 additions and 43 deletions
src/main/java/com/bsth/controller/schedule/InOutScheduleController.java
src/main/java/com/bsth/data/schedule/real/ScheduleDataBuffer.java
src/main/java/com/bsth/service/schedule/ScheduleService.java
src/main/java/com/bsth/service/schedule/impl/ScheduleServiceImpl.java
src/main/resources/static/assets/css/abnormal_monitor.css
src/main/resources/static/assets/js/common.js
src/main/resources/static/index.html
src/main/resources/static/pages/abnormal/fragments/abnormal_handler.html
src/main/resources/static/pages/abnormal/fragments/expand_card_modal.html
src/main/resources/static/pages/abnormal/fragments/h_cont_dftz.html
src/main/resources/static/pages/abnormal/fragments/h_cont_hrcc.html
src/main/resources/static/pages/abnormal/fragments/m_dftz.html
src/main/resources/static/pages/abnormal/fragments/m_tzrc.html
src/main/resources/static/pages/abnormal/js/o_s_card.js
src/main/resources/static/pages/abnormal/main.html
@@ -4,6 +4,7 @@ import com.bsth.data.schedule.dto.ScheduleInOut;
 import com.bsth.service.schedule.ScheduleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -45,4 +46,9 @@ public class InOutScheduleController {
     public Map<String, Object> findSchByLpName(@RequestParam String lineCode, @RequestParam String lpName){
         return inOutScheduleService.findSchByLpName(lineCode, lpName);
     }
+
+    @RequestMapping(value = "dftz", method = RequestMethod.POST)
+    public Map<String, Object> dftz(@RequestParam Map<String, Object> map){
+        return inOutScheduleService.dftz(map);
+    }
 }
@@ -110,7 +110,7 @@ public class ScheduleDataBuffer implements CommandLineRunner {
         p_c_mapps();
     }
-    private static void put(ScheduleInOut sio) {
+    public static void put(ScheduleInOut sio) {
         if (allMaps.containsKey(sio.getId()))
             update(allMaps.get(sio.getId()), sio);
         else
@@ -30,6 +30,8 @@ public interface ScheduleService {
     List<ScheduleInOut> findOutByIdx(String idx);
+    Map<String,Object> dftz(Map<String, Object> map);
+
     //void inOut(CarInOutEntity obj);
     //void busInOut(CarInOutEntity obj);
@@ -10,6 +10,7 @@ import com.bsth.data.schedule.dto.dd.ScheduleRealInfo;
 import com.bsth.data.schedule.real.ScheduleDataBuffer;
 import com.bsth.data.utils.HttpClientUtils;
 import com.bsth.data.utils.RsRequestUtils;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.schedule.ScheduleService;
 import com.bsth.util.ConfigUtil;
 import com.google.common.base.Splitter;
@@ -132,4 +133,25 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> dftz(Map<String, Object> map) {
+        Map<String, Object> rs = new HashMap<>();
+        try{
+            map.put("userId", SecurityUtils.getCurrentUser().getUserName());
+            StringBuilder sb = HttpClientUtils.post(dataUrl + "/tcc_dftz" + RsRequestUtils.getParams(), JSON.toJSONString(map));
+
+            rs = JSON.parseObject(sb.toString());
+
+            if("SUCCESS".equals(rs.get("status"))){
+                ScheduleInOut sio = JSON.toJavaObject(JSON.parseObject(rs.get("t").toString()), ScheduleInOut.class);
+                ScheduleDataBuffer.put(sio);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常！");
+        }
+        return rs;
+    }
 }
@@ -311,12 +311,10 @@ span.red_line_empty{
 .o_s_expand_table_modal table tr>th:nth-of-type(6),
 .o_s_expand_table_modal table tr>td:nth-of-type(6){
     width: 12%;
-    text-align: center;
 }
 .o_s_expand_table_modal table tr>th:nth-of-type(7),
 .o_s_expand_table_modal table tr>td:nth-of-type(7){
     width: 12%;
-    text-align: center;
 }
 .o_s_expand_table_modal table tr>th:nth-of-type(8),
 .o_s_expand_table_modal table tr>td:nth-of-type(8){
@@ -353,7 +351,7 @@ table.curr_out_plan_table{
     background: #f8f8f8;
     border: 1px solid #ececec;
     font-size: 14px;
-    margin-top: 30px;
+    margin-bottom: 10px;
 }
 .tzrc_table_wrap table.sch_list_table{
@@ -366,8 +364,8 @@ table.curr_out_plan_table{
     font-size: 12px;
     border-radius: 0;
     height: 17px;
-    padding: 0px 5px 1px;
-    margin-left: 2px;
+    padding: 0px 2px 1px;
+    margin-left: 0;
     vertical-align: top;
     margin-top: 1px;
 }
@@ -394,6 +392,7 @@ table.curr_out_plan_table{
 .o_s_abnormal_handler_modal .tzrc_form_card form{
     margin-left: -12px;
+    margin-top: 20px;
 }
 .modal_cont_tzrc_wrap form.uk-form-horizontal .uk-form-label{
@@ -435,27 +434,23 @@ table.curr_out_plan_table{
 }
 .tzrc_table_wrap table.tab_wid_1 tr>th:nth-of-type(2),
 .tzrc_table_wrap table.tab_wid_1 tr>td:nth-of-type(2){
-    width: 16%;
+    width: 22%;
 }
 .tzrc_table_wrap table.tab_wid_1 tr>th:nth-of-type(3),
 .tzrc_table_wrap table.tab_wid_1 tr>td:nth-of-type(3){
-    width: 21%;
+    width: 20%;
 }
 .tzrc_table_wrap table.tab_wid_1 tr>th:nth-of-type(4),
 .tzrc_table_wrap table.tab_wid_1 tr>td:nth-of-type(4){
-    width: 18%;
+    width: 20%;
 }
 .tzrc_table_wrap table.tab_wid_1 tr>th:nth-of-type(5),
 .tzrc_table_wrap table.tab_wid_1 tr>td:nth-of-type(5){
-    width: 15%;
+    width: 17%;
 }
 .tzrc_table_wrap table.tab_wid_1 tr>th:nth-of-type(6),
 .tzrc_table_wrap table.tab_wid_1 tr>td:nth-of-type(6){
-    width: 12%;
-}
-.tzrc_table_wrap table.tab_wid_1 tr>th:nth-of-type(7),
-.tzrc_table_wrap table.tab_wid_1 tr>td:nth-of-type(7){
-    width: 13%;
+    width: 16%;
 }
 .tzrc_table_wrap table.tab_wid_1{
@@ -686,3 +681,18 @@ table tr&gt;td.empty{
     position: relative;
 }
+.destroy_row,
+.uk-table-hover tbody tr.destroy_row:hover,
+.uk-table-hover>tr.destroy_row:hover{
+    background: #ebebeb;
+    color: #464646;
+    box-shadow: inset 0px 0px 9px 0px rgba(0, 0, 0, 0.17);
+}
+
+.destroy_row a,
+.destroy_row .uk-link:hover,
+.destroy_row a:hover{
+    color: #e85757;
+}
+
+
@@ -395,8 +395,9 @@ var gb_common = (function () {
             labels: {
                 ok: okBtn,
                 cancel: '取消'
-            }
-        }).then(fun);
+            },
+            stack: true
+        }).then(fun, null);
     };
     var alt_prompt = function (name, defaultVal, okBtn, cb) {
@@ -280,6 +280,10 @@
             }
         }
     }
+
+    var isArray = function (obj) {
+        return Object.prototype.toString.call(obj) === '[object Array]';
+    };
 </script>
 <!-- 异常监管 JS -->
@@ -41,7 +41,7 @@
             });
             $('._switcher_cont', wrap).on('show', function (e) {
-                $('div:first', e.target).trigger('init', {ae: ae});
+                $('div:first', e.target).trigger('init', {ae: ae, modalId: modalId});
             });
         })();
     </script>
@@ -45,21 +45,38 @@
     <script id="o_s_expand_sch_list-temp" type="text/html">
         {{each list as sch i}}
-            <tr>
+            <tr class="{{sch.status==-1?'destroy_row':''}}">
                 <td>{{i + 1}}</td>
                 <td>{{sch.lineName}}</td>
                 <td><a>{{sch.lpName}}</a></td>
                 <td>{{sch.jsy}}</td>
                 <td>{{sch.nbbm}}</td>
-                <td>{{sch.attJhTimeStr}}/04:22</td>
-                <td>{{sch.dfsjStr}}/04:30</td>
-                <td>{{sch.remarks}}</td>
+                <td>{{sch.attJhTimeStr}}/</td>
                 <td>
-                    {{if sch.status!=-1}}
+                    {{sch.dfsjStr}}/
+                    {{if sch.outTimeRfid!=null}}
+                        <span style="color: {{sch.rfidLate>0?'red':'blue'}};">{{sch.outTimeRfidStr}}</span>
+                    {{else if sch.outTimePzsb!=null}}
+                        <span style="color: {{sch.pzsbLate>0?'red':'blue'}};">{{sch.outTimePzsbStr}}</span>
+                    {{else if sch.fcsjActual!=null}}
+                        <span style="color: #8b8b8b">{{sch.fcsjActual}}</span>
+                    {{/if}}
+                </td>
+                <td><span title="{{sch.remarks}}">{{sch.remarks}}</span></td>
+                <td>
+                    {{if sch.outTimeRfid!=null && sch.outTimePzsb!=null}}
+                        <small style="color: #2283e3;">已出场（2）</small>
+                    {{else if sch.outTimeRfid!=null}}
+                        <small>已出场（RFID）</small>
+                    {{else if sch.outTimePzsb!=null}}
+                        <small>已出场（牌照识别）</small>
+                    {{else if sch.fcsjActual!=null}}
+                        <small style="color: #8b8b8b;">已出场（集调）</small>
+                    {{else if sch.status==-1}}
+                        <small style="color: #e85757;">已烂班</small>
+                    {{else}}
                         <button class="uk-button uk-button-primary uk-button-small ct_dftz_btn" data-id="{{sch.id}}" data-line="{{sch.lineCode}}">调档</button>&nbsp;
                         <button class="uk-button uk-button-primary uk-button-small ct_hrhc_btn" data-id="{{sch.id}}" data-lp="{{sch.lpName}}" data-line="{{sch.lineCode}}">换人换车</button>
-                    {{else}}
-                        <small style="color: red;">已烂班</small>
                     {{/if}}
                 </td>
             </tr>
@@ -7,7 +7,7 @@
     <script>
         (function () {
-            var wrap = '.handler_cont_dftz_wrap', ae, inoutSch;
+            var wrap = '.handler_cont_dftz_wrap', ae, inoutSch, modalId;
             $(wrap).on('init', function (e, data) {
@@ -15,6 +15,7 @@
                 if ($(this).attr('data-init') == 1)
                     return;
+                modalId = data.modalId;
                 ae = data.ae;
                 inoutSch = gb_os_card.findByLineCode(ae.lineCode)[ae.schId];
@@ -26,6 +27,9 @@
                 }, readerScheduleList);
                 $(this).attr('data-init', 1);
+
+                //提交
+                $(wrap).on('click', '.submit-btn', _submit);
             });
             var readerScheduleList = function (rs) {
@@ -124,6 +128,50 @@
                     cbox.checked = this.checked;
                 }
             });
+
+
+            function _submit() {
+                var f = $('.dftz_form_card>form', wrap);
+                var fData = f.serializeJSON();
+                if(!fData['remarks']){
+                    _shake_elem($('[name=remarks]', f));
+                    return UIkit.notification('你必须输入备注信息！', 'danger');
+                }
+
+                if(fData['destroyItem'] && !fData['reason']){
+                    _shake_elem($('[name=reason]', f));
+                    return UIkit.notification('你必须选择烂班原因！', 'danger');
+                }
+
+                gb_common.alt_confirm('确定提交当前操作？', '是的，我确定', function () {
+                    disabledSubmitBtn();
+
+                    var idx = '';
+                    if(fData['destroyItem']){
+                        for(var i in fData['destroyItem'])
+                            idx+=(fData['destroyItem'][i]+',');
+                        idx = idx.substr(0, idx.length-1);
+                    }
+                    fData['destroyIdx']=idx;
+                    delete fData['destroyItem'];
+
+                    gb_common.$post('/in_out/dftz', fData, function (rs) {
+                        UIkit.notification('操作成功！', 'success');
+                        gb_os_card.update(rs.t);
+                        UIkit.modal(modalId).hide();
+                    });
+                });
+            }
+
+            function disabledSubmitBtn() {
+                $('.submit-btn', wrap).html('<div uk-spinner></div>').attr('disabled', 'disabled');
+            }
+
+            function _shake_elem($e) {
+                $e.addClass('uk-animation-shake').one('animationend', function () {
+                    $(this).removeClass('uk-animation-shake');
+                });
+            }
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -20,7 +20,6 @@
             <th>驾驶员</th>
             <th>售票员</th>
             <th>车辆</th>
-            <th>路牌</th>
             <th>状态</th>
         </tr>
         </thead>
@@ -8,11 +8,12 @@
     <script>
         (function () {
-            var wrap = '.modal_cont_dftz_wrap', inoutSch;
+            var wrap = '.modal_cont_dftz_wrap', inoutSch, modalId;
             $(wrap).on('init', function (e, data) {
                 e.stopPropagation();
+                modalId = '#'+data.modalId;
                 inoutSch = gb_os_card.findByLineCode(data.lineCode)[data.id];
@@ -24,6 +25,9 @@
                     readerScheduleList(rs);
                     data && data.caller && data.caller();
                 });
+
+                //提交
+                $(modalId).on('click', '.submit-btn', _submit);
             });
             var readerScheduleList = function (rs) {
@@ -122,6 +126,49 @@
                     cbox.checked = this.checked;
                 }
             });
+
+            function _submit() {
+                var f = $('.dftz_form_card>form', modalId);
+                var fData = f.serializeJSON();
+                if(!fData['remarks']){
+                    _shake_elem($('[name=remarks]', f));
+                    return UIkit.notification('你必须输入备注信息！', 'danger');
+                }
+
+                if(fData['destroyItem'] && !fData['reason']){
+                    _shake_elem($('[name=reason]', f));
+                    return UIkit.notification('你必须选择烂班原因！', 'danger');
+                }
+
+                gb_common.alt_confirm('确定提交当前操作？', '是的，我确定', function () {
+                    disabledSubmitBtn();
+
+                    var idx = '';
+                    if(fData['destroyItem']){
+                        for(var i in fData['destroyItem'])
+                            idx+=(fData['destroyItem'][i]+',');
+                        idx = idx.substr(0, idx.length-1);
+                    }
+                    fData['destroyIdx']=idx;
+                    delete fData['destroyItem'];
+
+                    gb_common.$post('/in_out/dftz', fData, function (rs) {
+                        UIkit.notification('操作成功！', 'success');
+                        gb_os_card.update(rs.t);
+                        UIkit.modal(modalId).hide();
+                    });
+                });
+            }
+            
+            function disabledSubmitBtn() {
+                $('.submit-btn', modalId).html('<div uk-spinner></div>').attr('disabled', 'disabled');
+            }
+            
+            function _shake_elem($e) {
+                $e.addClass('uk-animation-shake').one('animationend', function () {
+                   $(this).removeClass('uk-animation-shake');
+                });
+            }
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -22,7 +22,6 @@
             <th>驾驶员</th>
             <th>售票员</th>
             <th>车辆</th>
-            <th>路牌</th>
             <th>状态</th>
         </tr>
         </thead>
@@ -9,11 +9,24 @@ var gb_os_card = (function () {
     var init = function (lineIdx, cb) {
         $.get('/in_out/findOutByIdx',{idx: lineIdx}, function (list) {
             list.sort(function (a, b) {
-                return a.dfsjT - b.dfsjT;
+                return a['dfsjT'] - b['dfsjT'];
             });
             for (var i = 0, sch; sch = list[i++];) {
                 sch.attJhTimeStr = moment(sch.attJhTime).format('HH:mm');
                 sch.dfsjStr = moment(sch.dfsjT).format('HH:mm');
+                if(sch.fcsjActualTime){//集调出场时间
+                    sch.fcsjActual = moment(sch.fcsjActualTime).format('HH:mm');
+                }
+
+                if(sch.outTimeRfid){//rfid出场时间
+                    sch.outTimeRfidStr = moment(sch.outTimeRfid).format('HH:mm');
+                    sch.rfidLate = sch.outTimeRfid - sch.dfsjT;
+                }
+
+                if(sch.outTimePzsb){//牌照识别出场时间
+                    sch.outTimePzsbStr = moment(sch.outTimePzsb).format('HH:mm');
+                    sch.pzsbLate = sch.outTimePzsb - sch.dfsjT;
+                }
             }
             //按线路分组数据
             var data = gb_common.groupBy(list, 'lineCode');
@@ -91,6 +104,23 @@ var gb_os_card = (function () {
         return all;
     };
+    var update = function (schArr) {
+        if (!isArray(schArr))
+            schArr = [schArr];
+
+        $.each(schArr, function () {
+            try{
+                _data[this.lineCode][this.id] = this;
+                updateDom(this);
+            }catch (e){
+                console.log(e);
+            }
+        });
+    };
+
+    var updateDom = function (sch) {
+        //刷新卡片
+    };
     return {
         init: init,
@@ -98,6 +128,7 @@ var gb_os_card = (function () {
         findLps: findLps,
         findCls: findCls,
         findJsys: findJsys,
-        findAll: findAll
+        findAll: findAll,
+        update: update
     };
 })();
 \ No newline at end of file
@@ -178,7 +178,6 @@
             <td>{{sch.jGh}}/{{sch.jName}}</td>
             <td>{{sch.sGh}}/{{sch.sName}}</td>
             <td>{{sch.clZbh}}</td>
-            <td>{{sch.lpName}}</td>
             <td>
                 {{if sch.status==2}}
                 <span class="ct_zt_yzx">已执行</span>
@@ -197,63 +196,63 @@
     </script>
     <script id="jd_schedule_form_table_002-temp" type="text/html">
-
+        <input type="hidden" name="dftzId" value="{{currSch.id}}">
         <div class="uk-width-1-2@s">
             <label class="uk-form-label">从<small>(停车场)</small></label>
             <div class="uk-form-controls">
-                <input class="uk-input" name="" value="{{currSch.qdzName}}" disabled>
+                <input class="uk-input" value="{{currSch.qdzName}}" disabled>
             </div>
         </div>
         <div class="uk-width-1-2@s">
             <label class="uk-form-label">至<small>(站点)</small></label>
             <div class="uk-form-controls">
-                <input class="uk-input" name="" value="{{currSch.zdzName}}" disabled>
+                <input class="uk-input" value="{{currSch.zdzName}}" disabled>
             </div>
         </div>
         <div class="uk-width-1-2@s">
             <label class="uk-form-label">车辆编码</label>
             <div class="uk-form-controls">
-                <input class="uk-input" name="" value="{{currSch.clZbh}}" disabled>
+                <input class="uk-input" value="{{currSch.clZbh}}" disabled>
             </div>
         </div>
         <div class="uk-width-1-2@s">
             <label class="uk-form-label">路牌</label>
             <div class="uk-form-controls">
-                <input class="uk-input" name="" value="{{currSch.lpName}}" disabled>
+                <input class="uk-input" value="{{currSch.lpName}}" disabled>
             </div>
         </div>
         <div class="uk-width-1-2@s">
             <label class="uk-form-label">驾驶员</label>
             <div class="uk-form-controls">
-                <input class="uk-input" name="" value="{{currSch.jGh}}/{{currSch.jName}}" disabled>
+                <input class="uk-input" value="{{currSch.jGh}}/{{currSch.jName}}" disabled>
             </div>
         </div>
         <div class="uk-width-1-2@s">
             <label class="uk-form-label">售票员</label>
             <div class="uk-form-controls">
-                <input class="uk-input" name="" value="{{currSch.sGh}}/{{currSch.sName}}" disabled>
+                <input class="uk-input" value="{{currSch.sGh}}/{{currSch.sName}}" disabled>
             </div>
         </div>
         <div class="uk-width-1-2@s">
             <label class="uk-form-label">计发时刻</label>
             <div class="uk-form-controls">
-                <input class="uk-input" name="" type="time" value="{{currSch.fcsj}}" disabled>
+                <input class="uk-input" name="fcsj" type="time" value="{{currSch.fcsj}}" disabled>
             </div>
         </div>
         <div class="uk-width-1-2@s">
             <label class="uk-form-label font-orange">预发时刻</label>
             <div class="uk-form-controls">
-                <input class="uk-input" name="" type="time" value="{{currSch.dfsj}}" >
+                <input class="uk-input" name="newTimeStr" type="time" value="{{currSch.dfsj}}" >
             </div>
         </div>
         <div class="uk-width-1-1@s">
             <label class="uk-form-label font-orange">备注</label>
             <div class="uk-form-controls">
-                <textarea class="uk-textarea" rows="4" placeholder="必填，不超过50字" >{{currSch.remarks}}</textarea>
+                <textarea class="uk-textarea" name="remarks" rows="4" placeholder="必填，不超过50字" >{{currSch.remarks}}</textarea>
             </div>
         </div>
@@ -280,7 +279,7 @@
                 {{each list as sch i}}
                 <tr data-id="{{sch.id}}">
                     <td>
-                        <input class="uk-checkbox " type="checkbox" >
+                        <input class="uk-checkbox " type="checkbox" name="destroyItem[{{i}}]" value="{{sch.id}}">
                     </td>
                     <td>
                         {{sch.fcsj}}
@@ -325,6 +324,24 @@
                 {{/each}}
             </table>
             </div>
+
+            <div class="uk-width-1-2@s" style="padding: 12px 0 12px 0;">
+                <label class="uk-form-label font-orange" style="width: 100px;text-indent: 22px;margin-top: 12px;">烂班原因:</label>
+                <div class="uk-form-controls" style="margin-left: 102px;">
+                    <select class="uk-select" name="reason">
+                        <option value="">请选择..</option>
+                        <option value="配车">配车</option>
+                        <option value="保养">保养</option>
+                        <option value="故障">故障</option>
+                        <option value="缺人">缺人</option>
+                        <option value="缺车">缺车</option>
+                        <option value="气候">气候</option>
+                        <option value="援外">援外</option>
+                        <option value="抽减">抽减</option>
+                        <option value="其他">其他</option>
+                    </select>
+                </div>
+            </div>
         </div>
         <div class="uk-width-1-1@s">
             <hr>