异常报表更新

sgz
1 parent 62370d45
Showing 3 changed files with 23 additions and 30 deletions
src/main/java/com/bsth/service/excep/impl/OfflineServiceImpl.java
src/main/java/com/bsth/service/excep/impl/OutboundServiceImpl.java
src/main/java/com/bsth/service/excep/impl/SpeedingServiceImpl.java
@@ -56,7 +56,7 @@ public class OfflineServiceImpl implements OfflineService {
 		Object date=map.get("date");
 		if(line!=null){
-			sql +=" and line like'%"+line.toString()+"%'";
+			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
 		if(nbbm!=null){
@@ -131,6 +131,7 @@ public class OfflineServiceImpl implements OfflineService {
 	@SuppressWarnings("unchecked")
 	public PageObject <Offline> Pagequery(Map<String, Object> map) {
 		// TODO Auto-generated method stub
+
 		String sql="select count(*) record  from bsth_c_offline where 1=1 ";
 		Object line=map.get("line");
@@ -140,7 +141,7 @@ public class OfflineServiceImpl implements OfflineService {
 		Object date=map.get("date");
 		if(line!=null){
-			sql +=" and line like'%"+line.toString()+"%'";
+			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
 		if(nbbm!=null){
@@ -194,10 +195,9 @@ public class OfflineServiceImpl implements OfflineService {
 			Date datess = new Date(d1);
 			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
 			String sk=new SimpleDateFormat("HH:mm").format(datess);
-			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
-					+ "   real_exec_date='"+dates+"' ";
-//							+ "and fcsj_actual > '"+sk+"' ";
-//							+ "and '"+sk+"' <dfsj";
+			String sqlPbb="SELECT * FROM ( select lp_name,cl_zbh,j_gh,j_name,MIN(fcsj) as fcsj,MAX(zdsj) as ddsj"
+					+ "  from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' GROUP BY cl_zbh,lp_name,j_gh,j_name ) t WHERE t.fcsj<='"+sk+"' AND t.ddsj>='"+sk+"' " ;
 			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
 			        new RowMapper<ScheduleRealInfo>(){  
 			            @Override  
@@ -208,20 +208,15 @@ public class OfflineServiceImpl implements OfflineService {
 			            	s.setLpName(rs.getString("lp_name"));
 			                return s;  
 			            }  
-					});  
-			if(pbb.size()>0){
-				list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
-				list.get(i).setLpname(pbb.get(0).getLpName());
-				
-			}
-			
+					});
+		if(pbb.size()>0){
+					list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
+					list.get(i).setLpname(pbb.get(0).getLpName());
+				}
 		}
+         
 		PageObject<Offline> pageObject = pageHelper.getPageObject();
-//		for (int i = 0; i < list.size(); i++) {
-//			if(list.get(i).getLpname()!=null){
 				pageObject.setDataList(list);
-//			}
-//		}
 		return pageObject;
 	}
@@ -43,7 +43,7 @@ public class OutboundServiceImpl implements OutboundService{
 		Object updown=map.get("updown");
 		Object date=map.get("date");
 		if(line!=null){
-				 sql +=" and line like'%"+line.toString()+"%'";
+				 sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
 		if(nbbm!=null){
@@ -105,7 +105,7 @@ public class OutboundServiceImpl implements OutboundService{
 			outbound.setTimestampDate(sdf.format(new Date(outbound.getTimestamp())));
 			outbound.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
 			outbound.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
-			outbound.setLocation(rs.getObject("location")==null?"":rs.getObject("location").toString());
+//			outbound.setLocation(rs.getObject("location")==null?"":rs.getObject("location").toString());
 			list.add(outbound);
 		}
 		return list;
@@ -120,7 +120,7 @@ public class OutboundServiceImpl implements OutboundService{
 		Object updown=map.get("updown");
 		Object date=map.get("date");
 		if(line!=null){
-				 sql +=" and line like '%"+line.toString()+"%'";
+				 sql +=" and line like '%"+line.toString().trim()+"%'";
 		}
@@ -174,10 +174,9 @@ public class OutboundServiceImpl implements OutboundService{
 			Date datess = new Date(d1);
 			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
 			String sk=new SimpleDateFormat("HH:mm").format(datess);
-			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
-					+ "   real_exec_date='"+dates+"' ";
-//							+ "and fcsj_actual > '"+sk+"' ";
-//							+ "and '"+sk+"' <dfsj";
+			String sqlPbb="SELECT * FROM ( select lp_name,cl_zbh,j_gh,j_name,MIN(fcsj) as fcsj,MAX(zdsj) as ddsj"
+					+ "  from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' GROUP BY cl_zbh,lp_name,j_gh,j_name ) t WHERE t.fcsj<='"+sk+"' AND t.ddsj>='"+sk+"' " ;
 			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
 			        new RowMapper<ScheduleRealInfo>(){  
 			            @Override  
@@ -46,7 +46,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 		Object date=map.get("date");
 		if(line!=null){
-			sql +=" and line like'%"+line.toString()+"%'";
+			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
 		if(nbbm!=null){
@@ -125,7 +125,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 		Object date=map.get("date");
 		if(line!=null){
-			sql +=" and line like'%"+line.toString()+"%'";
+			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
 		if(nbbm!=null){
@@ -177,10 +177,9 @@ public class SpeedingServiceImpl implements SpeedingService {
 			Date datess = new Date(d1);
 			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
 			String sk=new SimpleDateFormat("HH:mm").format(datess);
-			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
-					+ "   real_exec_date='"+dates+"' ";
-//							+ "and fcsj_actual > '"+sk+"' ";
-//							+ "and '"+sk+"' <dfsj";
+			String sqlPbb="SELECT * FROM ( select lp_name,cl_zbh,j_gh,j_name,MIN(fcsj) as fcsj,MAX(zdsj) as ddsj"
+					+ "  from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' GROUP BY cl_zbh,lp_name,j_gh,j_name ) t WHERE t.fcsj<='"+sk+"' AND t.ddsj>='"+sk+"' " ;
 			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
 			        new RowMapper<ScheduleRealInfo>(){  
 			            @Override