update

潘钊
1 parent 485ba583
Showing 9 changed files with 209 additions and 70 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/css/ct_table.css
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_in_out.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/tzrc.html
src/main/resources/static/real_control_v2/js/common.js
@@ -107,7 +107,7 @@ public class XDApplication implements CommandLineRunner {
         //dayOfSchedule.dataRecovery();
         //sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
         //实际排班更新线程
-        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //实际排班延迟入库线程
         //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
         //班次修正日志延迟入库
@@ -140,7 +140,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(fcxxUpdateThread, 60, 40, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
         //线路首末班数据（网关用，班次更新时写入）
         //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
-        //无法自动完成的班次信息（网关用，补信号）
+        //靠GPS信号无法自动完成的班次信息（网关用，补信号）
         //运管处静态数据提交
@@ -729,7 +729,7 @@ public class DayOfSchedule {
     /**
      * @Title: prveNotExecNum
      * @Description: TODO(班次之前未执行班次数量)
-     */
+
     public int prveNotExecNum(ScheduleRealInfo sch) {
         int n = 0;
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
@@ -741,29 +741,29 @@ public class DayOfSchedule {
                 break;
         }
         return n;
-    }
+    }*/
     /**
      * @Title: validEndTime
      * @Description: TODO(是否是有效的到达时间)
-     */
+
     public boolean validEndTime(ScheduleRealInfo sch, Long ts) {
         if (sch.getFcsjActualTime() != null && sch.getFcsjActualTime() > ts)
             return false;
         return validTime(sch, ts);
-    }
+    }*/
     /**
      * @Title: validStartTime
      * @Description: TODO(是否是合适的发车时间)
-     */
+
     public boolean validStartTime(ScheduleRealInfo sch, Long ts) {
         if (sch.getZdsjActualTime() != null && sch.getZdsjActualTime() < ts)
             return false;
         return validTime(sch, ts);
-    }
+    }*/
     public boolean validTime(ScheduleRealInfo sch, Long ts) {
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
@@ -875,9 +875,9 @@ public class DayOfSchedule {
         return outList;
     }
-    public Set<String> allCar() {
+/*    public Set<String> allCar() {
         return nbbmScheduleMap.keySet();
-    }
+    }*/
     public Collection<ScheduleRealInfo> findAll() {
         return nbbmScheduleMap.values();
@@ -939,12 +939,12 @@ public class DayOfSchedule {
         return ups;
     }
-    public void removeNbbm2SchMapp(ScheduleRealInfo sch, String nbbm) {
-        nbbmScheduleMap.remove(nbbm, sch);
+    public void removeNbbm2SchMapp(ScheduleRealInfo sch) {
+        nbbmScheduleMap.remove(sch.getClZbh(), sch);
     }
-    public void addNbbm2SchMapp(ScheduleRealInfo sch, String nbbm) {
-        nbbmScheduleMap.put(nbbm, sch);
+    public void addNbbm2SchMapp(ScheduleRealInfo sch) {
+        nbbmScheduleMap.put(sch.getClZbh(), sch);
     }
     public void reCalcExecPlan(String nbbm) {
@@ -3011,10 +3011,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (sch == null)
                 continue;
-            if (cpc.getClZbh() != null && !carExist(sch.getGsBm(), cpc.getClZbh())) {
-                rs.put("msg", "车辆 " + cpc.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
-                rs.put("status", ResponseCode.ERROR);
-                return rs;
+            if (cpc.getClZbh() != null) {
+                if(!carExist(sch.getGsBm(), cpc.getClZbh())) {
+                    rs.put("msg", "车辆 " + cpc.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
+                    rs.put("status", ResponseCode.ERROR);
+                    return rs;
+                }
+                else if(!sch.getGsBm().equals(BasicData.nbbm2CompanyCodeMap.get(cpc.getClZbh()))){
+                    rs.put("msg", sch.getXlName() + "所属的公司编码下找不到自编号为【" + cpc.getClZbh() + "】的车辆");
+                    rs.put("status", ResponseCode.ERROR);
+                    return rs;
+                }
             }
             if (StringUtils.isNotEmpty(cpc.getJsy())) {
@@ -4439,9 +4446,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         try {
             List<String> leftList = Splitter.on(",").splitToList(leftIdx);
             List<String> rightList = Splitter.on(",").splitToList(rightIdx);
-
-            //有班次变更的车辆
-            Set<String> cars = new HashSet<>();
+            Set<String> lpSet = new HashSet<>();
             List<ScheduleRealInfo> largeList, smallList;
             if (leftList.size() > rightList.size()) {
@@ -4462,7 +4467,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     //不对称时多出来的
                     lpChangeByLeft(leftSch, largeList.get(i - 1), type);
                     ts.add(leftSch);
-                    cars.add(leftSch.getClZbh());
+                    lpSet.add(leftSch.getXlBm() + "_" + leftSch.getLpName());
                     continue;
                 }
@@ -4470,13 +4475,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 lpChange(leftSch, rightSch, type);
                 ts.add(leftSch);
-                cars.add(leftSch.getClZbh());
-                cars.add(rightSch.getClZbh());
+                lpSet.add(leftSch.getXlBm() + "_" + leftSch.getLpName());
+                lpSet.add(rightSch.getXlBm() + "_" + rightSch.getLpName());
             }
-            //重新计算起点应到时间
-            for(String nbbm : cars){
-                ts.addAll(dayOfSchedule.updateQdzTimePlan(nbbm));
+            //重新计算路牌的起点应到时间
+            for(String lpName : lpSet){
+                ts.addAll(dayOfSchedule.updateQdzTimePlan(lpName));
             }
             for (ScheduleRealInfo sch : ts) {
@@ -4504,6 +4509,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public void lpChange(ScheduleRealInfo leftSch, ScheduleRealInfo rightSch, int type) {
+        //释放班次映射
+        if(type > 0) {
+            dayOfSchedule.removeNbbm2SchMapp(leftSch);
+            dayOfSchedule.removeNbbm2SchMapp(rightSch);
+        }
+
+        //对调数据
         LpData leftData = new LpData(leftSch);
         LpData rightData = new LpData(rightSch);
@@ -4511,12 +4523,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         rightData.appendTo(leftSch, type);
         if(type > 0){
-            //更新车辆和班次映射信息
-            dayOfSchedule.removeNbbm2SchMapp(leftSch, leftData.getNbbm());
-            dayOfSchedule.removeNbbm2SchMapp(rightSch, rightData.getNbbm());
-
-            dayOfSchedule.addNbbm2SchMapp(leftSch, rightData.getNbbm());
-            dayOfSchedule.addNbbm2SchMapp(rightSch, leftData.getNbbm());
+            //重新映射
+            dayOfSchedule.addNbbm2SchMapp(leftSch);
+            dayOfSchedule.addNbbm2SchMapp(rightSch);
         }
     }
@@ -4527,14 +4536,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
      * @param type
      */
     public void lpChangeByLeft(ScheduleRealInfo leftSch, ScheduleRealInfo rightSch, int type) {
-        LpData rightData = new LpData(rightSch);
+        //释放班次映射
+        if(type > 0)
+            dayOfSchedule.removeNbbm2SchMapp(leftSch);
+        LpData rightData = new LpData(rightSch);
         rightData.appendTo(leftSch, type);
-        if(type > 0){
-            //更新车辆和班次映射信息
-            dayOfSchedule.addNbbm2SchMapp(leftSch, rightData.getNbbm());
-        }
+        //重新映射
+        if(type > 0)
+            dayOfSchedule.addNbbm2SchMapp(leftSch);
+
     }
     @Override
@@ -33,7 +33,7 @@
 .ct_table>.ct_table_body {
     width: 100%;
     border-bottom: 1px solid #dedede;
-    color: #000;
+    /*color: #000;*/
 }
 .ct_table dl {
@@ -771,27 +771,30 @@ input.i-cbox[type=checkbox]{
 .sch-tzrc-table dl dt:nth-of-type(1), .sch-tzrc-table dl dd:nth-of-type(1) {
-    width: 30%;
+    width: 25%;
 }
 .sch-tzrc-table dl dt:nth-of-type(2), .sch-tzrc-table dl dd:nth-of-type(2) {
-    width: 25%;
+    width: 18%;
 }
 .sch-tzrc-table dl dt:nth-of-type(3), .sch-tzrc-table dl dd:nth-of-type(3) {
-    width: 25%;
+    width: 21%;
 }
 .sch-tzrc-table dl dt:nth-of-type(4), .sch-tzrc-table dl dd:nth-of-type(4) {
-    width: 20%;
+    width: 21%;
+}
+.sch-tzrc-table dl dt:nth-of-type(5), .sch-tzrc-table dl dd:nth-of-type(5) {
+    width: 15%;
 }
 .ct-form-modal .uk-autocomplete{
     width: 100%;
 }
-.sch-tzrc-table.ct_table dl.active,
+/*.sch-tzrc-table.ct_table dl.active,
 .sch-tzrc-table.ct_table>.ct_table_body dl.active:hover,
 .sch-tzrc-table.ct_table>.ct_table_body dl.context-menu-active{
     background: #e6e6e6;
-}
+}*/
 .search_sch_panel{
     float: right;
@@ -1597,3 +1597,62 @@ ul.left_tabs_lg li{
     text-decoration: underline;
     font-size: 13px;
 }
+
+#schedule-tzrc-modal input[type=checkbox]{
+    margin-right: 9px;
+}
+
+#schedule-tzrc-modal span.ct_zt_yzx{
+    color: #2196F3;
+    font-size: 12px;
+}
+
+#schedule-tzrc-modal span.ct_zt_lb{
+    color: red;
+    font-size: 12px;
+}
+
+#schedule-tzrc-modal span.ct_zt_zzzx{
+    font-size: 12px;
+    color: #38ad3c;
+}
+
+#schedule-tzrc-modal .tzrc_form{
+    padding: 20px;
+    border: 1px solid #f0eded;
+    box-shadow: 0px -3px 15px rgba(0,0,0,0.08);
+    background: #f9f9f9;
+}
+
+.uk-panel.ct_search_panel{
+    padding: 15px;
+    border: 1px solid #f0eded;
+    box-shadow: 0px 3px 15px rgba(0,0,0,0.08);
+    background: #f9f9f9;
+}
+
+.sch-tzrc-table.ct_table dl.active,
+.sch-tzrc-table.ct_table>.ct_table_body dl.active:hover{
+    background: #5bd460;
+    color: white;
+}
+
+#schedule-tzrc-modal dl.active span.ct_zt_yzx{
+    color: #545252;
+}
+
+#schedule-tzrc-modal dl.active span.ct_zt_lb{
+    color: #d64949;
+}
+
+#schedule-tzrc-modal dl.active span.ct_zt_zzzx{
+    color: white;
+}
+
+#schedule-tzrc-modal dl.active input[type=checkbox]{
+    border: 0;
+}
+
+#schedule-tzrc-modal dl.active input[type=checkbox]:before{
+    color: #ffffff;
+}
 \ No newline at end of file
@@ -100,7 +100,7 @@
                 else if (sch.status == 2) {
                     $f('destroy', f).parents('label').remove();
                     $f('endDate', f).val(sch.zdsjActual);
-                    $('input,select', f).attr('disabled', 'disabled');
+                    //$('input,select', f).attr('disabled', 'disabled');
                 }
             }
@@ -3,7 +3,7 @@
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
             <h2>调整人车</h2></div>
-        <div class="uk-panel uk-panel-box uk-panel-box-primary">
+        <div class="uk-panel ct_search_panel">
             <form class="uk-form uk-form-horizontal search-form">
                 <div class="uk-grid">
                     <div class="uk-width-1-3">
@@ -26,21 +26,23 @@
             </form>
         </div>
-        <div class="ct_table_wrap ct_table_no_border tzrc-table-wrap" style="height: 300px;">
+        <form class="uk-form">
+        <div class="ct_table_wrap ct_table_no_border tzrc-table-wrap" style="height: 340px;">
             <div class="ct_table sch-tzrc-table">
                 <div class="ct_table_head">
                     <dl>
-                        <dt><input type="checkbox" id="globalCheckBox" class="i-cbox" style="margin-top: 0px;">时间</dt>
+                        <dt><input type="checkbox" id="globalCheckBox" class="i-cbox"  >时间</dt>
                         <dt>车辆</dt>
                         <dt>驾驶员</dt>
                         <dt>售票员</dt>
+                        <dt>状态</dt>
                     </dl>
                 </div>
                 <div class="ct_table_body"></div>
             </div>
         </div>
-
-        <form class="uk-form uk-form-horizontal tzrc_form" style="padding-top: 20px;border-top: 1px solid whitesmoke;">
+        </form>
+        <form class="uk-form uk-form-horizontal tzrc_form">
             <div class="uk-grid">
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
@@ -77,7 +79,7 @@
             </div>
             <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
                 <button type="button" class="uk-button uk-modal-close">取消</button>
-                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存
+                <button type="submit" class="uk-button uk-button-primary" ><i class="uk-icon-check"></i> &nbsp;保存
                 </button>
             </div>
         </form>
@@ -85,10 +87,9 @@
     <script id="schedule-tzrc-table-temp" type="text/html">
         {{each list as sch i}}
-        <dl data-id="{{sch.id}}">
+        <dl data-id="{{sch.id}}" {{if sch.status==0}}class="no_exec_sch_row"{{/if}}>
             <dd>
-                <label>
-                    <input type="checkbox" value=1 name="schCBox" class="i-cbox" style="margin-top: 0px;">
+                    <input type="checkbox" value=1 name="schCBox" class="i-cbox" >
                     {{sch.dfsj}}
                     {{if sch.bcType == "out"}}
                     <span class="uk-badge uk-badge-success">出场</span>
@@ -105,11 +106,19 @@
                     {{if sch.cTasks.length > 0}}
                     <span class="uk-badge uk-badge-notification">{{sch.cTasks.length}}</span>
                     {{/if}}
-                </label>
             </dd>
             <dd>{{sch.clZbh}}</dd>
             <dd>{{sch.jGh}}/{{sch.jName}}</dd>
             <dd>{{sch.sGh}}/{{sch.sName}}</dd>
+            <dd>
+                {{if sch.status==2}}
+                    <span class="ct_zt_yzx">已执行</span>
+                {{else if sch.status==1}}
+                    <span class="ct_zt_zzzx">正在执行</span>
+                {{else if sch.status==-1}}
+                    <span class="ct_zt_lb">烂班</span>
+                {{/if}}
+            </dd>
         </dl>
         {{/each}}
     </script>
@@ -151,17 +160,21 @@
                     $('.tzrc-table-wrap', modal).perfectScrollbar('update');
                 });
-                $(modal).on('click', '.sch-tzrc-table .ct_table_body dl input[type=checkbox]', function () {
-                    if ($(this).attr('disabled')) return;
-                    var dl = $(this).parents('dl');
-                    if (this.checked) {
-                        dl.addClass('active');
+                $(modal).on('click', '.sch-tzrc-table .ct_table_body dl', function () {
+                    var cbox = $('input[type=checkbox]',this)[0];
+                    //var active = $();
+                    if(!$(this).hasClass('active')){
+                        $(this).addClass('active');
+                        cbox.checked = true;
                         var lineCode = $('[name=lineSelect]', modal).val();
-                        var sch = gb_schedule_table.findScheduleByLine(lineCode)[dl.data('id')];
+                        var sch = gb_schedule_table.findScheduleByLine(lineCode)[$(this).data('id')];
                         writeSch2Form(sch);
-                    } else
-                        dl.removeClass('active');
+                    }
+                    else{
+                        $(this).removeClass('active');
+                        cbox.checked = false;
+                    }
                 });
                 //默认选中项
@@ -191,7 +204,42 @@
                 //});
                 //submit
-                var f = $('form.tzrc_form', modal).formValidation({
+                var f = $('form.tzrc_form', modal);
+                f.on('submit', function (e) {
+                    e.stopPropagation();
+
+                    var checkeds = $('.sch-tzrc-table .ct_table_body input[type=checkbox]:checked', modal);
+                    if (checkeds.length == 0)
+                        return notify_err('请选中要调整的班次');
+
+                    var param = $(this).serializeJSON();
+                    var data = [];
+                    var schId;
+                    $.each(checkeds, function () {
+                        schId = $(this).parents('dl').data('id');
+                        data.push({
+                            schId: schId,
+                            jsy: param.jsy,
+                            spy: param.spy,
+                            clZbh: param.clZbh
+                        });
+                    });
+
+                    //检查一下是否跨公司换人，换车
+                   // gb_common.$get('/')
+
+                    gb_common.$post('/realSchedule/multi_tzrc', {
+                        cpcsJson: JSON.stringify(data)
+                    }, function (rs) {
+                        if (rs.ts && rs.ts.length > 0) {
+                            gb_schedule_table.updateSchedule(rs.ts);
+                            UIkit.modal(modal).hide();
+                            notify_succ('调整人车成功');
+                        }
+                    });
+                    return false;
+                });
+                /*var f = $('form.tzrc_form', modal).formValidation({
                     framework: 'uikit',
                     locale: 'zh_CN'
                 });
@@ -222,7 +270,7 @@
                             notify_succ('调整人车成功');
                         }
                     });
-                });
+                });*/
             });
             function writeSch2Form(sch) {
@@ -235,11 +283,28 @@
             //全选
             $('#globalCheckBox', modal).on('click', function () {
+                clearCheckAll();
                 var status = this.checked;
-                $('input[name=schCBox]', modal).each(function () {
-                    this.checked = status;
-                });
+                if(status){
+                    var id;
+                    $('.no_exec_sch_row', modal).each(function () {
+                        $(this).addClass('active');
+                        $('input[type=checkbox]',this)[0].checked = true;
+                        id = $(this).data('id');
+                    });
+
+                    var lineCode = $('[name=lineSelect]', modal).val();
+                    var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
+                    writeSch2Form(sch);
+                }
             });
+            
+            function clearCheckAll() {
+                $('.sch-tzrc-table .ct_table_body>dl', modal).each(function () {
+                    $(this).removeClass('active');
+                    $('input[type=checkbox]',this)[0].checked = false;
+                });
+            }
         })();
     </script>
 </div>
@@ -112,7 +112,7 @@ var gb_common = (function () {
         });
     };
-    var errorHead = '<span style="color:red;">服务器出现异常：</span>';
+    var errorHead = '<span style="color:red;">异常：</span>';
     function successHandle(json, handle) {
         var status = json.status;