1.

王通
1 parent 9e555437
Showing 3 changed files with 76 additions and 58 deletions
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/data/gpsdata_v2/entity/GpsEntity.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/StationInsideProcess.java
@@ -7,6 +7,7 @@ import com.bsth.data.gpsdata_v2.handlers.*;
 import com.bsth.email.SendEmailController;
 import com.bsth.email.entity.EmailBean;
 import com.bsth.util.IpUtils;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
@@ -94,10 +95,10 @@ public class DataHandleProcess {
                 dataListMap.putAll(threadIndex, multimap.get(deviceList.get(i)));
             }
             Set<Integer> ks = dataListMap.keySet();
-            logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
+            logger.info("gps: " + JSON.toJSONString(list));
             CountDownLatch count = new CountDownLatch(ks.size());
  
-            logger.info(JSON.toJSONString(ks));
+            logger.info("ks: " + JSON.toJSONString(ks));
             for (Integer index : ks) {
                 threadPool.execute(new SignalHandleThread(dataListMap.get(index), count));
             }
@@ -118,6 +118,11 @@ public class GpsEntity implements Cloneable{
 	 */
 	private int energy = -1;
  
+	/**
+	 * 站内外 -1无效 0站外 1站内
+	 */
+	private int inOrOutStation;
+
 	public Object clone() {
 		try {
 			return super.clone();
@@ -418,4 +423,12 @@ public class GpsEntity implements Cloneable{
 	public void setEnergy(int energy) {
 		this.energy = energy;
 	}
+
+	public int getInOrOutStation() {
+		return inOrOutStation;
+	}
+
+	public void setInOrOutStation(int inOrOutStation) {
+		this.inOrOutStation = inOrOutStation;
+	}
 }
-package com.bsth.data.gpsdata_v2.handlers;
-
-import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
-import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.data.gpsdata_v2.entity.StationRoute;
-import com.bsth.data.gpsdata_v2.utils.GeoUtils;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 站内 场内判定
- * Created by panzhao on 2017/11/16.
- */
-@Component
-public class StationInsideProcess {
-
-    public void process(GpsEntity gps) {
-        //是否在场内
-        String parkCode = GeoUtils.gpsInCarpark(gps);
-
-        if (parkCode != null) {
-            gps.setInstation(2);
-            gps.setStopNo(parkCode);
-            gps.setCarparkNo(parkCode);
-        }
-
-        //是否在站内
-        List<StationRoute> srs = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
-        StationRoute station = GeoUtils.gpsInStation(gps, srs);
-        if (station != null) {
-            gps.setInstation(1);
-            gps.setStopNo(station.getCode());
-            gps.setStation(station);
-        }
-
-        //是否在进站前置围栏内
-        String premiseCode = GeoUtils.gpsInPremiseGeo(gps);
-        gps.setPremiseCode(premiseCode);
-
-        //上一个点位
-        GpsEntity prev = GpsCacheData.getPrev(gps);
-
-        if (null != prev) {
-            //继承前置围栏状态
-            if (null == premiseCode && null != prev.getPremiseCode())
-                gps.setPremiseCode(prev.getPremiseCode());
-
-            //在场，站外
-            if (gps.getInstation() == 0) {
-                gps.setStopNo(prev.getStopNo());//继承上一个点的站点编码
-            }
-        }
-    }
-}
+package com.bsth.data.gpsdata_v2.handlers;
+
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
+import com.bsth.data.gpsdata_v2.utils.GeoUtils;
+import com.bsth.entity.Station;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 站内 场内判定
+ * Created by panzhao on 2017/11/16.
+ */
+@Component
+public class StationInsideProcess {
+
+    public void process(GpsEntity gps) {
+        //是否在场内
+        String parkCode = GeoUtils.gpsInCarpark(gps);
+
+        if (parkCode != null) {
+            gps.setInstation(2);
+            gps.setCarparkNo(parkCode);
+        }
+
+        //是否在站内
+        List<StationRoute> srs = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
+        StationRoute station = null;
+        for (StationRoute sr : srs) {
+            if (sr.getCode().equals(gps.getStopNo())) {
+                station = sr;
+            }
+        }
+        if (gps.getInOrOutStation() == 1) {
+            gps.setInstation(1);
+            gps.setStation(station);
+        }
+
+        //是否在进站前置围栏内
+        String premiseCode = GeoUtils.gpsInPremiseGeo(gps);
+        gps.setPremiseCode(premiseCode);
+
+        //上一个点位
+        GpsEntity prev = GpsCacheData.getPrev(gps);
+
+        if (null != prev) {
+            //继承前置围栏状态
+            if (null == premiseCode && null != prev.getPremiseCode())
+                gps.setPremiseCode(prev.getPremiseCode());
+
+            //在场，站外
+            if (gps.getInstation() == 0) {
+                gps.setStopNo(prev.getStopNo());//继承上一个点的站点编码
+            }
+        }
+    }
+}