update...

潘钊
1 parent 18c7788e
Showing 6 changed files with 655 additions and 284 deletions
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/entity/realcontrol/D80ReplyTemp.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/websocket/entity/WsScheduleRealInfo.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
@@ -2,7 +2,6 @@ package com.bsth.data;
 import com.bsth.Application;
 import com.bsth.entity.Line;
-import com.bsth.entity.realcontrol.D80ReplyTemp;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.LineService;
@@ -135,31 +134,15 @@ public class LineConfigData implements CommandLineRunner {
         conf.setLine(line);
         //开始运营时间
         conf.setStartOpt("02:00");
-        //托管状态
-        conf.setTrust(true);
         //出场时间类型
         conf.setOutConfig(0);
-        //进场时间类型
-        //conf.setInConfig(1);
-        //短语模板
-        conf.setPhraseTemps("");
         //调度指令模板
         conf.setSchDirectiveTemp("");
-        //80指令回复  闵行用
-        D80ReplyTemp t50 = new D80ReplyTemp(conf, (short) 0x50, "同意，回电详谈", "不同意，请回电"), t60 = new D80ReplyTemp(conf, (short) 0x60, "同意，回电详谈", "不同意，请回电"), tA2 = new D80ReplyTemp(conf, (short) 0xA2, "同意，回电详谈", "不同意，请回电"), t70 = new D80ReplyTemp(conf, (short) 0x70, "同意，回电详谈", "不同意，请回电"), t11 = new D80ReplyTemp(conf, (short) 0x11, "同意，回电详谈", "不同意，请回电");
-
         //应急停靠默认值
         conf.setYjtkStart("00:00");
         conf.setYjtkEnd("23:59");
-        Set<D80ReplyTemp> temps = conf.getD80Temps();
-        temps.add(t50);
-        temps.add(t60);
-        temps.add(tA2);
-        temps.add(t70);
-        temps.add(t11);
-
         set(conf);
     }
 }
