潘钊 / bsth_control · Commits

Commit 6fea2a7e7aa0765e249f576cb39e28f182e9d6c4

Authored by 徐烜
2 parents cb88db97 712c343e
build: skipped

Merge branch 'pudong' of http://222.66.0.204:8090//panzhaov5/bsth_control into pudong

Inline Side-by-side
Showing 5 changed files with 7 additions and 11 deletions
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
  View file @6fea2a7
... ... @@ -110,8 +110,6 @@ public class DataHandleProcess {
110 110 logger.error("", e);
111 111 }
112 112 }
113   - } catch (Exception e) {
114   - //logger.error("", e);
115 113 } finally {
116 114 if (count != null)
117 115 count.countDown();
... ...
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
  View file @6fea2a7
... ... @@ -61,12 +61,13 @@ public class InStationProcess {
61 61 * @param prev
62 62 */
63 63 private void inStation(GpsEntity gps, GpsEntity prev){
  64 + boolean flow=true;
64 65 //要经过一个中途站才能进
65 66 StationRoute s = GpsCacheData.prevStation(gps);
66 67 List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
67 68 if(routes.size() > 3 && null != s && s.getName().equals(gps.getStation().getName())){
68   - logger.info("没有进中途站，拒绝进场... -" + gps.getNbbm() + " -time:" + gps.getTimestamp());
69   - return;
  69 + logger.info("没有进中途站，拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp());
  70 + flow = false;
70 71 }
71 72  
72 73  
... ... @@ -74,7 +75,7 @@ public class InStationProcess {
74 75 boolean isEnd=false;
75 76  
76 77 //进终点
77   - if(null != sch && sch.getZdzCode().equals(gps.getStopNo())){
  78 + if(flow && null != sch && sch.getZdzCode().equals(gps.getStopNo())){
78 79 inEndStation(sch, gps);
79 80 isEnd = true;
80 81 }
... ...
src/main/java/com/bsth/data/gpsdata_v2/handlers/ReverseRouteProcess.java
  View file @6fea2a7
... ... @@ -48,7 +48,7 @@ public class ReverseRouteProcess {
48 48 int sortNo = gps.getStation().getRouteSort();
49 49 StationRoute prev = GpsCacheData.prevStation(gps);
50 50 //和上一个站点是反向
51   - if(sortNo < prev.getRouteSort()){
  51 + if(null != prev && sortNo < prev.getRouteSort()){
52 52  
53 53 //满足3个进站反向信号
54 54 List<StationRoute> prevs = GpsCacheData.prevMultiStation(gps);
... ...
src/main/resources/application-dev.properties
  View file @6fea2a7
... ... @@ -27,6 +27,7 @@ spring.datasource.test-on-return=true
27 27 spring.datasource.test-while-idle=true
28 28 spring.datasource.validation-query=select 1
29 29  
  30 +http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
30 31 ##
31 32 #222.66.0.204:5555
32 33 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
... ...
src/main/resources/logback.xml
  View file @6fea2a7
... ... @@ -177,11 +177,7 @@
177 177 </pattern>
178 178 </layout>
179 179 </appender>
180   - <logger name="com.bsth.data.gpsdata.thread.GpsDataLoaderThread"
181   - level="INFO" additivity="false">
182   - <appender-ref ref="GPS_COUNT" />
183   - </logger>
184   - <logger name="com.bsth.data.gpsdata.arrival.GpsRealAnalyse"
  180 + <logger name="com.bsth.data.gpsdata_v2"
185 181 level="INFO" additivity="false">
186 182 <appender-ref ref="GPS_COUNT" />
187 183 </logger>
... ...