update

潘钊
1 parent b11fe36f
Showing 1 changed file with 49 additions and 4 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
@@ -2,7 +2,6 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.bsth.Application;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.FirstScheduleCheckThread;
 import com.bsth.data.gpsdata.GpsRealData;
@@ -34,7 +33,6 @@ import org.springframework.stereotype.Component;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 /**
  * @author PanZhao
@@ -134,7 +132,7 @@ public class DayOfSchedule implements CommandLineRunner {
         //首班出场指令补发器
 //		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
         //班次误点扫描
-        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
         //每天凌晨2点20提交数据到运管处
         long diff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
@@ -221,7 +219,7 @@ public class DayOfSchedule implements CommandLineRunner {
             }
             // 页面 翻班通知
-            sendUtils.shiftSchedule(lineCode);
+            //sendUtils.shiftSchedule(lineCode);
         } catch (Exception e) {
             logger.error("", e);
             return -1;
@@ -492,6 +490,41 @@ public class DayOfSchedule implements CommandLineRunner {
     }
     /**
+     * 下一个相同走向的班次
+     * @param sch
+     * @return
+     */
+    public ScheduleRealInfo nextSame(ScheduleRealInfo sch){
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        int outConfig = -1;
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (config != null)
+            outConfig = config.getOutConfig();
+
+        boolean flag = false;
+        ScheduleRealInfo next = null;
+        for (ScheduleRealInfo temp : list) {
+            if (temp.getId() == sch.getId()) {
+                flag = true;
+                continue;
+            }
+            //忽略烂班
+            if (temp.isDestroy())
+                continue;
+
+            //出站既出场，忽略出场班次
+            if (outConfig == 2 && temp.getBcType().equals("out"))
+                continue;
+
+            if (flag && temp.getXlDir().equals(sch.getXlDir())) {
+                next = temp;
+                break;
+            }
+        }
+        return next;
+    }
+
+    /**
      * 上一个班次
      *
      * @param sch
@@ -516,6 +549,18 @@ public class DayOfSchedule implements CommandLineRunner {
         return prev;
     }
+    /**
+     * 是否是首班出场
+     * @param sch
+     * @return
+     */
+    public boolean isFirstOut(ScheduleRealInfo sch){
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        if(list.get(0).equals(sch) && sch.getBcType().equals("out"))
+            return true;
+        return false;
+    }
+
     public void put(ScheduleRealInfo sch) {
         schAttrCalculator
                 .calcRealDate(sch)