@@ -2,15 +2,12 @@ package com.bsth.data.pilot80;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.status_manager.GpsStatusManager;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.Line;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.directive.DC0_A4;
-import com.bsth.entity.realcontrol.D80ReplyTemp;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D80Repository;
@@ -56,14 +53,11 @@ public class PilotReport {
     @Autowired
     GpsStatusManager gpsStatusManager;
-    //private static ArrayListMultimap<String, D80> d80MultiMap;
-
     private static ConcurrentHashMap<Integer, D80> d80Maps;
     Logger logger = LoggerFactory.getLogger(PilotReport.class);
     static {
-        //d80MultiMap = ArrayListMultimap.create();
         d80Maps = new ConcurrentHashMap<>();
     }
@@ -75,7 +69,6 @@ public class PilotReport {
             d80Repository.save(d80);
             //入缓存
             d80Maps.put(d80.getId(), d80);
-            //d80MultiMap.put(d80.getData().getLineId().toString(), d80);
             String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
             //上报时，在执行的班次
@@ -94,23 +87,8 @@ public class PilotReport {
                         //没有计划里程的出场班次，出场既是首发站，发送下一班次的调度指令
                         if (outSch.getJhlc() == null)
                             outSch = dayOfSchedule.next(outSch);
-
                         //下发调度指令
-                        String deviceId = d80.getDeviceId();
                         DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
-
-                        //下发线路切换指令
-                        DirectivePushQueue.put64(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
-
-                        try {
-                            GpsEntity gps = gpsRealData.get(deviceId);
-                            if(gps != null && !gps.isService()){
-                                //切换到营运状态
-                                gpsStatusManager.changeServiceState(nbbm, outSch.getXlDir() ,0, "请出@系统");
-                            }
-                        }catch (Exception e){
-                            logger.error("请出切换营运状态异常", e);
-                        }
                     }
                     break;
             }
@@ -141,10 +119,7 @@ public class PilotReport {
      * @Description: TODO(调度员回复)
      */
     public void reply(D80 d80) {
-        String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
         Short reqCode = d80.getData().getRequestCode();
-        //默认短语回复
-        //defaultReply(nbbm, reqCode, d80.getConfirmRs() == 0?true:false);
         switch (reqCode) {
             case 0xA3:
@@ -229,54 +204,6 @@ public class PilotReport {
         return v == null || v.equals(0.0);
     }
-    public void defaultReply(String nbbm, short requestCode, boolean agree) {
-        Line line = BasicData.nbbm2LineMap.get(nbbm);
-        String lineCode = null;
-
-        if (line != null)
-            lineCode = line.getLineCode();
-        else {
-            try {
-                lineCode = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm)).getLineId().toString();
-            } catch (Exception e) {
-                logger.error("", e);
-            }
-        }
-
-        if (null == lineCode)
-            return;
-
-        LineConfig conf = lineConfigData.get(lineCode);
-        D80ReplyTemp temp = conf.findByCode(requestCode);
-
-        if (null == temp)
-            return;
-
-        String text;
-        if (agree)
-            text = temp.getAgreeText();
-        else
-            text = temp.getRejectText();
-
-        directiveService.send60Phrase(nbbm, text, "系统");
-    }
-
-    /**
-     * @Title: resumeOperation
-     * @Description: TODO(恢复营运)
-     */
-    public void resumeOperation(D80 d80) {
-
-    }
-
-    /**
-     * @Title: applyTiaodang
-     * @Description: TODO(申请调档)
-     */
-    public void applyTiaodang(D80 d80) {
-
-    }
-
     /**
      * @Title: unconfirmed80
      * @Description: TODO(根据lineCode 获取未处理的80数据)
@@ -304,10 +231,6 @@ public class PilotReport {
         return d80Maps.get(id);
     }
-/*    public String coordHtmlStr(GpsEntity gps) {
-
-        return "<span class=\"nt-coord\" data-lon=\"" + gps.getLon() + "\" data-lat=\"" + gps.getLat() + "\"></span>";
-    }*/
     public Collection<D80> findAll() {
         return d80Maps.values();
@@ -321,18 +244,4 @@ public class PilotReport {
         }
         logger.info("清除 80数据 after: " + d80Maps.size());
     }
-
-    public Collection<? extends D80> findByCar(String nbbm) {
-        List<D80> rs = new ArrayList<>();
-        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-        if (null == deviceId)
-            return rs;
-
-        Collection<D80> all = findAll();
-        for (D80 d80 : all) {
-            if (d80.getDeviceId().equals(deviceId))
-                rs.add(d80);
-        }
-        return rs;
-    }
 }
-package com.bsth.entity.realcontrol;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * 
- * @ClassName: D80ReplyTemp 
- * @Description: TODO(80处理后自动回复模板) 
- * @author PanZhao 
- * @date 2016年8月22日 下午11:30:10 
- *
- */
-@Entity
-@Table(name = "bsth_v_d80_reply_temp")
-public class D80ReplyTemp {
-	
-	public D80ReplyTemp(LineConfig conf, short requestCode, String agreeText, String rejectText){
-		this.conf = conf;
-		this.requestCode = requestCode;
-		this.agreeText = agreeText;
-		this.rejectText = rejectText;
-	}
-	
-	public D80ReplyTemp(){}
-	
-	@Id
-	@GeneratedValue
-	private Integer id;
-	
-	@JsonIgnore
-	@ManyToOne
-	private LineConfig conf;
-	
-	private Short requestCode;
-	
-	/** 同意时下发文本 */
-	private String agreeText;
-	
-	/** 拒绝时下发文本 */
-	private String rejectText;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public LineConfig getConf() {
-		return conf;
-	}
-
-	public void setConf(LineConfig conf) {
-		this.conf = conf;
-	}
-
-	public Short getRequestCode() {
-		return requestCode;
-	}
-
-	public void setRequestCode(Short requestCode) {
-		this.requestCode = requestCode;
-	}
-
-	public String getAgreeText() {
-		return agreeText;
-	}
-
-	public void setAgreeText(String agreeText) {
-		this.agreeText = agreeText;
-	}
-
-	public String getRejectText() {
-		return rejectText;
-	}
-
-	public void setRejectText(String rejectText) {
-		this.rejectText = rejectText;
-	}
-}
@@ -3,8 +3,6 @@ package com.bsth.entity.realcontrol;
 import com.bsth.entity.Line;
 import javax.persistence.*;
-import java.util.HashSet;
-import java.util.Set;
 /**
  * 
@@ -18,8 +16,7 @@ import java.util.Set;
 @Table(name = "bsth_c_line_config")
 @NamedEntityGraphs({
     @NamedEntityGraph(name = "lineConfig_line_80temps", attributeNodes = {
-            @NamedAttributeNode("line"),
-            @NamedAttributeNode("d80Temps")
+            @NamedAttributeNode("line")
     })
 })
 public class LineConfig {
@@ -33,13 +30,6 @@ public class LineConfig {
 	/** 开始运营时间 HH:mm */
 	private String startOpt;
-	
-	/** 当天开始营运时间戳 
-	@Transient
-	private long currStartTime;*/
-
-	/** 托管状态 */
-	private boolean trust;
 	/** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 2：出站即出场 */
 	private int outConfig;
@@ -50,9 +40,6 @@ public class LineConfig {
 	/** 出站既出场 对应的起点站 */
 	private String twinsStation;
-	/** 短语模板 , 号分隔多个 */
-	private String phraseTemps;
-
 	/** 调度指令模板 */
 	private String schDirectiveTemp;
@@ -62,6 +49,7 @@ public class LineConfig {
 	/** 原线路回场 */
 	private boolean inParkForSource;
+	/** 自动执行 */
 	private boolean autoExec;
 	/**
@@ -93,10 +81,6 @@ public class LineConfig {
 	 */
 	private boolean lockFirstOutTime;
-
-	@OneToMany(cascade = CascadeType.ALL)
-	private Set<D80ReplyTemp> d80Temps = new HashSet<>();
-
 	public Integer getId() {
 		return id;
 	}
@@ -121,14 +105,6 @@ public class LineConfig {
 		this.startOpt = startOpt;
 	}
-	public boolean isTrust() {
-		return trust;
-	}
-
-	public void setTrust(boolean trust) {
-		this.trust = trust;
-	}
-
 	public int getOutConfig() {
 		return outConfig;
 	}
@@ -137,14 +113,6 @@ public class LineConfig {
 		this.outConfig = outConfig;
 	}
-	public String getPhraseTemps() {
-		return phraseTemps;
-	}
-
-	public void setPhraseTemps(String phraseTemps) {
-		this.phraseTemps = phraseTemps;
-	}
-
 	public String getSchDirectiveTemp() {
 		return schDirectiveTemp;
 	}
@@ -153,35 +121,6 @@ public class LineConfig {
 		this.schDirectiveTemp = schDirectiveTemp;
 	}
-/*	public long getCurrStartTime() {
-		Date d = null;
-		try {
-			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm")
-						,sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
-			d = sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(new Date()) + this.startOpt);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		return d.getTime();
-	}*/
-	
-	public D80ReplyTemp findByCode(short code){
-		for(D80ReplyTemp temp : d80Temps){
-			if(temp.getRequestCode() == code)
-				return temp;
-		}
-		
-		return null;
-	}
-
-	public Set<D80ReplyTemp> getD80Temps() {
-		return d80Temps;
-	}
-
-	public void setD80Temps(Set<D80ReplyTemp> d80Temps) {
-		this.d80Temps = d80Temps;
-	}
-
 	public boolean isReadReverse() {
 		return readReverse;
 	}
+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){
+        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;
+    }
+}
@@ -8,6 +8,7 @@ import com.bsth.data.gpsdata.arrival.entity.SignalState;
 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 +40,7 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "faChe");
-		map.put("t", sch);
+		map.put("t", WsScheduleRealInfo.getInstance(sch));
 		map.put("dataStr", sdf.format(new Date()));
 		ObjectMapper mapper = new ObjectMapper();
@@ -63,7 +64,7 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "refreshSch");
-		map.put("ts", list);
+		map.put("ts", WsScheduleRealInfo.getMultiInstance(list));
 		ObjectMapper mapper = new ObjectMapper();
