Commit c45a329be731cb76fac85d2f6f9102a58a135321
1 parent
d62a4b7c
添加一些日志信息
Showing
3 changed files
with
6 additions
and
2 deletions
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
| @@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | @@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | ||
| 84 | Calendar calendar = Calendar.getInstance(); | 84 | Calendar calendar = Calendar.getInstance(); |
| 85 | int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR); | 85 | int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR); |
| 86 | 86 | ||
| 87 | - String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=39"; //+ dayOfYear; | 87 | + String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info_2018"; //+ dayOfYear; |
| 88 | JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource()); | 88 | JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource()); |
| 89 | 89 | ||
| 90 | List<GpsEntity> list = | 90 | List<GpsEntity> list = |
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
| @@ -108,6 +108,7 @@ public class LateAdjustHandle implements ApplicationContextAware { | @@ -108,6 +108,7 @@ public class LateAdjustHandle implements ApplicationContextAware { | ||
| 108 | try { | 108 | try { |
| 109 | if (gps.getInstation() <= 0 || null == sch) | 109 | if (gps.getInstation() <= 0 || null == sch) |
| 110 | return; | 110 | return; |
| 111 | + logger.info("carArrive id: " + sch.getId()); | ||
| 111 | 112 | ||
| 112 | if (!lateSchMap.containsKey(sch.getId())) { | 113 | if (!lateSchMap.containsKey(sch.getId())) { |
| 113 | //班次是否误点(可能处于误点线程扫描的空隙,所以再判定一次) | 114 | //班次是否误点(可能处于误点线程扫描的空隙,所以再判定一次) |
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/buffer_config.html
| @@ -128,6 +128,8 @@ | @@ -128,6 +128,8 @@ | ||
| 128 | if (conf[field] != val) { | 128 | if (conf[field] != val) { |
| 129 | var data = $('form[name=yjtkForm]', wrap).serializeJSON(); | 129 | var data = $('form[name=yjtkForm]', wrap).serializeJSON(); |
| 130 | data.lineCode = conf.line.lineCode; | 130 | data.lineCode = conf.line.lineCode; |
| 131 | + // 0禁用 1启用 2修改参数 | ||
| 132 | + data.operCode = 2; | ||
| 131 | gb_common.$post('/lineConfig/yjtkSet', data, function (rs) { | 133 | gb_common.$post('/lineConfig/yjtkSet', data, function (rs) { |
| 132 | conf = rs.conf; | 134 | conf = rs.conf; |
| 133 | notify_succ('调整应急停靠参数'); | 135 | notify_succ('调整应急停靠参数'); |
| @@ -147,6 +149,7 @@ | @@ -147,6 +149,7 @@ | ||
| 147 | 149 | ||
| 148 | var data = f.serializeJSON(); | 150 | var data = f.serializeJSON(); |
| 149 | data.lineCode = conf.line.lineCode; | 151 | data.lineCode = conf.line.lineCode; |
| 152 | + data.operCode = 1; | ||
| 150 | gb_common.$post('/lineConfig/yjtkSet', data, function (rs) { | 153 | gb_common.$post('/lineConfig/yjtkSet', data, function (rs) { |
| 151 | conf = rs.conf; | 154 | conf = rs.conf; |
| 152 | notify_succ('启用应急停靠'); | 155 | notify_succ('启用应急停靠'); |
| @@ -162,7 +165,7 @@ | @@ -162,7 +165,7 @@ | ||
| 162 | $('[name=upStopMinute]',f).val(conf.upStopMinute); | 165 | $('[name=upStopMinute]',f).val(conf.upStopMinute); |
| 163 | $('[name=downStopMinute]',f).val(conf.downStopMinute); | 166 | $('[name=downStopMinute]',f).val(conf.downStopMinute); |
| 164 | 167 | ||
| 165 | - var data = {enableYjtk: 0, lineCode: conf.line.lineCode}; | 168 | + var data = {enableYjtk: 0, lineCode: conf.line.lineCode, operCode: 0}; |
| 166 | gb_common.$post('/lineConfig/yjtkSet', data, function (rs) { | 169 | gb_common.$post('/lineConfig/yjtkSet', data, function (rs) { |
| 167 | conf = rs.conf; | 170 | conf = rs.conf; |
| 168 | notify_succ('禁用应急停靠'); | 171 | notify_succ('禁用应急停靠'); |