Commit b1f60e76e41960797913391cba0b18c441947424
1 parent
1ea977a4
update...
Showing
3 changed files
with
4 additions
and
4 deletions
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
| @@ -81,7 +81,7 @@ public class InStationProcess { | @@ -81,7 +81,7 @@ public class InStationProcess { | ||
| 81 | //要经过2个中途站才能进 | 81 | //要经过2个中途站才能进 |
| 82 | int count = GpsCacheData.lastInTrailsSize(gps); | 82 | int count = GpsCacheData.lastInTrailsSize(gps); |
| 83 | List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown()); | 83 | List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown()); |
| 84 | - if (isNotInOut(sch) && gps.getInstation() == 1 && routes.size() > 4 | 84 | + if (null != sch && isNotInOut(sch) && gps.getInstation() == 1 && routes.size() > 4 |
| 85 | && count < 2) { | 85 | && count < 2) { |
| 86 | logger.info("没有进中途站，拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp()); | 86 | logger.info("没有进中途站，拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp()); |
| 87 | flow = false; | 87 | flow = false; |
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataUtils.java
| @@ -25,7 +25,7 @@ public class GpsDataUtils { | @@ -25,7 +25,7 @@ public class GpsDataUtils { | ||
| 25 | 25 | ||
| 26 | try { | 26 | try { |
| 27 | for (GpsEntity gps : list) { | 27 | for (GpsEntity gps : list) { |
| 28 | - if (gps.getValid() == 0 && Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20) | 28 | + if (gps.getValid() == 0 && Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) < 1000 * 60 * 20) |
| 29 | rs.add(gps); | 29 | rs.add(gps); |
| 30 | } | 30 | } |
| 31 | 31 |
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
| @@ -43,10 +43,10 @@ | @@ -43,10 +43,10 @@ | ||
| 43 | </select> | 43 | </select> |
| 44 | </div> | 44 | </div> |
| 45 | <button class="uk-button search-btn" title="只支持后模糊">检索</button> | 45 | <button class="uk-button search-btn" title="只支持后模糊">检索</button> |
| 46 | - <label class="auto-refresh" > | 46 | + <!--<label class="auto-refresh" > |
| 47 | <input type="checkbox" value="1" name="schCBox" class="i-cbox"> | 47 | <input type="checkbox" value="1" name="schCBox" class="i-cbox"> |
| 48 | 自动刷新 | 48 | 自动刷新 |
| 49 | - </label> | 49 | + </label>--> |
| 50 | </fieldset> | 50 | </fieldset> |
| 51 | </form> | 51 | </form> |
| 52 | </div> | 52 | </div> |