Merge remote-tracking branch 'origin/master'

王通
2 parents daca09ba 66133844
Showing 1 changed file with 134 additions and 39 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -217,7 +217,6 @@ public class BigscreenService {
 					}
 				});
-    	Set<String> yyLine = new HashSet<String>();
     	int level1 = 0, level2 = 0;
     	for(Map<String, Object> t : lineList){
     		if(t.get("level") != null){
@@ -227,12 +226,28 @@ public class BigscreenService {
     				++level2;
     			}
     		}
-    		
+    	}
+    	
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
     		if(t.get("lineCode") != null){
     			yyLine.add(t.get("lineCode").toString());
     		}
     	}
+    	
     	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
     			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
     			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
@@ -410,15 +425,30 @@ public class BigscreenService {
     	String date1 = sd.format(dd1);	//前一天
     	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date1);
     	List<ScheduleRealInfo> listSche = new ArrayList<ScheduleRealInfo>();
+    	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
     	for(ScheduleRealInfo s : findAll){
     		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
     			listSche.add(s);
+    			Set<ChildTaskPlan> cts = s.getcTasks();
+    			if (cts != null && cts.size() > 0) {
+                    list_s.add(s);
+                } else {
+                    if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
+                        list_s.add(s);
+                    }
+                }
     		}
     	}
     	double jhyygl = culateJhgl(listSche);//计划营运公里
-    	double sjgl = culateSjgl(listSche);//实际公里
+    	double jhjccgl = culateJhJccgl(listSche);
+    	double jhzgl = Arith.add(jhyygl, jhjccgl);
+    	double sjgl = culateSjgl(list_s);//实际营运公里（不含临加）
     	double sjljgl = culateLjgl(listSche);//实际临加公里
     	double sjyygl = Arith.add(sjgl, sjljgl);//实际营运公里
+    	double sjjccgl = culateJccgl(list_s);
+    	double sjksgl = culateKsgl(list_s);
+    	double zksgl = Arith.add(sjjccgl, sjksgl);
+    	double sjzgl = Arith.add(sjyygl, zksgl);//实际总公里
     	double lz = culateCJLC(listSche, "路阻");
     	double dm = culateCJLC(listSche, "吊慢");
     	double gz = culateCJLC(listSche, "故障");
@@ -436,14 +466,14 @@ public class BigscreenService {
     	double lb_qt = culateCJLC(listSche, "其他");
     	double qt = Arith.add(Arith.add(lb_pc, lb_by), Arith.add(lb_cj, lb_qt));//其他
-    	Map<String, Object> jhyyglMap = new HashMap<String, Object>();
-    	jhyyglMap.put("name", "计划营运");
-    	jhyyglMap.put("value", jhyygl);
-    	glList.add(jhyyglMap);
-    	Map<String, Object> sjyyglMap = new HashMap<String, Object>();
-    	sjyyglMap.put("name", "实际营运");
-    	sjyyglMap.put("value", sjyygl);
-    	glList.add(sjyyglMap);
+    	Map<String, Object> jhzglMap = new HashMap<String, Object>();
+    	jhzglMap.put("name", "计划总公里");
+    	jhzglMap.put("value", jhzgl);
+    	glList.add(jhzglMap);
+    	Map<String, Object> sjzglMap = new HashMap<String, Object>();
+    	sjzglMap.put("name", "实际总公里");
+    	sjzglMap.put("value", sjzgl);
+    	glList.add(sjzglMap);
     	Map<String, Object> lzMap = new HashMap<String, Object>();
     	lzMap.put("name", "路阻");
     	lzMap.put("value", lz);
@@ -536,36 +566,26 @@ public class BigscreenService {
     		datesMap.put(format, i);
     	}
-    	String lineSql="SELECT b.start_opt,a.company,a.line_code,a.name,a.level,"
-    			+ " a.shanghai_linecode, a.nature from "
-    			+ " bsth_c_line a left join bsth_c_line_config b "
-    			+ " on a.id=b.line where  a.shanghai_linecode is not null"
-    			+ " and a.shanghai_linecode !='' and a.destroy=0 and a.remove=0"
-    			+ " and a.nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> lineList=jdbcTemplate.query(lineSql,
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
 				new RowMapper<Map<String, Object>>(){
 					@Override
 					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
 						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("state", rs.getString("start_opt"));
-						m.put("company", rs.getString("company"));
-						m.put("companyName", getGs(rs.getString("company")));
-						m.put("lineCode",rs.getString("line_code"));
-						m.put("name", rs.getString("name"));
-						m.put("level", rs.getString("level"));
-						m.put("shanghaiLinecode", rs.getString("shanghai_linecode"));
-						m.put("nature", getNature(rs.getString("nature")));
+						m.put("lineCode", rs.getString("line_code"));
 						return m;
 					}
 				});