@@ -85,8 +86,8 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "zhongDian");
-		map.put("t", sch);
-		map.put("nt", nextSch);
+		map.put("t", WsScheduleRealInfo.getInstance(sch));
+		map.put("nt", WsScheduleRealInfo.getInstance(nextSch));
 		map.put("finish", finish);
 		map.put("dataStr", sdf.format(new Date()));
@@ -116,28 +117,7 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
-	
-	/**
-	 * 
-	 * @Title: shiftSchedule 
-	 * @Description: TODO(线路翻班通知) 
-	public void shiftSchedule(String lineCode){
-		Map<String, Object> map = new HashMap<>();
-		map.put("fn", "systemNotice");
-		map.put("type", "info");
-		map.put("text", BasicData.lineCode2NameMap.get(lineCode) + "切换至 " 
-				+ DayOfSchedule.currSchDateMap.get(lineCode) + " 日排班");
-
-		ObjectMapper mapper = new ObjectMapper();
-		
-		try {
-			socketHandler.sendMessageToLine(lineCode, mapper.writeValueAsString(map));
-		} catch (Exception e) {
-			logger.error("", e);
-		}
-	}
-	 */
 	/**
 	 * 
 	 * @Title: sendDirectiveToPage 
@@ -147,7 +127,7 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "directive");
-		map.put("t", sch);;
+		map.put("t", WsScheduleRealInfo.getInstance(sch));;
 		ObjectMapper mapper = new ObjectMapper();