update...

潘钊
1 parent b1f60e76
Showing 2 changed files with 5 additions and 655 deletions
src/main/java/com/bsth/websocket/entity/WsScheduleRealInfo.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
-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();