update...

潘钊
1 parent ae4b1e0c
Showing 4 changed files with 35 additions and 6 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
@@ -175,7 +175,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             dayOfSchedule.save(sch);
             //清理应发未发标记
-            LateAdjustHandle.remove(sch);
+            LateAdjustHandle.remove(sch.getClZbh());
             if(!gps.isService() && !dayOfSchedule.emptyService(sch)){
                 //切换成营运状态
@@ -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=267";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=285";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -162,6 +162,15 @@ public class PilotReport {
             LineConfig conf = lineConfigData.get(sch.getXlBm());
             if (conf.getOutConfig() == 1) {
+
+                try{
+                    //最大允许时间阈值 2 小时
+                    if(Math.abs(d80.getTimestamp() - sch.getDfsjT()) > 1000 * 60 * 60 * 2)
+                        return;
+                }catch (Exception e){
+                    logger.error("", e);
+                }
+
                 //为相关班次写入请求出场时间
                 sch.setFcsjActualAll(d80.getTimestamp());
@@ -102,12 +102,25 @@ public class LateAdjustHandle implements ApplicationContextAware{
                 sch.setLate2(false);
                 sch.setLateMinute(0);
                 sch.setDfAuto(false);
+
+                logger.info("移除误点调整 -" + sch.getClZbh());
             }
         }catch (Exception e){
             logger.error("", e);
         }
     }
+    public static void remove(String nbbm){
+        if(lateSchMap.containsKey(nbbm)){
+            ScheduleRealInfo sch = lateSchMap.get(nbbm);
+            sch.setLate2(false);
+            sch.setLateMinute(0);
+            sch.setDfAuto(false);
+
+            logger.info("移除误点调整 nbbm -" + nbbm);
+        }
+    }
+
     /**
      * 车辆到站
      * @param gps
@@ -127,10 +140,17 @@ public class LateAdjustHandle implements ApplicationContextAware{
                     /*&& sch.getLateMinute() > 0*/){
                 //自动调整待发 到达时间 + 停靠时间
                 long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-                sch.setDfsjAll(dt);
-                sch.setDfAuto(true);
-                //取消应发未到标记
-                sch.setLate2(false);
+
+                //超过2小时最大阈值，放弃
+                if(Math.abs(dt - sch.getDfsjT()) > 1000 * 60 * 60 * 2){
+                    logger.info(sch.getClZbh() + " 超过误点调整阈值，放弃");
+                }
+                else{
+                    sch.setDfsjAll(dt);
+                    sch.setDfAuto(true);
+                    //取消应发未到标记
+                    sch.setLate2(false);
+                }
                 lateSchMap.remove(sch.getClZbh());
                 logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);