update

娄高锋
1 parent 5fef2d7b
Showing 6 changed files with 118 additions and 178 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/statement/busInterval.html
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
src/main/resources/static/pages/forms/statement/scheduleAnaly.html
src/main/resources/static/pages/forms/statement/timeAndSpeed.html
@@ -217,6 +217,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //				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'" +
 						" and bc_type != 'ldks' and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
+				if(line.length() != 0){
+					sql += " and xl_bm = '"+line+"'";
+				}
 				ttList = jdbcTemplate.query(sql,
 						new RowMapper<Long>(){
@@ -638,6 +638,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 //				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'" +
 						" and bc_type != 'ldks' and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
+				if(line.length() != 0){
+					sql += " and xl_bm = '"+line+"'";
+				}
 				ttList = jdbcTemplate.query(sql,
 						new RowMapper<Long>(){
@@ -646,7 +649,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 						return rs.getLong("id");
 					}
 				});
-
 			}
 		} catch (Exception e) {
@@ -1127,38 +1129,39 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 	@Override
 	public List<Map<String, Object>> getModel(Map<String, Object> map) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		SimpleDateFormat sdfEE = new SimpleDateFormat("EEEE");
+//		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+//		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//		SimpleDateFormat sdfEE = new SimpleDateFormat("EEEE");
 		String line = map.get("line").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
+		String isCancel = "";
-		if(startDate.length() == 0){
-			startDate = sdf.format(new Date());
-		}
-		if(endDate.length() == 0){
-			endDate = sdf.format(new Date());
+		if(map.containsKey("isCancel") && map.get("isCancel").toString().trim().length() > 0){
+			isCancel = map.get("isCancel").toString().trim();
 		}
 		try {
-			
-			String sql = "select tt.id, tt.name, qyrq, tt.rule_days, tt.special_days from bsth_c_s_ttinfo tt left join bsth_c_line cl on cl.id = tt.xl where tt.is_cancel = 0 and tt.is_enable_dis_template = 1";
-			if(line.length() != 0){
-				sql += " and cl.line_code = '"+line+"'";
+			String sql = "select tt.id, tt.name from bsth_c_s_ttinfo tt left join" +
+					" (select tt_info from bsth_c_s_sp_info where 1=1";
+			if(startDate.trim().length() > 0)
+				sql += " and schedule_date >= '"+startDate+"'";
+			if(endDate.trim().length() > 0)
+				sql += " and schedule_date <= '"+endDate+"'";
+			if(line.trim().length() != 0){
+				sql += " and xl_bm = '"+line+"'";
+			} else {
+				return resList;
 			}
-			sql += " order by tt.create_date desc";
+			sql += " ) sp on sp.tt_info = tt.id where sp.tt_info is not null group by tt.id, tt.name";
-			list = jdbcTemplate.query(sql,
+			resList = jdbcTemplate.query(sql,
 					new RowMapper<Map<String, Object>>(){
 				@Override
 				public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
 					Map<String, Object> map = new HashMap<String, Object>();
 					map.put("id", rs.getString("id"));
 					map.put("name", rs.getString("name"));
-					map.put("qyrq", rs.getString("qyrq"));
-					map.put("ruleDays", rs.getString("rule_days"));
-					map.put("specialDays", rs.getString("special_days"));
 					return map;
 				}
 			});
@@ -1168,73 +1171,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			e.printStackTrace();
 		}
-		Date date1 = null;
-		Date date2 = null;
-		try {
-			date1 = sdf.parse(startDate);
-			date2 = sdf.parse(endDate);
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		Set<Integer> ruleDays1 = new HashSet<Integer>();
-		List<String> specialDays1 = new ArrayList<String>();
-		for(long i = 0; ; i++){
-			Date tempDate = new Date(date1.getTime() + i*1000*60*60*24);
-			if(tempDate.getTime() > date2.getTime())
-				break;
-			String week = sdfEE.format(tempDate);
-			if(week.equals("星期一"))
-				ruleDays1.add(0);
-			else if(week.equals("星期二"))
-				ruleDays1.add(1);
-			else if(week.equals("星期三"))
-				ruleDays1.add(2);
-			else if(week.equals("星期四"))
-				ruleDays1.add(3);
-			else if(week.equals("星期五"))
-				ruleDays1.add(4);
-			else if(week.equals("星期六"))
-				ruleDays1.add(5);
-			else if(week.equals("星期日"))
-				ruleDays1.add(6);
-			specialDays1.add(sdf.format(tempDate));
-		}
-		for(Map<String, Object> m : list){
-			String[] ruleDays = m.get("ruleDays").toString().split(",");
-			String[] specialDays = m.get("specialDays").toString().split(",");
-			boolean flag = false;
-			DO:{
-				try {
-					long qyrq = sdf.parse(m.get("qyrq").toString()).getTime();
-					if(qyrq > date2.getTime())
-						break DO;
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				for(int i = 0; i < ruleDays.length; i++){
-					if(ruleDays[i].equals("1")){
-						if(ruleDays1.contains(i)){
-							flag = true;
-							break DO;
-						}
-					}
-				}
-				for(int i = 0; i < specialDays.length; i++){
-					for(int j = 0; j < specialDays1.size(); j++){
-						if(specialDays[i].equals(specialDays1.get(j))){
-							flag = true;
-							break DO;
-						}
-					}
-				}
-			}
-			if(flag)
-				resList.add(m);
-		}
-		
 		return resList;
 	}
@@ -399,38 +399,38 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
-// 			if(statu == 0)
-// 				params['line'] = " ";
-// 			if(statu == 1)
-// 				params['line'] = line;
-// 			params['startDate'] = startDate;
-// 			params['endDate'] = endDate;
-// 			$get('/pcpc/getModel', params, function(result){
-// 				treeData = createTreeData(result);
-// 				var options = '<option value="">请选择...</option>';
-// 				$.each(treeData, function(i, g){
-// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
-// 				});
-// 				$('#model').html(options)/* .select2() */;
-// 				flag = 0;
-// 			});
 			if(statu == 0)
+				params['line'] = " ";
+			if(statu == 1)
+				params['line'] = line;
+			params['startDate'] = $("#startDate").val();
+			params['endDate'] = $("#endDate").val();
+			$get('/pcpc/getModel', params, function(result){
+				treeData = createTreeData(result);
 				var options = '<option value="">请选择...</option>';
+				$.each(treeData, function(i, g){
+					options += '<option value="'+g.id+'">'+g.name+'</option>';
+				});
 				$('#model').html(options)/* .select2() */;
 				flag = 0;
-			if(statu == 1){
-				params['xl.lineCode_eq'] = line;
-				$get('/tic_ec', params, function(result){
-					treeData = createTreeData(result.data.content);
-					var options = '<option value="">请选择...</option>';
-					$.each(treeData, function(i, g){
-						if(!g.isCancel)
-							options += '<option value="'+g.id+'">'+g.name+'</option>';
-					});
-					$('#model').html(options)/* .select2() */;
-					flag = 0;
-				});
-			}
+			});
+// 			if(statu == 0)
+// 				var options = '<option value="">请选择...</option>';
+// 				$('#model').html(options)/* .select2() */;
+// 				flag = 0;
+// 			if(statu == 1){
+// 				params['xl.lineCode_eq'] = line;
+// 				$get('/tic_ec', params, function(result){
+// 					treeData = createTreeData(result.data.content);
+// 					var options = '<option value="">请选择...</option>';
+// 					$.each(treeData, function(i, g){
+// 						if(!g.isCancel)
+// 							options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 					});
+// 					$('#model').html(options)/* .select2() */;
+// 					flag = 0;
+// 				});
+// 			}
 		}
 		/**
@@ -473,29 +473,29 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
-// 			params['line'] = line;
-// 			params['startDate'] = startDate;
-// 			params['endDate'] = endDate;
-// 			$get('/pcpc/getModel', params, function(result){
-// 				treeData = createTreeData(result);
-// 				var options = '<option value="">请选择...</option>';
-// 				$.each(treeData, function(i, g){
-// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
-// 				});
-// 				$('#model').html(options)/* .select2() */;
-// 				flag = 0;
-// 			});
-			params['xl.lineCode_eq'] = line;
-			$get('/tic_ec', params, function(result){
-				treeData = createTreeData(result.data.content);
+			params['line'] = line;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
+			$get('/pcpc/getModel', params, function(result){
+				treeData = createTreeData(result);
 				var options = '<option value="">请选择...</option>';
 				$.each(treeData, function(i, g){
-					if(!g.isCancel)
-						options += '<option value="'+g.id+'">'+g.name+'</option>';
+					options += '<option value="'+g.id+'">'+g.name+'</option>';
 				});
 				$('#model').html(options)/* .select2() */;
 				flag = 0;
 			});
+// 			params['xl.lineCode_eq'] = line;
+// 			$get('/tic_ec', params, function(result){
+// 				treeData = createTreeData(result.data.content);
+// 				var options = '<option value="">请选择...</option>';
+// 				$.each(treeData, function(i, g){
+// 					if(!g.isCancel)
+// 						options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 				});
+// 				$('#model').html(options)/* .select2() */;
+// 				flag = 0;
+// 			});
 		}
 		/**
@@ -315,31 +315,32 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
-// 			params['line'] = line;
-// 			params['startDate'] = startDate;
-// 			params['endDate'] = endDate;
-// 			$get('/pcpc/getModel', params, function(result){
-// 				treeData = createTreeData(result);
-// 				var options = '<option value="">请选择...</option>';
-// 				var size = 0;
-// 				$.each(treeData, function(i, g){
-// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
-// 					size++;
-// 				});
-// 				$('#model').html(options)/* .select2() */;
-// 				flag = 0;
-// 			});
-			params['xl.lineCode_eq'] = line;
-			$get('/tic_ec', params, function(result){
-				treeData = createTreeData(result.data.content);
+			params['line'] = line;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
+			$('#model').html('<option value="">载入中...</option>');
+			$get('/pcpc/getModel', params, function(result){
+				treeData = createTreeData(result);
 				var options = '<option value="">请选择...</option>';
+				var size = 0;
 				$.each(treeData, function(i, g){
-					if(!g.isCancel)
-						options += '<option value="'+g.id+'">'+g.name+'</option>';
+					options += '<option value="'+g.id+'">'+g.name+'</option>';
+					size++;
 				});
 				$('#model').html(options)/* .select2() */;
 				flag = 0;
 			});
+// 			params['xl.lineCode_eq'] = line;
+// 			$get('/tic_ec', params, function(result){
+// 				treeData = createTreeData(result.data.content);
+// 				var options = '<option value="">请选择...</option>';
+// 				$.each(treeData, function(i, g){
+// 					if(!g.isCancel)
+// 						options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 				});
+// 				$('#model').html(options)/* .select2() */;
+// 				flag = 0;
+// 			});
 		}
 		/**
@@ -455,38 +455,38 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
-// 			if(statu == 0)
-// 				params['line'] = " ";
-// 			if(statu == 1)
-// 				params['line'] = line;
-// 			params['startDate'] = startDate;
-// 			params['endDate'] = endDate;
-// 			$get('/pcpc/getModel', params, function(result){
-// 				treeData = createTreeData(result);
-// 				var options = '<option value="">请选择...</option>';
-// 				$.each(treeData, function(i, g){
-// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
-// 				});
-// 				$('#model').html(options);
-// 				flag = 0;
-// 			});
 			if(statu == 0)
+				params['line'] = " ";
+			if(statu == 1)
+				params['line'] = line;
+			params['startDate'] = $("#startDate").val();
+			params['endDate'] = $("#endDate").val();
+			$get('/pcpc/getModel', params, function(result){
+				treeData = createTreeData(result);
 				var options = '<option value="">请选择...</option>';
-				$('#model').html(options)/* .select2() */;
-				flag = 0;
-			if(statu == 1){
-				params['xl.lineCode_eq'] = line;
-				$get('/tic_ec', params, function(result){
-					treeData = createTreeData(result.data.content);
-					var options = '<option value="">请选择...</option>';
-					$.each(treeData, function(i, g){
-						if(!g.isCancel)
-							options += '<option value="'+g.id+'">'+g.name+'</option>';
-					});
-					$('#model').html(options)/* .select2() */;
-					flag = 0;
+				$.each(treeData, function(i, g){
+					options += '<option value="'+g.id+'">'+g.name+'</option>';
 				});
-			}
+				$('#model').html(options);
+				flag = 0;
+			});
+// 			if(statu == 0)
+// 				var options = '<option value="">请选择...</option>';
+// 				$('#model').html(options)/* .select2() */;
+// 				flag = 0;
+// 			if(statu == 1){
+// 				params['xl.lineCode_eq'] = line;
+// 				$get('/tic_ec', params, function(result){
+// 					treeData = createTreeData(result.data.content);
+// 					var options = '<option value="">请选择...</option>';
+// 					$.each(treeData, function(i, g){
+// 						if(!g.isCancel)
+// 							options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 					});
+// 					$('#model').html(options)/* .select2() */;
+// 					flag = 0;
+// 				});
+// 			}
 		}
 		function updateLp(ttId){