潘钊 / bsth_control · Commits

Commit 4e02e20845bb99c25a1cd1e636b7499f72c09e57

Authored by 潘钊
1 parent 7acde535

update...

Inline Side-by-side
Showing 7 changed files with 59 additions and 24 deletions
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
  View file @4e02e20
... ... @@ -70,10 +70,12 @@ public abstract class SignalHandle {
70 70  
71 71 protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
72 72 int updown = Integer.parseInt(sch.getXlDir());
  73 + //gps 切换走向
  74 + gps.setUpDown(updown);
  75 +
73 76 List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), updown);
74 77 StationRoute station = GeoUtils.gpsInStation(gps, srs);
75 78 if (station != null) {
76   - gps.setUpDown(updown);
77 79 gps.setStopNo(station.getCode());
78 80 }
79 81 }
... ...
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
  View file @4e02e20
... ... @@ -178,7 +178,12 @@ public class InOutStationSignalHandle extends SignalHandle{
178 178  
179 179 if(gps.getStopNo().equals(sch.getZdzCode())){
180 180  
181   - int diff = (int) (sch.getZdsjT() - gps.getTimestamp());
  181 + int diff = 0;
  182 + try{
  183 + diff = (int) (sch.getZdsjT() - gps.getTimestamp());
  184 + }catch(NullPointerException e){
  185 + logger.info("NullPointerException " + sch.getXlName() + " 有班次无班次历时，，，检查一下是否需要出站既出场。");
  186 + }
182 187 //进场最多提前1.2小时
183 188 if(sch.getBcType().equals("in") && diff > MAX_BEFORE_TIME)
184 189 return;
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @4e02e20
... ... @@ -3468,11 +3468,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3468 3468  
3469 3469 try {
3470 3470 ScheduleRealInfo sch = dayOfSchedule.get(id);
3471   - if (sch.getZdsjActual() == null) {
  3471 + if (sch.getZdsjActual() == null && sch.getFcsjActual() == null) {
3472 3472 rs.put("status", ResponseCode.ERROR);
3473   - rs.put("msg", "无实际到达时间，无法撤销！");
  3473 + rs.put("msg", "班次未执行，无法撤销！");
3474 3474 } else {
3475 3475  
  3476 + sch.clearFcsjActual();
3476 3477 sch.clearZdsjActual();
3477 3478 //清除下一个班次的起点到达时间
3478 3479 ScheduleRealInfo next = dayOfSchedule.next(sch);
... ...
src/main/resources/static/real_control_v2/css/main.css
  View file @4e02e20
... ... @@ -716,16 +716,16 @@ li.map-panel {
716 716 }
717 717  
718 718 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(1), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(1) {
719   - width: 7%;
  719 + width: 5%;
720 720 border-left: 1px solid #dedede;
721 721 }
722 722  
723 723 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(2), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(2) {
724   - width: 25%;
  724 + width: 22%;
725 725 }
726 726  
727 727 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(3), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(3) {
728   - width: 20%;
  728 + width: 17%;
729 729 }
730 730  
731 731 #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 {
733 733 }
734 734  
735 735 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(5), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(5) {
736   - width: 22%;
  736 + width: 21%;
737 737 }
738 738  
739 739 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(6), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(6) {
740   - width: 15%;
  740 + width: 10%;
  741 +}
  742 +
  743 +#schedule-lp_change-modal .sch-list dl dt:nth-of-type(7), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(7) {
  744 + width: 14%;
741 745 }
742 746  
743 747  
744 748  
745 749  
746 750 #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) {
747   - width: 7%;
  751 + width: 5%;
748 752 border-left: 1px solid #dedede;
749 753 }
750 754  
751 755 #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) {
752   - width: 15%;
  756 + width: 14%;
753 757 }
754 758  
755 759 #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) {
756   - width: 22%;
  760 + width: 10%;
757 761 }
758 762  
759 763 #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) {
760   - width: 10%;
  764 + width: 21%;
761 765 }
762 766  
763 767 #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) {
764   - width: 20%;
  768 + width: 10%;
765 769 }
766 770  
767 771 #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) {
768   - width: 25%;
  772 + width: 17%;
  773 +}
  774 +
  775 +#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) {
  776 + width: 22%;
