update...

潘钊
1 parent cbc35119
Showing 2 changed files with 17 additions and 1 deletions
src/main/java/com/bsth/data/gpsdata_v2/GpsRealData.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataUtils.java
@@ -97,7 +97,7 @@ public class GpsRealData {
     /**
      * @Title: get @Description: TODO(设备号获取GPS)
      */
-    public GpsEntity get(String deviceId) {
+    public static GpsEntity get(String deviceId) {
         return gpsMap.get(deviceId);
     }
  
 package com.bsth.data.gpsdata_v2.utils;
  
+import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,7 +25,22 @@ public class GpsDataUtils {
         List<GpsEntity> rs = new ArrayList<>();
  
         try {
+            GpsEntity prev;
             for (GpsEntity gps : list) {
+                prev = GpsRealData.get(gps.getDeviceId());
+
+                //不接收过期数据
+                if(prev != null){
+
+                    if(gps.getTimestamp().longValue() < prev.getTimestamp().longValue())
+                        continue;
+
+                    if(prev.getTimestamp().equals(gps.getTimestamp())&&
+                            prev.getLat().equals(gps.getLat()) &&
+                            prev.getLon().equals(gps.getLon()))
+                        continue;
+                }
+
                 if (gps.getValid() == 0 && Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) < 1000 * 60 * 20)
                     rs.add(gps);
             }