Commit 89dead75983d8b7b2b7b12d8bcf25df97d0eac22
Merge remote-tracking branch 'origin/school_control' into school_control
Showing
5 changed files
with
23 additions
and
19 deletions
src/main/java/com/bsth/XDApplication.java
| ... | ... | @@ -180,20 +180,23 @@ public class XDApplication implements CommandLineRunner { |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | public void prodInit(){ |
| 183 | - log.info("prodInit..."); | |
| 183 | + log.info("devInit..."); | |
| 184 | 184 | ScheduledExecutorService sexec = Application.mainServices; |
| 185 | + //抓取GPS数据 | |
| 186 | + gpsDataLoader.setFlag(-1); | |
| 187 | + //dayOfSchedule.dataRecovery(); | |
| 188 | + | |
| 185 | 189 | //安全驾驶 |
| 186 | - sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS); | |
| 190 | + //sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS); | |
| 187 | 191 | |
| 188 | - GpsDataLoaderThread.setFlag(-1); | |
| 189 | 192 | /** 线调业务 */ |
| 190 | - sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程 | |
| 193 | + sexec.scheduleWithFixedDelay(scheduleRefreshThread, 30, 120, TimeUnit.SECONDS);//班次更新线程 | |
| 191 | 194 | sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点 |
| 192 | - sexec.scheduleWithFixedDelay(gpsDataLoader, 0, 2, TimeUnit.SECONDS);//抓取GPS数据 | |
| 193 | - sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据 | |
| 195 | + //sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据 | |
| 196 | + //sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据 | |
| 194 | 197 | sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码 |
| 195 | 198 | |
| 196 | - sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线 | |
| 199 | + //sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线 | |
| 197 | 200 | sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程 |
| 198 | 201 | sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//班次修正日志入库 |
| 199 | 202 | sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库 |
| ... | ... | @@ -203,20 +206,21 @@ public class XDApplication implements CommandLineRunner { |
| 203 | 206 | sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行 |
| 204 | 207 | //DirectivePushQueue.start();//消息队列 -指令，系统下发的 |
| 205 | 208 | WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的 |
| 206 | - sexec.scheduleAtFixedRate(ddexamThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS); | |
| 207 | 209 | |
| 208 | 210 | /** 线调为其他程序提供的数据 --写入数据库 */ |
| 209 | 211 | //sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布） |
| 210 | 212 | //线路首末班数据（网关用，班次更新时写入） |
| 211 | 213 | //com.bsth.data.schedule.f_a_l.FirstAndLastHandler |
| 212 | 214 | //sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号） |
| 215 | + /******************************************************/ | |
| 216 | + sexec.scheduleAtFixedRate(ddexamThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS); | |
| 213 | 217 | |
| 214 | 218 | //运管处静态数据提交 |
| 215 | - // log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处"); | |
| 216 | - // sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS); | |
| 219 | + //log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处"); | |
| 220 | + //sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS); | |
| 217 | 221 | |
| 218 | 222 | //线路版本更新 |
| 219 | - // sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS); | |
| 223 | + //sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS); | |
| 220 | 224 | |
| 221 | 225 | //线路版本更新 |
| 222 | 226 | //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS); | ... | ... |
src/main/resources/static/index.html
| ... | ... | @@ -221,7 +221,7 @@ |
| 221 | 221 | <!-- LOGO --> |
| 222 | 222 | <div class="page-logo"> |
| 223 | 223 | <a href="index.html" class="logo-default logo-default-text"> |
| 224 | - 集群调度考试系统 </a> | |
| 224 | + 公共交通运营调度教学资源系统 </a> | |
| 225 | 225 | <div class="menu-toggler sidebar-toggler"></div> |
| 226 | 226 | </div> |
| 227 | 227 | <!-- END LOGO --> | ... | ... |
src/main/resources/static/login.html
| ... | ... | @@ -181,7 +181,7 @@ |
| 181 | 181 | <div class="wrapper ng-scope"> |
| 182 | 182 | <div id="loginPanel" class="dialog dialog-shadow"> |
| 183 | 183 | <br> |
| 184 | - <h3 class="logo-text">集群调度考试系统</h3> | |
| 184 | + <h3 class="logo-text">公共交通运营调度教学资源系统</h3> | |
| 185 | 185 | <hr> |
| 186 | 186 | <form style="padding: 0px 35px;"> |
| 187 | 187 | <div class="form-group" style="margin-bottom: 0"> | ... | ... |
src/main/resources/static/pages/subjectUser/selectSubject.html
| ... | ... | @@ -29,7 +29,7 @@ |
| 29 | 29 | <div class="portlet-title"> |
| 30 | 30 | <form class="form-inline" action=""> |
| 31 | 31 | <div style="display: inline-block;"> |
| 32 | - <span class="item-label" style="width: 80px;margin-left: 6px;">选题: </span> | |
| 32 | + <span class="item-label" style="width: 80px;margin-left: 6px;">场景: </span> | |
| 33 | 33 | <div id="myselect"> |
| 34 | 34 | <select id="multiselect" style="width: 350px;" class="form-control" name="countries[]" multiple="multiple"> |
| 35 | 35 | </select> |
| ... | ... | @@ -44,7 +44,7 @@ |
| 44 | 44 | <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px"> |
| 45 | 45 | <form role="form"> |
| 46 | 46 | <div class="form-group"> |
| 47 | - <span class="item-label" style="width: 80px;margin-left: 6px;">题目: </span> | |
| 47 | + <span class="item-label" style="width: 80px;margin-left: 6px;">场景: </span> | |
| 48 | 48 | <textarea class="form-control" rows="12" id="subjectText"></textarea> |
| 49 | 49 | </div> |
| 50 | 50 | </form> |
| ... | ... | @@ -101,11 +101,11 @@ |
| 101 | 101 | }); |
| 102 | 102 | function selectSubject(){ |
| 103 | 103 | var arr=select.getData(); |
| 104 | - if(arr.length!=10){ | |
| 105 | - layer.alert("请选择10道题"); | |
| 104 | + if(arr.length == 0){ | |
| 105 | + layer.alert("请选择场景"); | |
| 106 | 106 | return; |
| 107 | 107 | } |
| 108 | - layer.confirm('提交后会覆盖当天选题是否确认', { | |
| 108 | + layer.confirm('提交后会覆盖当天场景是否确认', { | |
| 109 | 109 | btn: ['确认', '取消'],isOutAnim: false,//可以无限个按钮 |
| 110 | 110 | }, function(index, layero){ |
| 111 | 111 | layer.close(index) | ... | ... |
src/main/resources/static/real_control_v2/main.html