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 3f8436ce 95465573
Showing 18 changed files with 116 additions and 703 deletions
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.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/handlers/ReverseRouteProcess.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataUtils.java
src/main/java/com/bsth/data/gpsdata_v2/utils/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/auto_exec/RealScheduleAutoExecHandler.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/java/com/bsth/service/realcontrol/LineConfigService.java
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
src/main/java/com/bsth/websocket/entity/WsScheduleRealInfo.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
src/main/resources/static/real_control_v2/js/main.js
@@ -121,4 +121,9 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	public Map<String, Object> setAutoExec(@RequestParam Map<String, String> map){
 		return lineConfigService.setAutoExec(map);
 	}
+
+	@RequestMapping(value = "/setReadReverse")
+	public Map<String, Object> setReadReverse(@RequestParam int status,@RequestParam String lineCode){
+		return lineConfigService.setReadReverse(status, lineCode);
+	}
 }
@@ -131,6 +131,7 @@ public class LineConfigData implements CommandLineRunner {
         if (null == line)
             throw new NullPointerException("异常的lineCode");
+        conf.setReadReverse(true);
         conf.setLine(line);
         //开始运营时间
         conf.setStartOpt("02:00");
@@ -152,11 +152,11 @@ public class GpsCacheData {
     private static List<StationRoute> searchLinked(LinkedList<GpsEntity> list, int upDown){
         List<StationRoute> rs = new ArrayList<>();
-        Iterator<GpsEntity> iterator = list.iterator();
+
         GpsEntity gps;
         int prevCode=0;
-        while (iterator.hasNext()){
-            gps = iterator.next();
+        for(int i = list.size() - 1; i > 0; i --){
+            gps = list.get(i);
             if(gps.getInstation()!=1)
                 continue;
@@ -43,6 +43,11 @@ public class InStationProcess {
     Logger logger = LoggerFactory.getLogger(this.getClass());
     public void process(GpsEntity gps) {
+        //自动执行的班次信号，滚蛋
+        LineConfig config = lineConfigData.get(gps.getLineId());
+        if(null != config && config.isAutoExec())
+            return;
+
         GpsEntity prev = GpsCacheData.getPrev(gps);
         if(null == prev)
@@ -81,7 +86,7 @@ public class InStationProcess {
         //要经过2个中途站才能进
         int count = GpsCacheData.lastInTrailsSize(gps);
         List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
-        if (isNotInOut(sch) && gps.getInstation() == 1 && routes.size() > 4
+        if (null != sch && isNormalSch(sch) && gps.getInstation() == 1 && routes.size() > 4
                 && count < 2) {
             logger.info("没有进中途站，拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp());
             flow = false;
@@ -90,7 +95,8 @@ public class InStationProcess {
         boolean isEnd = false;
         //进终点
-        if (flow && null != sch && sch.getZdzCode().equals(gps.getStopNo())) {
+        if (flow && null != sch &&
+                ((sch.getZdzCode().equals(gps.getStopNo()) && gps.getInstation()>0) || sch.getZdzCode().equals(gps.getCarparkNo()))) {
             inEndStation(sch, gps);
             isEnd = true;
         }
@@ -98,6 +104,10 @@ public class InStationProcess {
         GpsCacheData.in(gps, isEnd);
     }
+    private boolean isNormalSch(ScheduleRealInfo sch) {
+        return sch.getBcType().equals("normal");
+    }
+
     private boolean isNotInOut(ScheduleRealInfo sch) {
         return !sch.getBcType().equals("in") && !sch.getBcType().equals("out");
     }
@@ -41,28 +41,34 @@ public class OutStationProcess {
     GpsStatusManager gpsStatusManager;
     private final static int MAX_BEFORE_TIME = 1000 * 60 * 120;
-    public void process(GpsEntity gps){
+    public void process(GpsEntity gps) {
+        //自动执行的班次信号，滚蛋
+        LineConfig config = lineConfigData.get(gps.getLineId());
+        if (null != config && config.isAutoExec())
+            return;
+
         GpsEntity prev = GpsCacheData.getPrev(gps);
-        if(null == prev)
+        if (null == prev)
             return;
         //从站内到站外
-        if(prev.getInstation() > 0 && gps.getInstation() == 0)
+        if (prev.getInstation() > 0 && gps.getInstation() == 0)
             outStation(gps, prev);
         //从站内到另一个站内
-        if(prev.getInstation() > 0 && gps.getInstation() > 0
+        if (prev.getInstation() > 0 && gps.getInstation() > 0
                 && !prev.getStopNo().equals(gps.getStopNo()))
             outStation(gps, prev);
         //在被起点站覆盖的情况下出场
-        if(isOutPark(gps, prev))
+        if (isOutPark(gps, prev))
             outStation(gps, prev);
     }
     /**
      * 出站
+     *
      * @param gps
      */
     private void outStation(GpsEntity gps, GpsEntity prev) {
@@ -70,22 +76,24 @@ public class OutStationProcess {
         //起点发车
         if (null != sch &&
-                (sch.getQdzCode().equals(prev.getStopNo()) || sch.getQdzCode().equals(prev.getCarparkNo()))){
+                ((sch.getQdzCode().equals(prev.getStopNo())
+                        && (gps.getInstation() == 0 || !gps.getStopNo().equals(prev.getStopNo())))
+                        || sch.getQdzCode().equals(prev.getCarparkNo()))) {
             //发车班次匹配
-            if(!signalSchPlanMatcher.outMatch(gps, sch)){
+            if (!signalSchPlanMatcher.outMatch(gps, sch)) {
                 outStation(gps, prev);
                 return;
             }
             int diff = (int) (sch.getDfsjT() - gps.getTimestamp());
             //首班出场最多提前2小时
-            if((dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME / 2)
+            if ((dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME / 2)
                 return;
             gps.setPremiseCode(null);//清除前置围栏标记
-            if(StringUtils.isNotEmpty(sch.getFcsjActual())
-                    && !outManyFit(gps, sch)){
+            if (StringUtils.isNotEmpty(sch.getFcsjActual())
+                    && !outManyFit(gps, sch)) {
                 return;//班次已经实发
             }
@@ -108,7 +116,7 @@ public class OutStationProcess {
             LateAdjustHandle.remove(sch.getClZbh());
             //发车的时候，同步一下状态
-            if(!gps.isService() && !dayOfSchedule.emptyService(sch))
+            if (!gps.isService() && !dayOfSchedule.emptyService(sch))
                 gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 0, "发车@系统");
             logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
@@ -119,16 +127,17 @@ public class OutStationProcess {
     /**
      * 是否是一个更合适的发车信号
+     *
      * @param gps
      * @param sch
      * @return
      */
     private boolean outManyFit(GpsEntity gps, ScheduleRealInfo sch) {
         LineConfig conf = lineConfigData.get(sch.getXlBm());
-        if(null != conf && conf.isLockFirstOutTime())
+        if (null != conf && conf.isLockFirstOutTime())
             return false;
-        if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+        if (StringUtils.isNotEmpty(sch.getZdsjActual()))
             return false;
         long t1 = sch.getFcsjActualTime();
@@ -136,18 +145,18 @@ public class OutStationProcess {
         long c = sch.getDfsjT();
         int threshold = 1000 * 60 * 5;
-        if(Math.abs(t2 - c) < threshold && c - t1 > threshold){
+        if (Math.abs(t2 - c) < threshold && c - t1 > threshold) {
             return true;
         }
-        if(c - t1 > 1000 * 60 * 60 * 2 && Math.abs(t2 - c) < c - t1){
+        if (c - t1 > 1000 * 60 * 60 * 2 && Math.abs(t2 - c) < c - t1) {
             return true;
         }
         return false;
     }
-    private void outStationAndOutPark(ScheduleRealInfo sch){
-        try{
+    private void outStationAndOutPark(ScheduleRealInfo sch) {
+        try {
             LineConfig config = lineConfigData.get(sch.getXlBm());
             //限定出站既出场的停车场
             String park = config.getTwinsPark();
@@ -168,26 +177,26 @@ public class OutStationProcess {
                     dayOfSchedule.save(schPrev);
                 }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
         }
     }
-    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;
     }
-    private boolean isOut(ScheduleRealInfo sch){
+    private boolean isOut(ScheduleRealInfo sch) {
         return sch != null && sch.getBcType().equals("out");
     }
-    private void endSch(ScheduleRealInfo sch, Long t){
+    private void endSch(ScheduleRealInfo sch, Long t) {
         sch.setFcsjActualAll(t);
         sch.setZdsjActualAll(t);
     }
-    private boolean isOutPark(GpsEntity gps, GpsEntity prve){
-        if(StringUtils.isNotEmpty(prve.getCarparkNo()) && StringUtils.isEmpty(gps.getCarparkNo()))
+    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.handlers;
+import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.entity.StationRoute;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -18,15 +20,22 @@ import java.util.List;
 @Component
 public class ReverseRouteProcess {
-    private static final int REVER_THRESHOLD = 3;
+    private static final int REVER_THRESHOLD = 6;
-    private static final long TIME_THRESHOLD = 1000 * 60 * 120;
+    private static final long TIME_THRESHOLD = 1000 * 60 * 30;
     @Autowired
     DayOfSchedule dayOfSchedule;
+    @Autowired
+    LineConfigData lineConfigData;
+
     public void process(GpsEntity gps){
-        if(reversRoute(gps) && !GeoCacheData.isLoopLine(gps.getLineId())){
+
+        LineConfig config = lineConfigData.get(gps.getLineId());
+        if(null != config && config.isReadReverse() &&
+                reversRoute(gps) && !GeoCacheData.isLoopLine(gps.getLineId())){
+
             ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
             if(isInOut(sch) || !sch.getXlBm().equals(gps.getLineId()))
                 return;
@@ -60,7 +60,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("W7C-035"))
+            /*if(nbbm.equals("W1E-169"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
             /*if(lineId.equals("60028"))
                 new RecoveryThread(listMap.get(lineId), count).run();*/
@@ -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,SERVER_TS from bsth_c_gps_info where days_year=327"; //+ dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=329"; //+ dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -154,7 +154,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 for (GpsEntity gps : list) {
                     try {
-                        /*if(gps.getTimestamp() >= 1511396220000L)
+                        /*if(gps.getTimestamp() >= 1511569544000L)
                             System.out.println("aaa");*/
                         if(Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
@@ -25,7 +25,7 @@ public class GpsDataUtils {
         try {
             for (GpsEntity gps : list) {
-                if (gps.getValid() == 0 && Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
+                if (gps.getValid() == 0 && Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) < 1000 * 60 * 20)
                     rs.add(gps);
             }
@@ -41,11 +41,15 @@ public class SignalSchPlanMatcher {
         try{
             //晚于待发时间 10 分钟 ，匹配一下最佳的班次
             if(t - sch.getDfsjT() > 1000 * 60 * 10){
-                ScheduleRealInfo near = searchNearOut(gps);
+                ScheduleRealInfo near = searchNearSch(gps, sch.getQdzCode());
                 if(null != near && !near.getId().equals(sch.getId())){
-                    dayOfSchedule.addExecPlan(near);
-                    return false;
+
+                    if(Math.abs(t - near.getDfsjT()) < Math.abs((t - sch.getDfsjT()))){
+
+                        dayOfSchedule.addExecPlan(near);
+                        return false;
+                    }
                 }
             }
@@ -101,7 +105,7 @@ public class SignalSchPlanMatcher {
      * @param gps
      * @return
      */
-    private ScheduleRealInfo searchNearOut(GpsEntity gps) {
+    private ScheduleRealInfo searchNearSch(GpsEntity gps, String qdzCode) {
         List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(gps.getNbbm());
         //排序
         Collections.sort(list, schComp);
@@ -109,6 +113,8 @@ public class SignalSchPlanMatcher {
         ScheduleRealInfo near = null;
         int diff, minDiff=-1;
         for(ScheduleRealInfo sch : list){
+            if(!sch.getQdzCode().equals(qdzCode))
+                continue;
             if(StringUtils.isNotEmpty(sch.getFcsjActual()))
                 continue;
@@ -98,7 +98,7 @@ public class SchAttrCalculator {
             // 计划终点时间
             if (sch.getBcsj() != null) {
-                sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
+                sch.setZdsjT(sch.getFcsjT() + (sch.getBcsj() * 60 * 1000));
                 sch.setZdsj(fmtHHmm.print(sch.getZdsjT()));
             }
         } catch (ParseException e) {
@@ -37,6 +37,7 @@ public class RealScheduleAutoExecHandler {
         if (StringUtils.isEmpty(sch.getZdsjActual()) && sch.getZdsjT() < t) {
             sch.setZdsjActualAll(sch.getZdsjT());
+            flag = true;
             //准备执行下一个班次
             ScheduleRealInfo next = dayOfSchedule.next(sch);
@@ -48,11 +49,13 @@ public class RealScheduleAutoExecHandler {
                 }
             }
-            //路牌的下一个班次，线调页面显示
+            //路牌有下一个班次，线调页面显示
             ScheduleRealInfo nextLp = dayOfSchedule.nextByLp(sch);
             if (null != nextLp) {
-                nextLp.setQdzArrDatesj(sch.getZdsjActual());
+                //入库
+                dayOfSchedule.save(sch);
+                nextLp.setQdzArrDatesj(sch.getZdsjActual());
                 List<ScheduleRealInfo> refs = new ArrayList<>();
                 refs.add(sch);
                 refs.add(nextLp);
@@ -36,7 +36,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES);
+                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL);
     }
     @Override
@@ -28,4 +28,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
     Map<String,Object> findByIdx(String idx);
     Map<String,Object> setAutoExec(Map<String, String> map);
+
+    Map<String,Object> setReadReverse(int status, String lineCode);
 }
@@ -245,4 +245,22 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> setReadReverse(int status, String lineCode) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            LineConfig conf = lineConfigData.get(lineCode);
+            conf.setReadReverse(status==1?true:false);
+
+            lineConfigData.set(conf);
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("conf", conf);
+        } catch (Exception e) {
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+            logger.error("", e);
+        }
+        return rs;
+    }
 }
-package com.bsth.websocket.entity;
-
-import com.bsth.entity.realcontrol.ChildTaskPlan;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Transient;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * 精简字段的实际排班 entity
- * webSocket 传输用，去掉了页面不需要的一些字段
- * Created by panzhao on 2017/11/14.
- */
-public class WsScheduleRealInfo {
-
-    public static WsScheduleRealInfo getInstance(ScheduleRealInfo sch){
-        if(null == sch)
-            return null;
-        WsScheduleRealInfo wss = new WsScheduleRealInfo();
-        wss.id = sch.getId();
-        wss.scheduleDateStr = sch.getScheduleDateStr();
-        wss.realExecDate = sch.getRealExecDate();
-        wss.xlName = sch.getXlName();
-        wss.xlBm = sch.getXlBm();
-        wss.lpName = sch.getLpName();
-        wss.clZbh = sch.getClZbh();
-        wss.jGh = sch.getjGh();
-        wss.jName = sch.getjName();
-        wss.sGh = sch.getsGh();
-        wss.sName = sch.getsName();
-        wss.xlDir = sch.getXlDir();
-        wss.qdzCode = sch.getQdzCode();
-        wss.qdzName = sch.getQdzName();
-        wss.zdzCode = sch.getZdzCode();
-        wss.zdzName = sch.getZdzName();
-        wss.fcsj = sch.getFcsj();
-        wss.fcsjT = sch.getFcsjT();
-        wss.zdsj = sch.getZdsj();
-        wss.zdsjT = sch.getZdsjT();
-        wss.jhlc = sch.getJhlc();
-        wss.jhlcOrig = sch.getJhlcOrig();
-        wss.bcsj = sch.getBcsj();
-        wss.bcType = sch.getBcType();
-        wss.majorStationName = sch.getMajorStationName();
-        wss.fcsjActual = sch.getFcsjActual();
-        wss.fcsjActualTime = sch.getFcsjActualTime();
-        wss.zdsjActual = sch.getZdsjActual();
-        wss.zdsjActualTime = sch.getZdsjActualTime();
-        wss.status = sch.getStatus();
-        wss.adjustExps = sch.getAdjustExps();
-        wss.sflj = sch.isSflj();
-        wss.late = sch.isLate();
-        wss.late2 = sch.isLate2();
-        wss.lateMinute = sch.getLateMinute();
-        wss.remarks = sch.getRemarks();
-        wss.dfsj = sch.getDfsj();
-        wss.dfsjT = sch.getDfsjT();
-        wss.directiveState = sch.getDirectiveState();
-        wss.qdzArrDatejh = sch.getQdzArrDatejh();
-        wss.qdzArrDatesj = sch.getQdzArrDatesj();
-        wss.cTasks = sch.getcTasks();
-        wss.gsName = sch.getGsName();
-        wss.gsBm = sch.getGsBm();
-        wss.fgsName = sch.getFgsName();
-        wss.fgsBm = sch.getFgsBm();
-        wss.dfAuto = sch.isDfAuto();
-        wss.online = sch.isOnline();
-        wss.reissue = sch.isReissue();
-        wss.driftStatus = sch.getDriftStatus();
-        wss.ccService = sch.isCcService();
-        return wss;
-    }
-
-
-    public static List<WsScheduleRealInfo> getMultiInstance(List<ScheduleRealInfo> list){
-        List<WsScheduleRealInfo> rs = new ArrayList<>();
-        for(ScheduleRealInfo sch : list){
-            rs.add(getInstance(sch));
-        }
-        return rs;
-    }
-
-    /** 主键Id */
-    private Long id;
-
-    /** 排班日期字符串 YYYY-MM-DD */
-    private String scheduleDateStr;
-
-    /** 真实执行时间 yyyy-MM-dd */
-    private String realExecDate;
-
-    /** 线路名称 */
-    private String xlName;
-    /** 线路编码 */
-    private String xlBm;
-
-    /** 路牌名称 */
-    private String lpName;
-
-    /** 车辆自编号 */
-    private String clZbh;
-
-    /** 驾驶员工号 */
-    private String jGh;
-    /** 驾驶员名字 */
-    private String jName;
-    /** 售票员工号 */
-    private String sGh;
-    /** 售票员名字 */
-    private String sName;
-
-    /** 线路方向 */
-    private String xlDir;
-    /** 起点站code*/
-    private String qdzCode;
-    /** 起点站名字 */
-    private String qdzName;
-
-    /** 终点站code*/
-    private String zdzCode;
-    /** 终点站名字 */
-    private String zdzName;
-
-    /** 计划发车时间（格式 HH:mm） */
-    private String fcsj;
-    /** 计划发车时间戳*/
-    @Transient
-    private Long fcsjT;
-
-    /** 计划终点时间（格式 HH:mm） */
-    private String zdsj;
-    /** 计划终点时间戳*/
-    @Transient
-    private Long zdsjT;
-
-    /** 计划里程 */
-    private Double jhlc;
-
-    /** 原始计划里程 （原计调的数据） */
-    private Double jhlcOrig;
-    /** 班次历时 */
-    private Integer bcsj;
-
-    /**
-     * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
-     */
-    private String bcType;
-
-    //放站班次 站点名称
-    private String majorStationName;
-
-    /** 实际发车时间*/
-    private String fcsjActual;
-    /** 实际发车时间戳*/
-    @Transient
-    private Long fcsjActualTime;
-    /**实际终点时间 */
-    private String zdsjActual;
-    /** 实际终点时间戳*/
-    @Transient
-    private Long zdsjActualTime;
-
-    /**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
-    private int status;
-
-    private String adjustExps;
-
-    /** 是否是临加班次 */
-    private boolean sflj;
-
-    /** 是否误点  （应发未发）*/
-    @Transient
-    private boolean late;
-
-    /** 是否误点 （应发未到） */
-    @Transient
-    private boolean late2;
-    /** 误点停靠时间 */
-    @Transient
-    private float lateMinute;
-
-    /** 备注*/
-    private String remarks;
-
-    /**待发时间（格式 HH:mm） */
-    private String dfsj;
-
-    /**待发时间戳 */
-    @Transient
-    private Long dfsjT;
-
-    /** 指令下发状态  60: 已发送， 100： 设备确认收到， 200：驾驶员确认   0：失败 */
-    private Integer directiveState = -1;
-
-    /** 起点站计划到达时间 */
-    @Transient
-    private String qdzArrDatejh;
-
-    /** 起点站实际到达时间 */
-    @Transient
-    private String qdzArrDatesj;
-
-    /** 子任务 */
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "schedule")
-    private Set<ChildTaskPlan> cTasks = new HashSet<>();
-
-    /** 关联的公司名称 */
-    private String gsName;
-    /** 关联的公司编码 */
-    private String gsBm;
-    /** 关联的分公司名称 */
-    private String fgsName;
-    /** 关联的分公司编码 */
-    private String fgsBm;
-
-    //待发调试（是否自动调整）
-    private boolean dfAuto;
-    //是否有GPS信号
-    private boolean online;
-
-    /** 是否有补发GPS信号 */
-    private boolean reissue;
-
-    /**
-     * 漂移状态
-     * 1: 发车漂移
-     * 2：到站漂移
-     * 3：中途漂移
-     */
-    private Integer driftStatus = 0;
-
-    /**
-     * 换车营运标记 true 表示该主任务由 【中途换车子任务】 级联生成
-     */
-    private boolean ccService;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getScheduleDateStr() {
-        return scheduleDateStr;
-    }
-
-    public void setScheduleDateStr(String scheduleDateStr) {
-        this.scheduleDateStr = scheduleDateStr;
-    }
-
-    public String getRealExecDate() {
-        return realExecDate;
-    }
-
-    public void setRealExecDate(String realExecDate) {
-        this.realExecDate = realExecDate;
-    }
-
-    public String getXlName() {
-        return xlName;
-    }
-
-    public void setXlName(String xlName) {
-        this.xlName = xlName;
-    }
-
-    public String getXlBm() {
-        return xlBm;
-    }
-
-    public void setXlBm(String xlBm) {
-        this.xlBm = xlBm;
-    }
-
-    public String getLpName() {
-        return lpName;
-    }
-
-    public void setLpName(String lpName) {
-        this.lpName = lpName;
-    }
-
-    public String getClZbh() {
-        return clZbh;
-    }
-
-    public void setClZbh(String clZbh) {
-        this.clZbh = clZbh;
-    }
-
-    public String getjGh() {
-        return jGh;
-    }
-
-    public void setjGh(String jGh) {
-        this.jGh = jGh;
-    }
-
-    public String getjName() {
-        return jName;
-    }
-
-    public void setjName(String jName) {
-        this.jName = jName;
-    }
-
-    public String getsGh() {
-        return sGh;
-    }
-
-    public void setsGh(String sGh) {
-        this.sGh = sGh;
-    }
-
-    public String getsName() {
-        return sName;
-    }
-
-    public void setsName(String sName) {
-        this.sName = sName;
-    }
-
-    public String getXlDir() {
-        return xlDir;
-    }
-
-    public void setXlDir(String xlDir) {
-        this.xlDir = xlDir;
-    }
-
-    public String getQdzCode() {
-        return qdzCode;
-    }
-
-    public void setQdzCode(String qdzCode) {
-        this.qdzCode = qdzCode;
-    }
-
-    public String getQdzName() {
-        return qdzName;
-    }
-
-    public void setQdzName(String qdzName) {
-        this.qdzName = qdzName;
-    }
-
-    public String getZdzCode() {
-        return zdzCode;
-    }
-
-    public void setZdzCode(String zdzCode) {
-        this.zdzCode = zdzCode;
-    }
-
-    public String getZdzName() {
-        return zdzName;
-    }
-
-    public void setZdzName(String zdzName) {
-        this.zdzName = zdzName;
-    }
-
-    public String getFcsj() {
-        return fcsj;
-    }
-
-    public void setFcsj(String fcsj) {
-        this.fcsj = fcsj;
-    }
-
-    public Long getFcsjT() {
-        return fcsjT;
-    }
-
-    public void setFcsjT(Long fcsjT) {
-        this.fcsjT = fcsjT;
-    }
-
-    public String getZdsj() {
-        return zdsj;
-    }
-
-    public void setZdsj(String zdsj) {
-        this.zdsj = zdsj;
-    }
-
-    public Long getZdsjT() {
-        return zdsjT;
-    }
-
-    public void setZdsjT(Long zdsjT) {
-        this.zdsjT = zdsjT;
-    }
-
-    public Double getJhlc() {
-        return jhlc;
-    }
-
-    public void setJhlc(Double jhlc) {
-        this.jhlc = jhlc;
-    }
-
-    public Double getJhlcOrig() {
-        return jhlcOrig;
-    }
-
-    public void setJhlcOrig(Double jhlcOrig) {
-        this.jhlcOrig = jhlcOrig;
-    }
-
-    public Integer getBcsj() {
-        return bcsj;
-    }
-
-    public void setBcsj(Integer bcsj) {
-        this.bcsj = bcsj;
-    }
-
-    public String getBcType() {
-        return bcType;
-    }
-
-    public void setBcType(String bcType) {
-        this.bcType = bcType;
-    }
-
-    public String getMajorStationName() {
-        return majorStationName;
-    }
-
-    public void setMajorStationName(String majorStationName) {
-        this.majorStationName = majorStationName;
-    }
-
-    public String getFcsjActual() {
-        return fcsjActual;
-    }
-
-    public void setFcsjActual(String fcsjActual) {
-        this.fcsjActual = fcsjActual;
-    }
-
-    public Long getFcsjActualTime() {
-        return fcsjActualTime;
-    }
-
-    public void setFcsjActualTime(Long fcsjActualTime) {
-        this.fcsjActualTime = fcsjActualTime;
-    }
-
-    public String getZdsjActual() {
-        return zdsjActual;
-    }
-
-    public void setZdsjActual(String zdsjActual) {
-        this.zdsjActual = zdsjActual;
-    }
-
-    public Long getZdsjActualTime() {
-        return zdsjActualTime;
-    }
-
-    public void setZdsjActualTime(Long zdsjActualTime) {
-        this.zdsjActualTime = zdsjActualTime;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public String getAdjustExps() {
-        return adjustExps;
-    }
-
-    public void setAdjustExps(String adjustExps) {
-        this.adjustExps = adjustExps;
-    }
-
-    public boolean isSflj() {
-        return sflj;
-    }
-
-    public void setSflj(boolean sflj) {
-        this.sflj = sflj;
-    }
-
-    public boolean isLate() {
-        return late;
-    }
-
-    public void setLate(boolean late) {
-        this.late = late;
-    }
-
-    public boolean isLate2() {
-        return late2;
-    }
-
-    public void setLate2(boolean late2) {
-        this.late2 = late2;
-    }
-
-    public float getLateMinute() {
-        return lateMinute;
-    }
-
-    public void setLateMinute(float lateMinute) {
-        this.lateMinute = lateMinute;
-    }
-
-    public String getRemarks() {
-        return remarks;
-    }
-
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    public String getDfsj() {
-        return dfsj;
-    }
-
-    public void setDfsj(String dfsj) {
-        this.dfsj = dfsj;
-    }
-
-    public Long getDfsjT() {
-        return dfsjT;
-    }
-
-    public void setDfsjT(Long dfsjT) {
-        this.dfsjT = dfsjT;
-    }
-
-    public Integer getDirectiveState() {
-        return directiveState;
-    }
-
-    public void setDirectiveState(Integer directiveState) {
-        this.directiveState = directiveState;
-    }
-
-    public String getQdzArrDatejh() {
-        return qdzArrDatejh;
-    }
-
-    public void setQdzArrDatejh(String qdzArrDatejh) {
-        this.qdzArrDatejh = qdzArrDatejh;
-    }
-
-    public String getQdzArrDatesj() {
-        return qdzArrDatesj;
-    }
-
-    public void setQdzArrDatesj(String qdzArrDatesj) {
-        this.qdzArrDatesj = qdzArrDatesj;
-    }
-
-    public Set<ChildTaskPlan> getcTasks() {
-        return cTasks;
-    }
-
-    public void setcTasks(Set<ChildTaskPlan> cTasks) {
-        this.cTasks = cTasks;
-    }
-
-    public String getGsName() {
-        return gsName;
-    }
-
-    public void setGsName(String gsName) {
-        this.gsName = gsName;
-    }
-
-    public String getGsBm() {
-        return gsBm;
-    }
-
-    public void setGsBm(String gsBm) {
-        this.gsBm = gsBm;
-    }
-
-    public String getFgsName() {
-        return fgsName;
-    }
-
-    public void setFgsName(String fgsName) {
-        this.fgsName = fgsName;
-    }
-
-    public String getFgsBm() {
-        return fgsBm;
-    }
-
-    public void setFgsBm(String fgsBm) {
-        this.fgsBm = fgsBm;
-    }
-
-    public boolean isDfAuto() {
-        return dfAuto;
-    }
-
-    public void setDfAuto(boolean dfAuto) {
-        this.dfAuto = dfAuto;
-    }
-
-    public boolean isOnline() {
-        return online;
-    }
-
-    public void setOnline(boolean online) {
-        this.online = online;
-    }
-
-    public boolean isReissue() {
-        return reissue;
-    }
-
-    public void setReissue(boolean reissue) {
-        this.reissue = reissue;
-    }
-
-    public Integer getDriftStatus() {
-        return driftStatus;
-    }
-
-    public void setDriftStatus(Integer driftStatus) {
-        this.driftStatus = driftStatus;
-    }
-
-    public boolean isCcService() {
-        return ccService;
-    }
-
-    public void setCcService(boolean ccService) {
-        this.ccService = ccService;
-    }
-}
@@ -7,7 +7,6 @@ import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.safe_driv.SafeDriv;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.websocket.entity.WsScheduleRealInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
@@ -39,7 +38,7 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "faChe");
-		map.put("t", WsScheduleRealInfo.getInstance(sch));
+		map.put("t", sch);
 		map.put("dataStr", sdf.format(new Date()));
 		ObjectMapper mapper = new ObjectMapper();
@@ -63,7 +62,7 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "refreshSch");
-		map.put("ts", WsScheduleRealInfo.getMultiInstance(list));
+		map.put("ts", list);
 		ObjectMapper mapper = new ObjectMapper();
@@ -83,8 +82,8 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "zhongDian");
-		map.put("t", WsScheduleRealInfo.getInstance(sch));
-		map.put("nt", WsScheduleRealInfo.getInstance(nextSch));
+		map.put("t", sch);
+		map.put("nt", nextSch);
 		map.put("finish", finish);
 		map.put("dataStr", sdf.format(new Date()));
@@ -124,7 +123,7 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "directive");
-		map.put("t", WsScheduleRealInfo.getInstance(sch));;
+		map.put("t", sch);;
 		ObjectMapper mapper = new ObjectMapper();
@@ -43,10 +43,10 @@
                         </select>
                     </div>
                     <button class="uk-button search-btn" title="只支持后模糊">检索</button>
-                    <label class="auto-refresh" >
+                    <!--<label class="auto-refresh" >
                         <input type="checkbox" value="1" name="schCBox" class="i-cbox">
                         自动刷新
-                    </label>
+                    </label>-->
                 </fieldset>
             </form>
         </div>
@@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-11-24',
-        text: '<h5>1、修复23号下午更新后出现的部分线路班次执行问题。</h5><h5>2、尝试接入成山路停车场的RFID信号，以弥补成山路停车场高峰时GPS信号弱的问题。</h5><h5>3、报表管理里加入 “班次车辆人员日统计”</h5><h5>4、现在“历史班次调整”里可以修改烂班原因和售票员</h5>'
+        date: '2017-11-25_中午',
+        text: '<h5>1、修复这个版本的一个问题，这个问题导致首站和第二站重叠的时候无法发车。</h5><h5>2、修复455路因 昌邑路民生路 和 昌邑路苗圃路 站点顺序颠倒引发的上下行跳动问题。</h5><h5>3、放宽对中途站的检测机制，如果仍然有线路出现上下行乱跳的问题，及时上报管理员。</h5>'
     };
     var storage = window.localStorage