Merge remote-tracking branch 'origin/school_control' into school_control

yiming
2 parents 630d5494 a43a2446
Showing 5 changed files with 23 additions and 19 deletions
src/main/java/com/bsth/XDApplication.java
src/main/resources/static/index.html
src/main/resources/static/login.html
src/main/resources/static/pages/subjectUser/selectSubject.html
src/main/resources/static/real_control_v2/main.html
@@ -180,20 +180,23 @@ public class XDApplication implements CommandLineRunner {
     }
     public void prodInit(){
-        log.info("prodInit...");
+        log.info("devInit...");
         ScheduledExecutorService sexec = Application.mainServices;
+        //抓取GPS数据
+        gpsDataLoader.setFlag(-1);
+        //dayOfSchedule.dataRecovery();
+
         //安全驾驶
-        sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
-        GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
-        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
+        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 30, 120, TimeUnit.SECONDS);//班次更新线程
         sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
-        sexec.scheduleWithFixedDelay(gpsDataLoader, 0, 2, TimeUnit.SECONDS);//抓取GPS数据
-        sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
+        //sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
+        //sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
         sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
-        sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
+        //sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
         sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程
         sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//班次修正日志入库
         sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库
@@ -203,20 +206,21 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行
         //DirectivePushQueue.start();//消息队列 -指令，系统下发的
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
-        sexec.scheduleAtFixedRate(ddexamThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         /** 线调为其他程序提供的数据 --写入数据库 */
         //sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
         //线路首末班数据（网关用，班次更新时写入）
         //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
         //sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
+        /******************************************************/
+        sexec.scheduleAtFixedRate(ddexamThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //运管处静态数据提交
-       // log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
-       // sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
+        //sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //线路版本更新
-       // sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
         //线路版本更新
         //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
@@ -221,7 +221,7 @@
 		<!-- LOGO -->
 		<div class="page-logo">
 			<a href="index.html" class="logo-default logo-default-text">
-				集群调度考试系统 </a>
+				公共交通运营调度教学资源系统 </a>
 			<div class="menu-toggler sidebar-toggler"></div>
 		</div>
 		<!-- END LOGO -->
@@ -181,7 +181,7 @@
 <div class="wrapper ng-scope">
     <div id="loginPanel" class="dialog dialog-shadow">
         <br>
-        <h3 class="logo-text">集群调度考试系统</h3>
+        <h3 class="logo-text">公共交通运营调度教学资源系统</h3>
         <hr>
         <form style="padding: 0px 35px;">
             <div class="form-group" style="margin-bottom: 0">
@@ -29,7 +29,7 @@
 			<div class="portlet-title">
 				<form class="form-inline" action="">
 					<div style="display: inline-block;">
-						<span class="item-label" style="width: 80px;margin-left: 6px;">选题: </span>
+						<span class="item-label" style="width: 80px;margin-left: 6px;">场景: </span>
 						<div id="myselect">
 							<select id="multiselect" style="width: 350px;" class="form-control"  name="countries[]" multiple="multiple">
 							</select>
@@ -44,7 +44,7 @@
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
 					<form role="form">
 						<div class="form-group">
-							<span class="item-label" style="width: 80px;margin-left: 6px;">题目: </span>
+							<span class="item-label" style="width: 80px;margin-left: 6px;">场景: </span>
 							<textarea class="form-control" rows="12" id="subjectText"></textarea>
 						</div>
 					</form>
@@ -101,11 +101,11 @@
 	});
 	function selectSubject(){
 		var arr=select.getData();
-		if(arr.length!=10){
-			layer.alert("请选择10道题");
+		if(arr.length == 0){
+			layer.alert("请选择场景");
 			return;
 		}
-		layer.confirm('提交后会覆盖当天选题是否确认', {
+		layer.confirm('提交后会覆盖当天场景是否确认', {
 			btn: ['确认', '取消'],isOutAnim: false,//可以无限个按钮
 		}, function(index, layero){
 			layer.close(index)
@@ -55,7 +55,7 @@
         <div class="uk-width-4-10">
             <div class="uk-panel">
                 <h2 class="north-logo">
-                    <!--<i class="uk-icon-life-ring"></i>--> 集群调度考试系统
+                    <!--<i class="uk-icon-life-ring"></i>--> 公共交通运营调度教学资源系统
                 </h2>
             </div>
         </div>