Commit 612f4636d6dc9f884e845fdac8b89bdfbef47a6b

Authored by 王通
1 parent 06d814d8

1.线调中设备管理排序bug清除

src/main/java/com/bsth/service/gps/GpsServiceImpl.java
@@ -664,7 +664,7 @@ public class GpsServiceImpl implements GpsService { @@ -664,7 +664,7 @@ public class GpsServiceImpl implements GpsService {
664 Collections.sort(rs, new Comparator<GpsEntity>() { 664 Collections.sort(rs, new Comparator<GpsEntity>() {
665 @Override 665 @Override
666 public int compare(GpsEntity o1, GpsEntity o2) { 666 public int compare(GpsEntity o1, GpsEntity o2) {
667 - return o2.getTimestamp().intValue() - o1.getTimestamp().intValue(); 667 + return (int)(o2.getTimestamp().longValue() - o1.getTimestamp().longValue());
668 } 668 }
669 }); 669 });
670 670
@@ -1185,7 +1185,7 @@ public class GpsServiceImpl implements GpsService { @@ -1185,7 +1185,7 @@ public class GpsServiceImpl implements GpsService {
1185 Collections.sort(rs, new Comparator<SafeDriv>() { 1185 Collections.sort(rs, new Comparator<SafeDriv>() {
1186 @Override 1186 @Override
1187 public int compare(SafeDriv o1, SafeDriv o2) { 1187 public int compare(SafeDriv o1, SafeDriv o2) {
1188 - return o2.getTs().intValue() - o1.getTs().intValue(); 1188 + return (int)(o2.getTs().longValue() - o1.getTs().longValue());
1189 } 1189 }
1190 }); 1190 });
1191 1191