行驶时间及车速统计表

娄高锋
1 parent c857201c
Showing 1 changed file with 64 additions and 68 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
@@ -673,9 +673,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(sfqr == 1){
 				where += " and zdsj >= '"+times1+"' and fcsj <= '"+times2+"'";
 			}
-			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+//			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			where += " and bc_type != 'ldks'";
-			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc,"
+			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type,"
 					+ " fcsj, fcsj_actual, zdsj, zdsj_actual, qdz_name, zdz_name, xl_dir, status, remarks, gs_name, fgs_name, sp_id"
 					+ " from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"'"
 					+ " and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"+where+"";
@@ -699,6 +700,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setZdsjActual(rs.getString("zdsj_actual"));
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setZdzName(rs.getString("zdz_name"));
+					schedule.setBcType(rs.getString("bc_type"));
 					schedule.setXlDir(rs.getString("xl_dir"));
 					schedule.setStatus(rs.getInt("status"));
 					schedule.setRemarks(rs.getString("remarks"));
@@ -832,7 +834,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(model.length() != 0){
 				sql = "select sp.id from "
 						+ "(select id, tt_info, xl_bm, lp, fcsj from bsth_c_s_sp_info where schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'"
-						+ " and tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks') sp"
+						+ " and tt_info = '" + model + "' and bc_type != 'ldks') sp"
 						+ " left join bsth_c_s_ttinfo_detail tt on sp.tt_info = tt.ttinfo and sp.xl_bm = tt.xl and sp.lp = tt.lp and sp.fcsj = tt.fcsj";
 				ttList = jdbcTemplate.query(sql,
@@ -915,6 +917,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			Map<Long, ScheduleRealInfo> sortMap = new HashMap<Long, ScheduleRealInfo>();
+			Map<Long, Map<String, Object>> sortMap1 = new HashMap<Long, Map<String, Object>>();
 			List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 			List<Long> keyList = new ArrayList<Long>();
 			List<Long> keyList2 = new ArrayList<Long>();
@@ -946,30 +949,25 @@ 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));
-				if(!tsSet.contains(schedule1.getId())){
-					if(sfqr == 1 && time1 > schedule1.getFcsjT()){
-						jhyysj += schedule2.getFcsjT() - time1;
-					}else if(sfqr == 1 && time2 < schedule2.getFcsjT()){
-						jhyysj += time2 - schedule1.getFcsjT();
+				if(!tsSet.contains(schedule1.getId()) && !schedule1.getBcType().toString().equals("in") && !schedule1.getBcType().toString().equals("out")){
+					long fcsj1 = schedule1.getFcsjT();
+					long fcsj2 = schedule2.getFcsjT();
+					if(tsSet.contains(schedule2.getId()) || schedule2.getBcType().toString().equals("in") || schedule2.getBcType().toString().equals("out")){
+						fcsj2 = schedule1.getZdsjT();
+					}
+					if(sfqr == 1 && time1 > fcsj1){
+						jhyysj += fcsj2 - time1;
+					}else if(sfqr == 1 && time2 < fcsj2){
+						jhyysj += time2 - fcsj1;
 					}else{
-						jhyysj += schedule2.getFcsjT() - schedule1.getFcsjT();
+						jhyysj += fcsj2 - fcsj1;
 					}
-					jhyysj1 += schedule2.getFcsjT() - schedule1.getFcsjT();
-				}
-				long zdsj2 = schedule2.getZdsjT();
-				long fcsj2 = schedule2.getFcsjT();
-				if(fcsj2 > zdsj2)
-					zdsj2 += 1440l;
-				if(sfqr == 1 && time1 > fcsj2){
-					jhyssj += zdsj2 - time1;
-				}else if(sfqr == 1 && time2 < zdsj2){
-					jhyssj += time2 - fcsj2;
-				}else{
-					jhyssj += zdsj2 - fcsj2;
+					if(jhyysj < 0){
+						System.out.println(fcsj2 + " - " + fcsj1);
+					}
+					jhyysj1 += fcsj2 - fcsj1;
 				}
-				jhyssj1 += zdsj2 - fcsj2;
-				jhlc += schedule2.getJhlc()==null?0:schedule2.getJhlc();
-				if(i == 1){
+				if(i == 1 && schedule1.getBcType().toString().equals("normal")){
 					long zdsj1 = schedule1.getZdsjT();
 					long fcsj1 = schedule1.getFcsjT();
 					if(fcsj1 > zdsj1)
@@ -984,12 +982,27 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					jhyssj1 += zdsj1 - fcsj1;
 					jhlc += schedule1.getJhlc()==null?0:schedule1.getJhlc();
 				}
+				if(schedule2.getBcType().toString().equals("normal")){
+					long zdsj2 = schedule2.getZdsjT();
+					long fcsj2 = schedule2.getFcsjT();
+					if(fcsj2 > zdsj2)
+						zdsj2 += 1440l;
+					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();
+				}
 			}
 			for(int i = 0; i < keyList.size(); i++){
 				Map<String, Object> m = new HashMap<String, Object>();
 				ScheduleRealInfo schedule = sortMap.get(keyList.get(i));
-				
+
 				if(cMap.containsKey(schedule.getId())){
 					List<ChildTaskPlan> cTasks = cMap.get(schedule.getId());
 					for(ChildTaskPlan childTaskPlan : cTasks){
@@ -1012,6 +1025,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 								temp.put("fcsj", null);
 							}
 						}
+						temp.put("bcType", schedule.getBcType());
 						mapList.add(temp);
 					}
 				}else{
@@ -1029,6 +1043,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						m.put("zdsj", null);
 						m.put("fcsj", null);
 					}
+					m.put("bcType", schedule.getBcType());
 					mapList.add(m);
 				}
 			}
