update...

潘钊
1 parent 3a398294
Showing 7 changed files with 30 additions and 8 deletions
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/fragments/line_schedule/context_menu/sub_task/add_sub_task_oil.html
src/main/resources/static/real_control_v2/js/line_schedule/badge_tooltip.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/line_schedule/search.js
src/main/resources/static/real_control_v2/js/main.js
@@ -145,10 +145,10 @@ public class DayOfSchedule implements CommandLineRunner {
     public void run(String... arg0) throws Exception {
         basicDataLoader.loadAllData();
         //从数据库恢复排班
-        //dataRecovery();
+        dataRecovery();
         //翻班线程
-        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
 //        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
         //班次误点扫描
@@ -690,6 +690,7 @@ public class DayOfSchedule implements CommandLineRunner {
         nbbmScheduleMap.remove(sch.getClZbh(), sch);
         id2SchedulMap.remove(sch.getId());
+        lpScheduleMap.remove(sch.getXlBm() + "_" + sch.getLpName(), sch);
         //return sch;
     }
@@ -705,6 +706,10 @@ public class DayOfSchedule implements CommandLineRunner {
         return schAttrCalculator.updateQdzTimePlan(list);
     }
+    public List<ScheduleRealInfo> updateQdzTimePlan(ScheduleRealInfo sch) {
+        return updateQdzTimePlan(sch.getXlBm() + "_" + sch.getLpName());
+    }
+
     /**
      * @Title: doneSum
      * @Description: TODO(已完成班次总数)
@@ -364,7 +364,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix));
             t.setZdzName(BasicData.getStationNameByCode(t.getZdzCode(), prefix));
-            //计算班次实际时间
+            //计算班次实际执行时间
             schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
             if (t.getZdsjT() < t.getFcsjT()) {
                 rs.put("status", ResponseCode.ERROR);
@@ -379,7 +379,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             dayOfSchedule.put(t);
             //更新起点应到时间
-            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(t.getClZbh());
+            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(t);
             //重新计算车辆当前执行班次
             dayOfSchedule.reCalcExecPlan(t.getClZbh());
@@ -419,7 +419,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(rs.get("status").equals(ResponseCode.SUCCESS)){
                 dayOfSchedule.delete(sch);
                 //更新起点应到时间
-                List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
+                List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch);
                 rs.put("ts", ts);
                 rs.put("delete", sch);
             }
@@ -464,6 +464,11 @@
                     $('.uk-panel-box', f).removeClass('uk-panel-box-primary');
                     f.prepend('<input type="hidden" name="destroy" value="true">');
                     $('[name=mileage]', f).val(sch.jhlcOrig);
+
+                    //进场起点
+                    $('[name=startStation]', jcForm).val(sch.qdzCode);
+                    //出场终点
+                    $('[name=endStation]', ccForm).val(sch.qdzCode);
                 }
             }
         })();
@@ -20,7 +20,13 @@ var gb_schedule_badge_tootip = (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-task-tootip-temp']({tasks: sch.cTasks});
+                    //排序
+                    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);
+                        return parseInt(bn) - parseInt(an);
+                    });
+                    return temps['sch-table-task-tootip-temp']({tasks: array});
                 }
             },
             position: {
@@ -194,6 +194,9 @@ var gb_schedule_table = (function () {
             gb_schedule_table_dbclick.sfsjCellClick($('dd.fcsjActualCell', tabCont));
             //滚动条
             $('.schedule-wrap .ct_table_wrap', tabCont).perfectScrollbar({suppressScrollX: true});
+
+            //搜索模板初始化
+            gb_sch_search.init();
         }
     };
@@ -40,6 +40,9 @@ var gb_sch_search = (function() {
     var elements = '.search_sch_panel .sch-search-autocom';
     var init = function() {
         $(elements).each(function() {
+            if($('script[type="text/autocomplete"]', this).length > 0)
+                return true;
+
             $(this).append(result_template);
             constructor(this);
         });
@@ -171,8 +171,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-04-20',
-        text: '<h5>现在可以在轨迹回放里看到停车场位置和多边形电子围栏</h5><h5>区间调头子任务，可以勾选“调头后空驶回起点”</h5>'
+        date: '2017-04-24',
+        text: '<h5>应到实到时间按路牌连接显示</h5><h5>批量子任务时，如果主任务烂班，则自动复一个全程烂班子任务</h5><h5>鼠标悬停在子任务数字徽章上可查看详细</h5>'
     };
     var storage = window.localStorage