update...

panzhaov5
1 parent 64119598
Showing 1 changed file with 16 additions and 71 deletions
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
@@ -7,7 +7,6 @@ import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.util.Arith;
 import com.bsth.websocket.handler.SendUtils;
-import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -16,7 +15,8 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 import java.util.Collection;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 误点自动调整待发 处理程序
@@ -33,17 +33,11 @@ public class LateAdjustHandle implements ApplicationContextAware {
     static Logger logger = LoggerFactory.getLogger(LateAdjustHandle.class);
     /**
-     * 应发未到车辆 和 班次
-     * <p>
-     * 起点相同的，保留最后一个班次
+     * 应发未到的班次 key : id
      */
-    private static ArrayListMultimap lateSchMaps;
+    private static Map<Long, ScheduleRealInfo> lateSchMap = new HashMap<>();
-    static {
-        lateSchMaps = ArrayListMultimap.create();
-    }
-
     /**
      * 新增一个误点班次
      *
@@ -63,15 +57,12 @@ public class LateAdjustHandle implements ApplicationContextAware {
             if (sch.getDfsj().compareTo(config.getYjtkStart()) > 0
                     && sch.getDfsj().compareTo(config.getYjtkEnd()) <= 0) {
-                ScheduleRealInfo old = popLateSch(sch);
-
-                //班次被压入
-                if (lateSchMaps.containsEntry(sch.getClZbh(), sch)) {
-
-                    logger.info("21【应发未到 -多个(" + lateSchMaps.get(sch.getClZbh()).size() + ")】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
+                //班次压入
+                if (!lateSchMap.containsKey(sch.getId())) {
+                    logger.info("29【应发未到 班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
                     //通知客户端
                     sch.setLate2(true);
-                    sendUtils.sendAutoWdtz(sch, old);
+                    sendUtils.sendAutoWdtz(sch, null);
                 }
             }
@@ -80,51 +71,6 @@ public class LateAdjustHandle implements ApplicationContextAware {
         }
     }
-    /**
-     * 压入新的误点班次
-     *
-     * @param sch
-     * @return 返回被移除的误点班次
-     */
-    private static ScheduleRealInfo popLateSch(ScheduleRealInfo sch) {
-        List<ScheduleRealInfo> list = lateSchMaps.get(sch.getClZbh());
-
-        if (null == list || list.size() == 0)
-            lateSchMaps.put(sch.getClZbh(), sch);
-        else {
-            ScheduleRealInfo old = findExistQdz(list, sch.getQdzCode(), sch.getQdzName(), "");
-
-            if (null == old)
-                lateSchMaps.put(sch.getClZbh(), sch);
-            else if (old.getDfsjT() < sch.getDfsjT()) {
-                //同一个起点，保留时间最大的班次
-                lateSchMaps.remove(old.getClZbh(), old);
-                lateSchMaps.put(sch.getClZbh(), sch);
-
-                logger.info(sch.getClZbh() + "【应发未到】old 班次 " + old.getId() + " -被覆盖！");
-                return old;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * 搜索同样起点的班次
-     *
-     * @param list
-     * @return
-     */
-    private static ScheduleRealInfo findExistQdz(List<ScheduleRealInfo> list, String qdzCode, String nam1, String name2) {
-        for (ScheduleRealInfo item : list) {
-            if (item.getQdzCode().equals(qdzCode)
-                    || item.getQdzName().equals(nam1)
-                    || item.getQdzName().equals(name2))
-                return item;
-        }
-        return null;
-    }
-
     /**
      * 获取所有应发未到的班次
@@ -132,13 +78,13 @@ public class LateAdjustHandle implements ApplicationContextAware {
      * @return
      */
     public static Collection<ScheduleRealInfo> allLateSch() {
-        return lateSchMaps.values();
+        return lateSchMap.values();
     }
     public static void remove(ScheduleRealInfo sch) {
         try {
-            if (lateSchMaps.containsEntry(sch.getClZbh(), sch)) {
-                lateSchMaps.remove(sch.getClZbh(), sch);
+            if (lateSchMap.containsKey(sch.getId())) {
+                lateSchMap.remove(sch.getId());
                 sch.setLate2(false);
                 sch.setLateMinute(0);
@@ -161,15 +107,14 @@ public class LateAdjustHandle implements ApplicationContextAware {
             if (gps.getInstation() <= 0 || null == sch)
                 return;
-            List<ScheduleRealInfo> list = lateSchMaps.get(gps.getNbbm());
-
-            if (null == list || list.size() == 0 || !list.contains(sch))
+            if (!lateSchMap.containsKey(sch.getId()))
                 return;
+
             //可能是延迟信号，gps时间没有误点
             if (gps.getTimestamp() <= sch.getDfsjT()) {
                 sch.setLate2(false);
-                lateSchMaps.remove(sch.getClZbh(), sch);
+                lateSchMap.remove(sch.getId());
                 return;
             }
@@ -182,8 +127,8 @@ public class LateAdjustHandle implements ApplicationContextAware {
             //取消应发未到标记
             sch.setLate2(false);
-            lateSchMaps.remove(sch.getClZbh(), sch);
-            logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
+            lateSchMap.remove(sch.getId());
+            logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt + " -id:" + sch.getId());
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("late2 car arrive", e);