Commit 263fb4ef487e94d19261ee124c70281ef24d4697
1 parent
b8feebe3
一件报警修改url，功能对应标书文档
Showing
10 changed files
with
76 additions
and
29 deletions
src/main/java/com/bsth/data/pilot80/PilotReport.java
| ... | ... | @@ -13,6 +13,7 @@ import com.bsth.entity.realcontrol.LineConfig; |
| 13 | 13 | import com.bsth.entity.realcontrol.ScheduleRealInfo; |
| 14 | 14 | import com.bsth.repository.directive.D80Repository; |
| 15 | 15 | import com.bsth.repository.directive.DC0A4Repository; |
| 16 | +import com.bsth.service.SystemParamService; | |
| 16 | 17 | import com.bsth.service.directive.DirectiveService; |
| 17 | 18 | import com.bsth.util.HttpClientUtils; |
| 18 | 19 | import com.bsth.websocket.handler.SendUtils; |
| ... | ... | @@ -53,6 +54,8 @@ public class PilotReport { |
| 53 | 54 | @Autowired |
| 54 | 55 | GpsStatusManager gpsStatusManager; |
| 55 | 56 | |
| 57 | + @Autowired | |
| 58 | + private SystemParamService systemParamService; | |
| 56 | 59 | private static ConcurrentHashMap<Integer, D80> d80Maps; |
| 57 | 60 | |
| 58 | 61 | /** |
| ... | ... | @@ -101,7 +104,7 @@ public class PilotReport { |
| 101 | 104 | //报警请求 |
| 102 | 105 | case 0x10: |
| 103 | 106 | try { |
| 104 | - String url = "http://58.34.52.130:9103/dataDockingApi/accident/saveAccident?"; | |
| 107 | + String url = systemParamService.getValue("url.yjbj")+"dataDockingApi/accident/saveAccident?"; | |
| 105 | 108 | url = url + "accidentTime=" + new Date().getTime() + "&nbbm=" + nbbm; |
| 106 | 109 | logger.info("url===="+url); |
| 107 | 110 | String res = HttpClientUtils.get(url).toString(); | ... | ... |
src/main/resources/static/pages/base/timesmodel/add.html
| ... | ... | @@ -38,7 +38,7 @@ |
| 38 | 38 | |
| 39 | 39 | <div class="actions"> |
| 40 | 40 | <div class="btn-group btn-group-devided" data-toggle="buttons"> |
| 41 | - <a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 打开现有时刻表明细</a> | |
| 41 | + <a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 排班诊断</a> | |
| 42 | 42 | </div> |
| 43 | 43 | <div class="btn-group btn-group-devided" data-toggle="buttons"> |
| 44 | 44 | <a class="btn btn-circle default" href="/pages/base/timesmodel/index.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> 退出</a> | ... | ... |
src/main/resources/static/pages/base/timesmodel/gantt.html
| ... | ... | @@ -50,7 +50,7 @@ |
| 50 | 50 | <!-- actions 组件START --> |
| 51 | 51 | <div class="actions"> |
| 52 | 52 | <div class="btn-group btn-group-devided countbtn" data-toggle="buttons"> |
| 53 | - <a class="btn btn-circle blue countAdd" href="javascript:;" data-pjax><i class="fa fa-database"></i> 统计数据</a> | |
| 53 | + <a class="btn btn-circle blue countAdd" href="javascript:;" data-pjax><i class="fa fa-database"></i> 排班统计</a> | |
| 54 | 54 | </div> |
| 55 | 55 | <div class="btn-group btn-group-devided parambtn" data-toggle="buttons"> |
| 56 | 56 | <a class="btn btn-circle blue paramAdd" href="javascript:;" data-pjax><i class="fa fa-list-ol" aria-hidden="true"></i> 重新生成</a> | ... | ... |
src/main/resources/static/pages/base/timesmodel/js/systemTools.js
| ... | ... | @@ -42,7 +42,7 @@ $('.addBc').on('click',function() { |
| 42 | 42 | var lpData = echartsDrawGTT.getLpData(); |
| 43 | 43 | var lpDataCount = echartsDrawGTT.getLpDataCount(); |
| 44 | 44 | // 弹出层mobal页面 |
| 45 | - $.get('/pages/base/timesmodel/fragments/addBc.html', function(m){ | |
| 45 | + $.get('/pages/base/timesmodel/fragments/addbc.html', function(m){ | |
| 46 | 46 | $(pjaxContainer).append(m); |
| 47 | 47 | // 规定被选元素要触发的事件。可以使自定义事件（使用 bind() 函数来附加），或者任何标准事件。 |
| 48 | 48 | $('#addBc_mobal').trigger('addBcMobal.show',[lpData,lpDataCount,echartsDrawGTT]); | ... | ... |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/list.html
| ... | ... | @@ -192,7 +192,7 @@ |
| 192 | 192 | <a ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name, rflag : true, lineversion : info.lineVersion})" |
| 193 | 193 | class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a> |
| 194 | 194 | <a ng-click="ctrl.toTtInfoDetailAuto(info.id)" |
| 195 | - class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a> | |
| 195 | + class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 排班优化 </a> | |
| 196 | 196 | <a ui-sref="ttInfoDetailManage_form({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})" |
| 197 | 197 | class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 导入 </a> |
| 198 | 198 | <a href="javascript:" class="btn btn-info btn-sm" ng-click="ctrl.exportData(info.id)"> 导出 </a> | ... | ... |
src/main/resources/static/pages/zndd_yuan/DKL.html
| ... | ... | @@ -182,8 +182,8 @@ |
| 182 | 182 | id: 'card4', |
| 183 | 183 | x: 100, |
| 184 | 184 | y: 400, |
| 185 | - label: '待发调整', | |
| 186 | - type: "待发调整", | |
| 185 | + label: '待发调整工具', | |
| 186 | + type: "待发调整工具", | |
| 187 | 187 | nodes: [{ |
| 188 | 188 | type: "in", |
| 189 | 189 | level: 0, |
| ... | ... | @@ -199,13 +199,35 @@ |
| 199 | 199 | } |
| 200 | 200 | ], |
| 201 | 201 | titleBarColor: ['#3950e8', '#25f6d0'] |
| 202 | - }, | |
| 202 | + }, | |
| 203 | 203 | { |
| 204 | 204 | id: 'card5', |
| 205 | 205 | x: 100, |
| 206 | 206 | y: 400, |
| 207 | - label: '班次取消（烂班）', | |
| 208 | - type: "班次取消（烂班）", | |
| 207 | + label: '班次取消（烂班）工具', | |
| 208 | + type: "班次取消（烂班）工具", | |
| 209 | + nodes: [{ | |
| 210 | + type: "in", | |
| 211 | + level: 0, | |
| 212 | + enumType: 'call', | |
| 213 | + color: '#fff', | |
| 214 | + | |
| 215 | + }, | |
| 216 | + { | |
| 217 | + type: "out", | |
| 218 | + level: 0, | |
| 219 | + enumType: 'call', | |
| 220 | + color: '#3C8CE7', | |
| 221 | + } | |
| 222 | + ], | |
| 223 | + titleBarColor: ['#3950e8', '#25f6d0'] | |
| 224 | + }, | |
| 225 | + { | |
| 226 | + id: 'card51', | |
| 227 | + x: 100, | |
| 228 | + y: 400, | |
| 229 | + label: '撤销班次取消（烂班）工具', | |
| 230 | + type: "撤销班次取消（烂班）工具", | |
| 209 | 231 | nodes: [{ |
| 210 | 232 | type: "in", |
| 211 | 233 | level: 0, |
| ... | ... | @@ -226,8 +248,30 @@ |
| 226 | 248 | id: 'card6', |
| 227 | 249 | x: 100, |
| 228 | 250 | y: 400, |
| 229 | - label: '实发调整', | |
| 230 | - type: "实发调整", | |
| 251 | + label: '实发调整工具', | |
| 252 | + type: "实发调整工具", | |
| 253 | + nodes: [{ | |
| 254 | + type: "in", | |
| 255 | + level: 0, | |
| 256 | + enumType: 'call', | |
| 257 | + color: '#fff', | |
| 258 | + | |
| 259 | + }, | |
| 260 | + { | |
| 261 | + type: "out", | |
| 262 | + level: 0, | |
| 263 | + enumType: 'call', | |
| 264 | + color: '#3C8CE7', | |
| 265 | + } | |
| 266 | + ], | |
| 267 | + titleBarColor: ['#3950e8', '#25f6d0'] | |
| 268 | + }, | |
| 269 | + { | |
| 270 | + id: 'card7', | |
| 271 | + x: 100, | |
| 272 | + y: 400, | |
| 273 | + label: '实发撤销工具', | |
| 274 | + type: "实发撤销工具", | |
| 231 | 275 | nodes: [{ |
| 232 | 276 | type: "in", |
| 233 | 277 | level: 0, |
| ... | ... | @@ -248,8 +292,8 @@ |
| 248 | 292 | id: 'card7', |
| 249 | 293 | x: 100, |
| 250 | 294 | y: 400, |
| 251 | - label: '实发撤销', | |
| 252 | - type: "实发撤销", | |
| 295 | + label: '发车信息微调工具', | |
| 296 | + type: "发车信息微调工具", | |
| 253 | 297 | nodes: [{ |
| 254 | 298 | type: "in", |
| 255 | 299 | level: 0, |
| ... | ... | @@ -270,8 +314,8 @@ |
| 270 | 314 | id: 'card8', |
| 271 | 315 | x: 100, |
| 272 | 316 | y: 400, |
| 273 | - label: '新增临加班次', | |
| 274 | - type: "新增临加班次", | |
| 317 | + label: '新增临加班次工具', | |
| 318 | + type: "新增临加班次工具", | |
| 275 | 319 | nodes: [{ |
| 276 | 320 | type: "in", |
| 277 | 321 | level: 0, |
| ... | ... | @@ -292,8 +336,8 @@ |
| 292 | 336 | id: 'card9', |
| 293 | 337 | x: 100, |
| 294 | 338 | y: 400, |
| 295 | - label: '调整人车', | |
| 296 | - type: "调整人车", | |
| 339 | + label: '调整人车工具', | |
| 340 | + type: "调整人车工具", | |
| 297 | 341 | nodes: [{ |
| 298 | 342 | type: "in", |
| 299 | 343 | level: 0, |
| ... | ... | @@ -314,8 +358,8 @@ |
| 314 | 358 | id: 'card10', |
| 315 | 359 | x: 100, |
| 316 | 360 | y: 400, |
| 317 | - label: '指令重发', | |
| 318 | - type: "指令重发", | |
| 361 | + label: '指令重发工具', | |
| 362 | + type: "指令重发工具", | |
| 319 | 363 | nodes: [{ |
| 320 | 364 | type: "in", |
| 321 | 365 | level: 0, |
| ... | ... | @@ -336,8 +380,8 @@ |
| 336 | 380 | id: 'card11', |
| 337 | 381 | x: 100, |
| 338 | 382 | y: 400, |
| 339 | - label: '路牌对调', | |
| 340 | - type: "路牌对调", | |
| 383 | + label: '路牌对调工具', | |
| 384 | + type: "路牌对调工具", | |
| 341 | 385 | nodes: [{ |
| 342 | 386 | type: "in", |
| 343 | 387 | level: 0, |
| ... | ... | @@ -358,8 +402,8 @@ |
| 358 | 402 | id: 'card12', |
| 359 | 403 | x: 100, |
| 360 | 404 | y: 400, |
| 361 | - label: '误点调整', | |
| 362 | - type: "误点调整", | |
| 405 | + label: '误点调整工具', | |
| 406 | + type: "误点调整工具", | |
| 363 | 407 | nodes: [{ |
| 364 | 408 | type: "in", |
| 365 | 409 | level: 0, | ... | ... |
src/main/resources/static/real_control_v2/js/north/toolbar.js
| ... | ... | @@ -37,7 +37,7 @@ var gb_northToolbar = (function () { |
| 37 | 37 | $('.north .north-toolbar .exit-system').on('click', function () { |
| 38 | 38 | //调度员退出时提示未全部完成班次的线路 |
| 39 | 39 | //默认只取一个角色 |
| 40 | - if(user.roles[0].codeName == "LG_DDY" || user.roles[0].codeName == "LG_GLY" || user.roles[0].codeName == "BSTH_A"){ | |
| 40 | + if(user.roles[0].codeName == "LG_DDY" || user.roles[0].codeName == "LG_GLY"){ | |
| 41 | 41 | //提示未完成线路 搜索该用户下所有的线路 判断是否完成 |
| 42 | 42 | $.get('/logZndd/LineUserAll', {userId: user.id}, function (rs) { |
| 43 | 43 | if(rs.length > 0){ | ... | ... |
src/main/resources/static/real_control_v2/zndd/type/dkl.html
| ... | ... | @@ -432,9 +432,9 @@ |
| 432 | 432 | gb_common.$post('/realSchedule', data, function (rs) { |
| 433 | 433 | notify_succ('新增临加班次成功'); |
| 434 | 434 | cb && cb(rs); |
| 435 | - var folder = '/real_control_v2/zndd/yanshi'; | |
| 435 | + /*var folder = '/real_control_v2/zndd/yanshi'; | |
| 436 | 436 | open_modal(folder + '/yanshi.html', { |
| 437 | - }, {center: true, bgclose: false, modal: true}); | |
| 437 | + }, {center: true, bgclose: false, modal: true});*/ | |
| 438 | 438 | }, err); |
| 439 | 439 | } |
| 440 | 440 | ... | ... |
src/main/resources/static/real_control_v2/zndd/type/fcjg.html
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | <div class="uk-modal-dialog" style="width: 920px;"> |
| 3 | 3 | <a href="" class="uk-modal-close uk-close"></a> |
| 4 | 4 | <div class="uk-modal-header"> |
| 5 | - <h2>新增临加班次</h2></div> | |
| 5 | + <h2>发车间隔</h2></div> | |
| 6 | 6 | <div class="uk-grid uk-width-3-5" style="float: left"> |
| 7 | 7 | <div class="uk-width-5-5"> |
| 8 | 8 | <form class="uk-form uk-form-horizontal"> </form> | ... | ... |
src/main/resources/static/real_control_v2/zndd/type/mz.html