-    	
     	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : lineList){
+    	for(Map<String, Object> t : yyxlList){
     		if(t.get("lineCode") != null){
     			yyLine.add(t.get("lineCode").toString());
     		}
     	}
-
+    	
+    	
     	List<Map<String, Object>> attList = new ArrayList<Map<String, Object>>();
     	List<Map<String, Object>> lackList = new ArrayList<Map<String, Object>>();
@@ -823,6 +843,7 @@ public class BigscreenService {
     	return mapList;
     }
+    /**计划营运公里*/
     public double culateJhgl(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
 		double jhgl=0;
@@ -837,6 +858,7 @@ public class BigscreenService {
 		return jhgl;
 	}
+    /**实际营运公里（不包含临加）*/
     public double culateSjgl(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
 		double sjgl=0;
@@ -866,7 +888,7 @@ public class BigscreenService {
 			                    	 if (!childTaskPlan.isDestroy()) {
 			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 			 	                    	sjgl=Arith.add(sjgl,jhgl);
-			 	                    } 
+			 	                    }
 			                    }
 			                }
 						}
@@ -876,6 +898,7 @@ public class BigscreenService {
 		return sjgl;
 	}
+    /**临加公里*/
     public double culateLjgl(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
 		double ljgl=0;
@@ -891,7 +914,8 @@ public class BigscreenService {
 							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 			                while (it.hasNext()) {
 			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if(childTaskPlan.getMileageType().equals("service") && childTaskPlan.getCcId()==null){
+			                    if(childTaskPlan.getMileageType().equals("service")
+			                    		&& childTaskPlan.getCcId()==null){
 			                    	 if (!childTaskPlan.isDestroy()) {
 			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 			 	                    	ljgl=Arith.add(ljgl,jhgl);
@@ -912,24 +936,24 @@ public class BigscreenService {
 							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 			                while (it.hasNext()) {
 			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if(childTaskPlan.getCcId()==null){
-				                    if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
-				                    	 if (!childTaskPlan.isDestroy()) {
-				 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-				 	                    	ljgl=Arith.add(ljgl,jhgl);
-				 	                    } 
-				                    }
+			                    if("service".equals(childTaskPlan.getMileageType())
+			                    		&& "临加".equals(childTaskPlan.getType1())
+			                    		&& childTaskPlan.getCcId()==null){
+			                    	if (!childTaskPlan.isDestroy()) {
+			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+			 	                    	ljgl=Arith.add(ljgl,jhgl);
+			 	                    }
 			                    }
 			                }
 						}
 					}
 				}
-				
 			}
 		}
 		return ljgl;
 	}
+    /**烂班（少驶）公里*/
     public double culateCJLC(List<ScheduleRealInfo> list, String item) {
 		// TODO Auto-generated method stub
 		double sum = 0;
@@ -975,4 +999,75 @@ public class BigscreenService {
         }
         return sum;
 	}
+    
+    /**计划空驶公里*/
+    public double culateJhJccgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double jcclc =0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
+				if (isInOut(scheduleRealInfo)) {
+					jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+				}
+			}
+		}
+		return jcclc;
+	}
+    
+    /**实际进出场空驶*/
+    public double culateJccgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double jcclc =0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (isInOut(scheduleRealInfo)) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if(childTaskPlans.isEmpty()){
+					if(!(scheduleRealInfo.getStatus() == -1)){
+						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+					}
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("empty")
+	                    		&& childTaskPlan.getCcId()==null){
+	                    	 if (!childTaskPlan.isDestroy()) {
+	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+	 	                    	jcclc=Arith.add(jcclc,jhgl);
+	 	                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return jcclc;
+	}
+    
+	/**实际非进出场空驶公里*/
+    public double culateKsgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double ksgl =0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!isInOut(scheduleRealInfo)) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if(!childTaskPlans.isEmpty()){
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
+	                    	 if (!childTaskPlan.isDestroy()) {
+	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+	 	                    	ksgl=Arith.add(ksgl,jhgl);
+	 	                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return ksgl;
+	}
+    
 }