Commit 0d33b44d4a142c9849c177fbb546aafeda72a38f
1 parent
8ac2b4cd
update...
Showing
3 changed files
with
4 additions
and
4 deletions
src/main/java/com/bsth/data/gpsdata/status_manager/gps_line_state/LineStateHandle.java
| @@ -31,7 +31,7 @@ public class LineStateHandle { | @@ -31,7 +31,7 @@ public class LineStateHandle { | ||
| 31 | /** 重发次数 */ | 31 | /** 重发次数 */ |
| 32 | private final static int MAX_SEND_COUNT=3; | 32 | private final static int MAX_SEND_COUNT=3; |
| 33 | /** 重发间隔 */ | 33 | /** 重发间隔 */ |
| 34 | - private final static int SEND_SPACE=1000 * 60 * 4; | 34 | + private final static int SEND_SPACE=1000 * 60 * 6; |
| 35 | /** 最大有效时间 */ | 35 | /** 最大有效时间 */ |
| 36 | private final static int MAX_AVAIL_TIME=1000 * 60 * 60 * 2; | 36 | private final static int MAX_AVAIL_TIME=1000 * 60 * 60 * 2; |
| 37 | 37 |
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
| @@ -256,7 +256,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implemen | @@ -256,7 +256,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implemen | ||
| 256 | int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64)); | 256 | int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64)); |
| 257 | // 入库 | 257 | // 入库 |
| 258 | d64.setHttpCode(code); | 258 | d64.setHttpCode(code); |
| 259 | - d64.getData().setTxtContent("切换线路[" + lineCode + "]"); | 259 | + d64.getData().setTxtContent("切换线路[" + BasicData.lineCode2NameMap.get(lineCode) + "]"); |
| 260 | dayOfDirectives.put64(d64); | 260 | dayOfDirectives.put64(d64); |
| 261 | 261 | ||
| 262 | // 通知设备刷新线路文件,忽略结果 | 262 | // 通知设备刷新线路文件,忽略结果 |
src/main/resources/static/real_control_v2/js/main.js
| @@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) { | @@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) { | ||
| 168 | function showUpdateDescription() { | 168 | function showUpdateDescription() { |
| 169 | //更新说明 | 169 | //更新说明 |
| 170 | var updateDescription = { | 170 | var updateDescription = { |
| 171 | - date: '2017-11-02', | ||
| 172 | - text: '<h5>1、修正二次放站时,需要先将班次切回正常班次的问题。</h5><h5>2、驾驶员请求信使上,添加“编辑”链接,可弹出对应班次的发车信息微调框。</h5>' | 171 | + date: '2017-11-08', |
| 172 | + text: '<h5>1、现在点击驾驶员请求信使,也可以定位到班次。</h5><h5>2、修复进场班次不会自动误点待发调整的问题。</h5><h5>3、“指令下发记录” 和 “设备上报记录” 加入线路筛选。</h5><h5>4、尝试修复“自动执行的班车线路”和营运线路套跑时,线路切换指令会延迟触发的问题。</h5>' | ||
| 173 | }; | 173 | }; |
| 174 | 174 | ||
| 175 | var storage = window.localStorage | 175 | var storage = window.localStorage |