给谢灿的首末班推送数据，筛掉了直放班次

娄高锋
1 parent 876e9bdd
Showing 1 changed file with 49 additions and 17 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -3260,7 +3260,7 @@ 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") || isInOut(s)){
+			if(s.getBcType().equals("region") || s.getBcType().equals("venting") || isInOut(s)){
 				continue;	//区间班次与空驶班次不做首末班统计
 			}
     		if(!("77".equals(s.getGsBm())) && yyLine.containsKey(s.getXlBm())){	//只统计营运线路
@@ -3341,13 +3341,13 @@ public class BigscreenService {
 					}
 				}
-//				if (!(s.isSflj())) {
+				if (!(s.isSflj())) {
 					if (s.getXlDir().equals("0")) {
 						listjh0.add(s);
 					} else {
 						listjh1.add(s);
 					}
-//				}
+				}
 				if(s.getFcsjActual() != null && s.getFcsjActual().trim().length() > 0){
 					if (s.getXlDir().equals("0")) {
@@ -3369,11 +3369,19 @@ public class BigscreenService {
     			ScheduleRealInfo jhsb = listjh0.get(0); //计划首班
     			if("1".equals(sfss) ? createDate.getTime() > jhsb.getFcsjT() : true){
     				jhFirst++;
-    				if(listsj0.size() > 0){
-    					ScheduleRealInfo sjsb = listsj0.get(0); //实际首班
+//    				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); //实际首班
     					long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
     					if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
     						sjzdFirst++;
+    						break;
     					}
     				}
     			}
@@ -3382,13 +3390,21 @@ public class BigscreenService {
     				ScheduleRealInfo jhmb = listjh0.get(listjh0.size() - 1); //计划末班
     				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(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); //实际末班
+							long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
     						if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
     							sjzdLast++;
+        						break;
     						}
-    					}
+						}
     				}
     			}
     		}
@@ -3398,26 +3414,42 @@ public class BigscreenService {
     			ScheduleRealInfo jhsb = listjh1.get(0); //计划首班
     			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(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); //实际首班
+						long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
     					if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
     						sjzdFirst++;
+    						break;
     					}
-    				}
+					}
     			}
     			if(listjh1.size() > 1){
     				ScheduleRealInfo jhmb = listjh1.get(listjh1.size() - 1); //计划末班
     				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(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); //实际末班
+							long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
     						if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
     							sjzdLast++;
+        						break;
     						}
-    					}
+						}
     				}
     			}
     		}