添加时间段

娄高锋
1 parent f992eaea
Showing 1 changed file with 115 additions and 25 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
@@ -73,7 +73,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(normal){
 				sql += " and bc_type != 'in' and bc_type != 'out'";
 			}
-			System.out.println(sql);
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
@@ -238,6 +237,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			String sql = "select start_station_name, end_station_name from bsth_c_line where line_code = '"+line+"'";
+			System.out.println(sql);
 			list = jdbcTemplate.query(sql,
 					new RowMapper<Map<String, Object>>(){
 				@Override
@@ -315,8 +315,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String endDate = map.get("endDate").toString();
 		String model = map.get("model").toString();
 		String statu = map.get("statu").toString();
-//		String times = map.get("times").toString();
+		String times1 = map.get("times1").toString();
+		String times2 = map.get("times2").toString();
 		String type = map.get("type").toString();
+		int sfqr = Integer.valueOf(map.get("sfqr").toString());
 		if(startDate.length() == 0){
 			startDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
@@ -327,12 +329,18 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		if(statu.equals("0")){
 			line = "";
 		}
-//		if(times.length() == 0){
-//			times = "06:00-07:00";
-//		}
-		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line, startDate, endDate, model, "", true);
+		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line,
+				startDate, endDate, model, sfqr==1?times1+"-"+times2:"", true);
+		long time1 = 0;
+		long time2 = 0;
+		if(sfqr == 1){
+			String[] split1 = times1.split(":");
+			String[] split2 = times2.split(":");
+			time1 = Long.valueOf(split1[0])*60 + Long.valueOf(split1[1]);
+			time2 = Long.valueOf(split2[0])*60 + Long.valueOf(split2[1]);
+		}
 		String[] date1 = startDate.split("-");
 		String[] date2 = endDate.split("-");
 //		startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
@@ -349,6 +357,15 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //		int endTime = Integer.valueOf(split[1].split(":")[0])*60 + Integer.valueOf(split[1].split(":")[1]);
 		for(ScheduleRealInfo schedule : list){
+			String[] split1 = schedule.getFcsj().split(":");
+			String[] split2 = schedule.getZdsj().split(":");
+			long fcsj = Long.valueOf(split1[0])*60 + Long.valueOf(split1[1]);
+			long zdsj = Long.valueOf(split2[0])*60 + Long.valueOf(split2[1]);
+			if(sfqr == 1 && (zdsj < time1 || fcsj > time2)){
+				continue;
+			}
+			if(schedule.getXlName() == null || schedule.getXlName().trim().length() == 0)
+				continue;
 			String key = schedule.getXlBm() + "/" + schedule.getXlName() + "/" + schedule.getQdzName();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
@@ -566,8 +583,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String statu = map.get("statu").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
+		String times1 = map.get("times1").toString();
+		String times2 = map.get("times2").toString();
 		String model = map.get("model").toString();
 		String type = map.get("type").toString();
+		int sfqr = Integer.valueOf(map.get("sfqr").toString());
 		if(startDate.length() == 0){
 			startDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
@@ -588,6 +608,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(company.length() != 0){
 				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
 			}
+			if(sfqr == 1){
+				sql += " and zdsj >= '"+times1+"' and fcsj <= '"+times2+"'";
+			}
 			sql += " and bc_type != 'in' and bc_type != 'out' order by fcsj";
 			list = jdbcTemplate.query(sql,
@@ -698,7 +721,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			e.printStackTrace();
 		}
-		
+
+		long time1 = 0;
+		long time2 = 0;
 		String[] date1 = startDate.split("-");
 		String[] date2 = endDate.split("-");
 		String date = "";
@@ -710,6 +735,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			date = date1[0] + "年" + date1[1] + "月" + date1[2] + "日--" +
 					date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
 		}
+		if(sfqr == 1){
+			String[] split1 = times1.split(":");
+			String[] split2 = times2.split(":");
+			time1 = Long.valueOf(split1[0])*60 + Long.valueOf(split1[1]);
+			time2 = Long.valueOf(split2[0])*60 + Long.valueOf(split2[1]);
+		}
 		for(ChildTaskPlan cTask : cList){
 			String key = cTask.getRemarks();
@@ -719,6 +750,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		for(ScheduleRealInfo schedule : list){
+			if(schedule.getXlName()==null || schedule.getXlName().trim().length()==0)
+				continue;
 			if(model.length() != 0){
 				for(Long tt : ttList)
 					if((long) tt == (long)schedule.getSpId()){
@@ -744,6 +777,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			List<ScheduleRealInfo> list2 = keyMap.get(key);
 			long jhyysj = 0, sjyysj = 0;
 			long jhyssj = 0, sjyssj = 0;
+			long jhyysj1 = 0, sjyysj1 = 0;
+			long jhyssj1 = 0, sjyssj1 = 0;
 			double jhlc = 0, sjlc = 0;
 			for(ScheduleRealInfo schedule : list2){
 				if(companyName.length() == 0 && schedule.getGsName() != null){
@@ -766,20 +801,40 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(int i = 1; i < keyList.size(); i++){
 				ScheduleRealInfo schedule1 = sortMap.get(keyList.get(i - 1));
 				ScheduleRealInfo schedule2 = sortMap.get(keyList.get(i));
-				jhyysj += schedule2.getFcsjT() - schedule1.getFcsjT();
-				
+				if(sfqr == 1 && time1 > schedule1.getFcsjT()){
+					jhyysj += schedule2.getFcsjT() - time1;
+				}else if(sfqr == 1 && time2 < schedule2.getFcsjT()){
+					jhyysj += time2 - schedule1.getFcsjT();
+				}else{
+					jhyysj += schedule2.getFcsjT() - schedule1.getFcsjT();
+				}
+				jhyysj1 += schedule2.getFcsjT() - schedule1.getFcsjT();
 				long zdsj2 = schedule2.getZdsjT();
 				long fcsj2 = schedule2.getFcsjT();
 				if(fcsj2 > zdsj2)
 					zdsj2 += 1440l;
-				jhyssj += zdsj2 - fcsj2;
+				if(sfqr == 1 && time1 > fcsj2){
+					jhyssj += zdsj2 - time1;
+				}else if(sfqr == 1 && time2 < zdsj2){
+					jhyssj += time2 - fcsj2;
+				}else{
+					jhyssj += zdsj2 - fcsj2;
+				}
+				jhyssj1 += zdsj2 - fcsj2;
 				jhlc += schedule2.getJhlc()==null?0:schedule2.getJhlc();
 				if(i == 1){
 					long zdsj1 = schedule1.getZdsjT();
 					long fcsj1 = schedule1.getFcsjT();
 					if(fcsj1 > zdsj1)
 						zdsj1 += 1440l;
-					jhyssj += zdsj1 - fcsj1;
+					if(sfqr == 1 && time1 > fcsj1){
+						jhyssj += zdsj1 - time1;
+					}else if(sfqr == 1 && time2 < zdsj1){
+						jhyssj += time1 - fcsj1;
+					}else{
+						jhyssj += zdsj1 - fcsj1;
+					}
+					jhyssj1 += zdsj1 - fcsj1;
 					jhlc += schedule1.getJhlc()==null?0:schedule1.getJhlc();
 				}
 			}
@@ -834,22 +889,45 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				Map<String, Object> m1 = mapList.get(i - 1);
 				Map<String, Object> m2 = mapList.get(i);
 				if(m1.get("fcsj") != null && m2.get("fcsj") != null){
-					sjyysj += Long.valueOf(m2.get("fcsj").toString()) - Long.valueOf(m1.get("fcsj").toString());
+					long fcsj2 = Long.valueOf(m2.get("fcsj").toString());
+					long fcsj1 = Long.valueOf(m1.get("fcsj").toString());
+					if(sfqr == 1 && time1 > fcsj1){
+						sjyysj += fcsj2 - time1;
+					}else if(sfqr == 1 && time2 < fcsj2){
+						sjyysj += time2 - fcsj1;
+					}else{
+						sjyysj += fcsj2 - fcsj1;
+					}
+					sjyysj1 += fcsj2 - fcsj1;
 				}
-				if(m2.get("fcsj") != null){
+				if(m2.get("fcsj") != null && m2.get("zdsj") != null){
 					long zdsj = Long.valueOf(m2.get("zdsj").toString());
 					long fcsj = Long.valueOf(m2.get("fcsj").toString());
 					if(fcsj > zdsj)
 						zdsj += 1440l;
-					sjyssj += zdsj - fcsj;
+					if(sfqr == 1 && time1 > fcsj){
+						sjyssj += zdsj - time1;
+					}else if(sfqr == 1 && time2 < zdsj){
+						sjyssj += zdsj - fcsj;
+					}else{
+						sjyssj += zdsj - fcsj;
+					}
+					sjyssj1 += zdsj - fcsj;
 					sjlc += Double.valueOf(m2.get("lc").toString());
 				}
-				if(i == 1 && m1.get("fcsj") != null){
+				if(i == 1 && m1.get("fcsj") != null && m1.get("zdsj") != null){
 					long zdsj = Long.valueOf(m1.get("zdsj").toString());
 					long fcsj = Long.valueOf(m1.get("fcsj").toString());
 					if(fcsj > zdsj)
 						zdsj += 1440l;
-					sjyssj += zdsj - fcsj;
+					if(sfqr == 1 && time1 > fcsj){
+						sjyssj += zdsj - time1;
+					}else if(sfqr == 1 && time2 < zdsj){
+						sjyssj += time2 - fcsj;
+					}else{
+						sjyssj += zdsj - fcsj;
+					}
+					sjyssj1 += zdsj - fcsj;
 					sjlc += Double.valueOf(m1.get("lc").toString());
 				}
 			}
@@ -867,7 +945,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				tempMap.put("jhyycs", "0");
 			} else {
 				tempMap.put("jhyysj", df.format((float)jhyysj / 60));
-				tempMap.put("jhyycs", df.format(jhlc == 0 ? 0 : jhlc / jhyysj * 60));
+				tempMap.put("jhyycs", df.format(jhlc == 0 ? 0 : jhlc / jhyysj1 * 60));
 			}
 			if(jhyssj == 0){
@@ -875,7 +953,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				tempMap.put("jhyscs", "0");
 			} else {
 				tempMap.put("jhyssj", df.format((float)jhyssj / 60));
-				tempMap.put("jhyscs", df.format(jhlc == 0 ? 0 : jhlc / jhyssj * 60));
+				tempMap.put("jhyscs", df.format(jhlc == 0 ? 0 : jhlc / jhyssj1 * 60));
 			}
 			if(sjyysj == 0){
@@ -883,7 +961,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				tempMap.put("sjyycs", "0");
 			} else {
 				tempMap.put("sjyysj", df.format((float)sjyysj / 60));
-				tempMap.put("sjyycs", df.format(sjlc == 0 ? 0 : sjlc / sjyysj * 60));
+				tempMap.put("sjyycs", df.format(sjlc == 0 ? 0 : sjlc / sjyysj1 * 60));
 			}
 			if(sjyssj == 0){
@@ -891,8 +969,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				tempMap.put("sjyscs", "0");
 			} else {
 				tempMap.put("sjyssj", df.format((float)sjyssj / 60));
-				tempMap.put("sjyscs", df.format(sjlc == 0 ? 0 : sjlc / sjyssj * 60));
+				tempMap.put("sjyscs", df.format(sjlc == 0 ? 0 : sjlc / sjyssj1 * 60));
 			}
+			if(!tempMap.get("jhyysj").equals("0"))
+			if(!tempMap.get("jhyycs").equals("0"))
+			if(!tempMap.get("jhyssj").equals("0"))
+			if(!tempMap.get("jhyscs").equals("0"))
+			if(!tempMap.get("sjyysj").equals("0"))
+			if(!tempMap.get("sjyycs").equals("0"))
+			if(!tempMap.get("sjyssj").equals("0"))
+			if(!tempMap.get("sjyscs").equals("0"))
 			resList.add(tempMap);
 		}
 		Map<String, List<Map<String, Object>>> keyMap2 = new HashMap<String, List<Map<String, Object>>>();
@@ -1124,7 +1210,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			endDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 		}
 		if(times.length() == 0){
-			times = "06:00-07:00";
+			times = "05:00-23:00";
 		}
 		list = getSchedule(company, subCompany, line, startDate, endDate, model, times, true);
@@ -1387,6 +1473,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String model = map.get("model").toString();
 		String times = map.get("times").toString();
 		String type = map.get("type").toString();
+		int sfqr = Integer.valueOf(map.get("sfqr").toString());
 		if(startDate.length() == 0){
 			startDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
@@ -1395,10 +1482,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			endDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 		}
 		if(times.length() == 0){
-			times = "06:00-07:00";
+			times = "05:00-23:00";
 		}
-		list = getSchedule(company, subCompany, line, startDate, endDate, model, times, true);
+		list = getSchedule(company, subCompany, line, startDate, endDate, model, sfqr==1?times:"", true);
 		String[] date1 = startDate.split("-");
 		String[] date2 = endDate.split("-");
@@ -1417,7 +1504,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		for(ScheduleRealInfo schedule : list){
 			Long fcsj = schedule.getFcsjT();
-			if(!(endTime!=0?fcsj>=startTime&&fcsj<endTime:fcsj>=startTime)){
+			if(sfqr == 1 && !(endTime!=0?fcsj>=startTime&&fcsj<endTime:fcsj>=startTime)){
 				continue;
 			}
 			String key = schedule.getXlName();
@@ -1571,6 +1658,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String endDate = map.get("endDate").toString();
 		String times = map.get("times").toString();
 		String type = map.get("type").toString();
+		int sfqr = Integer.valueOf(map.get("sfqr").toString());
 		if(startDate.length() == 0){
 			startDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
@@ -1584,7 +1672,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
-			if(times.length() != 0){
+			if(sfqr == 1 && times.length() != 0){
 				String[] split = times.split("-");
 				String[] split0 = split[0].split(":");
 				String[] split1 = split[1].split(":");
@@ -1651,6 +1739,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			date = startDate + "--" + endDate;
 		for(ScheduleRealInfo schedule : list){
+			if(schedule.getXlName() == null || schedule.getXlName().trim().length() == 0)
+				continue;
 			String key = schedule.getGsName() + "/" + schedule.getFgsName() + "/" + schedule.getXlName();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());