update...

潘钊
1 parent bd8321da
Showing 8 changed files with 157 additions and 50 deletions
src/main/java/com/bsth/data/gpsdata_v2/cache/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/rfid/UploadRfidDataService.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
src/main/java/com/bsth/data/gpsdata_v2/utils/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
@@ -278,7 +278,7 @@ public class GeoCacheData {
         int len = coords.length;
         for (int i = 0; i < len; i++) {
             temps = coords[i].split(" ");
-            cds.add(new Point(Float.parseFloat(temps[1]), Float.parseFloat(temps[0])));
+            cds.add(new Point(Float.parseFloat(temps[0]), Float.parseFloat(temps[1])));
         }
         return new Polygon(cds);
     }
@@ -42,40 +42,56 @@ public class InStationProcess {
     Logger logger = LoggerFactory.getLogger(this.getClass());
-    public void process(GpsEntity gps){
+    public void process(GpsEntity gps) {
         GpsEntity prev = GpsCacheData.getPrev(gps);
-        if(isInsideStation(gps) &&
-                (prev == null || !isInsideStation(prev) || !prev.getStopNo().equals(gps.getStopNo()))){
-            inStation(gps, prev); //进站
+        if(null == prev)
+            return;
+
+        //从站外到站内
+        if(prev.getInstation() == 0 && gps.getInstation() > 0){
+            inStation(gps, prev);
+        }
+
+        //从站内到另一个站内
+        if(prev.getInstation() == 1 && gps.getInstation() == 1
+                && !prev.getStopNo().equals(gps.getStopNo())
+                && !prev.getStation().getName().equals(gps.getStation().getName()))
+            inStation(gps, prev);
+
+        //从场内到站内
+        if(prev.getInstation() == 2 && gps.getInstation() == 1){
+            inStation(gps, prev);
         }
-    }
-    private boolean isInsideStation(GpsEntity gps){
-        return gps.getInstation() >= 1;
+        //被起点站覆盖的情况下进场
+        if(isInPark(gps, prev))
+            inStation(gps, prev);
     }
     /**
      * 进站
+     *
      * @param gps
      * @param prev
      */
-    private void inStation(GpsEntity gps, GpsEntity prev){
-        boolean flow=true;
+    private void inStation(GpsEntity gps, GpsEntity prev) {
+        boolean flow = true;
         //要经过一个中途站才能进
         StationRoute s = GpsCacheData.prevStation(gps);
         List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
-        if(routes.size() > 3 && null != s && s.getName().equals(gps.getStation().getName())){
+        if (gps.getInstation() == 1 && routes.size() > 3
+                && null != s && s.getName().equals(gps.getStation().getName())) {
             logger.info("没有进中途站，拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp());
             flow = false;
         }
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-        boolean isEnd=false;
+        boolean isEnd = false;
         //进终点
-        if(flow && null != sch && sch.getZdzCode().equals(gps.getStopNo())){
+        if (flow && null != sch && sch.getZdzCode().equals(gps.getStopNo())) {
             inEndStation(sch, gps);
             isEnd = true;
         }
@@ -85,16 +101,17 @@ public class InStationProcess {
     /**
      * 进班次终点
+     *
      * @param gps
      */
     private void inEndStation(ScheduleRealInfo sch, GpsEntity gps) {
         String nbbm = sch.getClZbh();
         //校验进站前置约束
-        if(!validInPremise(gps))
+        if (!validInPremise(gps))
             return;
         //实达时间不覆盖
-        if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+        if (StringUtils.isNotEmpty(sch.getZdsjActual()))
             return;
         //应用到离站缓冲区设置参数
@@ -110,14 +127,14 @@ public class InStationProcess {
         //车辆的下一个班次
         ScheduleRealInfo next = dayOfSchedule.next(sch);
-        if(next != null){
+        if (next != null) {
             dayOfSchedule.addExecPlan(next);
             inStationAndInPark(sch, next);//进站既进场
         }
         //路牌的下一个班次，页面显示起点实际到达时间
         ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch);
-        if(lpNext != null){
+        if (lpNext != null) {
             lpNext.setQdzArrDatesj(sch.getZdsjActual());
         }
@@ -138,33 +155,33 @@ public class InStationProcess {
         DirectivePushQueue.put6002(next, doneSum, "到站@系统");
         //套跑  -下发线路切换指令
-        if(null != next && !next.getXlBm().equals(sch.getXlBm())){
+        if (null != next && !next.getXlBm().equals(sch.getXlBm())) {
             gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
         }
-        if(null == next && gps.isService())
+        if (null == next && gps.isService())
             nonService(sch, "结束@系统");//班次结束
-        else if(dayOfSchedule.emptyService(next))
+        else if (dayOfSchedule.emptyService(next))
             nonService(sch, "空驶@系统");//下一班非营运
     }
     /**
      * 校验进站前置约束
+     *
      * @param gps
      * @return
      */
     private boolean validInPremise(GpsEntity gps) {
         StationRoute sr = gps.getStation();
-        if(null == sr || !sr.isPremise())
+        if (null == sr || !sr.isPremise())
             return true;
         String premiseCode = gps.getPremiseCode();
-        if(StringUtils.isNotEmpty(premiseCode) && premiseCode.equals(gps.getStopNo())){
+        if (StringUtils.isNotEmpty(premiseCode) && premiseCode.equals(gps.getStopNo())) {
             logger.info("满足前置进站约束 " + premiseCode);
             return true;
-        }
-        else{
+        } else {
             logger.info(gps.getNbbm() + " not premiseCode 不满足前置进站约束 " + premiseCode);
         }
         return false;
@@ -172,9 +189,10 @@ public class InStationProcess {
     /**
      * 进站既进场
+     *
      * @param sch
      */
-    private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next){
+    private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next) {
         LineConfig config = lineConfigData.get(sch.getXlBm());
         //限定出站既出场的停车场
         String park = config.getTwinsPark();
@@ -191,7 +209,7 @@ public class InStationProcess {
             //分班的时候，需要再跳过1个班次
             next = dayOfSchedule.next(next);
-            if(next != null)
+            if (next != null)
                 dayOfSchedule.addExecPlan(next);
             //进场，切换成非营运状态
@@ -200,27 +218,28 @@ public class InStationProcess {
     }
-    private boolean isEmptyMileage(ScheduleRealInfo sch){
-        return sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0;
+    private boolean isEmptyMileage(ScheduleRealInfo sch) {
+        return sch.getBcsj() == 0 || sch.getJhlcOrig().intValue() == 0;
     }
     /**
      * 切换为非营运状态
+     *
      * @param sch
      * @param sender
      */
-    private void nonService(ScheduleRealInfo sch, String sender){
+    private void nonService(ScheduleRealInfo sch, String sender) {
         gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, sender);
     }
-    private void endSch(ScheduleRealInfo sch, Long t){
+    private void endSch(ScheduleRealInfo sch, Long t) {
         sch.setFcsjActualAll(t);
         sch.setZdsjActualAll(t);
     }
     private void transformUpDown(GpsEntity gps, ScheduleRealInfo sch) {
-        if(null == sch)
+        if (null == sch)
             return;
         byte upDown = Byte.parseByte(sch.getXlDir());
         //gps 切换走向
@@ -233,4 +252,10 @@ public class InStationProcess {
             gps.setStopNo(station.getCode());
         }
     }
+
+    private boolean isInPark(GpsEntity gps, GpsEntity prve){
+        if(StringUtils.isNotEmpty(gps.getCarparkNo()) && StringUtils.isEmpty(prve.getCarparkNo()))
+            return true;
+        return false;
+    }
 }
@@ -39,33 +39,49 @@ public class OutStationProcess {
     @Autowired
     GpsStatusManager gpsStatusManager;
+    private final static int MAX_BEFORE_TIME = 1000 * 60 * 120;
     public void process(GpsEntity gps){
         GpsEntity prev = GpsCacheData.getPrev(gps);
-        if(gps.getInstation()==0 && prev!=null && isInsideStation(prev)){
-            outStation(gps); //出站
-        }
-    }
-    private boolean isInsideStation(GpsEntity gps){
-        return gps.getInstation() >= 1;
+        if(null == prev)
+            return;
+
+        //从站内到站外
+        if(prev.getInstation() > 0 && gps.getInstation() == 0)
+            outStation(gps, prev);
+
+        //从站内到另一个站内
+        if(prev.getInstation() > 0 && gps.getInstation() > 0
+                && !prev.getStopNo().equals(gps.getStopNo()))
+            outStation(gps, prev);
+
+        //在被起点站覆盖的情况下出场
+        if(isOutPark(gps, prev))
+            outStation(gps, prev);
     }
     /**
      * 出站
      * @param gps
      */
-    private void outStation(GpsEntity gps) {
+    private void outStation(GpsEntity gps, GpsEntity prev) {
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         //起点发车
-        if (null != sch && sch.getQdzCode().equals(gps.getStopNo())){
+        if (null != sch &&
+                (sch.getQdzCode().equals(prev.getStopNo()) || sch.getQdzCode().equals(prev.getCarparkNo()))){
             //发车班次匹配
             if(!signalSchPlanMatcher.outMatch(gps, sch)){
-                outStation(gps);
+                //outStation(gps);
                 return;
             }
+            /*int diff = (int) (sch.getDfsjT() - gps.getTimestamp());
+            //首班出场最多提前2小时
+            if((dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME / 2)
+                return;*/
+
             gps.setPremiseCode(null);//清除前置围栏标记
             if(StringUtils.isNotEmpty(sch.getFcsjActual())
@@ -123,6 +139,10 @@ public class OutStationProcess {
         if(Math.abs(t2 - c) < threshold && c - t1 > threshold){
             return true;
         }
+
+        if(c - t1 > 1000 * 60 * 60 * 2 && Math.abs(t2 - c) < c - t1){
+            return true;
+        }
         return false;
     }
@@ -165,4 +185,10 @@ public class OutStationProcess {
         sch.setFcsjActualAll(t);
         sch.setZdsjActualAll(t);
     }
+
+    private boolean isOutPark(GpsEntity gps, GpsEntity prve){
+        if(StringUtils.isNotEmpty(prve.getCarparkNo()) && StringUtils.isEmpty(gps.getCarparkNo()))
+            return true;
+        return false;
+    }
 }
 package com.bsth.data.gpsdata_v2.rfid;
+import com.alibaba.fastjson.JSON;
 import com.bsth.data.gpsdata_v2.rfid.entity.RfidInoutStation;
 import com.bsth.data.gpsdata_v2.rfid.handle.RfidSignalHandle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,8 +23,11 @@ public class UploadRfidDataService {
     @Autowired
     RfidSignalHandle rfidSignalHandle;
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
     @RequestMapping("inside")
     public void inside(@RequestBody List<RfidInoutStation> list) {
+        logger.info("up rfid: " + JSON.toJSONString(list));
         rfidSignalHandle.handle(list);
     }
 }
@@ -59,7 +59,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.submit(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("W2H-015"))
+            /*if(nbbm.equals("S0L-065"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
             /*if(lineId.equals("60028"))
                 new RecoveryThread(listMap.get(lineId), count).run();*/
@@ -151,6 +151,9 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 for (GpsEntity gps : list) {
                     try {
+                        /*if(gps.getTimestamp() >= 1511386080000L)
+                            System.out.println("aaa");*/
+
                         gpsStateProcess.process(gps);//状态处理
                         stationInsideProcess.process(gps);//场站内外判定
@@ -2,12 +2,17 @@ package com.bsth.data.gpsdata_v2.utils;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * 班次匹配器
  * Created by panzhao on 2016/12/31.
@@ -18,6 +23,8 @@ public class SignalSchPlanMatcher {
     @Autowired
     DayOfSchedule dayOfSchedule;
+    static ScheduleComparator.DFSJ schComp = new ScheduleComparator.DFSJ();
+
     Logger log = LoggerFactory.getLogger(this.getClass());
     /**
@@ -26,12 +33,27 @@ public class SignalSchPlanMatcher {
      * @param sch
      * @return
      */
-    public void outMatch(GpsEntity gps, ScheduleRealInfo sch){
+    public boolean outMatch(GpsEntity gps, ScheduleRealInfo sch){
         long t = gps.getTimestamp();
         if(t < sch.getDfsjT())
-            return;
+            return true;
         try{
+            //晚于待发时间 半小时 ，匹配一下最佳的班次
+            if(t - sch.getDfsjT() > 1000 * 60 * 30){
+                ScheduleRealInfo near = searchNearOut(gps);
+
+                if(null != near && !near.getId().equals(sch.getId())){
+                    dayOfSchedule.addExecPlan(near);
+                    return false;
+                }
+            }
+
+        }catch (Exception e){
+            log.error("", e);
+        }
+        return true;
+        /*try{
             //会不会是分班没有完成
             if(sch.getBcType().equals("in") && t - sch.getDfsjT() > 1000 * 60 * 20){
                 ScheduleRealInfo fbFirst = dayOfSchedule.nextByBcType(sch, "normal");
@@ -71,10 +93,35 @@ public class SignalSchPlanMatcher {
         if(r / s > 0.7){
             if(dayOfSchedule.addExecPlan(next))
                 outMatch(gps, next);
-        }
+        }*/
     }
-    public static int fcSpace(ScheduleRealInfo sch, GpsEntity gps){
-        return (int) Math.abs((sch.getDfsjT() - gps.getTimestamp()));
+    /**
+     * 搜索一个离发车信号最近的班次
+     * @param gps
+     * @return
+     */
+    private ScheduleRealInfo searchNearOut(GpsEntity gps) {
+        List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(gps.getNbbm());
+        //排序
+        Collections.sort(list, schComp);
+
+        ScheduleRealInfo near = null;
+        int diff, minDiff=-1;
+        for(ScheduleRealInfo sch : list){
+
+            if(StringUtils.isNotEmpty(sch.getFcsjActual()))
+                continue;
+
+            if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+                continue;
+
+            diff = (int) Math.abs(gps.getTimestamp() - sch.getDfsjT());
+            if(null == near || diff < minDiff){
+                near = sch;
+                minDiff = diff;
+            }
+        }
+        return near;
     }
 }
@@ -108,15 +108,15 @@ public class DirectivePushQueue implements ApplicationContextAware {
                         code = qd.getCode();
                         if(code.equals("60_02")){
-                            directiveService.send60Dispatch(qd.getSch(), qd.getFinish(), qd.getSender());
+                            //directiveService.send60Dispatch(qd.getSch(), qd.getFinish(), qd.getSender());
                             log.info("directive 60_02 sch id: " + qd.getSch().getId());
                         }
                         else if(code.equals("60_03")){
-                            directiveService.send60Operation(qd.getNbbm(), qd.getState(), qd.getUpDown(), qd.getSender());
+                            //directiveService.send60Operation(qd.getNbbm(), qd.getState(), qd.getUpDown(), qd.getSender());
                             log.info("directive 60_03 nbbm: " + qd.getNbbm());
                         }
                         else if(code.equals("64")){
-                            directiveService.lineChange(qd.getNbbm(), qd.getLineCode(), qd.getSender());
+                            //directiveService.lineChange(qd.getNbbm(), qd.getLineCode(), qd.getSender());
                             log.info("directive 64 nbbm: " + qd.getNbbm() + " lineCode: " + qd.getLineCode());
                         }
@@ -219,7 +219,7 @@ public class SchAttrCalculator {
         boolean limitPark = StringUtils.isNotEmpty(park);
         ScheduleRealInfo sch, prev = null;
-        for(int i = list.size() - 1; i > 0; i --){
+        for(int i = list.size() - 1; i >= 0; i --){
             sch = list.get(i);
             //如果是出站既出场，忽略出场班次