潘钊 / bsth_control · Commits

Commit 7f63ee9f32fa3c271c0bf961e0a8f5686812527d

Authored by 潘钊
1 parent f44ae6c9

update

Inline Side-by-side
Showing 7 changed files with 19 additions and 15 deletions
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
  View file @7f63ee9
... ... @@ -51,7 +51,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
51 51 @Override
52 52 public void run(String... arg0) throws Exception {
53 53 logger.info("ArrivalData_GPS,30,10");
54   - Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 10, TimeUnit.SECONDS);
  54 + //Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 12, TimeUnit.SECONDS);
55 55 }
56 56  
57 57 @Component
... ...
src/main/java/com/bsth/data/directive/FirstScheduleCheckThread.java
  View file @7f63ee9
... ... @@ -43,9 +43,7 @@ public class FirstScheduleCheckThread extends Thread{
43 43 List<ScheduleRealInfo> schList;
44 44 ScheduleRealInfo first;
45 45 for(String car : cars){
46   - if(car.equals("SXC-CD1004")){
47   - System.out.println("debugger...");
48   - }
  46 +
49 47 schList = dayOfSchedule.findByNbbm(car);
50 48  
51 49 if(null == schList || schList.size() == 0)
... ...
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
  View file @7f63ee9
... ... @@ -72,7 +72,7 @@ public class GpsRealData implements CommandLineRunner{
72 72  
73 73 @Override
74 74 public void run(String... arg0) throws Exception {
75   - Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
  75 + //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
76 76 }
77 77  
78 78 public GpsEntity add(GpsEntity gps) {
... ... @@ -188,6 +188,7 @@ public class GpsRealData implements CommandLineRunner{
188 188  
189 189 String nbbm;
190 190 //附加车辆内部编码
  191 + Integer updown;
191 192 for(GpsEntity gps : list){
192 193 nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
193 194 if(StringUtils.isBlank(nbbm))
... ... @@ -196,6 +197,12 @@ public class GpsRealData implements CommandLineRunner{
196 197 gps.setNbbm(nbbm);
197 198  
198 199 gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
  200 + if(gps.getUpDown() == -1){
  201 + //如果走向未知，尝试根据站点纠正走向
  202 + updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
  203 + if(updown != null)
  204 + gps.setUpDown(updown);
  205 + }
199 206 gpsRealData.add(gps);
200 207 }
201 208 } else
... ...
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @7f63ee9
... ... @@ -118,13 +118,13 @@ public class DayOfSchedule implements CommandLineRunner {
118 118 @Override
119 119 public void run(String... arg0) throws Exception {
120 120 //翻班线程
121   - Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 20, 120, TimeUnit.SECONDS);
  121 + Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 20, 240, TimeUnit.SECONDS);
122 122 //入库
123 123 Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
124 124 //首班出场指令补发器
125   - Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 10, 60, TimeUnit.SECONDS);
  125 + Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 10, 120, TimeUnit.SECONDS);
126 126 //班次误点扫描
127   - Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
  127 + //Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
128 128 }
129 129  
130 130 public Map<String, String> getCurrSchDate() {
... ...
src/main/resources/static/real_control_v2/fragments/north/tabs.html
  View file @7f63ee9
... ... @@ -4,7 +4,7 @@
4 4 <li class="uk-active" ><a>主页</a></li>
5 5 <li class=""><a>地图</a></li>
6 6 {{each list as line i}}
7   - <li class="tab-line"><a>{{line.name}}（0, 22）</a></li>
  7 + <li class="tab-line"><a>{{line.name}}（0, 0）</a></li>
8 8 {{/each}}
9 9 </ul>
10 10 </script>
... ...
src/main/resources/static/real_control_v2/js/north/toolbar.js
  View file @7f63ee9
... ... @@ -19,7 +19,6 @@ var gb_northToolbar = (function() {
19 19  
20 20 //exit
21 21 $('.north .north-toolbar .exit-system').on('click', function(){
22   - alert(11);
23 22 //关闭websocket 连接
24 23 gb_sch_websocket.sock.close();
25 24 window.location.href='/pages/control/lineallot/allot.html';
... ...
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
  View file @7f63ee9
... ... @@ -35,11 +35,11 @@ var gb_sch_websocket = (function() {
35 35  
36 36 //80协议上报
37 37 var report80 = function(msg) {
38   - console.log('report80...', msg);
39   - msg.dateStr = moment(msg.timestamp).format('HH:mm');
40   - msg.text = gb_common.reqCode80[msg.data.requestCode];
41   -
42   - findMailBox(msg.data.lineId).prepend(temps['sys-note-80-temp'](msg));
  38 +// console.log('report80...', msg);
  39 +// msg.dateStr = moment(msg.timestamp).format('HH:mm');
  40 +// msg.text = gb_common.reqCode80[msg.data.requestCode];
  41 +//
  42 +// findMailBox(msg.data.lineId).prepend(temps['sys-note-80-temp'](msg));
43 43 }
44 44  
45 45 var waitRemoves = [];
... ...