给谢灿的首末班准点接口，计划首末班次的班次类型从计划排班获取，实际首末班次的班次类型从实际路单获取。

娄高锋
1 parent 3d52808e
Showing 1 changed file with 93 additions and 31 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -132,7 +132,20 @@ public class BigscreenService {
 		if(s.getBcType().equals("ldks")){
 			fage=true;
 		}
-			
+		return fage;
+	}
+    
+	public static boolean isInOut(String bcType){
+		boolean fage=false;
+		if(bcType.equals("in")){
+			fage=true;
+		}
+		if(bcType.equals("out")){
+			fage=true;
+		}
+		if(bcType.equals("ldks")){
+			fage=true;
+		}
 		return fage;
 	}
@@ -3260,8 +3273,9 @@ public class BigscreenService {
     	Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
     	Map<String, Map<String, Object>> lineXX = new HashMap<String, Map<String, Object>>();
     	for(ScheduleRealInfo s : findAll){
-			if(s.getBcType().equals("region") || s.getBcType().equals("venting")
-					|| s.getBcType().equals("major") || isInOut(s)){
+//			if(s.getBcType().equals("region") || s.getBcType().equals("venting")
+//					|| s.getBcType().equals("major") || isInOut(s)){
+			if(s.getBcType().equals("region") || isInOut(s)){
 				continue;	//区间班次、直放班次、放站班次与空驶班次不做首末班统计
 			}
     		if(!("77".equals(s.getGsBm())) && yyLine.containsKey(s.getXlBm())){	//只统计营运线路
@@ -3368,17 +3382,29 @@ public class BigscreenService {
     		//上行
     		if(listjh0.size() > 0){
     			ScheduleRealInfo jhsb = listjh0.get(0); //计划首班
+    			for(int f = 0; f < listjh0.size(); f++){
+    				jhsb = listjh0.get(f); //计划首班
+    				String bcType = jhsb.getBcType();
+    				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhsb.getSpId());
+    				if(oList.size() > 0 && oList.get(0) != null
+    						&& oList.get(0).trim().length() > 0){
+    					bcType = oList.get(0).trim();
+    				}
+    				if(bcType.equals("region") || bcType.equals("venting")
+    						|| bcType.equals("major") || isInOut(bcType)){
+    					continue;
+    				}
+    				break;
+    			}
     			if("1".equals(sfss) ? createDate.getTime() > jhsb.getFcsjT() : true){
     				jhFirst++;
-//    				if(listsj0.size() > 0){
-//    					ScheduleRealInfo sjsb = listsj0.get(0); //实际首班
-//    					long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
-//    					if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
-//    						sjzdFirst++;
-//    					}
-//    				}
     				for(int i = 0; i < listsj0.size(); i++){
     					ScheduleRealInfo sjsb = listsj0.get(i); //实际首班
+    					String bcType = sjsb.getBcType();
+    					if(bcType.equals("region") || bcType.equals("venting")
+        						|| bcType.equals("major") || isInOut(bcType)){
+        					continue;
+        				}
     					long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
     					if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
     						sjzdFirst++;
@@ -3389,17 +3415,29 @@ public class BigscreenService {
     			if(listjh0.size() > 1){
     				ScheduleRealInfo jhmb = listjh0.get(listjh0.size() - 1); //计划末班
+    				for(int l = listjh0.size() - 1; l >= 0; l--){
+    					jhmb = listjh0.get(l); //计划首班
+        				String bcType = jhmb.getBcType();
+        				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhmb.getSpId());
+        				if(oList.size() > 0 && oList.get(0) != null
+        						&& oList.get(0).trim().length() > 0){
+        					bcType = oList.get(0).trim();
+        				}
+        				if(bcType.equals("region") || bcType.equals("venting")
+        						|| bcType.equals("major") || isInOut(bcType)){
+        					continue;
+        				}
+        				break;
+        			}
     				if("1".equals(sfss) ? createDate.getTime() > jhmb.getFcsjT() : true){
     					jhLast++;
-//    					if(listsj0.size() > 1){
-//    						ScheduleRealInfo sjmb = listsj0.get(listsj0.size() - 1); //实际末班
-//    						long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
-//    						if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
-//    							sjzdLast++;
-//    						}
-//    					}
 						for(int i = listsj0.size() - 1; i >= 0; i--){
 							ScheduleRealInfo sjmb = listsj0.get(i); //实际末班
+							String bcType = sjmb.getBcType();
+	    					if(bcType.equals("region") || bcType.equals("venting")
+	        						|| bcType.equals("major") || isInOut(bcType)){
+	        					continue;
+	        				}
 							long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
     						if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
     							sjzdLast++;
@@ -3413,17 +3451,29 @@ public class BigscreenService {
     		//下行
     		if(listjh1.size() > 0){
     			ScheduleRealInfo jhsb = listjh1.get(0); //计划首班
+    			for(int f = 0; f < listjh1.size(); f++){
+    				jhsb = listjh1.get(f); //计划首班
+    				String bcType = jhsb.getBcType();
+    				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhsb.getSpId());
+    				if(oList.size() > 0 && oList.get(0) != null
+    						&& oList.get(0).trim().length() > 0){
+    					bcType = oList.get(0).trim();
+    				}
+    				if(bcType.equals("region") || bcType.equals("venting")
+    						|| bcType.equals("major") || isInOut(bcType)){
+    					continue;
+    				}
+    				break;
+    			}
     			if("1".equals(sfss) ? createDate.getTime() > jhsb.getFcsjT() : true){
     				jhFirst++;
-//    				if(listsj1.size() > 0){
-//    					ScheduleRealInfo sjsb = listsj1.get(0); //实际首班
-//    					long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
-//    					if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
-//    						sjzdFirst++;
-//    					}
-//    				}
     				for(int i = 0; i < listsj1.size(); i++){
     					ScheduleRealInfo sjsb = listsj1.get(i); //实际首班
+    					String bcType = sjsb.getBcType();
+    					if(bcType.equals("region") || bcType.equals("venting")
+        						|| bcType.equals("major") || isInOut(bcType)){
+        					continue;
+        				}
 						long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
     					if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
     						sjzdFirst++;
@@ -3434,17 +3484,29 @@ public class BigscreenService {
     			if(listjh1.size() > 1){
     				ScheduleRealInfo jhmb = listjh1.get(listjh1.size() - 1); //计划末班
+    				for(int l = listjh1.size() - 1; l >= 0; l--){
+    					jhmb = listjh1.get(l); //计划首班
+        				String bcType = jhmb.getBcType();
+        				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhmb.getSpId());
+        				if(oList.size() > 0 && oList.get(0) != null
+        						&& oList.get(0).trim().length() > 0){
+        					bcType = oList.get(0).trim();
+        				}
+        				if(bcType.equals("region") || bcType.equals("venting")
+        						|| bcType.equals("major") || isInOut(bcType)){
+        					continue;
+        				}
+        				break;
+        			}
     				if("1".equals(sfss) ? createDate.getTime() > jhmb.getFcsjT() : true){
     					jhLast++;
-//    					if(listsj1.size() > 1){
-//    						ScheduleRealInfo sjmb = listsj1.get(listsj1.size() - 1); //实际末班
-//    						long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
-//    						if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
-//    							sjzdLast++;
-//    						}
-//    					}
 						for(int i = listsj1.size() - 1; i >= 0; i--){
 							ScheduleRealInfo sjmb = listsj1.get(i); //实际末班
+							String bcType = sjmb.getBcType();
+	    					if(bcType.equals("region") || bcType.equals("venting")
+	        						|| bcType.equals("major") || isInOut(bcType)){
+	        					continue;
+	        				}
 							long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
     						if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
     							sjzdLast++;