潘钊 / bsth_control · Commits

Commit 9e2a31dd918526a2353a2e9cc2967246a4a1f25f

Authored by panzhaov5
1 parent cd2704ba
build: skipped

update...

Inline Side-by-side
Showing 2 changed files with 6 additions and 10 deletions
src/main/java/com/bsth/data/gpsdata_v2/thread/GpsDataLoaderThread.java
  View file @9e2a31d
... ... @@ -3,7 +3,6 @@ package com.bsth.data.gpsdata_v2.thread;
3 3 import com.bsth.data.gpsdata_v2.DataHandleProcess;
4 4 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
5 5 import com.bsth.data.gpsdata_v2.load.GatewayHttpLoader;
6   -import com.bsth.data.gpsdata_v2.load.SocketClientLoader;
7 6 import org.slf4j.Logger;
8 7 import org.slf4j.LoggerFactory;
9 8 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -32,13 +31,13 @@ public class GpsDataLoaderThread extends Thread {
32 31 @Override
33 32 public void run() {
34 33 try {
35   - List<GpsEntity> list;
36   - if (flag == 0)
  34 + List<GpsEntity> list = GatewayHttpLoader.load();
  35 + /*if (flag == 0)
37 36 list = SocketClientLoader.load();
38 37 else
39   - list = GatewayHttpLoader.load();
  38 + list = GatewayHttpLoader.load();*/
40 39  
41   - if(null != list && list.size() > 0)
  40 + if (null != list && list.size() > 0)
42 41 handleProcess.handle(list);
43 42 } catch (Exception e) {
44 43 logger.error("", e);
... ...
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
  View file @9e2a31d
... ... @@ -2,13 +2,10 @@ package com.bsth.data.schedule.thread;
2 2  
3 3 import com.bsth.data.directive.DayOfDirectives;
4 4 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
5   -import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
6 5 import com.bsth.service.calc.CalcWaybillService;
7 6 import com.bsth.service.oil.DlbService;
8   -import com.bsth.data.safe_driv.SafeDrivCenter;
9 7 import com.bsth.service.oil.YlbService;
10 8 import com.bsth.service.report.SheetService;
11   -
12 9 import org.slf4j.Logger;
13 10 import org.slf4j.LoggerFactory;
14 11 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -60,11 +57,11 @@ public class CalcOilThread extends Thread{
60 57 //清除指令数据
61 58 dayOfDirectives.clearAll();
62 59 //清除安全驾驶数据
63   - SafeDrivCenter.clear();
  60 + //SafeDrivCenter.clear();
64 61 //清除超速缓存数据
65 62 OverspeedProcess.clear();
66 63  
67   - GpsDataLoaderThread.setFlag(0);
  64 + //GpsDataLoaderThread.setFlag(0);
68 65  
69 66 }
70 67 }
... ...