Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents aacee66a edc8d8cf
Showing 4 changed files with 20 additions and 84 deletions
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
@@ -89,6 +89,8 @@ public class ServiceDataInterface {
             map.put("remarks", sch.getRemark());
             map.put("status", sch.getStatus());
+            //放站班次，放到的站点
+            map.put("majorStationName", sch.getMajorStationName());
             rs.add(map);
         }
         return rs;
@@ -146,8 +146,8 @@ public class InStationProcess {
             dayOfSchedule.removeExecPlan(nbbm);
         //通知误点停靠程序，有车辆到站
-        //LateAdjustHandle.carArrive(gps, next);
-        LateAdjustHandle.carArrive(gps);
+        LateAdjustHandle.carArrive(gps, next);
+        //LateAdjustHandle.carArrive(gps);
         //路牌的下一个班次，页面显示起点实际到达时间
         ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch);
 package com.bsth.data.schedule.late_adjust;
-import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.entity.realcontrol.LineConfig;
@@ -9,7 +8,6 @@ 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.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -154,37 +152,18 @@ public class LateAdjustHandle implements ApplicationContextAware {
     }
     /**
-     * 车辆到站
+     * 车辆到站 进站 进 的哪个班次，就调该车辆的下一个班次
      *
      * @param gps
      */
-    public static void carArrive(GpsEntity gps) {
+    public static void carArrive(GpsEntity gps, ScheduleRealInfo sch) {
         try {
-            if (gps.getInstation() <= 0) {
+            if (gps.getInstation() <= 0 || null == sch)
                 return;
-            }
             List<ScheduleRealInfo> list = lateSchMaps.get(gps.getNbbm());
-            if (null == list || list.size() == 0)
-                return;
-
-
-            String key = gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo(), name1 = BasicData.stationCode2NameMap.get(key)//站点名称
-                    , name2 = null;
-            if (StringUtils.isNotEmpty(gps.getCarparkNo())) {
-                name2 = BasicData.stationCode2NameMap.get(gps.getCarparkNo());
-            }
-
-            if (gps.getInstation() == 2) {
-                name1 = name2;//进场，没有站
-            }
-
-            gps.setStationName(name1);
-            //根据起点站获取误点班次
-            ScheduleRealInfo sch = findExistQdz(list, gps.getStopNo(), name1, name2);
-
-            if (null == sch)
+            if (null == list || list.size() == 0 || !list.contains(sch))
                 return;
             //可能是延迟信号，gps时间没有误点
@@ -194,21 +173,17 @@ public class LateAdjustHandle implements ApplicationContextAware {
                 return;
             }
-            if (gps.getStationName().equals(sch.getQdzName())
-                    || gps.getStopNo().equals(sch.getQdzCode())
-                    || sch.getQdzName().equals(name2)) {
-                //自动调整待发 到达时间 + 停靠时间
-                long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
+            //自动调整待发 到达时间 + 停靠时间
+            long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-                sch.setDfsjAll(dt);
-                sch.setDfAuto(true);
-                //取消应发未到标记
-                sch.setLate2(false);
+            sch.setDfsjAll(dt);
+            sch.setDfAuto(true);
+            //取消应发未到标记
+            sch.setLate2(false);
-                lateSchMaps.remove(sch.getClZbh(), sch);
-                logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
-            }
+            lateSchMaps.remove(sch.getClZbh(), sch);
+            logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("late2 car arrive", e);
@@ -216,47 +191,6 @@ public class LateAdjustHandle implements ApplicationContextAware {
     }
-    /**
-     * 车辆到站， 进站 进 的哪个班次，就调该车辆的下一个班次
-     *
-     * @param gps
-     * @param sch public static void carArrive(GpsEntity gps, ScheduleRealInfo sch) {
-     *            try {
-     *            if (gps.getInstation() <= 0 || null == sch) {
-     *            return;
-     *            }
-     *            <p>
-     *            List<ScheduleRealInfo> list = lateSchMaps.get(gps.getNbbm());
-     *            <p>
-     *            if (null == list || list.size() == 0 || !list.contains(sch)) {
-     *            return;
-     *            }
-     *            <p>
-     *            //可能是延迟信号，gps时间没有误点
-     *            if (gps.getTimestamp() <= sch.getDfsjT()) {
-     *            sch.setLate2(false);
-     *            lateSchMaps.remove(sch.getClZbh(), sch);
-     *            return;
-     *            }
-     *            <p>
-     *            <p>
-     *            //自动调整待发 到达时间 + 停靠时间
-     *            long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-     *            <p>
-     *            sch.setDfsjAll(dt);
-     *            sch.setDfAuto(true);
-     *            //取消应发未到标记
-     *            sch.setLate2(false);
-     *            <p>
-     *            lateSchMaps.remove(sch.getClZbh(), sch);
-     *            logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
-     *            } catch (Exception e) {
-     *            e.printStackTrace();
-     *            logger.error("late2 car arrive", e);
-     *            }
-     *            }
-     */
-
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         lineConfigData = applicationContext.getBean(LineConfigData.class);
@@ -150,9 +150,9 @@ public class GpsServiceImpl implements GpsService {
      * @return -1无效 0上行 1下行
      */
     public static byte getUpOrDown(long serviceState) {
-        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+        /*if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
                 || (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
-            return -1;
+            return -1;*/
         return (byte) (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
     }
@@ -162,8 +162,8 @@ public class GpsServiceImpl implements GpsService {
      * @return -1无效 0运营 1未运营
      */
     public static byte getService(long serviceState) {
-        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000)
-            return -1;
+        /*if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000)
+            return -1;*/
         return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
     }