潘钊 / bsth_control · Commits

Commit 28e471113a1bd66a5c7032187b5b67ce43d6bf13

Authored by 潘钊
1 parent 44091652

update...

Inline Side-by-side
Showing 1 changed file with 9 additions and 10 deletions
src/main/java/com/bsth/XDApplication.java
  View file @28e4711
... ... @@ -5,10 +5,10 @@ import com.bsth.data.ThreadMonotor;
5 5 import com.bsth.data.car_out_info.UpdateDBThread;
6 6 import com.bsth.data.directive.DirectivesPstThread;
7 7 import com.bsth.data.forecast.SampleTimeDataLoader;
8   -import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
9   -import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
  8 +import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
10 9 import com.bsth.data.msg_queue.DirectivePushQueue;
11 10 import com.bsth.data.msg_queue.WebSocketPushQueue;
  11 +import com.bsth.data.schedule.DayOfSchedule;
12 12 import com.bsth.data.schedule.auto_exec.AutoExecScanThread;
13 13 import com.bsth.data.schedule.edit_logs.SeiPstThread;
14 14 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
... ... @@ -42,10 +42,6 @@ public class XDApplication implements CommandLineRunner {
42 42 @Autowired
43 43 UpdateDBThread fcxxUpdateThread;
44 44 @Autowired
45   - GpsDataLoaderThread gpsDataLoader;
46   - @Autowired
47   - OfflineMonitorThread offlineMonitorThread;
48   - @Autowired
49 45 ScheduleRefreshThread scheduleRefreshThread;
50 46 @Autowired
51 47 SchedulePstThread schedulePstThread;
... ... @@ -68,6 +64,9 @@ public class XDApplication implements CommandLineRunner {
68 64 @Autowired
69 65 AutoExecScanThread autoExecScanThread;
70 66  
  67 + @Autowired
  68 + GpsDataLoaderThread gpsDataLoader;
  69 +
71 70 private static long timeDiff;
72 71 private static long timeDiffTraffic;
73 72  
... ... @@ -103,15 +102,15 @@ public class XDApplication implements CommandLineRunner {
103 102 }
104 103 }
105 104  
106   - //@Autowired
107   - //DayOfSchedule dayOfSchedule;
  105 + @Autowired
  106 + DayOfSchedule dayOfSchedule;
108 107 public void devInit(){
109 108 log.info("devInit...");
110 109 ScheduledExecutorService sexec = Application.mainServices;
111 110 //抓取GPS数据
112 111 gpsDataLoader.setFlag(-1);
113 112 //dayOfSchedule.dataRecovery();
114   - //sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
  113 + //sexec.scheduleWithFixedDelay(gpsDataLoader, 60, 4, TimeUnit.SECONDS);
115 114 //实际排班更新线程
116 115 //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
117 116 //sexec.scheduleWithFixedDelay(autoExecScanThread, 100, 50, TimeUnit.SECONDS);//班次自动执行
... ... @@ -135,7 +134,7 @@ public class XDApplication implements CommandLineRunner {
135 134 sexec.scheduleWithFixedDelay(scheduleLateThread, 70, 30, TimeUnit.SECONDS);//检查班次误点
136 135 sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
137 136  
138   - sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
  137 + //sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
139 138 sexec.scheduleWithFixedDelay(schedulePstThread, 120, 10, TimeUnit.SECONDS);//班次延迟入库线程
140 139 sexec.scheduleWithFixedDelay(seiPstThread, 160, 60, TimeUnit.SECONDS);//班次修正日志入库
141 140 sexec.scheduleWithFixedDelay(directivesPstThread, 180, 120, TimeUnit.SECONDS);//调度指令延迟入库
... ...