行驶时间车速

娄高锋
1 parent a290c423
Showing 1 changed file with 83 additions and 47 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
@@ -421,10 +421,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						long fcsj1 = fcsjs.get(i - 1);
 						long fcsj2 = fcsjs.get(i);
 						Long time = fcsj1/60;
-						if(!timeMap0.containsKey(time) && !timeMap1.containsKey(time)){
+						if(!timeMap0.containsKey(time)){
 							timeMap0.put(time, new ArrayList<Long>());
-							timeMap1.put(time, new ArrayList<Long>());
-							timeList.add(time);
+							if(!timeList.contains(time))
+								timeList.add(time);
 						}
 						timeMap0.get(time).add(fcsj2 - fcsj1);
 					}
@@ -432,6 +432,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						long fcsj1 = fcsjAs.get(i - 1);
 						long fcsj2 = fcsjAs.get(i);
 						Long time = fcsj1/60;
+						if(!timeMap1.containsKey(time)){
+							timeMap1.put(time, new ArrayList<Long>());
+							if(!timeList.contains(time))
+								timeList.add(time);
+						}
 						if(timeMap1.containsKey(time)){
 							timeMap1.get(time).add(fcsj2 - fcsj1);
 						}
@@ -440,9 +445,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					for(int i = 1; i < fcsjs.size(); i++){
 						long fcsj1 = fcsjs.get(i - 1);
 						long fcsj2 = fcsjs.get(i);
-						if(!temp0.containsKey(key) && !temp1.containsKey(key)){
+						if(!temp0.containsKey(key)){
 							temp0.put(key, new ArrayList<Long>());
-							temp1.put(key, new ArrayList<Long>());
 							if(!keyList.contains(key))
 								keyList.add(key);
 						}
@@ -451,6 +455,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					for(int i = 1; i < fcsjAs.size(); i++){
 						long fcsj1 = fcsjAs.get(i - 1);
 						long fcsj2 = fcsjAs.get(i);
+						if(!temp1.containsKey(key)){
+							temp1.put(key, new ArrayList<Long>());
+							if(!keyList.contains(key))
+								keyList.add(key);
+						}
+						System.out.println("key:"+key+" fcsj2:"+fcsj2+" fcsj1:"+fcsj2+" temp1:"+temp1.get(key)+" tem0:"+temp0.get(key));
 						temp1.get(key).add(fcsj2 - fcsj1);
 					}
 				}
@@ -461,14 +471,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					Map<String, Object> tempMap = new HashMap<String, Object>();
 					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);
-					}
+					if(timeMap0.containsKey(time))
+						for(Long l : timeMap0.get(time)){
+							if(l < 90)
+								fcsjs.add(l);
+						}
+					if(timeMap1.containsKey(time))
+						for(Long l : timeMap1.get(time)){
+							if(l < 90)
+								fcsjAs.add(l);
+						}
 					Collections.sort(fcsjs);
 					Collections.sort(fcsjAs);
 					String[] split = key.split("/");
@@ -495,7 +507,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						tempMap.put("deviation", df.format(Double.valueOf(tempMap.get("sjInterval").toString())
 								- Double.valueOf(tempMap.get("jhInterval").toString())));
 					}
-					tempList.add(tempMap);
+					if(fcsjs.size() != 0 || fcsjAs.size() != 0)
+						tempList.add(tempMap);
 				}
 			}
 		}
@@ -504,11 +517,24 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			List<Long> sortList = new ArrayList<Long>();
 			Map<Long, List<Map<String, Object>>> sortMap = new HashMap<Long, List<Map<String, Object>>>();
 			for(Map<String, Object> m : tempList){
-				Long sort = Long.valueOf(m.get("times").toString().substring(0, 2));
+				String times = m.get("times").toString();
+				Long sort = Long.valueOf(times.substring(0, 2));
 				if(!sortMap.containsKey(sort)){
 					sortMap.put(sort, new ArrayList<Map<String, Object>>());
 					sortList.add(sort);
 				}
+				String[] split = times.split("-");
+				String[] split0 = split[0].split(":");
+				String[] split1 = split[1].split(":");
+				int t0 = Integer.valueOf(split0[0]);
+				int t1 = Integer.valueOf(split1[0]);
+				if(t0 >= 24){
+					t0 = t0 - 24;
+				}
+				if(t1 >= 24){
+					t1 = t1 - 24;
+				}
+				m.put("times", (t0>9?t0:("0"+t0))+":"+split0[1]+"-"+(t1>9?t1:("0"+t1))+":"+split1[1]);
 				sortMap.get(sort).add(m);
 			}
 			Collections.sort(sortList);
@@ -531,14 +557,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						Map<String, Object> tempMap = new HashMap<String, Object>();
 						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);
