update...

潘钊
1 parent 7acde535
Showing 7 changed files with 59 additions and 24 deletions
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.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/context_menu/lp_change.html
src/main/resources/static/real_control_v2/js/common.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -70,10 +70,12 @@ public abstract class SignalHandle {
     protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
         int updown = Integer.parseInt(sch.getXlDir());
+        //gps 切换走向
+        gps.setUpDown(updown);
+
         List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), updown);
         StationRoute station = GeoUtils.gpsInStation(gps, srs);
         if (station != null) {
-            gps.setUpDown(updown);
             gps.setStopNo(station.getCode());
         }
     }
@@ -178,7 +178,12 @@ public class InOutStationSignalHandle extends SignalHandle{
         if(gps.getStopNo().equals(sch.getZdzCode())){
-            int diff = (int) (sch.getZdsjT() - gps.getTimestamp());
+            int diff = 0;
+            try{
+                diff = (int) (sch.getZdsjT() - gps.getTimestamp());
+            }catch(NullPointerException e){
+                logger.info("NullPointerException " + sch.getXlName() + " 有班次无班次历时，，，检查一下是否需要出站既出场。");
+            }
             //进场最多提前1.2小时
             if(sch.getBcType().equals("in") && diff > MAX_BEFORE_TIME)
                 return;
@@ -3468,11 +3468,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         try {
             ScheduleRealInfo sch = dayOfSchedule.get(id);
-            if (sch.getZdsjActual() == null) {
+            if (sch.getZdsjActual() == null && sch.getFcsjActual() == null) {
                 rs.put("status", ResponseCode.ERROR);
-                rs.put("msg", "无实际到达时间，无法撤销！");
+                rs.put("msg", "班次未执行，无法撤销！");
             } else {
+                sch.clearFcsjActual();
                 sch.clearZdsjActual();
                 //清除下一个班次的起点到达时间
                 ScheduleRealInfo next = dayOfSchedule.next(sch);
@@ -716,16 +716,16 @@ li.map-panel {
 }
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(1), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(1) {
-    width: 7%;
+    width: 5%;
     border-left: 1px solid #dedede;
 }
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(2), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(2) {
-    width: 25%;
+    width: 22%;
 }
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(3), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(3) {
-    width: 20%;
+    width: 17%;
 }
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(4), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(4) {
@@ -733,39 +733,47 @@ li.map-panel {
  }
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(5), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(5) {
-    width: 22%;
+    width: 21%;
 }
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(6), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(6) {
-    width: 15%;
+    width: 10%;
+}
+
+#schedule-lp_change-modal .sch-list dl dt:nth-of-type(7), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(7) {
+    width: 14%;
 }
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(1), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(1) {
-    width: 7%;
+    width: 5%;
     border-left: 1px solid #dedede;
 }
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(2), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(2) {
-    width: 15%;
+    width: 14%;
 }
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(3), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(3) {
-    width: 22%;
+    width: 10%;
 }
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(4), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(4) {
-    width: 10%;
+    width: 21%;
 }
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(5), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(5) {
-    width: 20%;
+    width: 10%;
 }
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(6), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(6) {
-    width: 25%;
+    width: 17%;
+}
+
+#schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(7), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(7) {
+    width: 22%;
 }
 #schedule-lp_change-modal .ct_table.sch-list .ct_table_body dl.active {
@@ -838,4 +846,12 @@ svg rect.offline{
     font-size: 12px;
     margin-left: 5px;
     display: none;
+}
+
+.operation-real-text{
+    position: absolute;
+    top: 10px;
+    width: 100%;
+    left: 0;
+    text-align: center;
 }
 \ No newline at end of file
 <div class="uk-modal" id="schedule-lp_change-modal">
-    <div class="uk-modal-dialog" style="width: 1200px;">
+    <div class="uk-modal-dialog" style="width: 1240px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
             <h2>路牌对调</h2></div>
+        <!--<div class="operation-real-text">
+            <span>
+                不同路牌才能对调
+            </span>
+        </div>-->
         <div class="uk-grid uk-grid-divider">
             <div class="uk-width-1-2">
                 <form class="uk-form uk-form-horizontal">
@@ -23,7 +28,8 @@
                                 <dt>车辆</dt>
                                 <dt>路牌</dt>
                                 <dt>起点站</dt>
-                                <dt>时间</dt>
+                                <dt>实发</dt>
+                                <dt>计发</dt>
                             </dl>
                         </div>
                         <div class="ct_table_body">
@@ -45,7 +51,8 @@
                         <div class="ct_table_head">
                             <dl>
                                 <dt><input type="checkbox" class="global_box"></dt>
-                                <dt>时间</dt>
+                                <dt>计发</dt>
+                                <dt>实发</dt>
                                 <dt>起点站</dt>
                                 <dt>路牌</dt>
                                 <dt>车辆</dt>
@@ -79,6 +86,7 @@
             <dd>{{sch.clZbh}}</dd>
             <dd>{{sch.lpName}}</dd>
             <dd>{{sch.qdzName}}</dd>
+            <dd style="color:#07d;">{{sch.fcsjActual}}</dd>
             <dd>{{sch.dfsj}}
                 {{if sch.bcType == "out"}}
                 <span class="uk-badge uk-badge-success">出</span>
@@ -106,6 +114,7 @@
                 <span class="uk-badge uk-badge-danger">放</span>
                 {{/if}}
             </dd>
+            <dd style="color:#07d;">{{sch.fcsjActual}}</dd>
             <dd>{{sch.qdzName}}</dd>
             <dd>{{sch.lpName}}</dd>
             <dd>{{sch.clZbh}}</dd>
@@ -218,7 +227,7 @@
                     var rightSize = $('.sch-list:eq(1) dl.active', modal).length;
                     if(leftSize != rightSize)
                         $submitBtn.attr('disabled', 'disabled');
-                    else
+                    else if(leftSize != 0)
                         $submitBtn.removeAttr('disabled');
                 }
             }
@@ -82,7 +82,7 @@ var gb_common = (function () {
     function successHandle(json, handle) {
         var status = json.status;
         if (status == 407) {
-            location.href = '/real_control_v2/login.html';
+            location.href = '/login.html';
             return;
         }
@@ -197,10 +197,12 @@ var gb_schedule_table = (function () {
         var tMaps = {};
         $.each(schArr, function () {
-            line2Schedule[this.xlBm][this.id] = this;
-            updateDom(this);
-            //线路_车辆 过滤重复数据
-            tMaps[this.xlBm + '_' + this.clZbh] = 1;
+            try {
+                line2Schedule[this.xlBm][this.id] = this;
+                updateDom(this);
+                //线路_车辆 过滤重复数据
+                tMaps[this.xlBm + '_' + this.clZbh] = 1;
+            }catch(e){}
         });
         /*       //重新标记末班