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