-						}
+						if(temp0.containsKey(key))
+							for(Long l : temp0.get(key)){
+								if(l < 90)
+									fcsjs.add(l);
+							}
+						if(temp0.containsKey(key))
+							for(Long l : temp1.get(key)){
+								if(l < 90)
+									fcsjAs.add(l);
+							}
 						Collections.sort(fcsjs);
 						Collections.sort(fcsjAs);
 						long fcsj = 0l;
@@ -563,7 +591,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 							tempMap.put("deviation", df.format(Double.valueOf(tempMap.get("sjInterval").toString())
 									- Double.valueOf(tempMap.get("jhInterval").toString())));
 						}
-						resList.add(tempMap);
+						if(fcsjs.size() != 0 || fcsjAs.size() != 0)
+							resList.add(tempMap);
 					}
 				}
 			}
@@ -601,6 +630,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		Map<String, List<ChildTaskPlan>> cMap = new HashMap<String, List<ChildTaskPlan>>();
 		Map<String, Object> modelMap = new HashMap<String, Object>();
 		Set<Long> tsSet = new HashSet<Long>();
+		Set<Long> ttSet = new HashSet<Long>();
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
@@ -639,7 +669,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			}
 			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"'"
+			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc,"
+					+ " 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+"";
 			list = jdbcTemplate.query(sql,
@@ -652,11 +684,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
-					schedule.setBcType(rs.getString("bc_type"));
 					schedule.setBcs(rs.getInt("bcs"));
 					schedule.setBcsj(rs.getInt("bcsj"));
 					schedule.setJhlc(rs.getDouble("jhlc"));
-					schedule.setDfsj(rs.getString("dfsj"));
 					schedule.setFcsj(rs.getString("fcsj"));
 					schedule.setFcsjActual(rs.getString("fcsj_actual"));
 					schedule.setZdsj(rs.getString("zdsj"));
@@ -668,12 +698,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setRemarks(rs.getString("remarks"));
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
-					schedule.setDfAuto(rs.getBoolean("df_auto"));
-					schedule.setOnline(rs.getBoolean("online"));
-					schedule.setClZbh(rs.getString("cl_zbh"));
-					schedule.setjGh(rs.getString("j_gh"));
-					schedule.setjName(rs.getString("j_name"));
-					schedule.setStatus(rs.getInt("status"));
 					schedule.setSpId(rs.getLong("sp_id"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
@@ -726,7 +750,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			{
 				List<Map<String, String>> temp1 = new ArrayList<Map<String, String>>();
 				List<Map<String, String>> temp2 = new ArrayList<Map<String, String>>();
-				sql = "select * from bsth_c_s_sp_info where bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+				sql = "select id, lp, fcsj, xl_bm, tt_info from bsth_c_s_sp_info where bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 				if(startDate.equals(endDate)){
 					sql += " and schedule_date = '"+startDate+"'";
@@ -782,7 +806,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
-			sql = "select * from bsth_c_s_child_task order by start_date";
+			sql = "select destroy, start_date, end_date, mileage, mileage_type, schedule from bsth_c_s_child_task order by start_date";
 			cList = jdbcTemplate.query(sql,
 					new RowMapper<ChildTaskPlan>(){
@@ -798,10 +822,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					return cTask;
 				}
 			});
-			
+
 			if(model.length() != 0){
-				sql = "select sp.id from bsth_c_s_sp_info 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 "
-						+ "where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+				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"
+						+ " 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,
 						new RowMapper<Map<String, Object>>(){
@@ -809,10 +835,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
 						Map<String, Object> m = new HashMap<String, Object>();
 						m.put("id", rs.getString("id"));
-						m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"0");
+//						m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"0");
 						return m;
 					}
 				});
+				
+				for(Map<String, Object> m : ttList){
+					ttSet.add(Long.valueOf(m.get("id").toString()));
+				}
 			}
 		} catch (Exception e) {
@@ -852,15 +882,21 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(schedule.getXlName()==null || schedule.getXlName().trim().length()==0)
 				continue;
 			if(model.length() != 0){
-				for(Map<String, Object> tt : ttList){
-					long id = Long.valueOf(tt.get("id").toString());
-					if(id == (long)schedule.getSpId()){
-						String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
-						if(!keyMap.containsKey(key))
-							keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-						keyMap.get(key).add(schedule);
-					}
+				if(ttSet.contains(schedule.getSpId())){
+					String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
+					if(!keyMap.containsKey(key))
+						keyMap.put(key, new ArrayList<ScheduleRealInfo>());
+					keyMap.get(key).add(schedule);
 				}
+//				for(Map<String, Object> tt : ttList){
+//					long id = Long.valueOf(tt.get("id").toString());
+//					if(id == (long)schedule.getSpId()){
+//						String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
+//						if(!keyMap.containsKey(key))
+//							keyMap.put(key, new ArrayList<ScheduleRealInfo>());
+//						keyMap.get(key).add(schedule);
+//					}
+//				}
 			}else{
 				String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
 				if(!keyMap.containsKey(key))