到离站

廖磊
1 parent ac54383f
Showing 2 changed files with 26 additions and 20 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/report/inoutstation/inoutstation.html
@@ -2058,7 +2058,7 @@ public class ReportServiceImpl implements ReportService{
 			int weeks_year2 = cal.get(Calendar.WEEK_OF_YEAR);
 			Date dates2=cal.getTime();
 			String d2=simpleDateFormat.format(dates2);
-			String sql="select *,UNIX_TIMESTAMP(times) as ts from bsth_c_arrival_info where times >= '"+d1 +"'and "
+			/*String sql="select *,UNIX_TIMESTAMP(times) as ts from bsth_c_arrival_info where times >= '"+d1 +"'and "
 					+ " times <='"+d2+"' and line_id = '"+line+"' and up_down = '"+zd+"'"
 					+ " order by device_id,times";
@@ -2073,7 +2073,30 @@ public class ReportServiceImpl implements ReportService{
 					ai.setTs(arg0.getLong("ts")*1000);
 					return ai;
 				}
-			});
+			});*/
+			
+			Connection conn = null;
+			PreparedStatement ps = null;
+			ResultSet rs = null;
+
+			String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year=? "
+					+ " AND ts >= ? AND ts <=? AND up_down=? order by device_id,ts";
+			try{
+				conn = DBUtils_MS.getConnection();
+				ps = conn.prepareStatement(sql);
+				ps.setString(1, line);
+				ps.setInt(2, weeks_year1);
+				ps.setLong(3, date1);
+				ps.setLong(4, date2);
+				ps.setInt(5, zd);
+				rs = ps.executeQuery();
+
+				list = resultSet2Set(rs);
+			}catch(Exception e){
+				logger.error("", e);
+			}finally {
+				DBUtils_MS.close(rs, ps, conn);
+			}
 		} catch (ParseException e1) {
 			// TODO Auto-generated catch block
@@ -2223,23 +2246,6 @@ public class ReportServiceImpl implements ReportService{
 					, (i+1));
 		}
 		inoutList.add(map1);
-
-			/*for (int j = 0; j < listStation.size(); j++) {
-				 map2=new HashMap<String,Object>();
-				StationRoute s=listStation.get(j);
-				List<ArrivalInfo> arrivalList=new ArrayList<ArrivalInfo>();
-				for (int j2 = 0; j2 < arrInfoList.size(); j2++) {
-					ArrivalInfo a=arrivalList.get(j2);
-					if(s.getStationCode().equals(a.getStopNo())){
-						arrivalList.add(a);
-					}
-				}
-				Map<String, String> m=this.strInOut(arrivalList,lzsj);
-
-				map2.put(s.getStationCode()+"in", m.get("in"));
-				map2.put(s.getStationCode()+"out", m.get("out"));
-				map2.put(s.getStationCode(), m.get("type"));
-			}*/
 		List<String> list_nbbm=new ArrayList<String>();
 		Map<String, Object> m=new HashMap<String,Object>();
 		for (int i = 0; i < arrInfoList.size(); i++) {
@@ -199,7 +199,7 @@
 				layer.msg("请选择方向");
 			}else{
 				$get('/report/queryStrinon',{line:line,zd:zdlx},function(result){
-					$get('/report/queryInOutStrtions',{line:line,date:date,zd:zdlx,lzsj:lzsj},function(result2){
+					$get('/report/queryInOutStrtion',{line:line,date:date,zd:zdlx,lzsj:lzsj},function(result2){
 						console.log(result2);
 					    /* getTime(result); */
 						var ludan_ll_1 = template('ludan_ll_1',{list:result2,lists:result});