Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 4f42d573 2283456a
Showing 3 changed files with 109 additions and 31 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
@@ -1102,7 +1102,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int jhbc = 0, sjbc = 0, kbc = 0, mbc = 0;
+			int jhbc = 0, sjbc = 0, wdfz = 0;
 			long jhdf = 0l, sjdf = 0l, wddf1 = 0l, wddf2 = 0l;
 			long jhfc = 0l, sjfc = 0l, wdfc1 = 0l, wdfc2 = 0l;
 			long jhys = 0l, sjys = 0l, yssjMax = 0l, yssjMin = 0l;
@@ -1127,10 +1127,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					yssj += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
 					if(schedule.getFcsjActualTime() - schedule.getFcsjT() < 0){
 						wdfc1 += schedule.getFcsjT() - schedule.getFcsjActualTime();
-						kbc++;
+//						kbc++;
 					} else if(schedule.getFcsjActualTime() - schedule.getFcsjT() > 0){
 						wdfc2 += schedule.getFcsjActualTime() - schedule.getFcsjT();
-						mbc++;
+//						mbc++;
 					}
 					if(schedule.getDfsj() != null){
@@ -1197,8 +1197,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				tempMap.put("pjys", "0分");
 				tempMap.put("pjtz", "0分");
 			}
-			tempMap.put("kbc", kbc);
-			tempMap.put("mbc", mbc);
+//			tempMap.put("kbc", kbc);
+//			tempMap.put("mbc", mbc);
+			if(!tempMap.get("jhfc").toString().equals("/") && !tempMap.get("sjfc").toString().equals("/")){
+				String[] temp1 = tempMap.get("jhfc").toString().split(":");
+				String[] temp2 = tempMap.get("sjfc").toString().split(":");
+				tempMap.put("wdfz", (Integer.valueOf(temp2[0])*60 + Integer.valueOf(temp2[1]))
+						- (Integer.valueOf(temp1[0])*60 + Integer.valueOf(temp1[1])));
+			}else{
+				tempMap.put("wdfz", "/");
+			}
 			tempMap.put("jhys", jhys);
 			tempMap.put("sjys", sjys);
 			tempMap.put("yssjMin", yssjMin);
@@ -77,6 +77,48 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setsGh(rs.getString("s_gh"));
 					schedule.setsName(rs.getString("s_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					
+					if(schedule.getFcsj() != null && schedule.getZdsj() != null){
+						String[] split1 = schedule.getFcsj().split(":");
+						String[] split2 = schedule.getZdsj().split(":");
+						int fcsj = Integer.valueOf(split1[0]) * 60 + Integer.valueOf(split1[1]);
+						int zdsj = Integer.valueOf(split2[0]) * 60 + Integer.valueOf(split2[1]);
+						if(fcsj > zdsj){
+							zdsj += 1440;
+							schedule.setZdsj((zdsj/60>9?zdsj/60:"0"+zdsj/60) + ":" + (zdsj%60>9?zdsj%60:"0"+zdsj%60));
+						}
+					}
+					if(schedule.getFcsj() != null){
+						String[] split = schedule.getFcsj().split(":");
+						int fcsj = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						schedule.setFcsjT((long)fcsj);
+					}
+					if(schedule.getZdsj() != null){
+						String[] split = schedule.getZdsj().split(":");
+						int zdsj = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						schedule.setZdsjT((long)zdsj);
+					}
+					if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null){
+						String[] split1 = schedule.getFcsjActual().split(":");
+						String[] split2 = schedule.getZdsjActual().split(":");
+						int fcsjA = Integer.valueOf(split1[0]) * 60 + Integer.valueOf(split1[1]);
+						int zdsjA = Integer.valueOf(split2[0]) * 60 + Integer.valueOf(split2[1]);
+						if(fcsjA > zdsjA){
+							zdsjA += 1440;
+							schedule.setZdsjActual((zdsjA/60>9?zdsjA/60:"0"+zdsjA/60) + ":" + (zdsjA%60>9?zdsjA%60:"0"+zdsjA%60));
+						}
+					}
+					if(schedule.getFcsjActual() != null){
+						String[] split = schedule.getFcsjActual().split(":");
+						int fcsjA = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						schedule.setFcsjActualTime((long)fcsjA);
+					}
+					if(schedule.getZdsjActual() != null){
+						String[] split = schedule.getZdsjActual().split(":");
+						int zdsjA = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						schedule.setZdsjActualTime((long)zdsjA);
+					}
+					
 					return schedule;
 				}
 			});
