Merge branch 'minhang' into pudong

潘钊
2 parents 2cc77183 8f4a8505
Showing 13 changed files with 113 additions and 56 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
src/main/java/com/bsth/entity/directive/D80.java
src/main/java/com/bsth/entity/directive/DC0.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/traffic/impl/YgcBasicDataServiceImpl.java
src/main/resources/static/pages/summary/work_hours/list.html
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_custom.html
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/north/nav/history_sch/editor.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
src/main/resources/static/real_control_v2/js/main.js
@@ -105,4 +105,15 @@ public class anomalyCheckController {
     public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
         return dayOfSchedule.getLpScheduleMap().get(lpName);
     }
+
+    @RequestMapping(value = "/findSchByNbbm")
+    public List<ScheduleRealInfo> findSchByNbbm(@RequestParam String nbbm){
+        return dayOfSchedule.findByNbbm(nbbm);
+    }
+
+    @RequestMapping(value = "/removeExecPlan")
+    public int removeExecPlan(@RequestParam String nbbm){
+        dayOfSchedule.removeExecPlan(nbbm);
+        return 1;
+    }
 }
@@ -6,6 +6,8 @@ import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.websocket.handler.SendUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
@@ -31,43 +33,49 @@ public class ScheduleLateThread extends Thread{
 	@Autowired
 	SendUtils sendUtils;
  
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
 	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.DFSJ();
  
 	@Override
 	public void run() {
-		List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
-		Collections.sort(all, cpm);
+		try{
+			List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+			Collections.sort(all, cpm);
  
-		long t = System.currentTimeMillis();
-		int size = all.size();
+			long t = System.currentTimeMillis();
+			int size = all.size();
  
-		ScheduleRealInfo sch;
-		for(int i = 0; i < size; i ++){
-			sch = all.get(i);
-			if(sch.getDfsjT() > t)
-				break;
+			ScheduleRealInfo sch;
+			for(int i = 0; i < size; i ++){
+				sch = all.get(i);
+				if(sch.getDfsjT() > t)
+					break;
  
-			if(sch.isLate())
-				continue;
+				if(sch.isLate())
+					continue;
  
-			if(sch.getStatus() == 0
-					&& StringUtils.isEmpty(sch.getFcsjActual())){
+				if(sch.getStatus() == 0
+						&& StringUtils.isEmpty(sch.getFcsjActual())){
  
-				//检查应发未到 当前班次无起点到达时间
-				if(StringUtils.isEmpty(sch.getQdzArrDatesj())){
-					ScheduleRealInfo prev = dayOfSchedule.prev(sch);
-					//上一个班次也没有实际终点到达时间
-					if(prev != null && StringUtils.isEmpty(prev.getZdsjActual())){
-						//进入误点调整程序
-						LateAdjustHandle.putLate(sch);
+					//检查应发未到 当前班次无起点到达时间
+					if(StringUtils.isEmpty(sch.getQdzArrDatesj())){
+						ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+						//上一个班次也没有实际终点到达时间
+						if(prev != null && StringUtils.isEmpty(prev.getZdsjActual())){
+							//进入误点调整程序
+							LateAdjustHandle.putLate(sch);
+						}
 					}
-				}
  
-				//应发未发
-				sch.setLate(true);
-				//通知客户端
-				sendUtils.refreshSch(sch);
+					//应发未发
+					sch.setLate(true);
+					//通知客户端
+					sendUtils.refreshSch(sch);
+				}
 			}
+		}catch (Exception e){
+			logger.error("", e);
 		}
 	}
 }
 \ No newline at end of file
@@ -241,6 +241,7 @@ public class D80 {
 		DC0Data data = new DC0Data();
 		data.setOperCode2((short) 0x86);
 		data.setRequestAck((short) (reply == 0 ? 0x06 : 0x15));
+		data.setTimestamp(this.getTimestamp());
 		c0.setData(data);
 		this.setC0(c0);
 	}
 package com.bsth.entity.directive;
  
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
  
 /**
  * 
@@ -52,6 +48,12 @@ public class DC0 {
 		 */
 		private Short requestAck;
  
+		/**
+		 * 时间戳
+		 */
+		@Transient
+		private Long timestamp;
+
 		public Short getOperCode2() {
 			return operCode2;
 		}
@@ -67,6 +69,14 @@ public class DC0 {
 		public void setRequestAck(Short requestAck) {
 			this.requestAck = requestAck;
 		}
+
+		public Long getTimestamp() {
+			return timestamp;
+		}
+
+		public void setTimestamp(Long timestamp) {
+			this.timestamp = timestamp;
+		}
 	}
  
 	public Integer getId() {
@@ -3308,6 +3308,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         boolean dest2 = sch.getStatus() == -1;
         if (!dest1 && dest2) {
             oldSch.destroy();
+            oldSch.setAdjustExps(sch.getAdjustExps());
             aflog.log("烂班");
         }
         else if(dest1 && !dest2){
@@ -3315,6 +3316,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             oldSch.setJhlc(oldSch.getJhlcOrig());
             oldSch.setStatus(0);
             oldSch.calcStatus();
+            oldSch.setAdjustExps(null);
             aflog.log("撤销烂班");
         }
  
@@ -213,6 +213,7 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{
     private List<HashMap<String,String>> parseXml(StringBuffer sb){
         List<HashMap<String,String>> list = new ArrayList<>();
         HashMap<String,String> map;
+        HashMap<String,Integer> keyMap = new HashMap<>();
         try {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             DocumentBuilder builder = factory.newDocumentBuilder();
@@ -238,13 +239,18 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{
                             doc.getElementsByTagName("DDFS").item(i).getFirstChild().getNodeValue();
                     lineStandardCode = doc.getElementsByTagName("LineStandardCode").item(i).getFirstChild() == null ?"":
                             doc.getElementsByTagName("LineStandardCode").item(i).getFirstChild().getNodeValue();
+                    // 保存相同lineId出现的次数
+                    keyMap.put(lineId,keyMap.get(lineId) == null ? 1 : keyMap.get(lineId) + 1);
                     map = new HashMap<>();
                     map.put("lineName",lineName);
                     map.put("lineId",lineId);
                     map.put("abbreviation",abbreviation);
                     map.put("ddfs",ddfs);
                     map.put("lineStandardCode",lineStandardCode);
-                    list.add(map);
+                    // 只保存第一次的lineId信息
+                    if(keyMap.get(lineId) < 2){
+                        list.add(map);
+                    }
                 }
             }
         }catch (Exception e){
@@ -263,8 +263,8 @@
     }
  
     //日期选择器
-    $('[name=rq_eq]', f).val('2017-09-17');
-    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-09-17', minDate: '2017-07-01'});
+    $('[name=rq_eq]', f).val('2017-09-24');
+    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-09-24', minDate: '2017-07-01'});
  
     var comps;
     //构建公司级联下拉框
@@ -1695,4 +1695,8 @@ dl.active&gt;dd.disabled{
 #change_user_options-modal .user_info{
     width: 360px;
     margin: auto;
+}
+
+.display_hide{
+    display: none;
 }
 \ No newline at end of file
@@ -92,8 +92,8 @@
                             return;
                         }
                         var data = dataArray[i];
-                        //里程为0的不保存
-                        if(data.mileage==0){
+                        //营运里程为0的不保存
+                        if(data.mileageType == 'service' && data.mileage==0){
                             i++;
                             f();
                         }
@@ -293,7 +293,7 @@
                         }
                         var data = dataArray[i];
                         //里程为0的不保存
-                        if(data.mileage==0){
+                        if(data.mileageType == 'service' && data.mileage==0){
                             i++;
                             f();
                         }
@@ -34,14 +34,14 @@
     </div>
  
     <script id="history-sch-edit-form-temp" type="text/html">
-        <input type="hidden" name="id" value="{{id}}"/>
+        <input type="hidden" name="id" value="{{sch.id}}"/>
  
         <div class="uk-grid">
             <div class="uk-width-1-3">
                 <div class="uk-form-row">
                     <label class="uk-form-label" >班次类型</label>
                     <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" data-code="{{bcType}}" name="bcType" data-group=ScheduleType></select>
+                        <select class="form-control nt-dictionary" data-code="{{sch.bcType}}" name="bcType" data-group=ScheduleType></select>
                     </div>
                 </div>
             </div>
@@ -69,7 +69,7 @@
                     <label class="uk-form-label" >车辆</label>
                     <div class="uk-form-controls">
                         <div class="uk-autocomplete uk-form car-autocom">
-                            <input type="text" value="{{clZbh}}" name="clZbh" required>
+                            <input type="text" value="{{sch.clZbh}}" name="clZbh" required>
                         </div>
                     </div>
                 </div>
@@ -79,7 +79,7 @@
                     <label class="uk-form-label" >驾驶员</label>
                     <div class="uk-form-controls">
                         <div class="uk-autocomplete uk-form jsy-autocom">
-                            <input type="text" value="{{jGh}}/{{jName}}" name="jsy" required>
+                            <input type="text" value="{{sch.jGh}}/{{sch.jName}}" name="jsy" required>
                         </div>
                     </div>
                 </div>
@@ -89,7 +89,7 @@
                     <label class="uk-form-label" >售票员</label>
                     <div class="uk-form-controls">
                         <div class="uk-autocomplete uk-form spy-autocom">
-                            <input type="text" value="{{sGh}}/{{sName}}" name="spy">
+                            <input type="text" value="{{sch.sGh}}/{{sch.sName}}" name="spy">
                         </div>
                     </div>
                 </div>
@@ -101,7 +101,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >计发</label>
                     <div class="uk-form-controls">
-                        <input type="time"  value="{{fcsj}}" disabled>
+                        <input type="time"  value="{{sch.fcsj}}" disabled>
                     </div>
                 </div>
             </div>
@@ -109,7 +109,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >待发</label>
                     <div class="uk-form-controls">
-                        <input type="time" name="dfsj"  value="{{dfsj}}" required>
+                        <input type="time" name="dfsj"  value="{{sch.dfsj}}" required>
                     </div>
                 </div>
             </div>
@@ -117,7 +117,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >实发</label>
                     <div class="uk-form-controls">
-                        <input type="time" name="fcsjActual"  value="{{fcsjActual}}" >
+                        <input type="time" name="fcsjActual"  value="{{sch.fcsjActual}}" >
                     </div>
                 </div>
             </div>
@@ -128,7 +128,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >里程</label>
                     <div class="uk-form-controls">
-                        <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
+                        <input type="text" name="jhlc" value="{{sch.jhlc}}" max=222 data-fv-lessthan-inclusive="false"
                                required>
                     </div>
                 </div>
@@ -137,7 +137,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >计达</label>
                     <div class="uk-form-controls">
-                        <input type="time"  value="{{zdsj}}" disabled>
+                        <input type="time"  value="{{sch.zdsj}}" disabled>
                     </div>
                 </div>
             </div>
@@ -145,7 +145,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >实达</label>
                     <div class="uk-form-controls">
-                        <input type="time" name="zdsjActual" value="{{zdsjActual}}" >
+                        <input type="time" name="zdsjActual" value="{{sch.zdsjActual}}" >
                     </div>
                 </div>
             </div>
@@ -155,17 +155,28 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" ></label>
                     <label>
-                        &nbsp;<input class="i-cbox destroy-box" type="checkbox" name="status" value="-1" {{if status==-1}}checked{{/if}}>
+                        &nbsp;<input class="i-cbox destroy-box" type="checkbox" name="status" value="-1" {{if sch.status==-1}}checked{{/if}}>
                         是否烂班
                     </label>
                 </div>
+
+                <div class="uk-form-row adjust_exps_select_wrap {{if sch.status!=-1}}display_hide{{/if}}" >
+                    <label class="uk-form-label" >烂班原因</label>
+                    <div class="uk-form-controls">
+                        <select name="adjustExps">
+                            {{each adjustExps as exp i}}
+                            <option value="{{exp}}" {{if sch.adjustExps==exp}}selected{{/if}}>{{exp}}</option>
+                            {{/each}}
+                        </select>
+                    </div>
+                </div>
             </div>
  
             <div class="uk-width-2-3">
                 <div class="uk-form-row ct-stacked">
                     <label class="uk-form-label" >备注</label>
                     <div class="uk-form-controls" style="margin-top: 5px;">
-                        <textarea id="form-s-t" cols="20" rows="3" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="100" placeholder="备注">{{remarks}}</textarea>
+                        <textarea id="form-s-t" cols="20" rows="3" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="100" placeholder="备注">{{sch.remarks}}</textarea>
                     </div>
                 </div>
             </div>
@@ -214,7 +225,7 @@
             var modal = '#history-sch-edit-modal'
                     ,gb_sch,parentModal;
             var stationRoutes, parks, information;
-
+            var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
                 var id = data.id;
@@ -223,7 +234,7 @@
                 $.get('/realSchedule/'+id, function (sch) {
                     gb_sch = sch;
  
-                    var htmlStr = template('history-sch-edit-form-temp', sch);
+                    var htmlStr = template('history-sch-edit-form-temp', {sch: sch, adjustExps: adjustExps});
                     $('form.sch_form', modal).html(htmlStr);
                     //子任务列表
                     sch.cTasks.sort(sub_task_sort);
@@ -239,10 +250,14 @@
                     var f = $('form.sch_form', modal).formValidation(gb_form_validation_opts);
                     //是否烂班
                     $('[name=status]', f).on('click', function () {
-                        if(this.checked)
+                        if(this.checked){
                             $('[name=jhlc]', f).val(0);
-                        else
+                            $('.adjust_exps_select_wrap', f).show();
+                        }
+                        else{
                             $('[name=jhlc]', f).val(gb_sch.jhlcOrig);
+                            $('.adjust_exps_select_wrap', f).hide();
+                        }
                     });
                     f.on('success.form.fv', function(e) {
                         e.preventDefault();
@@ -127,7 +127,7 @@
                         tsStr += '<li ' + (i == 0 ? 'class="uk-active"' : '') + '><a>' + this + '</a></li>';
                     });
                     //临时放开闵行39路的日期权限
-                    if(gb_data_basic.line_idx=='100001'){
+                    /*if(gb_data_basic.line_idx=='100001'){
                         var st = moment('2017-08-29', 'YYYY-MM-DD');
                         var et = moment().format('YYYY-MM-DD');
                         tsStr = '';
@@ -139,7 +139,7 @@
                             if(rq == et)
                                 break;
                         }
-                    }
+                    }*/
  
                     $('.h-s-time', modal).html(tsStr);
  
@@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(),
                 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
             }, 1000);
             //弹出更新说明
-            showUpdateDescription();
+            //showUpdateDescription();
         });
  
         function g_emit(id) {