update...

潘钊
1 parent a4e98411
Showing 5 changed files with 54 additions and 14 deletions
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/util/Arith.java
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_range_turn.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
src/main/resources/static/real_control_v2/js/main.js
 package com.bsth.data.schedule.late_adjust;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.util.Arith;
 import com.bsth.websocket.handler.SendUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,6 +49,9 @@ public class LateAdjustHandle implements ApplicationContextAware{
      */
     public static void putLate(ScheduleRealInfo sch){
         try {
+            //进出场班次不需要
+            if(sch.getBcType().equals("in") || sch.getBcType().equals("out"))
+                return;
             //线路配置
             LineConfig config = lineConfigData.get(sch.getXlBm());
             if(sch.getLateMinute() == 0){
@@ -115,11 +120,12 @@ public class LateAdjustHandle implements ApplicationContextAware{
             if(sch == null)
                 return;
-            //进的是班次起点
+            //进的是班次起点（名称一样即可）
+            gps.setStationName(BasicData.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo()));
             if(gps.getStationName().equals(sch.getQdzName())
                     && sch.getLateMinute() > 0){
                 //自动调整待发 到达时间 + 停靠时间
-                long dt = (long) (gps.getTimestamp() + (sch.getLateMinute() * 60 * 1000));
+                long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
                 sch.setDfsjAll(dt);
                 sch.setDfAuto(true);
                 //取消应发未到标记
@@ -24,8 +24,20 @@ public class Arith {
 	        BigDecimal b1 = new BigDecimal(v1.toString());    
 	        BigDecimal b2 = new BigDecimal(v2.toString());    
 	        return b1.add(b2).doubleValue();    
-	    }    
-	       
+	    }
+
+	/**
+	 * 提供精确的加法运算。
+	 * @param v1 被加数
+	 * @param v2 加数
+	 * @return 两个参数的和
+	 */
+	public static long addLong(Object v1,Object v2){
+		BigDecimal b1 = new BigDecimal(v1.toString());
+		BigDecimal b2 = new BigDecimal(v2.toString());
+		return b1.add(b2).longValue();
+	}
+
 	    /**   
 	     * 提供精确的减法运算。   
 	     * @param v1 被减数   
@@ -167,7 +167,7 @@
         <div class="uk-grid">
             <div class="uk-width-3-10">
                 <div class="uk-form-row">
-                    <label class="uk-form-label">营运里程</label>
+                    <label class="uk-form-label mileage_label">营运里程</label>
                 </div>
             </div>
             <div class="uk-width-7-10 pl5">
@@ -354,6 +354,9 @@
                                 return;
                             }
                             var data = dataArray[i];
+                            //营运子任务不写备注
+                            if(data.mileageType == 'service' && !data.destroy)
+                                data.remarks = '';
                             gb_common.$post('/childTask', data, function (rs) {
                                 notify_succ('子任务添加成功');
                                 gb_schedule_table.updateSchedule(rs.t);
@@ -435,8 +438,10 @@
                 $('[name=startDate]', cdf).val(ets);
                 //烂班2终点
                 try {
-                    $('[name=endStation]', ndf).val(searchParallelStation());
-                    calcFormMileage(ndf, nextSch.xlDir);
+                    if(!$('#emptyTurnCbox', modal)[0].checked){
+                        $('[name=endStation]', ndf).val(searchParallelStation());
+                        calcFormMileage(ndf, nextSch.xlDir);
+                    }
                 } catch (e) {
                 }
                 //开始时间
@@ -595,12 +600,28 @@
             $('#emptyTurnCbox', modal).on('click', function () {
                 if(this.checked){
                     //全程烂班
-                    $('[name=endStation]', ndf).val(nextSch.zdzCode).attr('disabled');
-                    //空驶回起点
-
+                    $('[name=endStation]', ndf).val(nextSch.zdzCode).attr('disabled', 'disabled');
+                    $('[name=mileage]', ndf).val(nextSch.jhlc).attr('disabled', 'disabled');
+                    //空驶回起点，营运变空驶
+                    var $panel = nsf.parents('.uk-panel').removeClass('uk-panel-box-primary')
+                            .addClass('uk-panel-box-secondary');
+                    $panel.find('.uk-panel-badge').addClass('uk-badge-default').text('空驶');
+                    $panel.find('.mileage_label').text('空驶里程');
+
+                    $('[name=mileageType]', nsf).val('empty');
                 }
                 else{
+                    //恢复
+                    $('[name=endStation]', ndf).removeAttr('disabled');
+                    $('[name=mileage]', ndf).removeAttr('disabled');
+                    //空驶变营运
+                    var $panel = nsf.parents('.uk-panel').removeClass('uk-panel-box-secondary')
+                            .addClass('uk-panel-box-primary');
+                    $panel.find('.uk-panel-badge').removeClass('uk-badge-default').text('营运');
+                    $panel.find('.mileage_label').text('营运里程');
+
+                    reClac();
                 }
             });
         })();
@@ -193,7 +193,8 @@ var gb_schedule_context_menu = (function () {
             var idx='', minute=0;
             $.each(schArray, function () {
-               if(this.fcsjActual && this.status != 0){
+               if(this.bcType=='in' || this.bcType=='out' ||
+                   (this.fcsjActual && this.status != 0)){
                    return true;
                }
                else
@@ -202,7 +203,7 @@ var gb_schedule_context_menu = (function () {
             });
             if(!idx || idx==''){
-                notify_err('没有需要调整的班次！');
+                notify_err('没有需要设置误点停靠时间的班次！');
                 return;
             }
@@ -171,8 +171,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-04-19',
-        text: '<h5>加油子任务改为空驶进出场子任务</h5><h5>计划烂班时调整说明必填</h5><h5>连接断开（横幅变红）后会自动尝试重连</h5><h5>误点调整功能加入，线上测试一天，20号再用</h5>'
+        date: '2017-04-20',
+        text: '<h5>现在可以在轨迹回放里看到停车场位置和多边形电子围栏</h5><h5>区间调头子任务，可以勾选“调头后空驶回起点”</h5>'
     };
     var storage = window.localStorage