@@ -259,11 +301,15 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		Long wgfEnd = 0l;
 		try {
 			//早晚高峰时段
-			zgfBegin = sdf.parse(date + "06:30").getTime();
-			zgfEnd = sdf.parse(date + "08:30").getTime();
-			wgfBegin = sdf.parse(date + "16:00").getTime();
-			wgfEnd = sdf.parse(date + "18:00").getTime();
-		} catch (ParseException e) {
+//			zgfBegin = sdf.parse(date + "06:30").getTime();
+//			zgfEnd = sdf.parse(date + "08:30").getTime();
+//			wgfBegin = sdf.parse(date + "16:00").getTime();
+//			wgfEnd = sdf.parse(date + "18:00").getTime();
+			zgfBegin = 6l * 60l + 30l;
+			zgfEnd = 8l * 60l + 30l;
+			wgfBegin = 16l * 60l + 0l;
+			wgfEnd = 18l * 60l + 0l;
+		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
@@ -276,7 +322,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			int jhsb = 0, sjsb = 0, jhmb = 0, sjmb = 0;
 			int jhzgf = 0, sjzgf = 0, jhwgf = 0, sjwgf = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
-				schedule.setFcsjAll(schedule.getFcsj());
+//				schedule.setFcsjAll(schedule.getFcsj());
 				//早晚高峰时段执行率
 				if(schedule.getFcsjT() >= zgfBegin && schedule.getFcsjT() <= zgfEnd){
@@ -299,13 +345,13 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				if(schedule.getFcsjActual() != null){
 					if(schedule.getBcType().equals("out"))
 						sjcc++;
-					schedule.setFcsjActualAll(schedule.getFcsjActual());
-					if(schedule.getFcsjActualTime() - schedule.getFcsjT() < -60000){
+//					schedule.setFcsjActualAll(schedule.getFcsjActual());
+					if(schedule.getFcsjActualTime() - schedule.getFcsjT() < -1){
 						if(schedule.getXlDir().equals("0"))
 							upfk++;
 						else if (schedule.getXlDir().equals("1"))
 							dnfk++;
-					} else if(schedule.getFcsjActualTime() - schedule.getFcsjT() > 180000){
+					} else if(schedule.getFcsjActualTime() - schedule.getFcsjT() > 3){
 						if(schedule.getXlDir().equals("0"))
 							upfm++;
 						else if (schedule.getXlDir().equals("1"))
@@ -314,15 +360,16 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				}
 				//到站时间快慢
 				if(schedule.getZdsjActual() != null && schedule.getBcsj() != null){
-					schedule.setZdsjActualAll(schedule.getZdsjActual());
-					schedule.setDfsjAll(schedule.getDfsj());
-					schedule.calcEndTime();
-					if(schedule.getZdsjActualTime() - schedule.getZdsjT() < -60000){
+//					schedule.setZdsjActualAll(schedule.getZdsjActual());
+//					schedule.setDfsjAll(schedule.getDfsj());
+//					schedule.calcEndTime();
+					schedule.setZdsjT(schedule.getFcsjT() + schedule.getBcsj());
+					if(schedule.getZdsjActualTime() - schedule.getZdsjT() < -1){
 						if(schedule.getXlDir().equals("0"))
 							updk++;
 						else if (schedule.getXlDir().equals("1"))
 							dndk++;
-					} else if(schedule.getZdsjActualTime() - schedule.getZdsjT() > 180000){
+					} else if(schedule.getZdsjActualTime() - schedule.getZdsjT() > 3){
 						if(schedule.getXlDir().equals("0"))
 							updm++;
 						else if (schedule.getXlDir().equals("1"))
@@ -337,7 +384,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					}
 				}
-				if(schedule.getBcType().equals("normal")){
+				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out")){
 					String clZbh = schedule.getClZbh();
 					if(!listMap.containsKey(clZbh))
 						listMap.put(clZbh, new ArrayList<ScheduleRealInfo>());
@@ -366,12 +413,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 //				System.out.println(moban.getFcsjActual() + "-末班-" + moban.getFcsj());
 				jhsb++;
 				if(shouban.getFcsjActual() != null){
-					if(shouban.getFcsjActualTime() - shouban.getFcsjT() >= -60000 && shouban.getFcsjActualTime() - shouban.getFcsjT() <= 180000)
+					if(shouban.getFcsjActualTime() - shouban.getFcsjT() >= -1 && shouban.getFcsjActualTime() - shouban.getFcsjT() <= 3)
 						sjsb++;
 				}
 				jhmb++;
 				if(moban.getFcsjActual() != null){
-					if(moban.getFcsjActualTime() - moban.getFcsjT() >= -60000 && moban.getFcsjActualTime() - moban.getFcsjT() <= 180000)
+					if(moban.getFcsjActualTime() - moban.getFcsjT() >= -1 && moban.getFcsjActualTime() - moban.getFcsjT() <= 3)
 						sjmb++;
 				}
@@ -452,7 +499,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			if(company.length() != 0){
 				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
 			}
-			sql += " and bc_type = 'normal'";
+			sql += " and bc_type != 'in' and bc_type != 'out'";
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
@@ -471,13 +518,39 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setBcsj(rs.getInt("bcsj"));
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					
+					if(schedule.getFcsj() != null && schedule.getZdsj() != null){
+						String[] split1 = schedule.getFcsj().split(":");
+						String[] split2 = schedule.getZdsj().split(":");
+						int fcsj = Integer.valueOf(split1[0]) * 60 + Integer.valueOf(split1[1]);
+						int zdsj = Integer.valueOf(split2[0]) * 60 + Integer.valueOf(split2[1]);
+						if(zdsj < fcsj){
+							zdsj += 1440;
+							schedule.setZdsj((zdsj/60>9?zdsj/60:"0"+zdsj/60) + ":" + (zdsj%60>9?zdsj%60:"0"+zdsj%60));
+						}
+						schedule.setFcsjT((long)fcsj);
+						schedule.setZdsjT((long)zdsj);
+					}
+					if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null){
+						String[] split3 = schedule.getFcsjActual().split(":");
+						String[] split4 = schedule.getZdsjActual().split(":");
+						int fcsjA = Integer.valueOf(split3[0]) * 60 + Integer.valueOf(split3[1]);
+						int zdsjA = Integer.valueOf(split4[0]) * 60 + Integer.valueOf(split4[1]);
+						if(fcsjA > zdsjA){
+							zdsjA += 1440;
+							schedule.setZdsjActual((zdsjA/60>9?zdsjA/60:"0"+zdsjA/60) + ":" + (zdsjA%60>9?zdsjA%60:"0"+zdsjA%60));
+						}
+						schedule.setFcsjActualTime((long)fcsjA);
+						schedule.setZdsjActualTime((long)zdsjA);
+					}
+					
 					return schedule;
 				}
 			});
 			if(model.length() != 0){
-//				sql = "select * from bsth_c_s_ttinfo_detail where ttinfo = '"+model+"' and bc_type = 'normal'";
-				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type = 'normal'";
+//				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'";
 				ttList = jdbcTemplate.query(sql,
 						new RowMapper<Long>(){
@@ -784,7 +857,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line, date);
 		for(ScheduleRealInfo schedule : list){
-			if(!schedule.getBcType().equals("normal"))
+			if(schedule.getBcType().equals("in") || schedule.getBcType().equals("out"))
 				continue;
 			String key = schedule.getXlName();
 			if(!keyMap.containsKey(key))
@@ -121,7 +121,7 @@
 									<th rowspan="2">日期</th>
 									<th colspan="4">到达时间</th>
 									<th colspan="4">发车时间</th>
-									<th colspan="2">误点率</th>
+									<th rowspan="2">误点分钟</th>
 									<th colspan="5">运送时间</th>
 									<th colspan="5">停站时间</th>
 								</tr>
@@ -134,8 +134,6 @@
 									<th>实际</th>
 									<th>平均提前</th>
 									<th>平均延误</th>
-									<th>快</th>
-									<th>慢</th>
 									<th>计划</th>
 									<th>实际</th>
 									<th>最快</th>
@@ -419,8 +417,7 @@
 				<td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc1}}</td>
 				<td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc2}}</td>
 			{{/if}}
-			<td>{{obj.kbc}}</td>
-			<td>{{obj.mbc}}</td>
+			<td class="merge">{{obj.wdfz}}</td>
 			<td>{{obj.jhys}}</td>
 			<td>{{obj.sjys}}</td>
 			<td>{{obj.yssjMin}}</td>