Commit 01455c5633edda399df1eb0ba8606206c75819f7

Authored by 王通
1 parent 2447426e

1.

src/main/java/com/bsth/service/gps/entity/GpsOutbound_DTO.java
... ... @@ -59,7 +59,7 @@ public class GpsOutbound_DTO {
59 59 }
60 60 }
61 61  
62   - if (i == size - 1 && dto.getEt() > 0 && dto.getSt() != dto.getEt())
  62 + if (i == size - 1 && dto != null && dto.getEt() > 0 && dto.getSt() != dto.getEt())
63 63 rsList.add(dto);
64 64 }
65 65 }
... ...
src/main/java/com/bsth/service/gps/entity/GpsSpeed_DTO.java
... ... @@ -56,10 +56,10 @@ public class GpsSpeed_DTO {
56 56 }
57 57  
58 58 //记录最大速度
59   - if (gs.getSpeed() > dto.getSpeed())
  59 + if (dto != null && gs.getSpeed() > dto.getSpeed())
60 60 dto.setSpeed(gs.getSpeed());
61 61  
62   - if (i == size - 1 && dto.getEt() > 0 && dto.getSt() != dto.getEt())
  62 + if (i == size - 1 && dto != null && dto.getEt() > 0 && dto.getSt() != dto.getEt())
63 63 rsList.add(dto);
64 64 }
65 65 }
... ...