Commit 4e1712f7adf42bb15dd5d4d734884417c1689b59
1 parent
90e19e94
update...
Showing
1 changed file
with
6 additions
and
2 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
| @@ -382,6 +382,9 @@ public class GpsServiceImpl implements GpsService { | @@ -382,6 +382,9 @@ public class GpsServiceImpl implements GpsService { | ||
| 382 | eCal.setTime(new Date(et * 1000)); | 382 | eCal.setTime(new Date(et * 1000)); |
| 383 | int eWeekOfYear = eCal.get(Calendar.DAY_OF_YEAR); | 383 | int eWeekOfYear = eCal.get(Calendar.DAY_OF_YEAR); |
| 384 | 384 | ||
| 385 | + //按年分表 | ||
| 386 | + String tableName = "bsth_c_arrival_info_" + fmtyyyy.print(st); | ||
| 387 | + | ||
| 385 | StringBuilder sql = new StringBuilder(""); | 388 | StringBuilder sql = new StringBuilder(""); |
| 386 | long t1,t2; | 389 | long t1,t2; |
| 387 | DeviceChange dc; | 390 | DeviceChange dc; |
| @@ -394,8 +397,8 @@ public class GpsServiceImpl implements GpsService { | @@ -394,8 +397,8 @@ public class GpsServiceImpl implements GpsService { | ||
| 394 | if(dc.getEt() < et) | 397 | if(dc.getEt() < et) |
| 395 | t2 = dc.getEt(); | 398 | t2 = dc.getEt(); |
| 396 | 399 | ||
| 397 | - sql.append("SELECT DEVICE_ID,LINE_ID as LINE_CODE,STOP_NO,TS,UP_DOWN,IN_OUT,WEEKS_YEAR,CREATE_DATE FROM bsth_c_arrival_info " + | ||
| 398 | - " where weeks_year in ("+sWeekOfYear+", "+eWeekOfYear+") and device_id='"+dc.getDevice()+"' and ts > "+t1+" and ts < " + t2); | 400 | + sql.append("SELECT DEVICE_ID,LINE_ID as LINE_CODE,STOP_NO,TS,UP_DOWN,IN_OUT,WEEKS_YEAR,CREATE_DATE FROM " + tableName + |
| 401 | + " where weeks_year in ("+sWeekOfYear+", "+eWeekOfYear+") and device_id='"+dc.getDevice()+"' and ts > "+t1+" and ts < " + t2); | ||
| 399 | 402 | ||
| 400 | if(i == len - 1) | 403 | if(i == len - 1) |
| 401 | sql.append(" ORDER BY device_id,ts,stop_no "); | 404 | sql.append(" ORDER BY device_id,ts,stop_no "); |
| @@ -403,6 +406,7 @@ public class GpsServiceImpl implements GpsService { | @@ -403,6 +406,7 @@ public class GpsServiceImpl implements GpsService { | ||
| 403 | sql.append(" UNION "); | 406 | sql.append(" UNION "); |
| 404 | } | 407 | } |
| 405 | 408 | ||
| 409 | + logger.info("arrivl sql : " + sql.toString()); | ||
| 406 | JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource()); | 410 | JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource()); |
| 407 | List<ArrivalEntity> list = jdbcTemplate_ms.query(sql.toString(), BeanPropertyRowMapper.newInstance(ArrivalEntity.class)); | 411 | List<ArrivalEntity> list = jdbcTemplate_ms.query(sql.toString(), BeanPropertyRowMapper.newInstance(ArrivalEntity.class)); |
| 408 | 412 |