update

娄高锋
1 parent 45c2e6ad
Showing 4 changed files with 102 additions and 273 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/report/timetable/timetable.html
@@ -71,7 +71,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
 			}
 			if(normal){
-				sql += " and bc_type != 'in' and bc_type != 'out'";
+				sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 			}
 			list = jdbcTemplate.query(sql,
@@ -158,7 +158,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(model.length() != 0){
 //				sql = "select * from bsth_c_s_ttinfo_detail where ttinfo = '"+model+"' and bc_type != 'in' and bc_type != 'out'";
-				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out'";
+				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 				ttList = jdbcTemplate.query(sql,
 						new RowMapper<Long>(){
@@ -452,8 +452,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(statu.equals("1")){
 				for(Long time : timeList){
 					Map<String, Object> tempMap = new HashMap<String, Object>();
-					List<Long> fcsjs = timeMap0.get(time);
-					List<Long> fcsjAs = timeMap1.get(time);
+					List<Long> fcsjs = new ArrayList<Long>();
+					List<Long> fcsjAs = new ArrayList<Long>();
+					for(Long l : timeMap0.get(time)){
+						if(l < 90)
+							fcsjs.add(l);
+					}
+					for(Long l : timeMap1.get(time)){
+						if(l < 90)
+							fcsjAs.add(l);
+					}
 					Collections.sort(fcsjs);
 					Collections.sort(fcsjAs);
 					String[] split = key.split("/");
@@ -514,8 +522,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					String[] split = key.split("/");
 					if((long)Long.valueOf(split[0]) == xlBm){
 						Map<String, Object> tempMap = new HashMap<String, Object>();
-						List<Long> fcsjs = temp0.get(key);
-						List<Long> fcsjAs = temp1.get(key);
+						List<Long> fcsjs = new ArrayList<Long>();
+						List<Long> fcsjAs = new ArrayList<Long>();
+						for(Long l : temp0.get(key)){
+							if(l < 90)
+								fcsjs.add(l);
+						}
+						for(Long l : temp1.get(key)){
+							if(l < 90)
+								fcsjAs.add(l);
+						}
 						Collections.sort(fcsjs);
 						Collections.sort(fcsjAs);
 						long fcsj = 0l;
@@ -613,7 +629,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(sfqr == 1){
 				sql += " and zdsj >= '"+times1+"' and fcsj <= '"+times2+"'";
 			}
-			sql += " and bc_type != 'in' and bc_type != 'out' order by fcsj";
+			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' order by fcsj";
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
@@ -707,7 +723,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			});
 			if(model.length() != 0){
-				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out'";
+				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 				ttList = jdbcTemplate.query(sql,
 						new RowMapper<Long>(){
@@ -896,9 +912,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
 			Collections.sort(keyList2);
-			for(long l : keyList2){
-				System.out.println(l);
-			}
+			
 			for(int i = 1; i < keyList2.size(); i++){
 				long fcsj1 = keyList2.get(i - 1);
 				long fcsj2 = keyList2.get(i);
@@ -911,7 +925,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						sjyysj += fcsj2 - fcsj1;
 					}
 					sjyysj1 += fcsj2 - fcsj1;
-					System.out.println("---"+(fcsj2-fcsj1)+"---"+sjyysj+"---"+sjyysj1);
 				}
 			}
@@ -1722,7 +1735,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(company.length() != 0){
 				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
 			}
-			sql += " and bc_type != 'in' and bc_type != 'out'";
+			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
@@ -793,260 +793,74 @@ public class ReportServiceImpl implements ReportService{
 						 return m;
 					 }
 				});		
-	
-		//班次
-		int sj_0 = 6*60+31,sj_1 = 8*60+30,sj_2 = 16*60+1,sj_3 = 18*60;
-				
-		//顺序 出场--早高峰---中午---晚高峰---进场
-		//实驶时间时间(分)，0为上行，1为下行
-		int ccsj0=0,ccsj1=0,zgf0=0,zgf1=0,zw0=0,zw1=0,wgf0=0,wgf1=0,jcsj0=0,jcsj1=0;
-		
-		//记录上一个发车时间(方便记录间距)
-		int cfc0=0,cfc1=0,zfc0=0,zfc1=0,zwfc0=0,zwfc1=0,wfc0=0,wfc1=0,jcfc0Z=0,jcfc1Z=0,jcfc0W=0,jcfc1W=0;
-		//车距 (发车时间的间距) i--MIN  a--MAX
-		int iC=999,aC=-1,iZg=999,aZg=-1,iZw=999,aZw=-1,iWg=999,aWg=-1,iJcZ=999,aJcZ=-1,iJcW=999,aJcW=-1; 
-		int iC1=999,aC1=-1,iZg1=999,aZg1=-1,iZw1=999,aZw1=-1,iWg1=999,aWg1=-1,iJc1Z=999,aJc1Z=-1,iJc1W=999,aJc1W=-1;
+
+		List<Map<String, Object>> newList=new ArrayList<Map<String,Object>>();
+		Map<String, List<Map<String, Object>>> keyMap = new HashMap<String, List<Map<String, Object>>>();
+		Map<String, Map<String, Object>> maps = new HashMap<String, Map<String, Object>>();
+		keyMap.put("(首)——6:30", new ArrayList<Map<String, Object>>());
+		keyMap.put("6:31——8:30", new ArrayList<Map<String, Object>>());
+		keyMap.put("8:31——16:00", new ArrayList<Map<String, Object>>());
+		keyMap.put("16:01——18:00", new ArrayList<Map<String, Object>>());
+		keyMap.put("18:01——(末)", new ArrayList<Map<String, Object>>());
+		for(int i = 0; i < list.size(); i++){
+			Map<String, Object> ttMap = list.get(i);
+			String fcsj = ttMap.get("fcsj").toString();
+			String[] split = fcsj.split(":");
+			int fcsjT = Integer.valueOf(split[0])*60+Integer.valueOf(split[1]);
+			if(fcsjT >= minSj && fcsjT <= 6*60+30){
+				keyMap.get("(首)——6:30").add(ttMap);
+			} else if(fcsjT > 6*60+30 && fcsjT <= 8*60+30){
+				keyMap.get("6:31——8:30").add(ttMap);
+			} else if(fcsjT > 8*60+30 && fcsjT <= 16*60){
+				keyMap.get("8:31——16:00").add(ttMap);
+			} else if(fcsjT > 16*60 && fcsjT <= 18*60){
+				keyMap.get("16:01——18:00").add(ttMap);
+			} else {
+				keyMap.get("18:01——(末)").add(ttMap);
+			}
+		}
-		for(int i=0;i<list.size();i++){
-			Map<String, Object> ttMap=list.get(i);
-			String xlDir=ttMap.get("dir").toString();
-			int bcsj=Integer.parseInt(ttMap.get("bcsj").toString());
-			String fcsj=ttMap.get("fcsj").toString();
-			String[] fcsjs=fcsj.split(":");
-			int fcsjNum=Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1]);
-			
-			if(xlDir.equals("0")){
-				if(fcsjNum>=minSj && fcsjNum<sj_0){
-					ccsj0 +=bcsj;
-					if(aC<0){
-						cfc0 =fcsjNum;
-						aC=0;
-					}else{
-						if(fcsjNum-cfc0<iC){
-							iC=fcsjNum-cfc0;
-						}
-						if(fcsjNum-cfc0>aC){
-							aC=fcsjNum-cfc0;
-						}
-						
-						cfc0=fcsjNum;
-					}
-					
-				}else if(fcsjNum>=sj_0 && fcsjNum<=sj_1){
-					zgf0 +=bcsj;
-					if(aZg<0){
-						zfc0 =fcsjNum;
-						aZg=0;
-					}else{
-						if(fcsjNum-zfc0<iZg){
-							iZg=fcsjNum-zfc0;
-						}
-						
-						if(fcsjNum-zfc0>aZg){
-							aZg=fcsjNum-zfc0;
-						}
-						
-						zfc0=fcsjNum;
-					}
-				}else if(fcsjNum>sj_1 && fcsjNum<sj_2){
-					zw0 +=bcsj;
-					if(aZw<0){
-						zwfc0 =fcsjNum;
-						aZw=0;
-					}else{
-						if(fcsjNum-zwfc0<iZw){
-							iZw=fcsjNum-zwfc0;
-						}
-						if(fcsjNum-zwfc0>aZw){
-							aZw=fcsjNum-zwfc0;
-						}
-						zwfc0=fcsjNum;
-					}
-					
-				}else if(fcsjNum>=sj_2 && fcsjNum<=sj_3){
-					wgf0 +=bcsj;
-					if(aWg<0){
-						wfc0=fcsjNum;
-						aWg=0;
-					}else{
-						if(fcsjNum-wfc0<iWg){
-							iWg=fcsjNum-wfc0;
-						}
-						if(fcsjNum-wfc0>aWg){
-							aWg=fcsjNum-wfc0;
-						}
-						wfc0=fcsjNum;
-					}
-				}else if(fcsjNum>sj_3){
-					jcsj0 +=bcsj;
-					if(aJcW<0){
-						jcfc0W=fcsjNum;
-						aJcW=0;
-					}else{
-						if(fcsjNum-jcfc0W<iJcW){
-							iJcW=fcsjNum-jcfc0W;
-						}
-						if(fcsjNum-jcfc0W>aJcW){
-							aJcW=fcsjNum-jcfc0W;
-						}
-						jcfc0W=fcsjNum;
-					}
-				}else if(fcsjNum<minSj){
-					jcsj0 +=bcsj;
-					if(aJcZ<0){
-						jcfc0Z=fcsjNum;
-						aJcZ=0;
-					}else{
-						if(fcsjNum-jcfc0Z<iJcZ){
-							iJcZ=fcsjNum-jcfc0Z;
-						}
-						if(fcsjNum-jcfc0Z>aJcZ){
-							aJcZ=fcsjNum-jcfc0Z;
-						}
-						jcfc0Z=fcsjNum;
-					}
+		for(String key : keyMap.keySet()){
+			Map<String, Object> tempMap = new HashMap<String, Object>();
+			List<Map<String, Object>> list2 = keyMap.get(key);
+			List<Integer> cjs = new ArrayList<Integer>();
+			int sxsj = 0, xxsj = 0, zcj = 0;
+			int temp = 24*60+1;
+			for(Map<String, Object> m : list2){
+				String[] split = m.get("fcsj").toString().split(":");
+				int fcsj = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+				int xlDir = Integer.valueOf(m.get("dir").toString());
+				int bcsj = Integer.valueOf(m.get("bcsj").toString());
+				if(xlDir == 0){
+					sxsj += bcsj;
+				} else {
+					xxsj += bcsj;
 				}
-				
-				
-			}else{
-				if(fcsjNum>=minSj && fcsjNum<sj_0){
-					ccsj1 +=bcsj;
-					if(aC1<0){
-						cfc1=fcsjNum;
-						aC1=0;
-					}else{
-						if(fcsjNum-cfc1<iC1){
-							iC1=fcsjNum-cfc1;
-						}
-						if(fcsjNum-cfc1>aC1){
-							aC1=fcsjNum-cfc1;
-						}
-						cfc1=fcsjNum;
-					}
-				}else if(fcsjNum>=sj_0 && fcsjNum<=sj_1){
-					zgf1 +=bcsj;
-					if(aZg1<0){
-						zfc1=fcsjNum;
-						aZg1=0;
-					}else{
-						if(fcsjNum-zfc1<iZg1){
-							iZg1=fcsjNum-zfc1;
-						}
-						if(fcsjNum-zfc1>aZg1){
-							aZg1=fcsjNum-zfc1;
-						}
-						
-						zfc1=fcsjNum;
-					}
-				}else if(fcsjNum>sj_1 && fcsjNum<sj_2){
-					zw1 +=bcsj;
-					if(aZw1<0){
-						zwfc1=fcsjNum;
-						aZw1=0;
-					}else{
-						if(fcsjNum-zwfc1<iZw1){
-							iZw1=fcsjNum-zwfc1;
-						}
-						if(fcsjNum-zwfc1>aZw1){
-							aZw1=fcsjNum-zwfc1;
-						}
-						zwfc1=fcsjNum;
-					}
-				}else if(fcsjNum>=sj_2 && fcsjNum<=sj_3){
-					wgf1 +=bcsj;
-					if(aWg1<0){
-						wfc1=fcsjNum;
-						aWg1=0;
-					}else{
-						if(fcsjNum-wfc1<iWg1){
-							iWg1=fcsjNum-wfc1;
-						}
-						if(fcsjNum-wfc1<aWg1){
-							aWg1=fcsjNum-wfc1;
-						}
-						wfc1=fcsjNum;
-					}
-				}else if(fcsjNum>sj_3){
-					jcsj1 +=bcsj;
-					if(aJc1W<0){
-						jcfc1W=fcsjNum;
-						aJc1W=0;
-					}else{
-						if(fcsjNum-jcfc1W<iJc1W){
-							aJc1W=fcsjNum-jcfc1W;
-						}
-						if(fcsjNum-jcfc1W>aJc1W){
-							aJc1W=fcsjNum-jcfc1W;
-						}
-						
-						jcfc1W=fcsjNum;
-					}
-				}else if(fcsjNum<minSj){
-					jcsj1 +=bcsj;
-					if(aJc1Z<0){
-						jcfc1Z=fcsjNum;
-						aJc1Z=0;
-					}else{
-						if(fcsjNum-jcfc1Z<iJc1Z){
-							aJc1Z=fcsjNum-jcfc1Z;
-						}
-						if(fcsjNum-jcfc1Z>aJc1Z){
-							aJc1Z=fcsjNum-jcfc1Z;
-						}
-						
-						jcfc1Z=fcsjNum;
-					}
+				if(temp >= fcsj){
+					temp = fcsj;
+				} else {
+					cjs.add(fcsj - temp);
+					temp = fcsj;
 				}
 			}
-			
+			Collections.sort(cjs);
+			for(int i : cjs){
+				zcj += i;
+			}
+			tempMap.put("sjd", key);
+			tempMap.put("sxsj", sxsj);
+			tempMap.put("xxsj", xxsj);
+			tempMap.put("fqsj", sxsj + xxsj);
+			tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
+			tempMap.put("pjcj", cjs.size()>0?zcj/(cjs.size()-1):"/");
+			maps.put(key, tempMap);
 		}
+		newList.add(maps.get("(首)——6:30"));
+		newList.add(maps.get("6:31——8:30"));
+		newList.add(maps.get("8:31——16:00"));
+		newList.add(maps.get("16:01——18:00"));
+		newList.add(maps.get("18:01——(末)"));
-		
-		List<Map<String, Object>> newList=new ArrayList<Map<String,Object>>();
-		Map<String, Object> newmap1=new HashMap<String,Object>();
-		Map<String, Object> newmap2=new HashMap<String,Object>();
-		Map<String, Object> newmap3=new HashMap<String,Object>();
-		Map<String, Object> newmap4=new HashMap<String,Object>();
-		Map<String, Object> newmap5=new HashMap<String,Object>();
-		newmap1.put("sjd", "(首)——6:30");
-		newmap1.put("sxsj", ccsj0);
-		newmap1.put("xxsj", ccsj1);
-		newmap1.put("fqsj", ccsj0+ccsj1);
-		newmap1.put("cj", (iC-iC1>0?iC1:iC)+"——"+(aC-aC1>0?aC:aC1));
-		
-		newmap2.put("sjd", "6:31——8:30");
-		newmap2.put("sxsj", zgf0);
-		newmap2.put("xxsj", zgf1);
-		newmap2.put("fqsj", zgf1+zgf0);
-		newmap2.put("cj", (iZg-iZg1>0?iZg1:iZg)+"——"+(aZg-aZg1>0?aZg:aZg1));
-		
-		newmap3.put("sjd", "8:30——16:00");
-		newmap3.put("sxsj", zw0);
-		newmap3.put("xxsj", zw1);
-		newmap3.put("fqsj", zw0+zw1);
-		newmap3.put("cj", (iZw-iZw1>0?iZw1:iZw)+"——"+(aZw-aZw1>0?aZw:aZw1));
-		
-		newmap4.put("sjd", "16:01——18:00");
-		newmap4.put("sxsj", wgf0);
-		newmap4.put("xxsj", wgf1);
-		newmap4.put("fqsj", wgf0+wgf1);
-		newmap4.put("cj", (iWg-iWg1>0?iWg1:iWg)+"——"+(aWg-aWg1>0?aWg:aWg1));
-		
-		newmap5.put("sjd", "18:00——(末)");
-		newmap5.put("sxsj", jcsj0);
-		newmap5.put("xxsj", jcsj1);
-		newmap5.put("fqsj", jcsj0+jcsj1);
-		int min0=iJcZ-iJcW>0?iJcW:iJcZ;
-		int max0=aJcZ-aJcW>0?aJcZ:aJcW;
-		int min1=iJc1Z-iJc1W>0?iJc1W:iJc1Z;
-		int max1=aJc1Z-aJc1W>0?aJc1Z:aJc1W;
-		newmap5.put("cj", (min0-min1>0?min1:min0)+"——"+(max0-max1>0?max0:max1));
-		
-		newList.add(newmap1);
-		newList.add(newmap2);
-		newList.add(newmap3);
-		newList.add(newmap4);
-		newList.add(newmap5);
 		return newList;
 	}
 	@Override
@@ -404,7 +404,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				}
 				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out")
-						&& schedule.getFcsjActual() != null){
+						&& !schedule.getBcType().equals("ldks") && schedule.getFcsjActual() != null){
 //					String clZbh = schedule.getClZbh();
 					String xlDir = schedule.getXlDir();
 					if(!listMap.containsKey(xlDir))
@@ -526,7 +526,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 //			if(company.length() != 0){
 				sql += " and gs_bm like '%"+company+"%' and fgs_bm like '%"+subCompany+"%'";
 //			}
-			sql += " and bc_type != 'in' and bc_type != 'out'";
+			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
@@ -579,7 +579,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			if(model.length() != 0){
 //				sql = "select * from bsth_c_s_ttinfo_detail where ttinfo = '"+model+"' and bc_type != 'in' and bc_type != 'out'";
-				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out'";
+				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 				ttList = jdbcTemplate.query(sql,
 						new RowMapper<Long>(){
@@ -807,7 +807,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 //			if(company.length() != 0){
 				sql += " and gs_bm like '%"+company+"%' and fgs_bm like '%"+subCompany+"%'";
 //			}
-			sql += " and bc_type != 'in' and bc_type != 'out'";
+			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
@@ -1174,7 +1174,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line, date);
 		for(ScheduleRealInfo schedule : list){
-			if(schedule.getBcType().equals("in") || schedule.getBcType().equals("out"))
+			if(schedule.getBcType().equals("in") || schedule.getBcType().equals("out") || schedule.getBcType().equals("ldks"))
 				continue;
 			if(schedule.getStatus() == -1){
 				continue;
@@ -1353,7 +1353,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line, date);
 		for(ScheduleRealInfo schedule : list){
-			if(schedule.getBcType().equals("in") || schedule.getBcType().equals("out"))
+			if(schedule.getBcType().equals("in") || schedule.getBcType().equals("out") || schedule.getBcType().equals("ldks"))
 				continue;
 			if(schedule.getStatus() == -1){
 				continue;
@@ -165,13 +165,14 @@
 							<div class="col-md-6" >
 								<table  class="table table-bordered table-checkable" id="formsTime5">
 									<tr>
-										<td colspan="5">全日分组行驶时间(区间除外)</td>
+										<td colspan="6">全日分组行驶时间(区间除外)</td>
 									</tr>
 									<tr>
-										<td width="25%" rowspan="2" style="text-align:center;vertical-align:middle;">分组   时间</td>
-										<td width="30%" colspan="2" style="text-align:center;vertical-align:middle;">实驶（分）</td>
+										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">分组   时间</td>
+										<td width="25%" colspan="2" style="text-align:center;vertical-align:middle;">计划行驶（分）</td>
 										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">分圈   时间</td>
-										<td width="25%" rowspan="2" style="text-align:center;vertical-align:middle;">车距</td>
+										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">车距区间</td>
+										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">平均车距</td>
 									</tr>
 									<tr>
 										<td>上行</td>
@@ -398,12 +399,13 @@
 		<td align="center">{{result.sxsj}}</td>
 		<td align="center">{{result.xxsj}}</td>
 		<td align="center">{{result.fqsj}}</td>
-		<td align="center">{{result.cj}}</td>
+		<td align="center">{{result.cjqj}}</td>
+		<td align="center">{{result.pjcj}}</td>
 	</tr>
 {{/each}}
 {{if list.length == 0}}
 		<tr>
-			<td colspan="5"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>