update...

panzh
1 parent ecfdcc98
Showing 1 changed file with 8 additions and 4 deletions
src/main/java/com/bsth/data/history/HistoryConsumeTimeDataHandler.java
@@ -102,7 +102,7 @@ public class HistoryConsumeTimeDataHandler {
         return rs;
     }
  
-    public static GpsEntity prevIn(String device){
+    public static GpsEntity prevIn(String device) {
         return lastInStationMap.get(device);
     }
  
@@ -207,20 +207,24 @@ public class HistoryConsumeTimeDataHandler {
                 || gps.getStationCode().equals(prev.getStationCode()))
             return;
  
-        GpsEntity lastInGps = lastInStationMap.get(gps.getDeviceId());
+        String device = gps.getDeviceId();
+
+        GpsEntity lastInGps = lastInStationMap.get(device);
         if (null == lastInGps)
-            lastInStationMap.put(gps.getDeviceId(), gps);
+            lastInStationMap.put(device, gps);
  
         if (gps.getUpDown().intValue() != prev.getUpDown().intValue()
                 || null == lastInGps
                 || !lastInGps.getStationCode().equals(prev.getStationCode())
                 || prev.getTimestamp() - lastInGps.getTimestamp() > 1000 * 60 * 60) {
+
+            lastInStationMap.remove(device);
             return;
         }
  
         StationConsumeTime sct = StationConsumeTime.getInstance(lastInGps, gps);
         pstQueue.add(sct);
-        lastInStationMap.put(gps.getDeviceId(), gps);
+        lastInStationMap.put(device, gps);
     }
  
     @Component