1.中运量线路数据接口

王通
1 parent 90a713df
Showing 16 changed files with 2184 additions and 1650 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/entity/ScheduleExec.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/entity/ZylInfo.java
src/main/java/com/bsth/server_rs/base_info/car/Car.java
src/main/java/com/bsth/server_rs/base_info/car/CarRestService.java
src/main/java/com/bsth/server_rs/base_info/line/Line.java
src/main/java/com/bsth/server_rs/base_info/line/LineRestService.java
src/main/java/com/bsth/server_rs/base_info/person/PersonRestService.java
src/main/java/com/bsth/server_rs/base_info/station/StationRestService.java
src/main/java/com/bsth/server_rs/base_info/station/entity/StationRotue.java
src/main/java/com/bsth/server_rs/gps/buffer/BasicDataRefreshThread.java
src/main/java/com/bsth/server_rs/schedule/SchedulePlanService.java
src/main/java/com/bsth/server_rs/schedule/ScheduleRealService.java
@@ -13,6 +13,7 @@ import com.bsth.server_rs.destroy.DestroyDetailRestService;
 import com.bsth.server_rs.directive.DirectiveRestService;
 import com.bsth.server_rs.exception.AesExceptionMapper;
 import com.bsth.server_rs.gps.GpsRestService;
+import com.bsth.server_rs.schedule.SchedulePlanService;
 import com.bsth.server_rs.schedule.ScheduleRealService;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import org.apache.cxf.Bus;
@@ -40,6 +41,8 @@ public class CXFConfig {
     }
  
     @Autowired
+    SchedulePlanService schedulePlanService;
+    @Autowired
     ScheduleRealService scheduleRealService;
     @Autowired
     StationRestService stationRestService;
