1.zyl接口加入电量信息

王通
1 parent efae6805
Showing 9 changed files with 438 additions and 415 deletions
src/main/java/com/bsth/entity/ScheduleExec.java
src/main/java/com/bsth/entity/SchedulePlanInfo.java
src/main/java/com/bsth/entity/ScheduleRealInfo.java
src/main/java/com/bsth/entity/TimeTable.java
src/main/java/com/bsth/entity/TimeTableDetail.java
src/main/java/com/bsth/server_rs/base_info/car/Car.java
src/main/java/com/bsth/server_rs/base_info/line/Line.java
src/main/java/com/bsth/server_rs/base_info/person/Personnel.java
src/main/java/com/bsth/server_rs/base_info/station/entity/StationRotue.java
 package com.bsth.entity;
  
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 /**
  * @author Hill
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ScheduleExec {
  
     private String lineName;
-package com.bsth.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 计调 计划排班
- * Created by panzhao on 2017/3/27.
- */
-@Entity
-@Table(name = "bsth_c_s_sp_info")
-public class SchedulePlanInfo implements Serializable {
-
-    /** 主键Id */
-    @Id
-    private Long id;
-
-    /** 排班计划日期 */
-    private Date scheduleDate;
-
-    /** 关联的公司名称 */
-    private String gsName;
-    /** 关联的公司编码 */
-    private String gsBm;
-    /** 关联的分公司名称 */
-    private String fgsName;
-    /** 关联的分公司编码 */
-    private String fgsBm;
-    /** 出场顺序号 */
-    private Integer ccno;
-
-    /** 关联 bsth_c_line 主键，不做mapping */
-    private Integer xl;
-    /** 线路名称 */
-    private String xlName;
-    /** 线路编码 */
-    private String xlBm;
-
-    /** 关联 bsth_c_s_gbi 主键，不做mapping */
-    private Long lp;
-    /** 路牌名称 */
-    private String lpName;
-
-    /** 关联 bsth_c_cars 主键，不做mapping */
-    private Integer cl;
-    /** 车辆自编号 */
-    private String clZbh;
-
-    /** 当分班的时候，驾驶员会不一样，具体根据规则，还有时刻表决定 */
-    /** 报道时间（格式 HH:mm） */
-    private String bdTime;
-    /** 出场时间（格式 HH:mm） */
-    private String ccTime;
-    /** 关联的驾驶员 bsth_c_personnel 主键，不做mapping */
-    private Integer j;
-    /** 驾驶员工号 */
-    private String jGh;
-    /** 驾驶员名字 */
-    private String jName;
-    /** 关联的售票员 bsth_c_personnel 主键，不做mapping */
-    private Integer s;
-    /** 售票员工号 */
-    private String sGh;
-    /** 售票员名字 */
-    private String sName;
-
-    // 冗余的时刻明细信息，不做mapping
-    /** 线路方向（TODO：上下行，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */
-    private String xlDir;
-    /** 起点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
-    private Integer qdz;
-    /** 起点站code */
-    private String qdzCode;
-    /** 起点站名字 */
-    private String qdzName;
-    /** 终点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
-    private Integer zdz;
-    /** 终点站code */
-    private String zdzCode;
-    /** 终点站名字 */
-    private String zdzName;
-
-    /** 发车时间（格式 HH:mm） */
-    private String fcsj;
-    /** 发车顺序号 */
-    private Integer fcno;
-    /** 对应班次数 */
-    private Integer bcs;
-    /** 计划里程 */
-    private Double jhlc;
-    /** 班次历时 */
-    private Integer bcsj;
-
-    /** 班次类型 字典type=ScheduleType */
-    private String bcType;
-
-    /** 关联的时刻表id */
-    private Long ttInfo;
-    /** 关联的时刻表名字 */
-    private String ttInfoName;
-
-    @Override
-    public int hashCode() {
-        return this.toString().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return this.toString().equals(((SchedulePlanInfo)obj).toString());
-    }
-
-    @Override
-    public String toString() {
-        return "sch_plan_" + this.id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Date getScheduleDate() {
-        return scheduleDate;
-    }
-
-    public void setScheduleDate(Date scheduleDate) {
-        this.scheduleDate = scheduleDate;
-    }
-
-    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 Integer getCcno() {
-        return ccno;
-    }
-
-    public void setCcno(Integer ccno) {
-        this.ccno = ccno;
-    }
-
-    public Integer getXl() {
-        return xl;
-    }
-
-    public void setXl(Integer xl) {
-        this.xl = xl;
-    }
-
-    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 Long getLp() {
-        return lp;
-    }
-
-    public void setLp(Long lp) {
-        this.lp = lp;
-    }
-
-    public String getLpName() {
-        return lpName;
-    }
-
-    public void setLpName(String lpName) {
-        this.lpName = lpName;
-    }
-
-    public Integer getCl() {
-        return cl;
-    }
-
-    public void setCl(Integer cl) {
-        this.cl = cl;
-    }
-
-    public String getClZbh() {
-        return clZbh;
-    }
-
-    public void setClZbh(String clZbh) {
-        this.clZbh = clZbh;
-    }
-
-    public String getBdTime() {
-        return bdTime;
-    }
-
-    public void setBdTime(String bdTime) {
-        this.bdTime = bdTime;
-    }
-
-    public String getCcTime() {
-        return ccTime;
-    }
-
-    public void setCcTime(String ccTime) {
-        this.ccTime = ccTime;
-    }
-
-    public Integer getJ() {
-        return j;
-    }
-
-    public void setJ(Integer j) {
-        this.j = j;
-    }
-
-    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 Integer getS() {
-        return s;
-    }
-
-    public void setS(Integer s) {
-        this.s = s;
-    }
-
-    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 Integer getQdz() {
-        return qdz;
-    }
-
-    public void setQdz(Integer qdz) {
-        this.qdz = qdz;
-    }
-
-    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 Integer getZdz() {
-        return zdz;
-    }
-
-    public void setZdz(Integer zdz) {
-        this.zdz = zdz;
-    }
-
-    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 Integer getFcno() {
-        return fcno;
-    }
-
-    public void setFcno(Integer fcno) {
-        this.fcno = fcno;
-    }
-
-    public Integer getBcs() {
-        return bcs;
-    }
-
-    public void setBcs(Integer bcs) {
-        this.bcs = bcs;
-    }
-
-    public Double getJhlc() {
-        return jhlc;
-    }
-
-    public void setJhlc(Double jhlc) {
-        this.jhlc = jhlc;
-    }
-
-    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 Long getTtInfo() {
-        return ttInfo;
-    }
-
-    public void setTtInfo(Long ttInfo) {
-        this.ttInfo = ttInfo;
-    }
-
-    public String getTtInfoName() {
-        return ttInfoName;
-    }
-
-    public void setTtInfoName(String ttInfoName) {
-        this.ttInfoName = ttInfoName;
-    }
-}
+package com.bsth.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 计调 计划排班
+ * Created by panzhao on 2017/3/27.
+ */
+@Entity
+@Table(name = "bsth_c_s_sp_info")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class SchedulePlanInfo implements Serializable {
+
+    /** 主键Id */
+    @Id
+    private Long id;
+
+    /** 排班计划日期 */
+    private Date scheduleDate;
+
+    /** 关联的公司名称 */
+    private String gsName;
+    /** 关联的公司编码 */
+    private String gsBm;
+    /** 关联的分公司名称 */
+    private String fgsName;
+    /** 关联的分公司编码 */
+    private String fgsBm;
+    /** 出场顺序号 */
+    private Integer ccno;
+
+    /** 关联 bsth_c_line 主键，不做mapping */
+    private Integer xl;
+    /** 线路名称 */
+    private String xlName;
+    /** 线路编码 */
+    private String xlBm;
+
+    /** 关联 bsth_c_s_gbi 主键，不做mapping */
+    private Long lp;
+    /** 路牌名称 */
+    private String lpName;
+
+    /** 关联 bsth_c_cars 主键，不做mapping */
+    private Integer cl;
+    /** 车辆自编号 */
+    private String clZbh;
+
+    /** 当分班的时候，驾驶员会不一样，具体根据规则，还有时刻表决定 */
+    /** 报道时间（格式 HH:mm） */
+    private String bdTime;
+    /** 出场时间（格式 HH:mm） */
+    private String ccTime;
+    /** 关联的驾驶员 bsth_c_personnel 主键，不做mapping */
+    private Integer j;
+    /** 驾驶员工号 */
+    private String jGh;
+    /** 驾驶员名字 */
+    private String jName;
+    /** 关联的售票员 bsth_c_personnel 主键，不做mapping */
+    private Integer s;
+    /** 售票员工号 */
+    private String sGh;
+    /** 售票员名字 */
+    private String sName;
+
+    // 冗余的时刻明细信息，不做mapping
+    /** 线路方向（TODO：上下行，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */
+    private String xlDir;
+    /** 起点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
+    private Integer qdz;
+    /** 起点站code */
+    private String qdzCode;
+    /** 起点站名字 */
+    private String qdzName;
+    /** 终点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
+    private Integer zdz;
+    /** 终点站code */
+    private String zdzCode;
+    /** 终点站名字 */
+    private String zdzName;
+
+    /** 发车时间（格式 HH:mm） */
+    private String fcsj;
+    /** 发车顺序号 */
+    private Integer fcno;
+    /** 对应班次数 */
+    private Integer bcs;
+    /** 计划里程 */
+    private Double jhlc;
+    /** 班次历时 */
+    private Integer bcsj;
+
+    /** 班次类型 字典type=ScheduleType */
+    private String bcType;
+
+    /** 关联的时刻表id */
+    private Long ttInfo;
+    /** 关联的时刻表名字 */
+    private String ttInfoName;
+
+    @Override
+    public int hashCode() {
+        return this.toString().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return this.toString().equals(((SchedulePlanInfo)obj).toString());
+    }
+
+    @Override
+    public String toString() {
+        return "sch_plan_" + this.id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(Date scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+
+    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 Integer getCcno() {
+        return ccno;
+    }
+
+    public void setCcno(Integer ccno) {
+        this.ccno = ccno;
+    }
+
+    public Integer getXl() {
+        return xl;
+    }
+
+    public void setXl(Integer xl) {
+        this.xl = xl;
+    }
+
+    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 Long getLp() {
+        return lp;
+    }
+
+    public void setLp(Long lp) {
+        this.lp = lp;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public Integer getCl() {
+        return cl;
+    }
+
+    public void setCl(Integer cl) {
+        this.cl = cl;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getBdTime() {
+        return bdTime;
+    }
+
+    public void setBdTime(String bdTime) {
+        this.bdTime = bdTime;
+    }
+
+    public String getCcTime() {
+        return ccTime;
+    }
+
+    public void setCcTime(String ccTime) {
+        this.ccTime = ccTime;
+    }
+
+    public Integer getJ() {
+        return j;
+    }
+
+    public void setJ(Integer j) {
+        this.j = j;
+    }
+
+    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 Integer getS() {
+        return s;
+    }
+
+    public void setS(Integer s) {
+        this.s = s;
+    }
+
+    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 Integer getQdz() {
+        return qdz;
+    }
+
+    public void setQdz(Integer qdz) {
+        this.qdz = qdz;
+    }
+
+    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 Integer getZdz() {
+        return zdz;
+    }
+
+    public void setZdz(Integer zdz) {
+        this.zdz = zdz;
+    }
+
+    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 Integer getFcno() {
+        return fcno;
+    }
+
+    public void setFcno(Integer fcno) {
+        this.fcno = fcno;
+    }
+
+    public Integer getBcs() {
+        return bcs;
+    }
+
+    public void setBcs(Integer bcs) {
+        this.bcs = bcs;
+    }
+
+    public Double getJhlc() {
+        return jhlc;
+    }
+
+    public void setJhlc(Double jhlc) {
+        this.jhlc = jhlc;
+    }
+
+    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 Long getTtInfo() {
+        return ttInfo;
+    }
+
+    public void setTtInfo(Long ttInfo) {
+        this.ttInfo = ttInfo;
+    }
+
+    public String getTtInfoName() {
+        return ttInfoName;
+    }
+
+    public void setTtInfoName(String ttInfoName) {
+        this.ttInfoName = ttInfoName;
+    }
+}
 package com.bsth.entity;
  
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -20,6 +21,7 @@ import java.util.Set;
             @NamedAttributeNode("cTasks")
     })
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ScheduleRealInfo implements Serializable{
  
  
 package com.bsth.entity;
  
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
  
 /**
  * @author Hill
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class TimeTable {
  
     private String lineCode;
 package com.bsth.entity;
  
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class TimeTableDetail {
  
     private String bcType;
 package com.bsth.server_rs.base_info.car;
  
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
  
 import javax.xml.bind.annotation.XmlRootElement;
@@ -10,6 +11,7 @@ import java.io.Serializable;
  * Created by panzhao on 2017/3/30.
  */
 @XmlRootElement
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Car implements Serializable {
  
     /**
 package com.bsth.server_rs.base_info.line;
  
 import com.bsth.server_rs.adapter.DateTimeAdapter;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @Version 公交调度系统BS版 0.1
  */
 @XmlRootElement
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Line implements Serializable {
  
  
 package com.bsth.server_rs.base_info.person;
  
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  
 import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
@@ -13,6 +14,7 @@ import java.io.Serializable;
  * @Version 公交调度系统BS版 0.1
  */
 @XmlRootElement
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Personnel implements Serializable {
  
     /**
 package com.bsth.server_rs.base_info.station.entity;
  
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 /**
  * Created by panzhao on 2017/8/31.
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class StationRotue {
  
     private String lineName;