潘钊 / bsth_control · Commits

Commit 113be33a30310f98526aa5588bef319279c59335

Authored by yiming
1 parent 5f9db6ab

超速计算优化

Inline Side-by-side
Showing 1 changed file with 15 additions and 16 deletions
src/main/java/com/bsth/service/gps/entity/GpsSpeed_DTO.java
  View file @113be33
... ... @@ -24,7 +24,7 @@ public class GpsSpeed_DTO {
24 24 }
25 25 });
26 26  
27   - int space = 1000 * 10;
  27 + int space = 1000 * 20;
28 28 int size = list.size();
29 29  
30 30 List<GpsSpeed_DTO> rsList = new ArrayList<>();
... ... @@ -39,21 +39,20 @@ public class GpsSpeed_DTO {
39 39 dto.setSt(gs.getTimestamp());
40 40 dto.setSpeed(gs.getSpeed());
41 41 }
42   - if (dto != null) {
43   - //超速结束
44   - if((i < size - 1 && list.get(i + 1).getTimestamp() - gs.getTimestamp() > space)){
45   - dto.setEt(gs.getTimestamp());
46   - rsList.add(dto);
47   - dto = null;
48   - continue;
49   - }
50   -
51   - //记录最大速度
52   - if(gs.getSpeed() > dto.getSpeed())
53   - dto.setSpeed(gs.getSpeed());
54   -
55   - if(i == size - 1 && dto.getEt() > 0)
56   - rsList.add(dto);
  42 + //记录最大速度
  43 + if(gs.getSpeed() > dto.getSpeed())
  44 + dto.setSpeed(gs.getSpeed());
  45 +
  46 + //超速结束
  47 + if((i < size - 1 && list.get(i + 1).getTimestamp() - gs.getTimestamp() > space)){
  48 + dto.setEt(gs.getTimestamp()+space);
  49 + rsList.add(dto);
  50 + dto = null;
  51 + continue;
  52 + }
  53 + if(i == size - 1){//最后一条数据
  54 + dto.setEt(gs.getTimestamp()+space);
  55 + rsList.add(dto);
57 56 }
58 57 }
59 58 return rsList;
... ...