Merge branch 'minhang' into qingpu

潘钊
2 parents d80b9172 ed598730
Showing 4 changed files with 46 additions and 10 deletions
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/match/Arrival2Schedule.java
src/main/java/com/bsth/data/match/ExpectArrivalEnd.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
@@ -61,7 +61,7 @@ public class ForecastRealServer implements CommandLineRunner {
 	@Override
 	public void run(String... arg0) throws Exception {
 		//2小时更新一次站点间耗时数据
-		Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS);
 	}
 	/**
@@ -73,6 +73,7 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		@Override
 		public void run() {
+				
 			//班次列表
 			List<ScheduleRealInfo> schList = dayOfSchedule.findByNbbm(nbbm);
 			//进出起终点数据
@@ -231,11 +232,7 @@ public class Arrival2Schedule implements ApplicationContextAware {
 			//车辆当前执行班次
 			dayOfSchedule.addExecPlan(sch);
 			//期望车辆到达的终点
-			ExpectArrivalEnd ead = new ExpectArrivalEnd();
-			ead.setNbbm(sch.getClZbh());
-			ead.setEndStation(sch.getZdzCode());
-			ead.setEndTime(sch.getZdsjT());
-			expectMap.put(ead.getNbbm(), ead);
+			expectMap.put(nbbm, ExpectArrivalEnd.getEndInstance(sch, mr.ts));
 		}
 		/**
@@ -255,8 +252,15 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				else
 					expectMap.remove(nbbm);
 			}
-			sch.setZdsjActualAll(mr.ts);
+			//如果是进停车场，并且实达时间差值大于 30 分钟，并且之前还有未完成班次。
+			if(sch.getBcType().equals("in") && Math.abs(mr.diff) > (1000 * 60 * 30)){
+				int prve_nen = dayOfSchedule.prveNotExecNum(sch);
+				if(prve_nen > 0)
+					return;
+			}
+			
+			sch.setZdsjActualAll(mr.ts);
 			int doneSum = dayOfSchedule.doneSum(nbbm);
 			ScheduleRealInfo next = dayOfSchedule.next(sch);
 			if(null != next){
 package com.bsth.data.match;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
 /**
  * 
  * @ClassName: ExpectArrivalEnd 
@@ -15,6 +17,18 @@ public class ExpectArrivalEnd {
 	private String endStation;
 	private Long endTime;
+	
+	public static ExpectArrivalEnd getEndInstance(ScheduleRealInfo sch, long t){
+		ExpectArrivalEnd ead = new ExpectArrivalEnd();
+		ead.setNbbm(sch.getClZbh());
+		ead.setEndStation(sch.getZdzCode());
+		if(sch.getBcType().equals("out"))
+			ead.setEndTime(sch.getZdsjT());
+		else{
+			ead.setEndTime(sch.getZdsjT() - (sch.getDfsjT() - t));
+		}
+		return ead;
+	}
 	public String getNbbm() {
 		return nbbm;
@@ -120,9 +120,9 @@ public class DayOfSchedule implements CommandLineRunner {
 		//翻班线程
 		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 20, 240, TimeUnit.SECONDS);
 		//入库
-		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
 		//首班出场指令补发器
-		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 10, 120, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 10, 120, TimeUnit.SECONDS);
 		//班次误点扫描
 		//Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
 	}
@@ -520,6 +520,24 @@ public class DayOfSchedule implements CommandLineRunner {
 		}
 		return rs;
 	}
+	
+	/**
+	 * 
+	 * @Title: prveNotExecNum 
+	 * @Description: TODO(班次之前未执行班次数量) 
+	 */
+	public int prveNotExecNum(ScheduleRealInfo sch){
+		int n = 0;
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		for(ScheduleRealInfo s : list){
+			if(s.getFcsjActual() == null && !s.isDestroy())
+				n ++;
+			
+			if(s.getId().equals(sch.getId()))
+				break;
+		}
+		return n;
+	}
 	/**
 	 * 
@@ -577,7 +595,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	public void save(ScheduleRealInfo sch){
 		//schRepository.save(sch);
-		pstBuffer.add(sch);
+		//pstBuffer.add(sch);
 	}