769 777 }
770 778  
771 779 #schedule-lp_change-modal .ct_table.sch-list .ct_table_body dl.active {
... ... @@ -838,4 +846,12 @@ svg rect.offline{
838 846 font-size: 12px;
839 847 margin-left: 5px;
840 848 display: none;
  849 +}
  850 +
  851 +.operation-real-text{
  852 + position: absolute;
  853 + top: 10px;
  854 + width: 100%;
  855 + left: 0;
  856 + text-align: center;
841 857 }
842 858 \ No newline at end of file
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lp_change.html
  View file @4e02e20
1 1 <div class="uk-modal" id="schedule-lp_change-modal">
2   - <div class="uk-modal-dialog" style="width: 1200px;">
  2 + <div class="uk-modal-dialog" style="width: 1240px;">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
5 5 <h2>路牌对调</h2></div>
6 6  
  7 + <!--<div class="operation-real-text">
  8 + <span>
  9 + 不同路牌才能对调
  10 + </span>
  11 + </div>-->
7 12 <div class="uk-grid uk-grid-divider">
8 13 <div class="uk-width-1-2">
9 14 <form class="uk-form uk-form-horizontal">
... ... @@ -23,7 +28,8 @@
23 28 <dt>车辆</dt>
24 29 <dt>路牌</dt>
25 30 <dt>起点站</dt>
26   - <dt>时间</dt>
  31 + <dt>实发</dt>
  32 + <dt>计发</dt>
27 33 </dl>
28 34 </div>
29 35 <div class="ct_table_body">
... ... @@ -45,7 +51,8 @@
45 51 <div class="ct_table_head">
46 52 <dl>
47 53 <dt><input type="checkbox" class="global_box"></dt>
48   - <dt>时间</dt>
  54 + <dt>计发</dt>
  55 + <dt>实发</dt>
49 56 <dt>起点站</dt>
50 57 <dt>路牌</dt>
51 58 <dt>车辆</dt>
... ... @@ -79,6 +86,7 @@
79 86 <dd>{{sch.clZbh}}</dd>
80 87 <dd>{{sch.lpName}}</dd>
81 88 <dd>{{sch.qdzName}}</dd>
  89 + <dd style="color:#07d;">{{sch.fcsjActual}}</dd>
82 90 <dd>{{sch.dfsj}}
83 91 {{if sch.bcType == "out"}}
84 92 <span class="uk-badge uk-badge-success">出</span>
... ... @@ -106,6 +114,7 @@
106 114 <span class="uk-badge uk-badge-danger">放</span>
107 115 {{/if}}
108 116 </dd>
  117 + <dd style="color:#07d;">{{sch.fcsjActual}}</dd>
109 118 <dd>{{sch.qdzName}}</dd>
110 119 <dd>{{sch.lpName}}</dd>
111 120 <dd>{{sch.clZbh}}</dd>
... ... @@ -218,7 +227,7 @@
218 227 var rightSize = $('.sch-list:eq(1) dl.active', modal).length;
219 228 if(leftSize != rightSize)
220 229 $submitBtn.attr('disabled', 'disabled');
221   - else
  230 + else if(leftSize != 0)
222 231 $submitBtn.removeAttr('disabled');
223 232 }
224 233 }
... ...
src/main/resources/static/real_control_v2/js/common.js
  View file @4e02e20
... ... @@ -82,7 +82,7 @@ var gb_common = (function () {
82 82 function successHandle(json, handle) {
83 83 var status = json.status;
84 84 if (status == 407) {
85   - location.href = '/real_control_v2/login.html';
  85 + location.href = '/login.html';
86 86 return;
87 87 }
88 88  
... ...
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
  View file @4e02e20
... ... @@ -197,10 +197,12 @@ var gb_schedule_table = (function () {
197 197  
198 198 var tMaps = {};
199 199 $.each(schArr, function () {
200   - line2Schedule[this.xlBm][this.id] = this;
201   - updateDom(this);
202   - //线路_车辆 过滤重复数据
203   - tMaps[this.xlBm + '_' + this.clZbh] = 1;
  200 + try {
  201 + line2Schedule[this.xlBm][this.id] = this;
  202 + updateDom(this);
  203 + //线路_车辆 过滤重复数据
  204 + tMaps[this.xlBm + '_' + this.clZbh] = 1;
  205 + }catch(e){}
204 206 });
205 207  
206 208 /* //重新标记末班
... ...