update

潘钊
1 parent f44ae6c9
Showing 7 changed files with 19 additions and 15 deletions
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/directive/FirstScheduleCheckThread.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/resources/static/real_control_v2/fragments/north/tabs.html
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
@@ -51,7 +51,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("ArrivalData_GPS,30,10");
-		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 10, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 12, TimeUnit.SECONDS);
 	}
 	@Component
@@ -43,9 +43,7 @@ public class FirstScheduleCheckThread extends Thread{
 			List<ScheduleRealInfo> schList;
 			ScheduleRealInfo first;
 			for(String car : cars){
-				if(car.equals("SXC-CD1004")){
-					System.out.println("debugger...");
-				}
+
 				schList = dayOfSchedule.findByNbbm(car);
 				if(null == schList || schList.size() == 0)
@@ -72,7 +72,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
@@ -188,6 +188,7 @@ public class GpsRealData implements CommandLineRunner{
 					String nbbm;
 					//附加车辆内部编码
+					Integer updown;
 					for(GpsEntity gps : list){
 						nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
 						if(StringUtils.isBlank(nbbm))
@@ -196,6 +197,12 @@ public class GpsRealData implements CommandLineRunner{
 							gps.setNbbm(nbbm);
 						gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
+						if(gps.getUpDown() == -1){
+							//如果走向未知，尝试根据站点纠正走向
+							updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
+							if(updown != null)
+								gps.setUpDown(updown);
+						}
 						gpsRealData.add(gps);
 					}
 				} else
@@ -118,13 +118,13 @@ public class DayOfSchedule implements CommandLineRunner {
 	@Override
 	public void run(String... arg0) throws Exception {
 		//翻班线程
-		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 20, 120, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 20, 240, TimeUnit.SECONDS);
 		//入库
 		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
 		//首班出场指令补发器
-		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 10, 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 10, 120, TimeUnit.SECONDS);
 		//班次误点扫描
-		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
 	}
 	public Map<String, String> getCurrSchDate() {
@@ -4,7 +4,7 @@
         <li class="uk-active" ><a>主页</a></li>
         <li class=""><a>地图</a></li>
         {{each list as line i}}
-        <li class="tab-line"><a>{{line.name}}（0, 22）</a></li>
+        <li class="tab-line"><a>{{line.name}}（0, 0）</a></li>
         {{/each}}
     </ul>
   </script>
@@ -19,7 +19,6 @@ var gb_northToolbar = (function() {
     //exit
     $('.north .north-toolbar .exit-system').on('click', function(){
-      alert(11);
       //关闭websocket 连接
       gb_sch_websocket.sock.close();
       window.location.href='/pages/control/lineallot/allot.html';
@@ -35,11 +35,11 @@ var gb_sch_websocket = (function() {
     //80协议上报
     var report80 = function(msg) {
-        console.log('report80...', msg);
-        msg.dateStr = moment(msg.timestamp).format('HH:mm');
-        msg.text = gb_common.reqCode80[msg.data.requestCode];
-
-        findMailBox(msg.data.lineId).prepend(temps['sys-note-80-temp'](msg));
+//        console.log('report80...', msg);
+//        msg.dateStr = moment(msg.timestamp).format('HH:mm');
+//        msg.text = gb_common.reqCode80[msg.data.requestCode];
+//
+//        findMailBox(msg.data.lineId).prepend(temps['sys-note-80-temp'](msg));
     }
     var waitRemoves = [];