update...

潘钊
1 parent c117dacc
Showing 13 changed files with 312 additions and 14 deletions
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/StationRoute.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/StationInsideHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/precondition/InPreconditionHandler.java
src/main/java/com/bsth/data/gpsdata/arrival/precondition/entity/PreconditionGeo.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/GeoUtils.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -79,6 +79,12 @@ public class GpsEntity implements Cloneable{
 	@JsonIgnore
 	private StationRoute station;
+	/**
+	 * 前置约束 -站点编码
+	 */
+	@JsonIgnore
+	private String premiseCode;
+
 	/** 状态 */
 	private String signalState = "normal";
@@ -358,4 +364,12 @@ public class GpsEntity implements Cloneable{
 	public void setServerTimestamp(Long serverTimestamp) {
 		this.serverTimestamp = serverTimestamp;
 	}
+
+	public String getPremiseCode() {
+		return premiseCode;
+	}
+
+	public void setPremiseCode(String premiseCode) {
+		this.premiseCode = premiseCode;
+	}
 }
@@ -3,8 +3,10 @@ package com.bsth.data.gpsdata.arrival;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
+import com.bsth.data.gpsdata.arrival.precondition.entity.PreconditionGeo;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.StationRouteComp;
+import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
@@ -14,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Component;
@@ -42,6 +45,8 @@ public class GeoCacheData {
     //线路站点路由
     private static ArrayListMultimap<String, StationRoute> stationCacheMap;
+    //线路前置进站围栏
+    public static ArrayListMultimap<String, PreconditionGeo> premiseGeoMap;
     //线路_上下行_站点编码 ——> 站点
     private static Map<String, StationRoute> routeCodeMap;
@@ -56,7 +61,6 @@ public class GeoCacheData {
     //需要定时刷新的站点路由
     public static Map<String, TimedEnableStationRoute> tesMap = new HashMap<>();
-    //TimedEnableStationRoute
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -68,10 +72,6 @@ public class GeoCacheData {
     public static void putGps(GpsEntity gps) {
         CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getNbbm());
         if (queue == null) {
-            /*//第一个点从站内开始
-            if (gps.getInstation() == 0)
-                return;*/
-
             queue = new CircleQueue<>(CACHE_SIZE);
             gpsCacheMap.put(gps.getNbbm(), queue);
         }
@@ -146,6 +146,61 @@ public class GeoCacheData {
         //加载路段信息
         loadRoadsData();
+
+        //加载前置进站围栏
+        loadPremiseGeoData();
+    }
+
+    private void loadPremiseGeoData() {
+        ArrayListMultimap<String, PreconditionGeo> premiseGeoMapCopy = ArrayListMultimap.create();
+
+        String sql = "select * from  bsth_f_geo_premise";
+        List<PreconditionGeo> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(PreconditionGeo.class));
+
+        List<String> coordList;
+        String[] cs;
+        com.bsth.util.Geo.Point point;
+        List<com.bsth.util.Geo.Point> ps;
+        StationRoute sr;
+        for(PreconditionGeo p : list){
+            try{
+                sr = routeCodeMap.get(p.getLineCode()+"_"+p.getUpDown()+"_"+p.getStationCode());
+                p.setOrder(sr.getRouteSort());
+                //polygon
+                ps = new ArrayList<>();
+                coordList = Splitter.on(",").trimResults().splitToList(p.getCoords());
+                for(String c : coordList){
+                    cs = c.split(" ");
+                    point = new com.bsth.util.Geo.Point(Double.parseDouble(cs[0]), Double.parseDouble(cs[1]));
+                    ps.add(point);
+                }
+
+                p.setPolygon(new com.bsth.util.Geo.Polygon(ps));
+
+                sr.setPremise(true);
+                //按线路，走向分组
+                premiseGeoMapCopy.put(p.getLineCode()+"_"+p.getUpDown(), p);
+            }catch (Exception e){
+                logger.error("", e);
+            }
+        }
+
+        //排序
+        Set<String> ks = premiseGeoMapCopy.keySet();
+        PreconditionGeoComp comp = new PreconditionGeoComp();
+        for(String k : ks){
+            Collections.sort(premiseGeoMapCopy.get(k), comp);
+        }
+
+        premiseGeoMap = premiseGeoMapCopy;
+    }
+
+    private static class PreconditionGeoComp implements Comparator<PreconditionGeo>{
+
+        @Override
+        public int compare(PreconditionGeo p1, PreconditionGeo p2) {
+            return p1.getOrder() - p2.getOrder();
+        }
     }
     private void loadRoadsData() {
@@ -78,6 +78,7 @@ public abstract class SignalHandle {
         byte updown = Byte.parseByte(sch.getXlDir());
         //gps 切换走向
         gps.setUpDown(updown);
+        gps.setPremiseCode(null);
         List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), updown);
         StationRoute station = GeoUtils.gpsInStation(gps, srs);
@@ -60,6 +60,11 @@ public class StationRoute {
     private String name;
+    /**
+     * 是否有前置进站约束
+     */
+    private boolean premise;
+
     public String getCode() {
         return code;
     }
@@ -147,5 +152,13 @@ public class StationRoute {
     public void setName(String name) {
         this.name = name;
     }
+
+    public boolean isPremise() {
+        return premise;
+    }
+
+    public void setPremise(boolean premise) {
+        this.premise = premise;
+    }
 }
@@ -4,6 +4,7 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
 import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
@@ -148,6 +149,7 @@ public class InOutStationSignalHandle extends SignalHandle{
                 && (gps.getInstation()==0 || !gps.getStopNo().equals(prev.getStopNo()))
                 && !willDepart(gps, prev, sch)){
+            gps.setPremiseCode(null);
             //发车班次匹配
             signalSchPlanMatcher.outMatch(gps, sch);
             sch = dayOfSchedule.executeCurr(gps.getNbbm());
@@ -234,6 +236,10 @@ public class InOutStationSignalHandle extends SignalHandle{
      * @return
      */
     private boolean outManyFit(GpsEntity gps, ScheduleRealInfo sch) {
+        LineConfig conf = lineConfigData.get(sch.getXlBm());
+        if(null != conf && conf.isLockFirstOutTime())
+            return false;//锁定第一个发车信号，不匹配最佳
+
         if(StringUtils.isNotEmpty(sch.getZdsjActual()))
             return false;
@@ -289,7 +295,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         if(gps.getStopNo().equals(sch.getZdzCode())
-                && !gps.getStopNo().equals(prev.getStopNo())){
+                && (!gps.getStopNo().equals(prev.getStopNo()) || gps.getStopNo().equals(prev.getPremiseCode()))){
             int diff = 0;
             try{
@@ -305,6 +311,11 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(Math.abs(diff) > MAX_NORMAL_DIFF)
                 return;
+            //校验进站前置约束
+            if(!validInPremise(gps)){
+                return;
+            }
+
             //环线或内外圈 ，飘出去再回来
             if(sch.getQdzCode().equals(sch.getZdzCode())
                     && StringUtils.isNotEmpty(sch.getFcsjActual())
@@ -409,6 +420,28 @@ public class InOutStationSignalHandle extends SignalHandle{
     }
     /**
+     * 校验进站前置约束
+     * @param gps
+     * @return
+     */
+    private boolean validInPremise(GpsEntity gps) {
+        StationRoute sr = gps.getStation();
+        if(null == sr || !sr.isPremise())
+            return true;
+
+        String premiseCode = gps.getPremiseCode();
+
+        if(StringUtils.isNotEmpty(premiseCode) && premiseCode.equals(gps.getStopNo())){
+            logger.info("满足前置进站约束 " + premiseCode);
+            return true;
+        }
+        else{
+            logger.info(gps.getNbbm() + " not premiseCode 不满足前置进站约束 " + premiseCode);
+        }
+        return false;
+    }
+
+    /**
      * 和当前进站信号最匹配的一个班次
      * @param gps
      * @param halfList
@@ -6,6 +6,8 @@ import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import java.util.List;
@@ -17,6 +19,7 @@ import java.util.List;
 @Component
 public class StationInsideHandle extends SignalHandle {
+    Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
@@ -37,13 +40,41 @@ public class StationInsideHandle extends SignalHandle {
             gps.setStation(station);
         }
+        //是否在进站前置围栏内
+        String premiseCode = GeoUtils.gpsInPremiseGeo(gps);
+        gps.setPremiseCode(premiseCode);
+
+        if(isNotEmpty(prevs)){
+            try {
+                GpsEntity prev = prevs.getTail();
+                //继承前置围栏
+                if(null == premiseCode && null != prev.getPremiseCode())
+                    gps.setPremiseCode(prev.getPremiseCode());
+
+                //在场，站外
+                if(gps.getInstation() == 0){
+                    //继承上一个点的站点编码
+                    gps.setStopNo(prev.getStopNo());
+
+                    /*if(null == premiseCode && null != prev.getPremiseCode())
+                        gps.setPremiseCode(prev.getPremiseCode());*/
+                }
+                /*else if(null != gps.getPremiseCode() && !gps.getStopNo().equals(gps.getPremiseCode())){
+                    gps.setPremiseCode(null);
+                }*/
+            }catch (Exception e){
+                logger.error("", e);
+            }
+        }
+
+/*
         //在场，站外
         if(gps.getInstation() == 0 && isNotEmpty(prevs)){
             //继承上一个点的站点编码
             GpsEntity prev = prevs.getTail();
             gps.setStopNo(prev.getStopNo());
         }
-
+*/
         return true;
     }
 }
+package com.bsth.data.gpsdata.arrival.precondition;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * 进站（前置电子围栏）
+ * Created by panzhao on 2017/9/23.
+ */
+@Component
+public class InPreconditionHandler {
+
+    /**
+     * 进站动作是否有通过前置围栏
+     * @param gps
+     * @param prev
+     * @return
+     */
+    public boolean isPass(GpsEntity gps, GpsEntity prev){
+        return false;
+    }
+}
+package com.bsth.data.gpsdata.arrival.precondition.entity;
+
+import com.bsth.util.Geo.Polygon;
+
+/**
+ * 前置围栏 -地理坐标
+ * Created by panzhao on 2017/9/23.
+ */
+public class PreconditionGeo {
+
+    private String name;
+
+    /**
+     * 前置约束的站点编码
+     */
+    private String stationCode;
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 上下行
+     */
+    private int upDown;
+
+    /**
+     * 多边形坐标
+     */
+    private String coords;
+
+    private com.bsth.util.Geo.Polygon polygon;
+
+    private Integer order;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getCoords() {
+        return coords;
+    }
+
+    public void setCoords(String coords) {
+        this.coords = coords;
+    }
+
+    public Integer getOrder() {
+        return order;
+    }
+
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
+
+    public Polygon getPolygon() {
+        return polygon;
+    }
+
+    public void setPolygon(Polygon polygon) {
+        this.polygon = polygon;
+    }
+}
@@ -3,6 +3,7 @@ package com.bsth.data.gpsdata.arrival.utils;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.precondition.entity.PreconditionGeo;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.geom.LineString;
@@ -169,6 +170,28 @@ public class GeoUtils {
     }
     /**
+     * 是否在进站前置围栏内
+     * @param gps
+     * @return
+     */
+    public static String gpsInPremiseGeo(GpsEntity gps) {
+        List<PreconditionGeo> list = GeoCacheData.premiseGeoMap.get(gps.getLineId()+"_"+gps.getUpDown());
+
+        if(null == list || list.size()==0)
+            return null;
+
+        com.bsth.util.Geo.Point point = new com.bsth.util.Geo.Point(gps.getLon(), gps.getLat());
+        com.bsth.util.Geo.Polygon polygon;
+        for(PreconditionGeo p : list){
+            polygon = p.getPolygon();
+            if(com.bsth.util.Geo.GeoUtils.isPointInPolygon(point, polygon)){
+                return p.getStationCode();
+            }
+        }
+        return null;
+    }
+
+    /**
      * 是否是有效的连续点
      * @param prevGps
      * @param gps
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("S0K-004"))
+            /*if(nbbm.equals("W2H-015"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
             /*if(lineId.equals("60028"))
                 new RecoveryThread(listMap.get(lineId), count).run();*/
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=246";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=267";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -153,7 +153,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 boolean task;
                 for (GpsEntity gps : list) {
                     try {
-                        /*if(gps.getTimestamp() >= 1504298280000L){
+                        /*if(gps.getTimestamp() >= 1506216540000L){
                             System.out.println("debugger...");
                         }*/
                         //是否有任务
@@ -89,6 +89,11 @@ public class LineConfig {
 	private int upStopMinute;
 	private int downStopMinute;
+	/**
+	 * 使用第一个发车时间，不匹配最佳时间
+	 */
+	private boolean lockFirstOutTime;
+
 	@OneToMany(cascade = CascadeType.ALL)
 	private Set<D80ReplyTemp> d80Temps = new HashSet<>();
@@ -281,4 +286,12 @@ public class LineConfig {
 	public void setTwinsStation(String twinsStation) {
 		this.twinsStation = twinsStation;
 	}
+
+	public boolean isLockFirstOutTime() {
+		return lockFirstOutTime;
+	}
+
+	public void setLockFirstOutTime(boolean lockFirstOutTime) {
+		this.lockFirstOutTime = lockFirstOutTime;
+	}
 }
@@ -642,7 +642,8 @@ public class ScheduleRealInfo {
 	public void calcEndTime(){
 		//计划终点时间
 		if(this.getBcsj() != null){
-			this.setZdsjT(this.getDfsjT() + (this.getBcsj() * 60 * 1000));
+			//this.setZdsjT(this.getDfsjT() + (this.getBcsj() * 60 * 1000));
+			this.setZdsjT(this.getFcsjT() + (this.getBcsj() * 60 * 1000));//计划终点时间不变
 			this.setZdsj(fmtHHmm.print(this.zdsjT));
 		}
 	}
@@ -251,12 +251,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             List<ScheduleRealInfo> ts = new ArrayList<>();
             ts.add(schedule);
             //调整终点时间和下一个班次的应到时间
-            schedule.calcEndTime();
-            ScheduleRealInfo nextSch = dayOfSchedule.nextByLp2(schedule);
+            //schedule.calcEndTime();
+            /*ScheduleRealInfo nextSch = dayOfSchedule.nextByLp2(schedule);
             if (null != nextSch) {
                 nextSch.setQdzArrDatejh(schedule.getZdsj());
                 ts.add(nextSch);
-            }
+            }*/
             //调整班次类型
             if (StringUtils.isNotEmpty(bcType) && !bcType.equals(schedule.getBcType())) {