调度大间隔修改时刻表分析表修改

廖磊
1 parent 009fc291
Showing 2 changed files with 137 additions and 38 deletions
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -1029,6 +1029,11 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 			 if(listInfo.size()>0){
 				  m=listDjg(peak,trough,listInfo,grade);
+			 }else{
+				 m.put("djgcsz", "0");
+				 m.put("djgcsw", "0");
+				 m.put("djgcsq", "0");
+				 m.put("djgsj", "0");
 			 }
 		}
 		return m;
@@ -873,7 +873,7 @@ public class ReportServiceImpl implements ReportService{
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
 						+ " fcsj > '"+minfcsj+"'  and bc_type!='ldks' "
 								+ " and bc_type !='region') "
-						+ " order by xl_dir, xh, lp,fcsj";
+						+ " order by  xh, lp,fcsj";
 				Map<String, Object> map=new HashMap<String,Object>();
 				List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
 						new RowMapper<Map<String, Object>>(){
@@ -915,6 +915,8 @@ public class ReportServiceImpl implements ReportService{
 		int temp = 48*60+1, zcj = 0;
 		boolean ists = true;
 		String lpname="";
+		int dir =-1;
+		int fcsjT_= 0;
 		for (int i = 0; i < list.size(); i++) {
 			Map<String, Object> m=list.get(i);
 			int xlDir = Integer.valueOf(m.get("dir").toString());
@@ -927,6 +929,10 @@ public class ReportServiceImpl implements ReportService{
 				if(temp>fcsjT){
 					temp=fcsjT+bcsj;
 				}
+				dir =xlDir;
+				if(bcType.equals("in") || bcType.equals("out")){
+					ists=false;
+				}
 			}else{
 				if(temp>fcsjT){
 					temp=fcsjT+bcsj;
@@ -934,74 +940,146 @@ public class ReportServiceImpl implements ReportService{
 				if(bcType.equals("in") || bcType.equals("out")){
 					temp = fcsjT+bcsj;
 					lpname=m.get("lp").toString();
+					dir =xlDir;
 					ists=false;
 				}else{
-//					if(ists){
-//						temp = fcsjT+bcsj;
-//						lpname=m.get("lp").toString();
-//					}else{
-						if(xlDir==0){
+//						if(xlDir==0){
 							//上行数据
 							if(fcsjT>= minSj && fcsjT <= 6*60+30){
 								//早高峰前
-								yysxZq +=bcsj;
-								sxcountZqbc ++;
-								zqFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxZq +=bcsj;
+									sxcountZqbc ++;
+									zqFcsj0.add(fcsjT);
+								}else{
+									yyxxZq +=bcsj;
+									xxcountZqbc ++;
+									zqFcsj1.add(fcsjT);
+								}
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxZq +=fcsjT-temp;
+										if(dir==0)
+											tzsxZq +=fcsjT-temp;
+										else
+											tzxxZq +=fcsjT-temp;
 									}
 								}
 								temp = fcsjT+bcsj;
 							}else if(fcsjT > 6*60+30 && fcsjT <= 8*60+30){
 								//早高峰
-								yysxZgf +=bcsj;
-								sxcountZgfbc ++;
-								zgfFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxZgf +=bcsj;
+									sxcountZgfbc ++;
+									zgfFcsj0.add(fcsjT);
+								}else{
+									yyxxZgf +=bcsj;
+									xxcountZgfbc ++;
+									zgfFcsj1.add(fcsjT);
+								}
+								
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxZgf +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT>= minSj && fcsjT <= 6*60+30)
+												tzsxZq +=fcsjT-temp;
+											else
+												tzsxZgf +=fcsjT-temp;
+										}else{
+											if(fcsjT_>= minSj && fcsjT_ <= 6*60+30)
+												tzxxZq +=fcsjT-temp;
+											else
+											    tzxxZgf +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}else if(fcsjT > 8*60+30 && fcsjT <= 16*60){
 								//中午
-								yysxZw +=bcsj;
-								sxcountZwbc ++;
-								zwFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxZw +=bcsj;
+									sxcountZwbc ++;
+									zwFcsj0.add(fcsjT);
+								}else{
+									yyxxZw +=bcsj;
+									xxcountZwbc ++;
+									zwFcsj1.add(fcsjT);
+								}
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxZw +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
+												tzsxZgf +=fcsjT-temp;
+											else
+											    tzsxZw +=fcsjT-temp;
+										}else{
+											if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
+												tzxxZgf +=fcsjT-temp;
+											else
+											    tzxxZw +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}else if(fcsjT > 16*60 && fcsjT <= 18*60){
 								//晚高峰
-								yysxWgf +=bcsj;
-								sxcountWgfbc ++;
-								wgfFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxWgf +=bcsj;
+									sxcountWgfbc ++;
+									wgfFcsj0.add(fcsjT);
+								}else{
+									yyxxWgf +=bcsj;
+									xxcountWgfbc ++;
+									wgfFcsj1.add(fcsjT);
+								}
+								
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxWgf +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
+												tzsxZw +=fcsjT-temp;
+											else	
+											    tzsxWgf +=fcsjT-temp;
+										}else{
+											if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
+												 tzxxZw +=fcsjT-temp;
+											else
+												 tzxxWgf +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}else{
 								//晚高峰后
-								yysxWh +=bcsj;
-								sxcountWhbc ++;
-								whFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxWh +=bcsj;
+									sxcountWhbc ++;
+									whFcsj0.add(fcsjT);
+								}else{
+									yyxxWh +=bcsj;
+									xxcountWhbc ++;
+									whFcsj1.add(fcsjT);
+								}
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxWh +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
+												tzsxWgf +=fcsjT-temp;
+											else
+											    tzsxWh +=fcsjT-temp;
+										}else{
+											if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
+												tzxxWgf +=fcsjT-temp;
+											else
+											    tzxxWh +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}
-							lpname=m.get("lp").toString();
-						}else{
+							
+						/*}else{
 							//下行数据
 							if(fcsjT>= minSj && fcsjT <= 6*60+30){
 								//早高峰前
@@ -1021,7 +1099,10 @@ public class ReportServiceImpl implements ReportService{
 								zgfFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxZgf +=fcsjT-temp;
+										if(fcsjT_>= minSj && fcsjT_ <= 6*60+30)
+											tzxxZq +=fcsjT-temp;
+										else
+										    tzxxZgf +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
@@ -1032,7 +1113,10 @@ public class ReportServiceImpl implements ReportService{
 								zwFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxZw +=fcsjT-temp;
+										if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
+											tzxxZgf +=fcsjT-temp;
+										else
+										    tzxxZw +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
@@ -1043,7 +1127,10 @@ public class ReportServiceImpl implements ReportService{
 								wgfFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxWgf +=fcsjT-temp;
+										if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
+											 tzxxZw +=fcsjT-temp;
+										else
+											 tzxxWgf +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
@@ -1054,20 +1141,27 @@ public class ReportServiceImpl implements ReportService{
 								whFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxWh +=fcsjT-temp;
+										if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
+											tzxxWgf +=fcsjT-temp;
+										else
+										    tzxxWh +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
 							}
 //						}
-					}
+					}*/
+						lpname=m.get("lp").toString();
+						fcsjT_=fcsjT;
+						dir =xlDir;
+						if(m.get("ists").toString().trim().equals("1")){
+							ists=false;
+						}else{
+							ists = true;
+						}
 			    }
 			}
-			if(m.get("ists").toString().trim().equals("1")){
-				ists=false;
-			}else{
-				ists = true;
-			}
+			
 		}
 		//---------------------------------------早前