@@ -66,6 +69,7 @@ public class CXFConfig {
                 new CarRestService(),
                 new PersonRestService(),
                 gpsRestService,
+                schedulePlanService,
                 scheduleRealService,
                 stationRestService,
                 ldSectionRestService,
+package com.bsth.entity;
+
+/**
+ * @author Hill
+ */
+public class ScheduleExec {
+
+    private String lineName;
+
+    private String plate;
+
+    private String lpName;
+
+    private String fcsj;
+
+    private Long time;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getPlate() {
+        return plate;
+    }
+
+    public void setPlate(String plate) {
+        this.plate = plate;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public Long getTime() {
+        return time;
+    }
+
+    public void setTime(Long time) {
+        this.time = time;
+    }
+}
-package com.bsth.entity;
-
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * 实际排班计划明细。
- */
-@Entity
-@Table(name = "bsth_c_s_sp_info_real")
-@NamedEntityGraphs({
-    @NamedEntityGraph(name = "scheduleRealInfo_cTasks", attributeNodes = {
-            @NamedAttributeNode("cTasks")
-    })
-})
-public class ScheduleRealInfo implements Serializable{
-
-
-
-	/** 主键Id */
-	@Id
-	private Long id;
-	
-	/** 计划ID */
-	private Long spId;
-
-	/** 排班计划日期 */
-	private Date scheduleDate;
-	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 Integer fcno;
-	/** 对应班次数 */
-	private Integer bcs;
-	/** 计划里程 */
-	private Double jhlc;
-
-	/** 原始计划里程 （原计调的数据） */
-	private Double jhlcOrig;
-
-	/** 班次历时 */
-	private Integer bcsj;
-
-	/**
-	 * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
-	 */
-	private String bcType;
-
-	/** 创建日期 */
-	@Column(name = "create_date")
-	private Date createDate;
-	/** 修改日期 */
-	@Column(name = "update_date")
-	private Date updateDate;
-
-	/** 实际发车时间*/
-	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;
-
-	/** 备注*/
-	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 Integer ccno;
-
-	//待发调试（是否自动调整）
-	private boolean dfAuto;
-	//是否有GPS信号
-	private boolean online;
-
-	/** 是否有补发GPS信号 */
-	private boolean reissue;
-
-
-
-	/**
-	 * 换车营运标记 true 表示该主任务由 【中途换车子任务】 级联生成
-	 */
-	private boolean ccService;
-	private Integer lpChange;
-
-	/**
-	 * rfid状态
-	 */
-	private int rfidState;
-
-	/**
-	 * 起点站rfid状态
-	 */
-	private int firstRfidState;
-
-	@Override
-	public int hashCode() {
-		return (this.id + this.scheduleDateStr + this.xlBm + this.fcsj).hashCode();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		return this.id.equals(((ScheduleRealInfo)obj).getId());
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getSpId() {
-		return spId;
-	}
-
-	public void setSpId(Long spId) {
-		this.spId = spId;
-	}
-
-	public Date getScheduleDate() {
-		return scheduleDate;
-	}
-
-	public void setScheduleDate(Date scheduleDate) {
-		this.scheduleDate = scheduleDate;
-	}
-
-	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 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 Date getCreateDate() {
-		return createDate;
-	}
-
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-
-	public Date getUpdateDate() {
-		return updateDate;
-	}
-
-	public void setUpdateDate(Date updateDate) {
-		this.updateDate = updateDate;
-	}
-
-	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 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 Integer getCcno() {
-		return ccno;
-	}
-
-	public void setCcno(Integer ccno) {
-		this.ccno = ccno;
-	}
-
-	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 boolean isCcService() {
-		return ccService;
-	}
-
-	public void setCcService(boolean ccService) {
-		this.ccService = ccService;
-	}
-
-	public Integer getLpChange() {
-		return lpChange;
-	}
-
-	public void setLpChange(Integer lpChange) {
-		this.lpChange = lpChange;
-	}
-
-	public Double getJhlcOrig() {
-		return jhlcOrig;
-	}
-
-	public void setJhlcOrig(Double jhlcOrig) {
-		this.jhlcOrig = jhlcOrig;
-	}
-
-	public int getRfidState() {
-		return rfidState;
-	}
-
-	public void setRfidState(int rfidState) {
-		this.rfidState = rfidState;
-	}
-
-	public int getFirstRfidState() {
-		return firstRfidState;
-	}
-
-	public void setFirstRfidState(int firstRfidState) {
-		this.firstRfidState = firstRfidState;
-	}
-
-	@Transient
-	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
-	/**
-	 *
-	 * @Title: setFcsjActualAll
-	 * @Description: TODO(设置实际发车时间 时间戳)
-	 * @throws
-	 */
-	public void setFcsjActualAll(Long t){
-		this.fcsjActualTime = t;
-		this.fcsjActual = fmtHHmm.print(t);
-	}
-
-	/**
-	 *
-	 * @Title: setFcsjActualAll
-	 * @Description: TODO(设置实际终点时间)
-	 * @throws
-	 */
-	public void setZdsjActualAll(Long t){
-		this.zdsjActualTime = t;
-		this.zdsjActual = fmtHHmm.print(t);
-	}
-}
+package com.bsth.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * 实际排班计划明细。
+ */
+@Entity
+@Table(name = "bsth_c_s_sp_info_real")
+@NamedEntityGraphs({
+    @NamedEntityGraph(name = "scheduleRealInfo_cTasks", attributeNodes = {
+            @NamedAttributeNode("cTasks")
+    })
+})
+public class ScheduleRealInfo implements Serializable{
+
+
+
+	/** 主键Id */
+	@Id
+	private Long id;
+	
+	/** 计划ID */
+	private Long spId;
+
+	/** 排班计划日期 */
+	private Date scheduleDate;
+	private String scheduleDateStr;
+	
+	/** 真实执行时间 yyyy-MM-dd */
+	private String realExecDate;
+
+	/** 线路名称 */
+	@JsonProperty("lineName")
+	private String xlName;
+	/** 线路编码 */
+	private String xlBm;
+
+	/** 路牌名称 */
+	private String lpName;
+
+	/** 车辆自编号 */
+	@JsonProperty("plate")
+	private String clZbh;
+
+	private String jsy;
+	/** 驾驶员工号 */
+	private String jGh;
+	/** 驾驶员名字 */
+	private String jName;
+
+	private String spy;
+	/** 售票员工号 */
+	private String sGh;
+	/** 售票员名字 */
+	private String sName;
+
+	/** 线路方向 */
+	@JsonProperty("direction")
+	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 Integer fcno;
+	/** 对应班次数 */
+	private Integer bcs;
+	/** 计划里程 */
+	private Double jhlc;
+
+	/** 原始计划里程 （原计调的数据） */
+	private Double jhlcOrig;
+
+	/** 班次历时 */
+	private Integer bcsj;
+
+	/**
+	 * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
+	 */
+	private String bcType;
+
+	/** 创建日期 */
+	@Column(name = "create_date")
+	private Date createDate;
+	/** 修改日期 */
+	@Column(name = "update_date")
+	private Date updateDate;
+
+	/** 实际发车时间*/
+	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 = true;
+
+	/** 是否误点*/
+	@Transient
+	private boolean late;
+
+	/** 备注*/
+	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 Integer ccno;
+
+	//待发调试（是否自动调整）
+	private boolean dfAuto;
+	//是否有GPS信号
+	private boolean online;
+
+	/** 是否有补发GPS信号 */
+	private boolean reissue;
+
+
+
+	/**
+	 * 换车营运标记 true 表示该主任务由 【中途换车子任务】 级联生成
+	 */
+	private boolean ccService;
+	private Integer lpChange;
+
+	/**
+	 * rfid状态
+	 */
+	private int rfidState;
+
+	/**
+	 * 起点站rfid状态
+	 */
+	private int firstRfidState;
+
+	@Override
+	public int hashCode() {
+		return (this.id + this.scheduleDateStr + this.xlBm + this.fcsj).hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return this.id.equals(((ScheduleRealInfo)obj).getId());
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getSpId() {
+		return spId;
+	}
+
+	public void setSpId(Long spId) {
+		this.spId = spId;
+	}
+
+	public Date getScheduleDate() {
+		return scheduleDate;
+	}
+
+	public void setScheduleDate(Date scheduleDate) {
+		this.scheduleDate = scheduleDate;
+	}
+
+	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 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 Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
+	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 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 Integer getCcno() {
+		return ccno;
+	}
+
+	public void setCcno(Integer ccno) {
+		this.ccno = ccno;
+	}
+
+	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 boolean isCcService() {
+		return ccService;
+	}
+
+	public void setCcService(boolean ccService) {
+		this.ccService = ccService;
+	}
+
+	public Integer getLpChange() {
+		return lpChange;
+	}
+
+	public void setLpChange(Integer lpChange) {
+		this.lpChange = lpChange;
+	}
+
+	public Double getJhlcOrig() {
+		return jhlcOrig;
+	}
+
+	public void setJhlcOrig(Double jhlcOrig) {
+		this.jhlcOrig = jhlcOrig;
+	}
+
+	public int getRfidState() {
+		return rfidState;
+	}
+
+	public void setRfidState(int rfidState) {
+		this.rfidState = rfidState;
+	}
+
+	public int getFirstRfidState() {
+		return firstRfidState;
+	}
+
+	public void setFirstRfidState(int firstRfidState) {
+		this.firstRfidState = firstRfidState;
+	}
+
+	@Transient
+	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+	/**
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际发车时间 时间戳)
+	 * @throws
+	 */
+	public void setFcsjActualAll(Long t){
+		this.fcsjActualTime = t;
+		this.fcsjActual = fmtHHmm.print(t);
+	}
+
+	/**
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际终点时间)
+	 * @throws
+	 */
+	public void setZdsjActualAll(Long t){
+		this.zdsjActualTime = t;
+		this.zdsjActual = fmtHHmm.print(t);
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public String getSpy() {
+		return spy;
+	}
+
+	public void setSpy(String spy) {
+		this.spy = spy;
+	}
+}
+package com.bsth.entity;
+
+import java.util.List;
+
+/**
+ * @author Hill
+ */
+public class TimeTable {
+
+    private String lineCode;
+
+    private Double totalMileage;
+
+    private Double serviceMileage;
+
+    private String weekDays;
+
+    private List<TimeTableDetail> details;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Double getTotalMileage() {
+        return totalMileage;
+    }
+
+    public void setTotalMileage(Double totalMileage) {
+        this.totalMileage = totalMileage;
+    }
+
+    public Double getServiceMileage() {
+        return serviceMileage;
+    }
+
+    public void setServiceMileage(Double serviceMileage) {
+        this.serviceMileage = serviceMileage;
+    }
+
+    public String getWeekDays() {
+        return weekDays;
+    }
+
+    public void setWeekDays(String weekDays) {
+        this.weekDays = weekDays;
+    }
+
+    public List<TimeTableDetail> getDetails() {
+        return details;
+    }
+
+    public void setDetails(List<TimeTableDetail> details) {
+        this.details = details;
+    }
+}
+package com.bsth.entity;
+
+public class TimeTableDetail {
+
+    private String bcType;
+
+    private int bcs;
+
+    private int bcsj;
+
+    private String lpName;
+
+    private int direction;
+
+    private String startStation;
+
+    private String endStation;
+
+    private String leaveTime;
+
+    private String arrivalTime;
+
+    public String getBcType() {
+        return bcType;
+    }
+
+    public void setBcType(String bcType) {
+        this.bcType = bcType;
+    }
+
+    public int getBcs() {
+        return bcs;
+    }
+
+    public void setBcs(int bcs) {
+        this.bcs = bcs;
+    }
+
+    public int getBcsj() {
+        return bcsj;
+    }
+
+    public void setBcsj(int bcsj) {
+        this.bcsj = bcsj;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public int getDirection() {
+        return direction;
+    }
+
+    public void setDirection(int direction) {
+        this.direction = direction;
+    }
+
+    public String getStartStation() {
+        return startStation;
+    }
+
+    public void setStartStation(String startStation) {
+        this.startStation = startStation;
+    }
+
+    public String getEndStation() {
+        return endStation;
+    }
+
+    public void setEndStation(String endStation) {
+        this.endStation = endStation;
+    }
+
+    public String getLeaveTime() {
+        return leaveTime;
+    }
+
+    public void setLeaveTime(String leaveTime) {
+        this.leaveTime = leaveTime;
+    }
+
+    public String getArrivalTime() {
+        return arrivalTime;
+    }
+
+    public void setArrivalTime(String arrivalTime) {
+        this.arrivalTime = arrivalTime;
+    }
+}
+package com.bsth.entity;
+
+/**
+ * 中运量下发指令时携带信息
+ * 发GPS时需回传此信息
+ * @author Hill
+ */
+public class ZylInfo {
+
+    /**
+     * 线路编码
+     */
+    private int lineId;
+
+    /**
+     * 车次
+     */
+    private int trainNum;
+
+    public ZylInfo() {
+
+    }
+
+    public ZylInfo(int lineId, int trainNum) {
+        this.lineId = lineId;
+        this.trainNum = trainNum;
+    }
+
+    public int getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(int lineId) {
+        this.lineId = lineId;
+    }
+
+    public int getTrainNum() {
+        return trainNum;
+    }
+
+    public void setTrainNum(int trainNum) {
+        this.trainNum = trainNum;
+    }
+}
-package com.bsth.server_rs.base_info.car;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-
-/**
- * 车辆信息
- * Created by panzhao on 2017/3/30.
- */
-@XmlRootElement
-public class Car implements Serializable {
-
-    /**
-     * 自编号/内部编号
-     */
-    private String nbbm;
-
-    /**
-     * 公司代码
-     */
-    private String companyCode;
-    /**
-     * 分公司编码
-     */
-    private String brancheCompanyCode;
-
-    /**
-     * 车牌号
-     */
-    private String carPlate;
-    /**
-     * 设备终端号
-     */
-    private String equipmentCode;
-    /**
-     * 车辆类型
-     */
-    private String carType;
-    /**
-     * 是否机动车（机动车类型选择）
-     */
-    private String vehicleStats;
-
-    /**
-     * 是否电车（TODO：在原系统里没有，这里暂时留着）
-     */
-    private Boolean sfdc;
-    /**
-     * 是否报废
-     */
-    private Boolean scrapState;
-
-    /**
-     * RFID 车卡ID号（16进制）
-     */
-    private String idRfid;
-
-    /**
-     * RFID 标签号
-     */
-    private String tagRfid;
-
-    private String lineCode;
-
-    private String lineName;
-
-    private String remark;
-
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
-    public String getCompanyCode() {
-        return companyCode;
-    }
-
-    public void setCompanyCode(String companyCode) {
-        this.companyCode = companyCode;
-    }
-
-    public String getBrancheCompanyCode() {
-        return brancheCompanyCode;
-    }
-
-    public void setBrancheCompanyCode(String brancheCompanyCode) {
-        this.brancheCompanyCode = brancheCompanyCode;
-    }
-
-    public String getCarPlate() {
-        return carPlate;
-    }
-
-    public void setCarPlate(String carPlate) {
-        this.carPlate = carPlate;
-    }
-
-    public String getEquipmentCode() {
-        return equipmentCode;
-    }
-
-    public void setEquipmentCode(String equipmentCode) {
-        this.equipmentCode = equipmentCode;
-    }
-
-    public String getCarType() {
-        return carType;
-    }
-
-    public void setCarType(String carType) {
-        this.carType = carType;
-    }
-
-    public String getVehicleStats() {
-        return vehicleStats;
-    }
-
-    public void setVehicleStats(String vehicleStats) {
-        this.vehicleStats = vehicleStats;
-    }
-
-    public Boolean getSfdc() {
-        return sfdc;
-    }
-
-    public void setSfdc(Boolean sfdc) {
-        this.sfdc = sfdc;
-    }
-
-    public Boolean getScrapState() {
-        return scrapState;
-    }
-
-    public void setScrapState(Boolean scrapState) {
-        this.scrapState = scrapState;
-    }
-
-    public String getIdRfid() {
-        return idRfid;
-    }
-
-    public void setIdRfid(String idRfid) {
-        this.idRfid = idRfid;
-    }
-
-    public String getTagRfid() {
-        return tagRfid;
-    }
-
-    public void setTagRfid(String tagRfid) {
-        this.tagRfid = tagRfid;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getLineName() {
-        return lineName;
-    }
-
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-}
+package com.bsth.server_rs.base_info.car;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+
+/**
+ * 车辆信息
+ * Created by panzhao on 2017/3/30.
+ */
+@XmlRootElement
+public class Car implements Serializable {
+
+    /**
+     * 自编号/内部编号
+     */
+    private String nbbm;
+
+    /**
+     * 公司代码
+     */
+    private String companyCode;
+    /**
+     * 分公司编码
+     */
+    private String brancheCompanyCode;
+
+    /**
+     * 车牌号
+     */
+    @JsonProperty("plate")
+    private String carPlate;
+    /**
+     * 设备终端号
+     */
+    private String equipmentCode;
+    /**
+     * 车辆类型
+     */
+    private String carType;
+    /**
+     * 是否机动车（机动车类型选择）
+     */
+    private String vehicleStats;
+
+    /**
+     * 是否电车（TODO：在原系统里没有，这里暂时留着）
+     */
+    private Boolean sfdc;
+    /**
+     * 是否报废
+     */
+    private Boolean scrapState;
+
+    /**
+     * RFID 车卡ID号（16进制）
+     */
+    private String idRfid;
+
+    /**
+     * RFID 标签号
+     */
+    private String tagRfid;
+
+    private String lineCode;
+
+    private String lineName;
+
+    private String remark;
+
+    /**
+     * 位0为1 油
+     * 位1为1 电
+     * 位2为1 氢
+     */
+    private int energyType;
+
+    /**
+     * 17位vin码
+     */
+    private String vin;
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getBrancheCompanyCode() {
+        return brancheCompanyCode;
+    }
+
+    public void setBrancheCompanyCode(String brancheCompanyCode) {
+        this.brancheCompanyCode = brancheCompanyCode;
+    }
+
+    public String getCarPlate() {
+        return carPlate;
+    }
+
+    public void setCarPlate(String carPlate) {
+        this.carPlate = carPlate;
+    }
+
+    public String getEquipmentCode() {
+        return equipmentCode;
+    }
+
+    public void setEquipmentCode(String equipmentCode) {
+        this.equipmentCode = equipmentCode;
+    }
+
+    public String getCarType() {
+        return carType;
+    }
+
+    public void setCarType(String carType) {
+        this.carType = carType;
+    }
+
+    public String getVehicleStats() {
+        return vehicleStats;
+    }
+
+    public void setVehicleStats(String vehicleStats) {
+        this.vehicleStats = vehicleStats;
+    }
+
+    public Boolean getSfdc() {
+        return sfdc;
+    }
+
+    public void setSfdc(Boolean sfdc) {
+        this.sfdc = sfdc;
+    }
+
+    public Boolean getScrapState() {
+        return scrapState;
+    }
+
+    public void setScrapState(Boolean scrapState) {
+        this.scrapState = scrapState;
+    }
+
+    public String getIdRfid() {
+        return idRfid;
+    }
+
+    public void setIdRfid(String idRfid) {
+        this.idRfid = idRfid;
+    }
+
+    public String getTagRfid() {
+        return tagRfid;
+    }
+
+    public void setTagRfid(String tagRfid) {
+        this.tagRfid = tagRfid;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public int getEnergyType() {
+        return energyType;
+    }
+
+    public void setEnergyType(int energyType) {
+        this.energyType = energyType;
+    }
+
+    public String getVin() {
+        return vin;
+    }
+
+    public void setVin(String vin) {
+        this.vin = vin;
+    }
+}
-package com.bsth.server_rs.base_info.car;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
-import com.bsth.server_rs.base_info.dto.BusCardDto;
-import org.apache.commons.lang3.StringEscapeUtils;
-
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/3/30.
- */
-@Path("/car")
-@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class CarRestService {
-
-    @GET
-    @Path("/all")
-    public List<Car> findAll(){
-        return CarBufferData.findAll();
-    }
-
-    @GET
-    @Path("/company/{companyId}")
-    public List<Car> findByCompany(@PathParam("companyId") String companyId) {
-        return companyId.equals("-9999") ? CarBufferData.findAll() : CarBufferData.findByCompany(companyId);
-    }
-
-    @GET
-    @Path("/{nbbm}")
-    public Car findOne(@PathParam("nbbm") String nbbm) {
-        return CarBufferData.findOne(nbbm);
-    }
-
-    @POST
-    @Path("/setCards")
-    public Map<String, Object> multiPostCards(String bodyStr){
-        bodyStr = StringEscapeUtils.unescapeHtml4(bodyStr);
-        List<BusCardDto> list = JSON.parseObject(bodyStr, new TypeReference<List<BusCardDto>>() {});
-        return CarBufferData.multiSaveCards(list);
-    }
-}
+package com.bsth.server_rs.base_info.car;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
+import com.bsth.server_rs.base_info.dto.BusCardDto;
+import com.bsth.server_rs.base_info.person.PersonRestService;
+import com.bsth.server_rs.base_info.person.Personnel;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Path("/vehicle")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class CarRestService {
+
+    private final static Logger log = LoggerFactory.getLogger(CarRestService.class);
+
+    private ObjectMapper mapper = new ObjectMapper();
+
+    @GET
+    @Path("/all")
+    public List<Car> findAll(){
+        return CarBufferData.findAll();
+    }
+
+    @GET
+    @Path("/company/{companyId}")
+    public List<Car> findByCompany(@PathParam("companyId") String companyId) {
+        return companyId.equals("-9999") ? CarBufferData.findAll() : CarBufferData.findByCompany(companyId);
+    }
+
+    @GET
+    @Path("/{nbbm}")
+    public Car findOne(@PathParam("nbbm") String nbbm) {
+        return CarBufferData.findOne(nbbm);
+    }
+
+    @POST
+    @Path("/setCards")
+    public Map<String, Object> multiPostCards(String bodyStr){
+        bodyStr = StringEscapeUtils.unescapeHtml4(bodyStr);
+        List<BusCardDto> list = JSON.parseObject(bodyStr, new TypeReference<List<BusCardDto>>() {});
+        return CarBufferData.multiSaveCards(list);
+    }
+
+    @POST
+    @Path("")
+    public Map<String, Object> save(List<Car> cars) throws JsonProcessingException {
+        Map<String, Object> result = new HashMap<>();
+        log.info(mapper.writeValueAsString(cars));
+
+        return result;
+    }
+}
-package com.bsth.server_rs.base_info.line;
-
-import com.bsth.server_rs.adapter.DateTimeAdapter;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * @ClassName: Line(线路实体类)
- * @Description: TODO(线路)
- * @Author bsth@lq
- * @Date 2016-4-11 16:06:17
- * @Version 公交调度系统BS版 0.1
- */
-@XmlRootElement
-public class Line implements Serializable {
-
-
-    /**线路名称  varchar length(50) 不能为空*/
-    private String name;
-
-    /** 线路编码 varchar length(50) 不能为空*/
-    private String lineCode;
-
-    /** 起始站名称*/
-    private String startStationName;
-
-    /** 终点站名称*/
-    private String endStationName;
-
-    /** 起始站首班车时间 00:00  */
-    private String startStationFirstTime;
-
-    /** 起始站末班车时间 00:00 */
-    private String startStationEndTime;
-
-    /** 终点站首班时间 00:00 */
-    private String endStationFirstTime;
-
-    /** 终点站末班时间 00:00 */
-    private String endStationEndTime;
-
-    /** 所属公司 */
-    private String company;
-
-    /**
-     * 所属公司名称
-     */
-    private String companyName;
-
-    /** 分公司  */
-    private String brancheCompany;
-
-    /** 性质(线路类型) */
-    private String nature;
-
-    /**线路等级 */
-    private String level;
-
-    /**是否撤销 <1:是;0:否> */
-    private Integer destroy;
-
-    /** 是否夜宵线   <1:是;0:否> */
-    private Integer supperLine;
-
-    /** 设备线路编码 */
-    private String eqLinecode;
-
-    /**
-     * 创建日期 timestamp
-     */
-    private Date createDate;
-
-    //-------------- 标准信息 -----------
-    /** 标准总里程 */
-    private Double totalMileage;
-    /** 早高峰大间隔（分钟） */
-    private Double earlyIntervalLg;
-
-    /** 晚高峰大间隔（分钟） */
-    private Double lateIntervalLg;
-
-    /** 平时大间隔（分钟） */
-    private Double intervalLg;
-
-    /** 限速（平时） */
-    private Double speedLimit;
-
-    /** 滞站 */
-    private Integer lagStation;
-
-    /** 越站 */
-    private Integer skip;
-
-    /** 超速 */
-    private Integer speeding;
-
-    /** 串线 */
-    private Integer  crossedLine;
-
-    /** 越界 */
-    private Integer overflights;
-
-    /**
-     * 上海市线路编码
-     */
-    private String shanghaiLinecode;
-    
-    // 环线或双向
-    private int linePlayType;
-    // 区内/外
-    private int region;
-
-    /**
-     * 运管处和app上线标识
-     * @return
-     */
-    private Integer inUse;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getStartStationName() {
-        return startStationName;
-    }
-
-    public void setStartStationName(String startStationName) {
-        this.startStationName = startStationName;
-    }
-
-    public String getEndStationName() {
-        return endStationName;
-    }
-
-    public void setEndStationName(String endStationName) {
-        this.endStationName = endStationName;
-    }
-
-    public String getStartStationFirstTime() {
-        return startStationFirstTime;
-    }
-
-    public void setStartStationFirstTime(String startStationFirstTime) {
-        this.startStationFirstTime = startStationFirstTime;
-    }
-
-    public String getStartStationEndTime() {
-        return startStationEndTime;
-    }
-
-    public void setStartStationEndTime(String startStationEndTime) {
-        this.startStationEndTime = startStationEndTime;
-    }
-
-    public String getEndStationFirstTime() {
-        return endStationFirstTime;
-    }
-
-    public void setEndStationFirstTime(String endStationFirstTime) {
-        this.endStationFirstTime = endStationFirstTime;
-    }
-
-    public String getEndStationEndTime() {
-        return endStationEndTime;
-    }
-
-    public void setEndStationEndTime(String endStationEndTime) {
-        this.endStationEndTime = endStationEndTime;
-    }
-
-    public String getCompany() {
-        return company;
-    }
-
-    public void setCompany(String company) {
-        this.company = company;
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getBrancheCompany() {
-        return brancheCompany;
-    }
-
-    public void setBrancheCompany(String brancheCompany) {
-        this.brancheCompany = brancheCompany;
-    }
-
-    public String getNature() {
-        return nature;
-    }
-
-    public void setNature(String nature) {
-        this.nature = nature;
-    }
-
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    public Integer getDestroy() {
-        return destroy;
-    }
-
-    public void setDestroy(Integer destroy) {
-        this.destroy = destroy;
-    }
-
-    public Integer getSupperLine() {
-        return supperLine;
-    }
-
-    public void setSupperLine(Integer supperLine) {
-        this.supperLine = supperLine;
-    }
-
-    public String getEqLinecode() {
-        return eqLinecode;
-    }
-
-    public void setEqLinecode(String eqLinecode) {
-        this.eqLinecode = eqLinecode;
-    }
-
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Double getTotalMileage() {
-        return totalMileage;
-    }
-
-    public void setTotalMileage(Double totalMileage) {
-        this.totalMileage = totalMileage;
-    }
-
-    public Double getEarlyIntervalLg() {
-        return earlyIntervalLg;
-    }
-
-    public void setEarlyIntervalLg(Double earlyIntervalLg) {
-        this.earlyIntervalLg = earlyIntervalLg;
-    }
-
-    public Double getLateIntervalLg() {
-        return lateIntervalLg;
-    }
-
-    public void setLateIntervalLg(Double lateIntervalLg) {
-        this.lateIntervalLg = lateIntervalLg;
-    }
-
-    public Double getIntervalLg() {
-        return intervalLg;
-    }
-
-    public void setIntervalLg(Double intervalLg) {
-        this.intervalLg = intervalLg;
-    }
-
-    public Double getSpeedLimit() {
-        return speedLimit;
-    }
-
-    public void setSpeedLimit(Double speedLimit) {
-        this.speedLimit = speedLimit;
-    }
-
-    public Integer getLagStation() {
-        return lagStation;
-    }
-
-    public void setLagStation(Integer lagStation) {
-        this.lagStation = lagStation;
-    }
-
-    public Integer getSkip() {
-        return skip;
-    }
-
-    public void setSkip(Integer skip) {
-        this.skip = skip;
-    }
-
-    public Integer getSpeeding() {
-        return speeding;
-    }
-
-    public void setSpeeding(Integer speeding) {
-        this.speeding = speeding;
-    }
-
-    public Integer getCrossedLine() {
-        return crossedLine;
-    }
-
-    public void setCrossedLine(Integer crossedLine) {
-        this.crossedLine = crossedLine;
-    }
-
-    public Integer getOverflights() {
-        return overflights;
-    }
-
-    public void setOverflights(Integer overflights) {
-        this.overflights = overflights;
-    }
-
-    public String getShanghaiLinecode() {
-        return shanghaiLinecode;
-    }
-
-    public void setShanghaiLinecode(String shanghaiLinecode) {
-        this.shanghaiLinecode = shanghaiLinecode;
-    }
-
-	public int getLinePlayType() {
-		return linePlayType;
-	}
-
-	public void setLinePlayType(int linePlayType) {
-		this.linePlayType = linePlayType;
-	}
-
-	public int getRegion() {
-		return region;
-	}
-
-	public void setRegion(int region) {
-		this.region = region;
-	}
-
-    public Integer getInUse() {
-        return inUse;
-    }
-
-    public void setInUse(Integer inUse) {
-        this.inUse = inUse;
-    }
-}
+package com.bsth.server_rs.base_info.line;
+
+import com.bsth.server_rs.adapter.DateTimeAdapter;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @ClassName: Line(线路实体类)
+ * @Description: TODO(线路)
+ * @Author bsth@lq
+ * @Date 2016-4-11 16:06:17
+ * @Version 公交调度系统BS版 0.1
+ */
+@XmlRootElement
+public class Line implements Serializable {
+
+
+    /**线路名称  varchar length(50) 不能为空*/
+    private String name;
+
+    /** 线路编码 varchar length(50) 不能为空*/
+    private String lineCode;
+
+    /** 起始站名称*/
+    private String startStationName;
+
+    /** 终点站名称*/
+    private String endStationName;
+
+    /** 起始站首班车时间 00:00  */
+    private String startStationFirstTime;
+
+    /** 起始站末班车时间 00:00 */
+    private String startStationEndTime;
+
+    /** 终点站首班时间 00:00 */
+    private String endStationFirstTime;
+
+    /** 终点站末班时间 00:00 */
+    private String endStationEndTime;
+
+    /** 所属公司 */
+    private String company;
+
+    /**
+     * 所属公司名称
+     */
+    private String companyName;
+
+    /** 分公司  */
+    private String brancheCompany;
+
+    /** 性质(线路类型) */
+    private String nature;
+
+    /**线路等级 */
+    private String level;
+
+    /**是否撤销 <1:是;0:否> */
+    private Integer destroy;
+
+    /** 是否夜宵线   <1:是;0:否> */
+    private Integer supperLine;
+
+    /** 设备线路编码 */
+    private String eqLinecode;
+
+    /**
+     * 创建日期 timestamp
+     */
+    private Date createDate;
+
+    //-------------- 标准信息 -----------
+    /** 标准总里程 */
+    private Double totalMileage;
+    /** 早高峰大间隔（分钟） */
+    private Double earlyIntervalLg;
+
+    /** 晚高峰大间隔（分钟） */
+    private Double lateIntervalLg;
+
+    /** 平时大间隔（分钟） */
+    private Double intervalLg;
+
+    /** 限速（平时） */
+    private Double speedLimit;
+
+    /** 滞站 */
+    private Integer lagStation;
+
+    /** 越站 */
+    private Integer skip;
+
+    /** 超速 */
+    private Integer speeding;
+
+    /** 串线 */
+    private Integer  crossedLine;
+
+    /** 越界 */
+    private Integer overflights;
+
+    /**
+     * 上海市线路编码
+     */
+    private String shanghaiLinecode;
+    
+    // 环线或双向
+    private int linePlayType;
+    // 区内/外
+    private int region;
+
+    /**
+     * 运管处和app上线标识
+     * @return
+     */
+    private Integer inUse;
+
+    private Double upMileage;
+
+    private Double downMileage;
+
+    private Double upTravelTime;
+
+    private Double downTravelTime;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getStartStationName() {
+        return startStationName;
+    }
+
+    public void setStartStationName(String startStationName) {
+        this.startStationName = startStationName;
+    }
+
+    public String getEndStationName() {
+        return endStationName;
+    }
+
+    public void setEndStationName(String endStationName) {
+        this.endStationName = endStationName;
+    }
+
+    public String getStartStationFirstTime() {
+        return startStationFirstTime;
+    }
+
+    public void setStartStationFirstTime(String startStationFirstTime) {
+        this.startStationFirstTime = startStationFirstTime;
+    }
+
+    public String getStartStationEndTime() {
+        return startStationEndTime;
+    }
+
+    public void setStartStationEndTime(String startStationEndTime) {
+        this.startStationEndTime = startStationEndTime;
+    }
+
+    public String getEndStationFirstTime() {
+        return endStationFirstTime;
+    }
+
+    public void setEndStationFirstTime(String endStationFirstTime) {
+        this.endStationFirstTime = endStationFirstTime;
+    }
+
+    public String getEndStationEndTime() {
+        return endStationEndTime;
+    }
+
+    public void setEndStationEndTime(String endStationEndTime) {
+        this.endStationEndTime = endStationEndTime;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getBrancheCompany() {
+        return brancheCompany;
+    }
+
+    public void setBrancheCompany(String brancheCompany) {
+        this.brancheCompany = brancheCompany;
+    }
+
+    public String getNature() {
+        return nature;
+    }
+
+    public void setNature(String nature) {
+        this.nature = nature;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public Integer getDestroy() {
+        return destroy;
+    }
+
+    public void setDestroy(Integer destroy) {
+        this.destroy = destroy;
+    }
+
+    public Integer getSupperLine() {
+        return supperLine;
+    }
+
+    public void setSupperLine(Integer supperLine) {
+        this.supperLine = supperLine;
+    }
+
+    public String getEqLinecode() {
+        return eqLinecode;
+    }
+
+    public void setEqLinecode(String eqLinecode) {
+        this.eqLinecode = eqLinecode;
+    }
+
+    @XmlJavaTypeAdapter(DateTimeAdapter.class)
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Double getTotalMileage() {
+        return totalMileage;
+    }
+
+    public void setTotalMileage(Double totalMileage) {
+        this.totalMileage = totalMileage;
+    }
+
+    public Double getEarlyIntervalLg() {
+        return earlyIntervalLg;
+    }
+
+    public void setEarlyIntervalLg(Double earlyIntervalLg) {
+        this.earlyIntervalLg = earlyIntervalLg;
+    }
+
+    public Double getLateIntervalLg() {
+        return lateIntervalLg;
+    }
+
+    public void setLateIntervalLg(Double lateIntervalLg) {
+        this.lateIntervalLg = lateIntervalLg;
+    }
+
+    public Double getIntervalLg() {
+        return intervalLg;
+    }
+
+    public void setIntervalLg(Double intervalLg) {
+        this.intervalLg = intervalLg;
+    }
+
+    public Double getSpeedLimit() {
+        return speedLimit;
+    }
+
+    public void setSpeedLimit(Double speedLimit) {
+        this.speedLimit = speedLimit;
+    }
+
+    public Integer getLagStation() {
+        return lagStation;
+    }
+
+    public void setLagStation(Integer lagStation) {
+        this.lagStation = lagStation;
+    }
+
+    public Integer getSkip() {
+        return skip;
+    }
+
+    public void setSkip(Integer skip) {
+        this.skip = skip;
+    }
+
+    public Integer getSpeeding() {
+        return speeding;
+    }
+
+    public void setSpeeding(Integer speeding) {
+        this.speeding = speeding;
+    }
+
+    public Integer getCrossedLine() {
+        return crossedLine;
+    }
+
+    public void setCrossedLine(Integer crossedLine) {
+        this.crossedLine = crossedLine;
+    }
+
+    public Integer getOverflights() {
+        return overflights;
+    }
+
+    public void setOverflights(Integer overflights) {
+        this.overflights = overflights;
+    }
+
+    public String getShanghaiLinecode() {
+        return shanghaiLinecode;
+    }
+
+    public void setShanghaiLinecode(String shanghaiLinecode) {
+        this.shanghaiLinecode = shanghaiLinecode;
+    }
+
+	public int getLinePlayType() {
+		return linePlayType;
+	}
+
+	public void setLinePlayType(int linePlayType) {
+		this.linePlayType = linePlayType;
+	}
+
+	public int getRegion() {
+		return region;
+	}
+
+	public void setRegion(int region) {
+		this.region = region;
+	}
+
+    public Integer getInUse() {
+        return inUse;
+    }
+
+    public void setInUse(Integer inUse) {
+        this.inUse = inUse;
+    }
+
+    public Double getUpMileage() {
+        return upMileage;
+    }
+
+    public void setUpMileage(Double upMileage) {
+        this.upMileage = upMileage;
+    }
+
+    public Double getDownMileage() {
+        return downMileage;
+    }
+
+    public void setDownMileage(Double downMileage) {
+        this.downMileage = downMileage;
+    }
+
+    public Double getUpTravelTime() {
+        return upTravelTime;
+    }
+
+    public void setUpTravelTime(Double upTravelTime) {
+        this.upTravelTime = upTravelTime;
+    }
+
+    public Double getDownTravelTime() {
+        return downTravelTime;
+    }
+
+    public void setDownTravelTime(Double downTravelTime) {
+        this.downTravelTime = downTravelTime;
+    }
+}
 package com.bsth.server_rs.base_info.line;
  
 import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
+import com.bsth.server_rs.schedule.ScheduleRealService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
  
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.*;
  
 /**
  * 线路 Rest Service
@@ -20,6 +19,10 @@ import java.util.stream.Collectors;
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
 public class LineRestService {
  
+    private final static Logger log = LoggerFactory.getLogger(LineRestService.class);
+
+    private ObjectMapper mapper = new ObjectMapper();
+
     @GET
     @Path("/all")
     public List<Line> findAll(){
@@ -52,4 +55,13 @@ public class LineRestService {
     public Line findOne(@PathParam("lineCode") String lineCode) {
         return LineBufferData.findOne(lineCode);
     }
+
+    @POST
+    @Path("")
+    public Map<String, Object> save(List<Line> lines) throws JsonProcessingException {
+        Map<String, Object> result = new HashMap<>();
+        log.info(mapper.writeValueAsString(lines));
+
+        return result;
+    }
 }
-package com.bsth.server_rs.base_info.person;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.bsth.server_rs.base_info.dto.PersonCardDto;
-import com.bsth.server_rs.base_info.person.buffer.PersonBufferData;
-import org.apache.commons.lang3.StringEscapeUtils;
-
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/3/28.
- */
-@Path("/person")
-@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class PersonRestService {
-
-    @GET
-    @Path("/all")
-    public List<Personnel> findAll(){
-        return PersonBufferData.findAll();
-    }
-
-    @GET
-    @Path("/company/{companyId}")
-    public List<Personnel> findByCompany(@PathParam("companyId") String companyId) {
-        return companyId.equals("-9999") ? PersonBufferData.findAll() : PersonBufferData.findByCompany(companyId);
-    }
-
-    @GET
-    @Path("/{workId}")
-    public Personnel findOne(@PathParam("workId") String workId) {
-        return PersonBufferData.findOne(workId);
-    }
-
-    @POST
-    @Path("/setCards")
-    public Map<String, Object> multiPostCards(String bodyStr){
-        bodyStr = StringEscapeUtils.unescapeHtml4(bodyStr);
-        List<PersonCardDto> list = JSON.parseObject(bodyStr, new TypeReference<List<PersonCardDto>>() {});
-        return PersonBufferData.multiSaveCards(list);
-    }
-}
+package com.bsth.server_rs.base_info.person;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.bsth.server_rs.base_info.dto.PersonCardDto;
+import com.bsth.server_rs.base_info.line.LineRestService;
+import com.bsth.server_rs.base_info.person.buffer.PersonBufferData;
+import com.bsth.server_rs.base_info.station.entity.StationRotue;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/3/28.
+ */
+@Path("/employee")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class PersonRestService {
+
+    private final static Logger log = LoggerFactory.getLogger(PersonRestService.class);
+
+    private ObjectMapper mapper = new ObjectMapper();
+
+    @GET
+    @Path("/all")
+    public List<Personnel> findAll(){
+        return PersonBufferData.findAll();
+    }
+
+    @GET
+    @Path("/company/{companyId}")
+    public List<Personnel> findByCompany(@PathParam("companyId") String companyId) {
+        return companyId.equals("-9999") ? PersonBufferData.findAll() : PersonBufferData.findByCompany(companyId);
+    }
+
+    @GET
+    @Path("/{workId}")
+    public Personnel findOne(@PathParam("workId") String workId) {
+        return PersonBufferData.findOne(workId);
+    }
+
+    @POST
+    @Path("/setCards")
+    public Map<String, Object> multiPostCards(String bodyStr){
+        bodyStr = StringEscapeUtils.unescapeHtml4(bodyStr);
+        List<PersonCardDto> list = JSON.parseObject(bodyStr, new TypeReference<List<PersonCardDto>>() {});
+        return PersonBufferData.multiSaveCards(list);
+    }
+
+    @POST
+    @Path("")
+    public Map<String, Object> save(List<Personnel> personnels) throws JsonProcessingException {
+        Map<String, Object> result = new HashMap<>();
+        log.info(mapper.writeValueAsString(personnels));
+
+        return result;
+    }
+}
-package com.bsth.server_rs.base_info.station;
-
-import com.bsth.server_rs.base_info.station.buffer.StationBufferData;
-import com.bsth.server_rs.base_info.station.entity.StationRotue;
-import org.springframework.stereotype.Component;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/8/31.
- */
-@Component
-@Path("/station")
-@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class StationRestService {
-
-    @GET
-    @Path("/all")
-    public Map<String, Collection<StationRotue>> findAll(){
-        return StationBufferData.findAllRoute();
-    }
-
-    @GET
-    @Path("/{company}")
-    public Map<String, Collection<StationRotue>> findByCompany(@PathParam("company") String company){
-        return StationBufferData.findRouteByCompany(company);
-    }
-
-    @GET
-    @Path("/line/{lineCode}")
-    public Map<String, Collection<StationRotue>> findByLineCode(@PathParam("lineCode") String lineCode){
-        return StationBufferData.findRouteByLineCode(lineCode);
-    }
-}
+package com.bsth.server_rs.base_info.station;
+
+import com.bsth.server_rs.base_info.line.Line;
+import com.bsth.server_rs.base_info.line.LineRestService;
+import com.bsth.server_rs.base_info.station.buffer.StationBufferData;
+import com.bsth.server_rs.base_info.station.entity.StationRotue;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/8/31.
+ */
+@Component
+@Path("/station")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class StationRestService {
+
+    private final static Logger log = LoggerFactory.getLogger(StationRestService.class);
+
+    private ObjectMapper mapper = new ObjectMapper();
+
+    @GET
+    @Path("/all")
+    public Map<String, Collection<StationRotue>> findAll(){
+        return StationBufferData.findAllRoute();
+    }
+
+    @GET
+    @Path("/{company}")
+    public Map<String, Collection<StationRotue>> findByCompany(@PathParam("company") String company){
+        return StationBufferData.findRouteByCompany(company);
+    }
+
+    @GET
+    @Path("/line/{lineCode}")
+    public Map<String, Collection<StationRotue>> findByLineCode(@PathParam("lineCode") String lineCode){
+        return StationBufferData.findRouteByLineCode(lineCode);
+    }
+
+    @POST
+    @Path("")
+    public Map<String, Object> save(List<StationRotue> stationRotues) throws JsonProcessingException {
+        Map<String, Object> result = new HashMap<>();
+        log.info(mapper.writeValueAsString(stationRotues));
+
+        return result;
+    }
+}
-package com.bsth.server_rs.base_info.station.entity;
-
-/**
- * Created by panzhao on 2017/8/31.
- */
-public class StationRotue {
-
-    /** 线路编码 */
-    private String lineCode;
-
-    /** 站点路由序号 */
-    private Integer stationRouteCode;
-
-    private String stationCode;
-
-    private String stationName;
-
-    private Station station;
-
-    /**
-     * 站点类型
-     * ------ B：起点站
-     * ------ Z：中途站
-     * ------ E：终点站
-     * ------ T：停车场
-     */
-    private String stationMark;
-
-    /** 站点路由到站距离 */
-    private Double distances;
-
-    /** 站点路由到站时间 */
-    private Double toTime;
-
-    /** 首班时间 */
-    private String firstTime;
-
-    /** 末班时间 */
-    private String endTime;
-
-    /** 站点路由方向 */
-    private Integer directions;
-
-    /** 版本号 */
-    private Integer versions;
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public Integer getStationRouteCode() {
-        return stationRouteCode;
-    }
-
-    public void setStationRouteCode(Integer stationRouteCode) {
-        this.stationRouteCode = stationRouteCode;
-    }
-
-    public Station getStation() {
-        return station;
-    }
-
-    public void setStation(Station station) {
-        this.station = station;
-    }
-
-    public String getStationMark() {
-        return stationMark;
-    }
-
-    public void setStationMark(String stationMark) {
-        this.stationMark = stationMark;
-    }
-
-    public Double getDistances() {
-        return distances;
-    }
-
-    public void setDistances(Double distances) {
-        this.distances = distances;
-    }
-
-    public Double getToTime() {
-        return toTime;
-    }
-
-    public void setToTime(Double toTime) {
-        this.toTime = toTime;
-    }
-
-    public String getFirstTime() {
-        return firstTime;
-    }
-
-    public void setFirstTime(String firstTime) {
-        this.firstTime = firstTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public Integer getDirections() {
-        return directions;
-    }
-
-    public void setDirections(Integer directions) {
-        this.directions = directions;
-    }
-
-    public Integer getVersions() {
-        return versions;
-    }
-
-    public void setVersions(Integer versions) {
-        this.versions = versions;
-    }
-
-    public String getStationCode() {
-        return stationCode;
-    }
-
-    public void setStationCode(String stationCode) {
-        this.stationCode = stationCode;
-    }
-
-    public String getStationName() {
-        return stationName;
-    }
-
-    public void setStationName(String stationName) {
-        this.stationName = stationName;
-    }
-}
+package com.bsth.server_rs.base_info.station.entity;
+
+/**
+ * Created by panzhao on 2017/8/31.
+ */
+public class StationRotue {
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 站点路由序号 */
+    private Integer stationRouteCode;
+
+    private String stationCode;
+
+    private String stationName;
+
+    private Station station;
+
+    /**
+     * 站点类型
+     * ------ B：起点站
+     * ------ Z：中途站
+     * ------ E：终点站
+     * ------ T：停车场
+     */
+    private String stationMark;
+
+    /** 站点路由到站距离 */
+    private Double distances;
+
+    /** 站点路由到站时间 */
+    private Double toTime;
+
+    /** 首班时间 */
+    private String firstTime;
+
+    /** 末班时间 */
+    private String endTime;
+
+    /** 站点路由方向 */
+    private Integer directions;
+
+    /** 版本号 */
+    private Integer versions;
+
+    private Float lon;
+
+    private Float lat;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Integer getStationRouteCode() {
+        return stationRouteCode;
+    }
+
+    public void setStationRouteCode(Integer stationRouteCode) {
+        this.stationRouteCode = stationRouteCode;
+    }
+
+    public Station getStation() {
+        return station;
+    }
+
+    public void setStation(Station station) {
+        this.station = station;
+    }
+
+    public String getStationMark() {
+        return stationMark;
+    }
+
+    public void setStationMark(String stationMark) {
+        this.stationMark = stationMark;
+    }
+
+    public Double getDistances() {
+        return distances;
+    }
+
+    public void setDistances(Double distances) {
+        this.distances = distances;
+    }
+
+    public Double getToTime() {
+        return toTime;
+    }
+
+    public void setToTime(Double toTime) {
+        this.toTime = toTime;
+    }
+
+    public String getFirstTime() {
+        return firstTime;
+    }
+
+    public void setFirstTime(String firstTime) {
+        this.firstTime = firstTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getDirections() {
+        return directions;
+    }
+
+    public void setDirections(Integer directions) {
+        this.directions = directions;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public Float getLon() {
+        return lon;
+    }
+
+    public void setLon(Float lon) {
+        this.lon = lon;
+    }
+
+    public Float getLat() {
+        return lat;
+    }
+
+    public void setLat(Float lat) {
+        this.lat = lat;
+    }
+}
-package com.bsth.server_rs.gps.buffer;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Component;
-
-import com.bsth.server_rs.gps.entity.LineInfo;
-import com.bsth.server_rs.gps.entity.Point;
-import com.bsth.server_rs.gps.entity.StopInfo;
-
-/**
- * Created by panzhao on 2017/3/30.
- */
-@Component
-public class BasicDataRefreshThread extends Thread implements InitializingBean {
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-    
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public void run() {
-        loadBasicData();
-    }
-    
-    private void loadBasicData() {
-    	try {
-        	String qline = "select a.id,in_use,line_code,name,start_station_name,start_station_first_time,start_station_end_time,end_station_name,end_station_first_time,end_station_end_time,company,branche_company,length,telephone,speed_limit,shanghai_linecode,line_play_type,up_travel_time,down_travel_time from bsth_c_line a left join bsth_c_line_information b on a.id = b.line where a.destroy = 0 and a.nature = 'hlwgj'";
-        	String qstop = "select b.id,b.station_cod,b.station_name,b.road_coding,b.g_lonx,b.g_laty,b.shapes_type,b.radius,AsText(b.g_polygon_grid) as g_polygon_grid,a.line,a.line_code,a.directions,a.distances from bsth_c_stationroute a join bsth_c_station b on a.station = b.id where a.destroy = 0 order by a.line,a.directions,a.station_route_code";
-        	String qcar = "select equipment_code device_id, car_plate plate_no from bsth_c_cars";
-        	
-        	List<LineInfo> lines = jdbcTemplate.query(qline, new RowMapperLineInfo());
-        	List<StopInfo> stops = jdbcTemplate.query(qstop, new RowMapperStopInfo());
-        	List<Map<String, Object>> cars = jdbcTemplate.queryForList(qcar);
-        	
-        	// 缓存线路基本信息
-    		for (LineInfo line : lines) {
-    			BasicDataBuffer.putLine(line.getLineId(), line);
-    		}
-    		
-    		// 线路信息中添加上下行站点信息
-    		int oldId = -1;
-    		LineInfo line = null;
-    		for (StopInfo stop : stops) {
-    			if (stop.getLineCode() != oldId) {
-    				oldId = stop.getLineCode();
-    				line = BasicDataBuffer.getLineById(oldId);
-    			}
-    			if (line != null) {
-    				if (stop.getDirections() == 0) line.getStopsUp().add(stop);
-    				else line.getStopsDown().add(stop);
-    			}
-    		}
-    		
-    		for (Map<String, Object> car : cars) {
-    			BasicDataBuffer.putCar((String)car.get("device_id"), (String)car.get("plate_no"));
-    		}
-    		
-    		logger.info("基础数据加载成功");
-        }catch (Exception e){
-            logger.error("基础数据加载失败", e);
-        }
-    }
-    
-    final class RowMapperLineInfo implements RowMapper<LineInfo> {
-
-		@Override
-		public LineInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
-			// TODO Auto-generated method stub
-			LineInfo line = new LineInfo();
-			line.setId(rs.getInt("id"));
-			line.setInUse(rs.getInt("in_use"));
-			line.setLineId(rs.getInt("line_code"));
-			line.setLineName(rs.getString("name"));
-			//line.setStartStation(rs.getInt("start_station"));
-			line.setStartStationName(rs.getString("start_station_name"));
-			line.setStartStationFirstTime(rs.getString("start_station_first_time"));
-			line.setStartStationEndTime(rs.getString("start_station_end_time"));
-			//line.setEndStation(rs.getInt("end_station"));
-			line.setEndStationName(rs.getString("end_station_name"));
-			line.setEndStationFirstTime(rs.getString("end_station_first_time"));
-			line.setEndStationEndTime(rs.getString("end_station_end_time"));
-			line.setCompany(rs.getString("company"));
-			line.setBrancheCompany(rs.getString("branche_company"));
-			line.setTelephone(rs.getString("telephone"));
-			line.setLinePlayType(rs.getInt("line_play_type"));
-			return line;
-		}
-		
-	}
-    
-    final class RowMapperStopInfo implements RowMapper<StopInfo> {
-
-		@Override
-		public StopInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
-			// TODO Auto-generated method stub
-			StopInfo stop = new StopInfo();
-			stop.setId(rs.getInt("id"));
-			stop.setStationCod(rs.getString("station_cod"));
-			stop.setStationName(rs.getString("station_name"));
-			//stop.setStationType(rs.getString("station_type"));
-			stop.setRoadCoding(rs.getString("road_coding"));
-			float lon = rs.getFloat("g_lonx");
-			float lat = rs.getFloat("g_laty");
-			stop.setPoint(new Point(lon, lat));
-			stop.setLineId(rs.getInt("line"));
-			stop.setLineCode(rs.getInt("line_code"));
-			stop.setDirections(rs.getInt("directions"));
-			stop.setShapesType(rs.getString("shapes_type"));
-			stop.setRadius(rs.getInt("radius"));
-			stop.setPoints(new ArrayList<Point>());
-			stop.setDistances(rs.getDouble("distances")*1000);
-			return stop;
-		}
-		
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		// TODO Auto-generated method stub
-		loadBasicData();
-	}
-}
+package com.bsth.server_rs.gps.buffer;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Component;
+
+import com.bsth.server_rs.gps.entity.LineInfo;
+import com.bsth.server_rs.gps.entity.Point;
+import com.bsth.server_rs.gps.entity.StopInfo;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+public class BasicDataRefreshThread extends Thread implements InitializingBean {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+    
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Override
+    public void run() {
+        loadBasicData();
+    }
+    
+    private void loadBasicData() {
+    	try {
+        	String qline = "select a.id,in_use,line_code,name,start_station_name,start_station_first_time,start_station_end_time,end_station_name,end_station_first_time,end_station_end_time,company,branche_company,length,telephone,speed_limit,shanghai_linecode,line_play_type,up_travel_time,down_travel_time from bsth_c_line a left join bsth_c_line_information b on a.id = b.line where a.destroy = 0 and a.nature = 'hlwgj'";
+        	String qstop = "select b.id,b.station_cod,b.station_name,b.road_coding,b.g_lonx,b.g_laty,b.shapes_type,b.radius,AsText(b.g_polygon_grid) as g_polygon_grid,a.line,a.line_code,a.directions,a.distances from bsth_c_stationroute a join bsth_c_station b on a.station = b.id where a.destroy = 0 order by a.line,a.directions,a.station_route_code";
+        	String qcar = "select equipment_code device_id, car_plate plate_no from bsth_c_cars";
+        	
+        	List<LineInfo> lines = jdbcTemplate.query(qline, new RowMapperLineInfo());
+        	List<StopInfo> stops = jdbcTemplate.query(qstop, new RowMapperStopInfo());
+        	List<Map<String, Object>> cars = jdbcTemplate.queryForList(qcar);
+        	
+        	// 缓存线路基本信息
+    		for (LineInfo line : lines) {
+    			BasicDataBuffer.putLine(line.getLineId(), line);
+    		}
+    		
+    		// 线路信息中添加上下行站点信息
+    		int oldId = -1;
+    		LineInfo line = null;
+    		for (StopInfo stop : stops) {
+    			if (stop.getLineCode() != oldId) {
+    				oldId = stop.getLineCode();
+    				line = BasicDataBuffer.getLineById(oldId);
+    			}
+    			if (line != null) {
+    				if (stop.getDirections() == 0) line.getStopsUp().add(stop);
+    				else line.getStopsDown().add(stop);
+    			}
+    		}
+    		
+    		for (Map<String, Object> car : cars) {
+    			String plateNo = (String)car.get("plate_no");
+    			if (plateNo != null) {
+					BasicDataBuffer.putCar((String)car.get("device_id"), plateNo.replace("沪","").replace("-", ""));
+				}
+    		}
+    		
+    		logger.info("基础数据加载成功");
+        }catch (Exception e){
+            logger.error("基础数据加载失败", e);
+        }
+    }
+    
+    final class RowMapperLineInfo implements RowMapper<LineInfo> {
+
+		@Override
+		public LineInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
+			// TODO Auto-generated method stub
+			LineInfo line = new LineInfo();
+			line.setId(rs.getInt("id"));
+			line.setInUse(rs.getInt("in_use"));
+			line.setLineId(rs.getInt("line_code"));
+			line.setLineName(rs.getString("name"));
+			//line.setStartStation(rs.getInt("start_station"));
+			line.setStartStationName(rs.getString("start_station_name"));
+			line.setStartStationFirstTime(rs.getString("start_station_first_time"));
+			line.setStartStationEndTime(rs.getString("start_station_end_time"));
+			//line.setEndStation(rs.getInt("end_station"));
+			line.setEndStationName(rs.getString("end_station_name"));
+			line.setEndStationFirstTime(rs.getString("end_station_first_time"));
+			line.setEndStationEndTime(rs.getString("end_station_end_time"));
+			line.setCompany(rs.getString("company"));
+			line.setBrancheCompany(rs.getString("branche_company"));
+			line.setTelephone(rs.getString("telephone"));
+			line.setLinePlayType(rs.getInt("line_play_type"));
+			return line;
+		}
+		
+	}
+    
+    final class RowMapperStopInfo implements RowMapper<StopInfo> {
+
+		@Override
+		public StopInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
+			// TODO Auto-generated method stub
+			StopInfo stop = new StopInfo();
+			stop.setId(rs.getInt("id"));
+			stop.setStationCod(rs.getString("station_cod"));
+			stop.setStationName(rs.getString("station_name"));
+			//stop.setStationType(rs.getString("station_type"));
+			stop.setRoadCoding(rs.getString("road_coding"));
+			float lon = rs.getFloat("g_lonx");
+			float lat = rs.getFloat("g_laty");
+			stop.setPoint(new Point(lon, lat));
+			stop.setLineId(rs.getInt("line"));
+			stop.setLineCode(rs.getInt("line_code"));
+			stop.setDirections(rs.getInt("directions"));
+			stop.setShapesType(rs.getString("shapes_type"));
+			stop.setRadius(rs.getInt("radius"));
+			stop.setPoints(new ArrayList<Point>());
+			stop.setDistances(rs.getDouble("distances")*1000);
+			return stop;
+		}
+		
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		// TODO Auto-generated method stub
+		loadBasicData();
+	}
+}
+package com.bsth.server_rs.schedule;
+
+import com.bsth.entity.ScheduleRealInfo;
+import com.bsth.server_rs.gps.buffer.GpsRealDataBuffer;
+import com.bsth.server_rs.gps.entity.GpsEntity;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("/plan")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class SchedulePlanService {
+
+    private final static Logger log = LoggerFactory.getLogger(SchedulePlanService.class);
+
+    private ObjectMapper mapper = new ObjectMapper();
+
+    @POST
+    public Map<String, Object> save(List<ScheduleRealInfo> reals) throws JsonProcessingException {
+        Map<String, Object> result = new HashMap<>();
+        log.info(mapper.writeValueAsString(reals));
+        result.put("code", 0);
+        result.put("msg", "ok");
+
+        return result;
+    }
+}
 package com.bsth.server_rs.schedule;
  
+import com.bsth.entity.ScheduleExec;
+import com.bsth.entity.ScheduleRealInfo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
  
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Component
+@Path("/real")
+@Produces({MediaType.APPLICATION_JSON})
 public class ScheduleRealService {
+
+    private final static Logger log = LoggerFactory.getLogger(ScheduleRealService.class);
+
+    private ObjectMapper mapper = new ObjectMapper();
+
+    @POST
+    @Path("/leave")
+    public Map<String, Object> leave(List<ScheduleExec> execs) throws JsonProcessingException {
+        Map<String, Object> result = new HashMap<>();
+        log.info(mapper.writeValueAsString(execs));
+        result.put("code", 0);
+        result.put("msg", "ok");
+
+        return result;
+    }
+
+    @POST
+    @Path("/arrival")
+    public Map<String, Object> arrival(List<ScheduleExec> execs) throws JsonProcessingException {
+        Map<String, Object> result = new HashMap<>();
+        log.info(mapper.writeValueAsString(execs));
+        result.put("code", 0);
+        result.put("msg", "ok");
+
+        return result;
+    }
+
+    @POST
+    @Path("/destroy")
+    public Map<String, Object> destroy(List<ScheduleExec> execs) throws JsonProcessingException {
+        Map<String, Object> result = new HashMap<>();
+        log.info(mapper.writeValueAsString(execs));
+        result.put("code", 0);
+        result.put("msg", "ok");
+
+        return result;
+    }
 }