@@ -1036,6 +1051,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(Map<String, Object> m : mapList){
 				if(m.get("fcsj") != null && m.get("fcsj").toString().trim().length()!=0){
 					keyList2.add(Long.valueOf(m.get("fcsj").toString()));
+					sortMap1.put(Long.valueOf(m.get("fcsj").toString()), m);
 				}
 			}
 			Collections.sort(keyList2);
@@ -1043,36 +1059,31 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(int i = 1; i < keyList2.size(); i++){
 				long fcsj1 = keyList2.get(i - 1);
 				long fcsj2 = keyList2.get(i);
-				if(fcsj2 - fcsj1 < 90){
-					if(sfqr == 1 && time1 > fcsj1){
-						sjyysj += fcsj2 - time1;
-					}else if(sfqr == 1 && time2 < fcsj2){
-						sjyysj += time2 - fcsj1;
-					}else{
-						sjyysj += fcsj2 - fcsj1;
-					}
-					sjyysj1 += fcsj2 - fcsj1;
+				Map<String, Object> m1 = sortMap1.get(fcsj1);
+				Map<String, Object> m2 = sortMap1.get(fcsj2);
+				if(m1.get("bcType").toString().equals("in") || m1.get("bcType").toString().equals("out"))
+					continue;
+				if(m2.get("bcType").toString().equals("in") || m2.get("bcType").toString().equals("out")){
+					fcsj2 = Long.valueOf(m1.get("zdsj").toString());
+				} else if(i == keyList.size() - 1){
+					fcsj2 = Long.valueOf(m2.get("zdsj").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;
 			}
-			for(int i = 1; i < mapList.size(); i++){
-				Map<String, Object> m1 = mapList.get(i - 1);
-				Map<String, Object> m2 = mapList.get(i);
-//				if(m1.get("fcsj") != null && m2.get("fcsj") != null){
-//					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 && m2.get("zdsj") != null){
-					long zdsj = Long.valueOf(m2.get("zdsj").toString());
-					long fcsj = Long.valueOf(m2.get("fcsj").toString());
+			for(int i = 0; i < mapList.size(); i++){
+				Map<String, Object> m = mapList.get(i);
+				if(m.get("fcsj") != null && m.get("zdsj") != null &&
+						!m.get("bcType").toString().equals("in") && !m.get("bcType").toString().equals("out")){
+					long zdsj = Long.valueOf(m.get("zdsj").toString());
+					long fcsj = Long.valueOf(m.get("fcsj").toString());
 					if(fcsj > zdsj)
 						zdsj += 1440l;
 					if(sfqr == 1 && time1 > fcsj){
@@ -1083,22 +1094,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						sjyssj += zdsj - fcsj;
 					}
 					sjyssj1 += zdsj - fcsj;
-					sjlc += Double.valueOf(m2.get("lc").toString());
-				}
-				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;
-					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());
+					sjlc += Double.valueOf(m.get("lc").toString());
 				}
 			}
 			tempMap.put("company", companyName);