1.

王通
1 parent 2cfa5798
Showing 4 changed files with 4690 additions and 4716 deletions
src/main/java/com/bsth/entity/ScheduleRealInfo.java
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
src/main/java/com/bsth/server_rs/dispatch/DispatchService.java
src/main/resources/logback.xml
-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 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;
+
+	@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 Double getJhlcOrig() {
+		return jhlcOrig;
+	}
+
+	public void setJhlcOrig(Double jhlcOrig) {
+		this.jhlcOrig = jhlcOrig;
+	}
+
+	@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.server_rs.bigdata;
-
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-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 org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.entity.ChildTaskPlan;
-import com.bsth.entity.ScheduleRealInfo;
-import com.bsth.repository.ScheduleRealInfoRepository;
-import com.bsth.util.Arith;
-
-@Component
-@Path("/bigscreen")
-@Produces({MediaType.APPLICATION_JSON})
-public class BigscreenService {
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-    
-    @Autowired
-    ScheduleRealInfoRepository scheduleRealInfoRepository;
-    
-	DecimalFormat df = new DecimalFormat("0.###");
-	
-	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-	
-	SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
-
-    /*
-     * 线路接口开始
-     */
-    private static String getNature(String natureCode){
-    	String natureName="";
-    	if("lj".equals(natureCode)){
-    		natureName="路救";
-    	}else if("bc".equals(natureCode)){
-    		natureName="备车";
-    	}else if("dbc".equals(natureCode)){
-    		natureName="定班车";
-    	}else if("yxl".equals(natureCode)){
-    		natureName="夜宵路";
-    	}else if("cgxl".equals(natureCode)){
-    		natureName="常规线路";
-    	}else if("gjxl".equals(natureCode)){
-    		natureName="过江线路";
-    	}else if("csbs".equals(natureCode)){
-    		natureName="穿梭巴士";
-    	}else if("tyxl".equals(natureCode)){
-    		natureName="特约线路";
-    	}else if("cctxl".equals(natureCode)){
-    		natureName="村村通线路";
-    	}else if("qt".equals(natureCode)){
-    		natureName="其他";
-    	}else {
-    		natureName="";
-    	}
-    	return natureName;
-    }
-    
-    private static String getGs(String gs){
-    	String name="";
-    	if("05".equals(gs)){
-    		name="杨高公司";
-    	}else if("22".equals(gs)){
-    		name="金高公司";
-    	}else if("26".equals(gs)){
-    		name="南汇公司";
-    	}else if("55".equals(gs)){
-    		name="上南公司";
-    	}else{
-    		name="";
-    	}
-    	return name;
-    }
-    
-    private static String getState(String carState){
-    	if(carState.equals("1")){
-    		return "在册未在用";
-    	}else if(carState.equals("2")){
-    		return "在册在用";
-    	}else if(carState.equals("3")){
-    		return "报废审核中";
-    	}else if(carState.equals("4")){
-    		return "报废待更新";
-    	}else if(carState.equals("5")){
-    		return "报废已更新";
-    	}else{
-    		return "";
-    	}
-    }
-    
-	public static boolean isInOut(ScheduleRealInfo s){
-		boolean fage=false;
-		if(s.getBcType().equals("in")){
-			fage=true;
-		}
-		if(s.getBcType().equals("out")){
-			fage=true;
-		}
-		if(s.getBcType().equals("ldks")){
-			fage=true;
-		}
-		return fage;
-	}
-    
-	public static boolean isInOut(String bcType){
-		boolean fage=false;
-		if(bcType.equals("in")){
-			fage=true;
-		}
-		if(bcType.equals("out")){
-			fage=true;
-		}
-		if(bcType.equals("ldks")){
-			fage=true;
-		}
-		return fage;
-	}
-    
-    public Map<String, Long> getEndtime(String date){
-    	Map<String, Long> map=new HashMap<String,Long>();
-    	String sql="select xl,endtime from bsth_c_calc_count "
-    			+ " where   date='"+date+"' ";
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
-				new RowMapper<Map<String, Object>>(){
-			@Override
-			public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-				Map<String, Object> m=new HashMap<String, Object>();
-				m.put("line", rs.getString("xl"));
-				m.put("endtime", rs.getString("endtime"));
-				return m;
-			}
-		});
-    	for (int i = 0; i < list.size(); i++) {
-    		map.put(list.get(i).get("line").toString(), 
-    				Long.parseLong(list.get(i).get("endtime").toString()));
-		}
-    	return map;
-    }
-    
-    /**给大屏的线路数、班次、里程汇总接口
-     * 
-     */
-    @GET
-    @Path("/selectData/getBigScreen")
-    public JSONObject getBigScreen(){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	
-    	int day = 8;//天数
-    	
-    	Date dd = new Date();
-    	String date = sd.format(dd);	//yyyy-MM-dd 当天
-    	Date dd2 = new Date();
-    	dd2.setTime(dd.getTime() - ((long)(day-1))*1000*60*60*24);
-    	String date2 = sd.format(dd2);	//yyyy-MM-dd 7天前（加上当天就是取8天数据）
-    	
-    	String[] dates = new String[day];
-    	Map<String, Integer> datesMap = new HashMap<String, Integer>();
-    	
-    	for(int i = 0; i < day; i++){
-    		Date tempDate = new Date();
-    		tempDate.setTime(dd2.getTime() + ((long)i)*1000*60*60*24);
-    		String format = sd.format(tempDate);
-    		dates[i] = format;
-    		datesMap.put(format, i);
-    	}
-    	
-    	String gpLineSql = "select * from bsth_c_line_plate";
-    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineName", rs.getString("line_name"));
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	
-    	Set<String> gpSet = new HashSet<String>();
-    	for(Map<String, Object> t : gpLineList){
-    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
-    			gpSet.add(t.get("lineCode").toString().trim());
-    		}
-    	}
-    	
-    	String lineSql="SELECT b.start_opt,a.company,a.line_code,a.name,a.level,"
-    			+ " a.shanghai_linecode, a.nature from "
-    			+ " bsth_c_line a left join bsth_c_line_config b "
-    			+ " on a.id=b.line where "
-    			+ " a.shanghai_linecode is not null and a.shanghai_linecode !='' and a.destroy=0 "
-    			+ " and a.remove=0 and a.nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> lineList=jdbcTemplate.query(lineSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("state", rs.getString("start_opt"));
-						m.put("company", rs.getString("company"));
-						m.put("companyName", getGs(rs.getString("company")));
-						m.put("lineCode",rs.getString("line_code"));
-						m.put("name", rs.getString("name"));
-						m.put("level", rs.getString("level"));
-						m.put("shanghaiLinecode", rs.getString("shanghai_linecode"));
-						m.put("nature", getNature(rs.getString("nature")));
-						return m;
-					}
-				});
-    	
-    	int level1 = 0, level2 = 0;
-    	for(Map<String, Object> t : lineList){
-    		if(t.get("level") != null){
-    			if("1".equals(t.get("level").toString())){
-    				++level1;
-    			} else if("2".equals(t.get("level").toString())){
-    				++level2;
-    			}
-    		}
-    	}
-    	
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	
-    	List<String> objList = new ArrayList<String>();
-    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
-    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
-    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
-    			+ " from bsth_c_calc_count where gsdm != '77'"
-    			+ " and date >= ? and date <= ?";
-    	objList.add(date2);
-    	objList.add(date);
-    	
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
-    			objList.toArray(),
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode",rs.getString("xl"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("date"));
-						
-						m.put("jhbc", rs.getString("jhbc"));
-						m.put("sjbc", rs.getString("sjbc"));
-						m.put("bczxl", rs.getString("bczxl"));
-						m.put("jhbcz", rs.getString("jhbcz"));
-						
-						m.put("jhcc", rs.getString("jhcc"));
-						m.put("sjcc", rs.getString("sjcc"));
-						m.put("ccl", rs.getString("ccl"));
-						m.put("jhccz", rs.getString("jhccz"));
-						
-						m.put("jhyylc", rs.getString("jhyylc"));
-						m.put("sjyylc", rs.getString("sjyylc"));
-						m.put("jhyylcz", rs.getString("jhyylcz"));
-						m.put("jhkslc", rs.getString("jhkslc"));
-						m.put("sjkslc", rs.getString("sjkslc"));
-						m.put("jhkslcz", rs.getString("jhkslcz"));
-
-						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
-						m.put("sjgfbcs", rs.getString("sjgfbcs"));
-						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
-						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
-						m.put("sjdgbcs", rs.getString("sjdgbcs"));
-						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
-
-						m.put("jhsmbcs", rs.getString("jhsmbcs"));
-						m.put("sjsmbczds", rs.getString("sjsmbczds"));
-						m.put("smbczdl", rs.getString("smbczdl"));
-						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
-						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
-						m.put("smbczdlz", rs.getString("smbczdlz"));
-						
-						m.put("jhszfcs", rs.getString("jhszfcs"));
-						m.put("sjszfczds", rs.getString("sjszfczds"));
-						m.put("szfczdl", rs.getString("szfczdl"));
-						
-						Date date = new Date();
-						date.setTime(rs.getTimestamp("create_date").getTime());
-						m.put("createDate", sdf.format(date));
-						return m;
-					}
-				});
-    	
-    	List<Map<String, Object>> bcDetail = new ArrayList<Map<String,Object>>();
-    	List<Map<String, Object>> smDetail = new ArrayList<Map<String,Object>>();
-    	List<Map<String, Object>> qqDetail = new ArrayList<Map<String,Object>>();
-    	List<Map<String, Object>> gpDetail = new ArrayList<Map<String,Object>>();
-    	
-    	List<Map<String, Object>> ccList = createMap("计划出车率", dates);
-    	List<Map<String, Object>> bcList = createMap("计划班次执行率", dates);
-    	List<Map<String, Object>> smList = createMap("首末班发车准点率", dates);
-    	List<Map<String, Object>> qqList = createMap("起讫站发车准点率", dates);
-    	List<Map<String, Object>> gpList = createMap("挂牌线路发车准点率", dates);
-    	List<Map<String, Object>> qkList = createMap("签卡率", dates);
-    	
-    	long sjbcs_z = 0l;//实时总班次
-    	BigDecimal yygl_z = new BigDecimal(0);//实时总营运里程
-    	long jhcc = 0, sjcc = 0, jhbc = 0, sjbc = 0, jhsmbc = 0, sjsmbc = 0,
-    			jhqqbc = 0, sjqqzd = 0, jhgpqqbc = 0, sjgpqqzd = 0, bcs_qk = 0, qks = 0;
-    	
-    	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-    			String d = t.get("date").toString();
-	    		if(date.equals(d)){
-	    			sjbcs_z += Long.valueOf(t.get("sjbc").toString());
-		    		yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
-		    		
-		    		jhcc += Long.valueOf(t.get("jhccz").toString());
-		    		sjcc += Long.valueOf(t.get("sjcc").toString());
-		    		jhbc += Long.valueOf(t.get("jhbc").toString());
-		    		sjbc += Long.valueOf(t.get("sjbc").toString());
-		    		jhsmbc += Long.valueOf(t.get("jhsmbcs").toString());
-		    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
-		    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
-		    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
-		    		if(gpSet.contains(t.get("lineCode").toString())){
-		    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
-		    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
-		    		}
-		    		
-		    		Map<String, Object> bc = new HashMap<String, Object>();
-		    		bc.put("type", "班次执行详情");
-		    		bc.put("lineName", t.get("lineName").toString());
-		    		bc.put("jh", t.get("jhbc").toString());
-		    		bc.put("sj", t.get("sjbc").toString());
-		    		bcDetail.add(bc);
-		    		
-		    		Map<String, Object> sm = new HashMap<String, Object>();
-		    		sm.put("type", "首站发车详情");
-		    		sm.put("lineName", t.get("lineName").toString());
-		    		sm.put("jh", t.get("jhsmbcs").toString());
-		    		sm.put("sj", t.get("sjsmbczds").toString());
-		    		smDetail.add(sm);
-		    		
-		    		Map<String, Object> qq = new HashMap<String, Object>();
-		    		qq.put("type", "起讫站发车准点详情");
-		    		qq.put("lineName", t.get("lineName").toString());
-		    		qq.put("jh", t.get("jhszfcs").toString());
-		    		qq.put("sj", t.get("sjszfczds").toString());
-		    		qqDetail.add(qq);
-		    		
-		    		if(gpSet.contains(t.get("lineCode").toString())){
-		    			Map<String, Object> gp = new HashMap<String, Object>();
-			    		gp.put("type", "挂牌线路发车准点详情");
-			    		gp.put("lineName", t.get("lineName").toString());
-			    		gp.put("jh", t.get("jhszfcs").toString());
-			    		gp.put("sj", t.get("sjszfczds").toString());
-			    		gpDetail.add(gp);
-		    		}
-	    		}
-	    		
-	    		Map<String, Object> ccMap = ccList.get(datesMap.get(d));
-	    		Map<String, Object> bcMap = bcList.get(datesMap.get(d));
-	    		Map<String, Object> smMap = smList.get(datesMap.get(d));
-	    		Map<String, Object> qqMap = qqList.get(datesMap.get(d));
-	    		Map<String, Object> gpMap = gpList.get(datesMap.get(d));
-	    		
-	    		ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString()));
-	    		ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString()));
-	    		bcMap.put("jh", Long.valueOf(bcMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
-	    		bcMap.put("sj", Long.valueOf(bcMap.get("sj").toString()) + Long.valueOf(t.get("sjbc").toString()));
-	    		smMap.put("jh", Long.valueOf(smMap.get("jh").toString()) + Long.valueOf(t.get("jhsmbcs").toString()));
-	    		smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString()));
-	    		qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
-	    		qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
-	    		if(gpSet.contains(t.get("lineCode").toString())){
-	    			gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
-	    			gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
-	    		}
-	    		
-    		}
-    	}
-    	
-    	
-    	//计算签卡率
-    	for(String d : dates){
-    		if(d!=null && d.trim().length() > 0){
-    			List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(d);
-	    		Map<String, Object> qkMap = qkList.get(datesMap.get(d));
-	    		long jh = 0, sj = 0;
-	    		for(ScheduleRealInfo s : findAll){
-	    			if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-		    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
-		    				++jh;
-		    				String sty = decimalToBinary(s.getRfidState());
-		    				Integer state = Integer.parseInt(sty);
-		    				if ((state & 4) == 4) {
-		    					++sj;
-		    				}
-		    			}
-	    			}
-	    		}
-	    		qkMap.put("jh", jh);
-	    		qkMap.put("sj", sj);
-	    		
-	    		if(date.equals(d)){
-	    			bcs_qk = jh;
-	    			qks = sj;
-	    		}
-    		}
-    	}
-    	
-    	
-    	List<Map<String, Object>> zxlList = new ArrayList<Map<String, Object>>();
-    	zxlList.addAll(ccList);
-    	zxlList.addAll(bcList);
-    	zxlList.addAll(smList);
-    	zxlList.addAll(qqList);
-    	zxlList.addAll(gpList);
-    	zxlList.addAll(qkList);
-    	
-    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
-    	detailsList.addAll(bcDetail);
-    	detailsList.addAll(smDetail);
-    	detailsList.addAll(qqDetail);
-    	detailsList.addAll(gpDetail);
-    	
-    	for(Map<String, Object> t : zxlList){
-    		if(t.get("jh") != null && Long.valueOf(t.get("jh").toString()).longValue() > 0l){
-    			t.put("ratio", new BigDecimal(t.get("sj").toString()).divide(new BigDecimal(t.get("jh").toString()),
-    					4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue());
-    		} else {
-    			t.put("ratio", "0");
-    		}
-    	}
-    	
-    	List<Map<String, Object>> glList = new ArrayList<Map<String, Object>>();
-    	
-    	Date dd1 = new Date();
-    	dd1.setTime(dd.getTime() - 1l*1000*60*60*24);
-    	String date1 = sd.format(dd1);	//前一天
-    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date1);
-    	List<ScheduleRealInfo> listSche = new ArrayList<ScheduleRealInfo>();
-    	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
-    	for(ScheduleRealInfo s : findAll){
-    		if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-    			listSche.add(s);
-    			Set<ChildTaskPlan> cts = s.getcTasks();
-    			if (cts != null && cts.size() > 0) {
-                    list_s.add(s);
-                } else {
-                    if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
-                        list_s.add(s);
-                    }
-                }
-    		}
-    	}
-    	double jhyygl = culateJhgl(listSche);//计划营运公里
-    	double jhjccgl = culateJhJccgl(listSche);
-    	double jhzgl = Arith.add(jhyygl, jhjccgl);
-    	double sjgl = culateSjgl(list_s);//实际营运公里（不含临加）
-    	double sjljgl = culateLjgl(listSche);//实际临加公里
-    	double sjyygl = Arith.add(sjgl, sjljgl);//实际营运公里
-    	double sjjccgl = culateJccgl(list_s);
-    	double sjksgl = culateKsgl(list_s);
-    	double zksgl = Arith.add(sjjccgl, sjksgl);
-    	double sjzgl = Arith.add(sjyygl, zksgl);//实际总公里
-    	double lz = culateCJLC(listSche, "路阻");
-    	double dm = culateCJLC(listSche, "吊慢");
-    	double gz = culateCJLC(listSche, "故障");
-    	double jf = culateCJLC(listSche, "纠纷");
-    	double zs = culateCJLC(listSche, "肇事");
-    	double qr = culateCJLC(listSche, "缺人");
-    	double qc = culateCJLC(listSche, "缺车");
-    	double qrqc = Arith.add(qr, qc);//缺人缺车
-    	double kx = culateCJLC(listSche, "客稀");
-    	double qh = culateCJLC(listSche, "气候");
-    	double yw = culateCJLC(listSche, "援外");
-    	double lb_pc = culateCJLC(listSche, "配车");
-    	double lb_by = culateCJLC(listSche, "保养");
-    	double lb_cj = culateCJLC(listSche, "抽减");
-    	double lb_qt = culateCJLC(listSche, "其他");
-    	double qt = Arith.add(Arith.add(lb_pc, lb_by), Arith.add(lb_cj, lb_qt));//其他
-    	
-    	Map<String, Object> jhzglMap = new HashMap<String, Object>();
-    	jhzglMap.put("name", "计划总公里");
-    	jhzglMap.put("value", jhzgl);
-    	glList.add(jhzglMap);
-    	Map<String, Object> sjzglMap = new HashMap<String, Object>();
-    	sjzglMap.put("name", "实际总公里");
-    	sjzglMap.put("value", sjzgl);
-    	glList.add(sjzglMap);
-    	Map<String, Object> lzMap = new HashMap<String, Object>();
-    	lzMap.put("name", "路阻");
-    	lzMap.put("value", lz);
-    	glList.add(lzMap);
-    	Map<String, Object> dmMap = new HashMap<String, Object>();
-    	dmMap.put("name", "吊慢");
-    	dmMap.put("value", dm);
-    	glList.add(dmMap);
-    	Map<String, Object> gzMap = new HashMap<String, Object>();
-    	gzMap.put("name", "故障");
-    	gzMap.put("value", gz);
-    	glList.add(gzMap);
-    	Map<String, Object> jfMap = new HashMap<String, Object>();
-    	jfMap.put("name", "纠纷");
-    	jfMap.put("value", jf);
-    	glList.add(jfMap);
-    	Map<String, Object> zsMap = new HashMap<String, Object>();
-    	zsMap.put("name", "肇事");
-    	zsMap.put("value", zs);
-    	glList.add(zsMap);
-    	Map<String, Object> qrqcMap = new HashMap<String, Object>();
-    	qrqcMap.put("name", "缺人缺车");
-    	qrqcMap.put("value", qrqc);
-    	glList.add(qrqcMap);
-    	Map<String, Object> kxMap = new HashMap<String, Object>();
-    	kxMap.put("name", "客稀");
-    	kxMap.put("value", kx);
-    	glList.add(kxMap);
-    	Map<String, Object> qhMap = new HashMap<String, Object>();
-    	qhMap.put("name", "气候");
-    	qhMap.put("value", qh);
-    	glList.add(qhMap);
-    	Map<String, Object> ywMap = new HashMap<String, Object>();
-    	ywMap.put("name", "援外");
-    	ywMap.put("value", yw);
-    	glList.add(ywMap);
-    	Map<String, Object> qtMap = new HashMap<String, Object>();
-    	qtMap.put("name", "其他");
-    	qtMap.put("value", qt);
-    	glList.add(qtMap);
-    	
-    	
-    	resMap.put("lineCount", lineList.size());
-    	resMap.put("level1Count", level1);
-    	resMap.put("level2Count", level2);
-    	resMap.put("sjbcs", sjbcs_z);
-    	resMap.put("sjlcs", yygl_z.doubleValue());
-    	
-    	resMap.put("ccl", jhcc>0?new BigDecimal(sjcc).divide(new BigDecimal(jhcc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("bczxl", jhbc>0?new BigDecimal(sjbc).divide(new BigDecimal(jhbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("smbzdl", jhsmbc>0?new BigDecimal(sjsmbc).divide(new BigDecimal(jhsmbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("qqzzdl", jhqqbc>0?new BigDecimal(sjqqzd).divide(new BigDecimal(jhqqbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("gpzdl", jhgpqqbc>0?new BigDecimal(sjgpqqzd).divide(new BigDecimal(jhgpqqbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("qkl", bcs_qk>0?new BigDecimal(qks).divide(new BigDecimal(bcs_qk),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	
-    	resMap.put("ratioList", zxlList);
-    	
-    	resMap.put("detailsList", detailsList);
-    	
-    	resMap.put("mileageList", glList);
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    /**给大屏的线路数、班次、里程汇总接口
-     * 按直属公司查询
-     */
-    @GET
-    @Path("/selectData/getBigScreen/{gsdm}")
-    public JSONObject getBigScreen(@PathParam("gsdm") String gsdm){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	
-    	int day = 8;//天数
-    	
-    	Date dd = new Date();
-    	String date = sd.format(dd);	//yyyy-MM-dd 当天
-    	Date dd2 = new Date();
-    	dd2.setTime(dd.getTime() - ((long)(day-1))*1000*60*60*24);
-    	String date2 = sd.format(dd2);	//yyyy-MM-dd 7天前（加上当天就是取8天数据）
-    	
-    	String[] dates = new String[day];
-    	Map<String, Integer> datesMap = new HashMap<String, Integer>();
-    	
-    	for(int i = 0; i < day; i++){
-    		Date tempDate = new Date();
-    		tempDate.setTime(dd2.getTime() + ((long)i)*1000*60*60*24);
-    		String format = sd.format(tempDate);
-    		dates[i] = format;
-    		datesMap.put(format, i);
-    	}
-    	
-    	String gpLineSql = "select * from bsth_c_line_plate";
-    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineName", rs.getString("line_name"));
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	
-    	Set<String> gpSet = new HashSet<String>();
-    	for(Map<String, Object> t : gpLineList){
-    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
-    			gpSet.add(t.get("lineCode").toString().trim());
-    		}
-    	}
-    	
-    	String lineSql="SELECT b.start_opt,a.company,a.line_code,a.name,a.level,"
-    			+ " a.shanghai_linecode, a.nature from "
-    			+ " bsth_c_line a left join bsth_c_line_config b "
-    			+ " on a.id=b.line where "
-    			+ " a.shanghai_linecode is not null and a.shanghai_linecode !='' and a.destroy=0 "
-    			+ " and a.remove=0 and a.nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> lineList=jdbcTemplate.query(lineSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("state", rs.getString("start_opt"));
-						m.put("company", rs.getString("company"));
-						m.put("companyName", getGs(rs.getString("company")));
-						m.put("lineCode",rs.getString("line_code"));
-						m.put("name", rs.getString("name"));
-						m.put("level", rs.getString("level"));
-						m.put("shanghaiLinecode", rs.getString("shanghai_linecode"));
-						m.put("nature", getNature(rs.getString("nature")));
-						return m;
-					}
-				});
-    	
-    	int level1 = 0, level2 = 0, lineCount = 0;
-    	for(Map<String, Object> t : lineList){
-    		if(t.containsKey("company") && t.get("company").toString().trim().equals(gsdm)){
-    			++lineCount;
-	    		if(t.get("level") != null){
-	    			if("1".equals(t.get("level").toString())){
-	    				++level1;
-	    			} else if("2".equals(t.get("level").toString())){
-	    				++level2;
-	    			}
-	    		}
-    		}
-    	}
-    	
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	
-    	List<String> objList = new ArrayList<String>();
-    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
-    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
-    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
-    			+ " from bsth_c_calc_count "
-    			+ " where date >= ? and date <= ? and gsdm = ?";
-    	objList.add(date2);
-    	objList.add(date);
-    	objList.add(gsdm);
-    	
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
-    			objList.toArray(),
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode",rs.getString("xl"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("date"));
-						
-						m.put("jhbc", rs.getString("jhbc"));
-						m.put("sjbc", rs.getString("sjbc"));
-						m.put("bczxl", rs.getString("bczxl"));
-						m.put("jhbcz", rs.getString("jhbcz"));
-						
-						m.put("jhcc", rs.getString("jhcc"));
-						m.put("sjcc", rs.getString("sjcc"));
-						m.put("ccl", rs.getString("ccl"));
-						m.put("jhccz", rs.getString("jhccz"));
-						
-						m.put("jhyylc", rs.getString("jhyylc"));
-						m.put("sjyylc", rs.getString("sjyylc"));
-						m.put("jhyylcz", rs.getString("jhyylcz"));
-						m.put("jhkslc", rs.getString("jhkslc"));
-						m.put("sjkslc", rs.getString("sjkslc"));
-						m.put("jhkslcz", rs.getString("jhkslcz"));
-
-						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
-						m.put("sjgfbcs", rs.getString("sjgfbcs"));
-						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
-						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
-						m.put("sjdgbcs", rs.getString("sjdgbcs"));
-						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
-
-						m.put("jhsmbcs", rs.getString("jhsmbcs"));
-						m.put("sjsmbczds", rs.getString("sjsmbczds"));
-						m.put("smbczdl", rs.getString("smbczdl"));
-						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
-						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
-						m.put("smbczdlz", rs.getString("smbczdlz"));
-						
-						m.put("jhszfcs", rs.getString("jhszfcs"));
-						m.put("sjszfczds", rs.getString("sjszfczds"));
-						m.put("szfczdl", rs.getString("szfczdl"));
-						
-						Date date = new Date();
-						date.setTime(rs.getTimestamp("create_date").getTime());
-						m.put("createDate", sdf.format(date));
-						return m;
-					}
-				});
-    	
-    	List<Map<String, Object>> bcDetail = new ArrayList<Map<String,Object>>();
-    	List<Map<String, Object>> smDetail = new ArrayList<Map<String,Object>>();
-    	List<Map<String, Object>> qqDetail = new ArrayList<Map<String,Object>>();
-    	List<Map<String, Object>> gpDetail = new ArrayList<Map<String,Object>>();
-    	
-    	List<Map<String, Object>> ccList = createMap("计划出车率", dates);
-    	List<Map<String, Object>> bcList = createMap("计划班次执行率", dates);
-    	List<Map<String, Object>> smList = createMap("首末班发车准点率", dates);
-    	List<Map<String, Object>> qqList = createMap("起讫站发车准点率", dates);
-    	List<Map<String, Object>> gpList = createMap("挂牌线路发车准点率", dates);
-    	List<Map<String, Object>> qkList = createMap("签卡率", dates);
-    	
-    	long sjbcs_z = 0l;//实时总班次
-    	BigDecimal yygl_z = new BigDecimal(0);//实时总营运里程
-    	long jhcc = 0, sjcc = 0, jhbc = 0, sjbc = 0, jhsmbc = 0, sjsmbc = 0,
-    			jhqqbc = 0, sjqqzd = 0, jhgpqqbc = 0, sjgpqqzd = 0, bcs_qk = 0, qks = 0;
-    	
-    	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-    			String d = t.get("date").toString();
-	    		if(date.equals(d)){
-	    			sjbcs_z += Long.valueOf(t.get("sjbc").toString());
-		    		yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
-		    		
-		    		jhcc += Long.valueOf(t.get("jhccz").toString());
-		    		sjcc += Long.valueOf(t.get("sjcc").toString());
-		    		jhbc += Long.valueOf(t.get("jhbc").toString());
-		    		sjbc += Long.valueOf(t.get("sjbc").toString());
-		    		jhsmbc += Long.valueOf(t.get("jhsmbcs").toString());
-		    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
-		    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
-		    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
-		    		if(gpSet.contains(t.get("lineCode").toString())){
-		    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
-		    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
-		    		}
-		    		
-		    		Map<String, Object> bc = new HashMap<String, Object>();
-		    		bc.put("type", "班次执行详情");
-		    		bc.put("lineName", t.get("lineName").toString());
-		    		bc.put("jh", t.get("jhbc").toString());
-		    		bc.put("sj", t.get("sjbc").toString());
-		    		bcDetail.add(bc);
-		    		
-		    		Map<String, Object> sm = new HashMap<String, Object>();
-		    		sm.put("type", "首站发车详情");
-		    		sm.put("lineName", t.get("lineName").toString());
-		    		sm.put("jh", t.get("jhsmbcs").toString());
-		    		sm.put("sj", t.get("sjsmbczds").toString());
-		    		smDetail.add(sm);
-		    		
-		    		Map<String, Object> qq = new HashMap<String, Object>();
-		    		qq.put("type", "起讫站发车准点详情");
-		    		qq.put("lineName", t.get("lineName").toString());
-		    		qq.put("jh", t.get("jhszfcs").toString());
-		    		qq.put("sj", t.get("sjszfczds").toString());
-		    		qqDetail.add(qq);
-		    		
-		    		if(gpSet.contains(t.get("lineCode").toString())){
-		    			Map<String, Object> gp = new HashMap<String, Object>();
-			    		gp.put("type", "挂牌线路发车准点详情");
-			    		gp.put("lineName", t.get("lineName").toString());
-			    		gp.put("jh", t.get("jhszfcs").toString());
-			    		gp.put("sj", t.get("sjszfczds").toString());
-			    		gpDetail.add(gp);
-		    		}
-	    		}
-	    		
-	    		Map<String, Object> ccMap = ccList.get(datesMap.get(d));
-	    		Map<String, Object> bcMap = bcList.get(datesMap.get(d));
-	    		Map<String, Object> smMap = smList.get(datesMap.get(d));
-	    		Map<String, Object> qqMap = qqList.get(datesMap.get(d));
-	    		Map<String, Object> gpMap = gpList.get(datesMap.get(d));
-	    		
-	    		ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString()));
-	    		ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString()));
-	    		bcMap.put("jh", Long.valueOf(bcMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
-	    		bcMap.put("sj", Long.valueOf(bcMap.get("sj").toString()) + Long.valueOf(t.get("sjbc").toString()));
-	    		smMap.put("jh", Long.valueOf(smMap.get("jh").toString()) + Long.valueOf(t.get("jhsmbcs").toString()));
-	    		smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString()));
-	    		qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
-	    		qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
-	    		if(gpSet.contains(t.get("lineCode").toString())){
-	    			gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
-	    			gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
-	    		}
-	    		
-    		}
-    	}
-    	
-    	
-    	//计算签卡率
-    	for(String d : dates){
-    		if(d!=null && d.trim().length() > 0){
-    			List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(d);
-	    		Map<String, Object> qkMap = qkList.get(datesMap.get(d));
-	    		long jh = 0, sj = 0;
-	    		for(ScheduleRealInfo s : findAll){
-	    			if(s.getGsBm() != null && s.getGsBm().trim().equals(gsdm)){
-		    			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-			    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
-			    				++jh;
-			    				String sty = decimalToBinary(s.getRfidState());
-			    				Integer state = Integer.parseInt(sty);
-			    				if ((state & 4) == 4) {
-			    					++sj;
-			    				}
-			    			}
-		    			}
-	    			}
-	    		}
-	    		qkMap.put("jh", jh);
-	    		qkMap.put("sj", sj);
-	    		
-	    		if(date.equals(d)){
-	    			bcs_qk = jh;
-	    			qks = sj;
-	    		}
-    		}
-    	}
-    	
-    	
-    	List<Map<String, Object>> zxlList = new ArrayList<Map<String, Object>>();
-    	zxlList.addAll(ccList);
-    	zxlList.addAll(bcList);
-    	zxlList.addAll(smList);
-    	zxlList.addAll(qqList);
-    	zxlList.addAll(gpList);
-    	zxlList.addAll(qkList);
-    	
-    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
-    	detailsList.addAll(bcDetail);
-    	detailsList.addAll(smDetail);
-    	detailsList.addAll(qqDetail);
-    	detailsList.addAll(gpDetail);
-    	
-    	for(Map<String, Object> t : zxlList){
-    		if(t.get("jh") != null && Long.valueOf(t.get("jh").toString()).longValue() > 0l){
-    			t.put("ratio", new BigDecimal(t.get("sj").toString()).divide(new BigDecimal(t.get("jh").toString()),
-    					4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue());
-    		} else {
-    			t.put("ratio", "0");
-    		}
-    	}
-    	
-    	List<Map<String, Object>> glList = new ArrayList<Map<String, Object>>();
-    	
-    	Date dd1 = new Date();
-    	dd1.setTime(dd.getTime() - 1l*1000*60*60*24);
-    	String date1 = sd.format(dd1);	//前一天
-    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date1);
-    	List<ScheduleRealInfo> listSche = new ArrayList<ScheduleRealInfo>();
-    	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
-    	for(ScheduleRealInfo s : findAll){
-    		if(s.getGsBm() != null && s.getGsBm().trim().equals(gsdm)){
-	    		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-	    			listSche.add(s);
-	    			Set<ChildTaskPlan> cts = s.getcTasks();
-	    			if (cts != null && cts.size() > 0) {
-	                    list_s.add(s);
-	                } else {
-	                    if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
-	                        list_s.add(s);
-	                    }
-	                }
-	    		}
-    		}
-    	}
-    	double jhyygl = culateJhgl(listSche);//计划营运公里
-    	double jhjccgl = culateJhJccgl(listSche);
-    	double jhzgl = Arith.add(jhyygl, jhjccgl);
-    	double sjgl = culateSjgl(list_s);//实际营运公里（不含临加）
-    	double sjljgl = culateLjgl(listSche);//实际临加公里
-    	double sjyygl = Arith.add(sjgl, sjljgl);//实际营运公里
-    	double sjjccgl = culateJccgl(list_s);
-    	double sjksgl = culateKsgl(list_s);
-    	double zksgl = Arith.add(sjjccgl, sjksgl);
-    	double sjzgl = Arith.add(sjyygl, zksgl);//实际总公里
-    	double lz = culateCJLC(listSche, "路阻");
-    	double dm = culateCJLC(listSche, "吊慢");
-    	double gz = culateCJLC(listSche, "故障");
-    	double jf = culateCJLC(listSche, "纠纷");
-    	double zs = culateCJLC(listSche, "肇事");
-    	double qr = culateCJLC(listSche, "缺人");
-    	double qc = culateCJLC(listSche, "缺车");
-    	double qrqc = Arith.add(qr, qc);//缺人缺车
-    	double kx = culateCJLC(listSche, "客稀");
-    	double qh = culateCJLC(listSche, "气候");
-    	double yw = culateCJLC(listSche, "援外");
-    	double lb_pc = culateCJLC(listSche, "配车");
-    	double lb_by = culateCJLC(listSche, "保养");
-    	double lb_cj = culateCJLC(listSche, "抽减");
-    	double lb_qt = culateCJLC(listSche, "其他");
-    	double qt = Arith.add(Arith.add(lb_pc, lb_by), Arith.add(lb_cj, lb_qt));//其他
-    	
-    	Map<String, Object> jhzglMap = new HashMap<String, Object>();
-    	jhzglMap.put("name", "计划总公里");
-    	jhzglMap.put("value", jhzgl);
-    	glList.add(jhzglMap);
-    	Map<String, Object> sjzglMap = new HashMap<String, Object>();
-    	sjzglMap.put("name", "实际总公里");
-    	sjzglMap.put("value", sjzgl);
-    	glList.add(sjzglMap);
-    	Map<String, Object> lzMap = new HashMap<String, Object>();
-    	lzMap.put("name", "路阻");
-    	lzMap.put("value", lz);
-    	glList.add(lzMap);
-    	Map<String, Object> dmMap = new HashMap<String, Object>();
-    	dmMap.put("name", "吊慢");
-    	dmMap.put("value", dm);
-    	glList.add(dmMap);
-    	Map<String, Object> gzMap = new HashMap<String, Object>();
-    	gzMap.put("name", "故障");
-    	gzMap.put("value", gz);
-    	glList.add(gzMap);
-    	Map<String, Object> jfMap = new HashMap<String, Object>();
-    	jfMap.put("name", "纠纷");
-    	jfMap.put("value", jf);
-    	glList.add(jfMap);
-    	Map<String, Object> zsMap = new HashMap<String, Object>();
-    	zsMap.put("name", "肇事");
-    	zsMap.put("value", zs);
-    	glList.add(zsMap);
-    	Map<String, Object> qrqcMap = new HashMap<String, Object>();
-    	qrqcMap.put("name", "缺人缺车");
-    	qrqcMap.put("value", qrqc);
-    	glList.add(qrqcMap);
-    	Map<String, Object> kxMap = new HashMap<String, Object>();
-    	kxMap.put("name", "客稀");
-    	kxMap.put("value", kx);
-    	glList.add(kxMap);
-    	Map<String, Object> qhMap = new HashMap<String, Object>();
-    	qhMap.put("name", "气候");
-    	qhMap.put("value", qh);
-    	glList.add(qhMap);
-    	Map<String, Object> ywMap = new HashMap<String, Object>();
-    	ywMap.put("name", "援外");
-    	ywMap.put("value", yw);
-    	glList.add(ywMap);
-    	Map<String, Object> qtMap = new HashMap<String, Object>();
-    	qtMap.put("name", "其他");
-    	qtMap.put("value", qt);
-    	glList.add(qtMap);
-    	
-    	
-    	resMap.put("lineCount", lineCount);
-    	resMap.put("level1Count", level1);
-    	resMap.put("level2Count", level2);
-    	resMap.put("sjbcs", sjbcs_z);
-    	resMap.put("sjlcs", yygl_z.doubleValue());
-    	
-    	resMap.put("ccl", jhcc>0?new BigDecimal(sjcc).divide(new BigDecimal(jhcc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("bczxl", jhbc>0?new BigDecimal(sjbc).divide(new BigDecimal(jhbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("smbzdl", jhsmbc>0?new BigDecimal(sjsmbc).divide(new BigDecimal(jhsmbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("qqzzdl", jhqqbc>0?new BigDecimal(sjqqzd).divide(new BigDecimal(jhqqbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("gpzdl", jhgpqqbc>0?new BigDecimal(sjgpqqzd).divide(new BigDecimal(jhgpqqbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("qkl", bcs_qk>0?new BigDecimal(qks).divide(new BigDecimal(bcs_qk),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	
-    	resMap.put("ratioList", zxlList);
-    	
-    	resMap.put("detailsList", detailsList);
-    	
-    	resMap.put("mileageList", glList);
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    /**给大屏按日期查线路指标
-     * 
-     */
-    @GET
-    @Path("/selectData/getScheduleStatistics/{date}")
-    public JSONObject getScheduleStatistics(@PathParam("date") String date){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	
-    	String gpLineSql = "select * from bsth_c_line_plate";
-    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineName", rs.getString("line_name"));
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	
-    	Set<String> gpSet = new HashSet<String>();
-    	for(Map<String, Object> t : gpLineList){
-    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
-    			gpSet.add(t.get("lineCode").toString().trim());
-    		}
-    	}
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	
-    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
-    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
-    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
-    			+ " from bsth_c_calc_count "
-    			+ " where date = ? and gsdm != '77'";
-    	
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{date},
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode",rs.getString("xl"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("date"));
-						
-						m.put("jhbc", rs.getString("jhbc"));
-						m.put("sjbc", rs.getString("sjbc"));
-						m.put("bczxl", rs.getString("bczxl"));
-						m.put("jhbcz", rs.getString("jhbcz"));
-						
-						m.put("jhcc", rs.getString("jhcc"));
-						m.put("sjcc", rs.getString("sjcc"));
-						m.put("ccl", rs.getString("ccl"));
-						m.put("jhccz", rs.getString("jhccz"));
-						
-						m.put("jhyylc", rs.getString("jhyylc"));
-						m.put("sjyylc", rs.getString("sjyylc"));
-						m.put("jhyylcz", rs.getString("jhyylcz"));
-						m.put("jhkslc", rs.getString("jhkslc"));
-						m.put("sjkslc", rs.getString("sjkslc"));
-						m.put("jhkslcz", rs.getString("jhkslcz"));
-
-						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
-						m.put("sjgfbcs", rs.getString("sjgfbcs"));
-						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
-						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
-						m.put("sjdgbcs", rs.getString("sjdgbcs"));
-						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
-
-						m.put("jhsmbcs", rs.getString("jhsmbcs"));
-						m.put("sjsmbczds", rs.getString("sjsmbczds"));
-						m.put("smbczdl", rs.getString("smbczdl"));
-						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
-						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
-						m.put("smbczdlz", rs.getString("smbczdlz"));
-						
-						m.put("jhszfcs", rs.getString("jhszfcs"));
-						m.put("sjszfczds", rs.getString("sjszfczds"));
-						m.put("szfczdl", rs.getString("szfczdl"));
-						
-						Date date = new Date();
-						date.setTime(rs.getTimestamp("create_date").getTime());
-						m.put("createDate", sdf.format(date));
-						return m;
-					}
-				});
-
-    	List<Map<String, Object>> ccDetail = new ArrayList<Map<String,Object>>();
-    	List<Map<String, Object>> bcDetail = new ArrayList<Map<String,Object>>();
-    	List<Map<String, Object>> smDetail = new ArrayList<Map<String,Object>>();
-    	List<Map<String, Object>> qqDetail = new ArrayList<Map<String,Object>>();
-    	List<Map<String, Object>> gpDetail = new ArrayList<Map<String,Object>>();
-    	List<Map<String, Object>> qkDetail = new ArrayList<Map<String,Object>>();
-    	
-    	long sjbcs_z = 0l;//实时总班次
-    	BigDecimal yygl_z = new BigDecimal(0);//实时总营运里程
-    	long jhcc = 0, sjcc = 0, jhbc = 0, sjbc = 0, jhsmbc = 0, sjsmbc = 0,
-    			jhqqbc = 0, sjqqzd = 0, jhgpqqbc = 0, sjgpqqzd = 0, bcs_qk = 0, qks = 0;
-    	
-    	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-    			sjbcs_z += Long.valueOf(t.get("sjbc").toString());
-	    		yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
-	    		
-	    		jhcc += Long.valueOf(t.get("jhccz").toString());
-	    		sjcc += Long.valueOf(t.get("sjcc").toString());
-	    		jhbc += Long.valueOf(t.get("jhbc").toString());
-	    		sjbc += Long.valueOf(t.get("sjbc").toString());
-	    		jhsmbc += Long.valueOf(t.get("jhsmbcs").toString());
-	    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
-	    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
-	    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
-	    		if(gpSet.contains(t.get("lineCode").toString())){
-	    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
-	    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
-	    		}
-	    		
-	    		Map<String, Object> cc = new HashMap<String, Object>();
-	    		cc.put("type", "线路出车详情");
-	    		cc.put("lineName", t.get("lineName").toString());
-	    		cc.put("jh", t.get("jhcc").toString());
-	    		cc.put("sj", t.get("sjcc").toString());
-	    		ccDetail.add(cc);
-	    		
-	    		Map<String, Object> bc = new HashMap<String, Object>();
-	    		bc.put("type", "班次执行详情");
-	    		bc.put("lineName", t.get("lineName").toString());
-	    		bc.put("jh", t.get("jhbc").toString());
-	    		bc.put("sj", t.get("sjbc").toString());
-	    		bcDetail.add(bc);
-	    		
-	    		Map<String, Object> sm = new HashMap<String, Object>();
-	    		sm.put("type", "首站发车详情");
-	    		sm.put("lineName", t.get("lineName").toString());
-	    		sm.put("jh", t.get("jhsmbcs").toString());
-	    		sm.put("sj", t.get("sjsmbczds").toString());
-	    		smDetail.add(sm);
-	    		
-	    		Map<String, Object> qq = new HashMap<String, Object>();
-	    		qq.put("type", "起讫站发车准点详情");
-	    		qq.put("lineName", t.get("lineName").toString());
-	    		qq.put("jh", t.get("jhszfcs").toString());
-	    		qq.put("sj", t.get("sjszfczds").toString());
-	    		qqDetail.add(qq);
-	    		
-	    		if(gpSet.contains(t.get("lineCode").toString())){
-	    			Map<String, Object> gp = new HashMap<String, Object>();
-					gp.put("type", "挂牌线路发车准点详情");
-					gp.put("lineName", t.get("lineName").toString());
-					gp.put("jh", t.get("jhszfcs").toString());
-					gp.put("sj", t.get("sjszfczds").toString());
-					gpDetail.add(gp);
-				}
-			}
-		}
-    	
-    	Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
-    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
-		for(ScheduleRealInfo s : findAll){
-			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
-    				String xlName = s.getXlName();
-    				if(!(keyMap.containsKey(xlName))){
-    					Map<String, Object> qk = new HashMap<String, Object>();
-    					qk.put("type", "线路签卡详情");
-    					qk.put("lineName", xlName);
-    		    		qk.put("jh", 0);
-    		    		qk.put("sj", 0);
-    		    		keyMap.put(xlName, qk);
-    		    		qkDetail.add(qk);
-    				}
-    				Map<String, Object> qk = keyMap.get(xlName);
-    				qk.put("jh", Long.valueOf(qk.get("jh").toString()) + 1);
-    				++bcs_qk;
-    				String sty = decimalToBinary(s.getRfidState());
-    				Integer state = Integer.parseInt(sty);
-    				if ((state & 4) == 4) {
-        				qk.put("sj", Long.valueOf(qk.get("sj").toString()) + 1);
-    					++qks;
-    				}
-    			}
-			}
-		}
-		
-		List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
-		detailsList.addAll(ccDetail);
-		detailsList.addAll(bcDetail);
-		detailsList.addAll(smDetail);
-		detailsList.addAll(qqDetail);
-		detailsList.addAll(gpDetail);
-		detailsList.addAll(qkDetail);
-		
-		resMap.put("ccl", jhcc>0?new BigDecimal(sjcc).divide(new BigDecimal(jhcc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-		resMap.put("bczxl", jhbc>0?new BigDecimal(sjbc).divide(new BigDecimal(jhbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-		resMap.put("smbzdl", jhsmbc>0?new BigDecimal(sjsmbc).divide(new BigDecimal(jhsmbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-		resMap.put("qqzzdl", jhqqbc>0?new BigDecimal(sjqqzd).divide(new BigDecimal(jhqqbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-		resMap.put("gpzdl", jhgpqqbc>0?new BigDecimal(sjgpqqzd).divide(new BigDecimal(jhgpqqbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-		resMap.put("qkl", bcs_qk>0?new BigDecimal(qks).divide(new BigDecimal(bcs_qk),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-		
-		resMap.put("detailsList", detailsList);
-		
-		return JSON.parseObject(JSON.toJSONString(resMap));
-	}
-    
-    /**给电科手机端查线路指标(出车率)
-     * 
-     */
-    @GET
-    @Path("/selectData/getDepartureBus/{company}/{branchCompany}")
-    public JSONObject getDepartureBus(@PathParam("company") String company,
-    		@PathParam("branchCompany") String branchCompany){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	String date = sd.format(new Date());
-    	String gs = "", fgs = "";
-    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
-    		gs = company.trim();
-    	}
-    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
-    		fgs = branchCompany.trim();
-    	}
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	List<String> objList = new ArrayList<String>();
-    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
-    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
-    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
-    			+ " from bsth_c_calc_count "
-    			+ " where date = ? and gsdm != '77'";
-    	objList.add(date);
-    	if(fgs.length() > 0){
-    		sql +=" and gsdm = ? and fgsdm = ?";
-    		objList.add(gs);
-    		objList.add(fgs);
-    	} else if(gs.length() > 0){
-    		sql +=" and gsdm = ?";
-    		objList.add(gs);
-    	}
-    	
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
-    			objList.toArray(),
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode",rs.getString("xl"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("date"));
-						
-						m.put("jhcc", rs.getString("jhcc"));
-						m.put("sjcc", rs.getString("sjcc"));
-						m.put("jhccz", rs.getString("jhccz"));
-						
-						Date date = new Date();
-						date.setTime(rs.getTimestamp("create_date").getTime());
-						m.put("createDate", sdf.format(date));
-						return m;
-					}
-				});
-
-    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
-    	
-    	long jh = 0, sj = 0;
-    	
-    	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-	    		
-    			Long plan = Long.valueOf(t.get("jhccz").toString());
-    			Long real = Long.valueOf(t.get("sjcc").toString());
-    			
-	    		jh += plan;
-	    		sj += real;
-	    		
-	    		Map<String, Object> detail = new HashMap<String, Object>();
-	    		detail.put("lineName", t.get("lineName").toString());
-	    		detail.put("plan", plan);
-	    		detail.put("real", real);
-	    		detail.put("ratio", plan>0?new BigDecimal(real*100l).divide(
-	    				new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-	    		detailsList.add(detail);
-    		}
-    	}
-    	
-    	resMap.put("plan", jh);
-    	resMap.put("real", sj);
-    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
-    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-    	
-    	resMap.put("detailsList", detailsList);
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    /**给电科手机端查线路指标(班次执行率)
-     * 
-     */
-    @GET
-    @Path("/selectData/getFinishScheduleBus/{company}/{branchCompany}")
-    public JSONObject getFinishScheduleBus(@PathParam("company") String company,
-    		@PathParam("branchCompany") String branchCompany){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	String date = sd.format(new Date());
-    	String gs = "", fgs = "";
-    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
-    		gs = company.trim();
-    	}
-    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
-    		fgs = branchCompany.trim();
-    	}
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	List<String> objList = new ArrayList<String>();
-    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
-    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
-    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
-    			+ " from bsth_c_calc_count "
-    			+ " where date = ? and gsdm != '77'";
-    	objList.add(date);
-    	if(fgs.length() > 0){
-    		sql +=" and gsdm = ? and fgsdm = ?";
-    		objList.add(gs);
-    		objList.add(fgs);
-    	} else if(gs.length() > 0){
-    		sql +=" and gsdm = ?";
-    		objList.add(gs);
-    	}
-    	
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
-    			objList.toArray(),
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode",rs.getString("xl"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("date"));
-						
-						m.put("jhbc", rs.getString("jhbc"));
-						m.put("sjbc", rs.getString("sjbc"));
-						
-						Date date = new Date();
-						date.setTime(rs.getTimestamp("create_date").getTime());
-						m.put("createDate", sdf.format(date));
-						return m;
-					}
-				});
-
-    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
-    	
-    	long jh = 0, sj = 0;
-    	
-    	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-	    		
-    			Long plan = Long.valueOf(t.get("jhbc").toString());
-    			Long real = Long.valueOf(t.get("sjbc").toString());
-    			
-	    		jh += plan;
-	    		sj += real;
-	    		
-	    		Map<String, Object> detail = new HashMap<String, Object>();
-	    		detail.put("lineName", t.get("lineName").toString());
-	    		detail.put("plan", plan);
-	    		detail.put("real", real);
-	    		detail.put("ratio", plan>0?new BigDecimal(real*100l).divide(
-	    				new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-	    		detailsList.add(detail);
-    		}
-    	}
-    	
-    	resMap.put("plan", jh);
-    	resMap.put("real", sj);
-    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
-    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-    	
-    	resMap.put("detailsList", detailsList);
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    /**给电科手机端查线路指标(首末班车发车准点率)
-     * 
-     */
-    @GET
-    @Path("/selectData/getBeginAndEnd/{company}/{branchCompany}")
-    public JSONObject getBeginAndEnd(@PathParam("company") String company,
-    		@PathParam("branchCompany") String branchCompany){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	String date = sd.format(new Date());
-    	String gs = "", fgs = "";
-    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
-    		gs = company.trim();
-    	}
-    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
-    		fgs = branchCompany.trim();
-    	}
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	List<String> objList = new ArrayList<String>();
-    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
-    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
-    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
-    			+ " from bsth_c_calc_count "
-    			+ " where date = ? and gsdm != '77'";
-    	objList.add(date);
-    	if(fgs.length() > 0){
-    		sql +=" and gsdm = ? and fgsdm = ?";
-    		objList.add(gs);
-    		objList.add(fgs);
-    	} else if(gs.length() > 0){
-    		sql +=" and gsdm = ?";
-    		objList.add(gs);
-    	}
-    	
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
-    			objList.toArray(),
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode",rs.getString("xl"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("date"));
-						
-						m.put("jhsmbcs", rs.getString("jhsmbcs"));
-						m.put("sjsmbczds", rs.getString("sjsmbczds"));
-						
-						Date date = new Date();
-						date.setTime(rs.getTimestamp("create_date").getTime());
-						m.put("createDate", sdf.format(date));
-						return m;
-					}
-				});
-
-    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
-    	
-    	long jh = 0, sj = 0;
-    	
-    	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-	    		
-    			Long plan = Long.valueOf(t.get("jhsmbcs").toString());
-    			Long real = Long.valueOf(t.get("sjsmbczds").toString());
-    			
-	    		jh += plan;
-	    		sj += real;
-	    		
-	    		Map<String, Object> detail = new HashMap<String, Object>();
-	    		detail.put("lineName", t.get("lineName").toString());
-	    		detail.put("plan", plan);
-	    		detail.put("real", real);
-	    		detail.put("ratio", plan>0?new BigDecimal(real*100l).divide(
-	    				new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-	    		detailsList.add(detail);
-    		}
-    	}
-    	
-    	resMap.put("plan", jh);
-    	resMap.put("real", sj);
-    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
-    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-    	
-    	resMap.put("detailsList", detailsList);
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    /**给电科手机端查线路指标(起讫站发车准点率)
-     * 
-     */
-    @GET
-    @Path("/selectData/getPunctualBus/{company}/{branchCompany}")
-    public JSONObject getPunctualBus(@PathParam("company") String company,
-    		@PathParam("branchCompany") String branchCompany){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	String date = sd.format(new Date());
-    	String gs = "", fgs = "";
-    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
-    		gs = company.trim();
-    	}
-    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
-    		fgs = branchCompany.trim();
-    	}
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	List<String> objList = new ArrayList<String>();
-    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
-    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
-    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
-    			+ " from bsth_c_calc_count "
-    			+ " where date = ? and gsdm != '77'";
-    	objList.add(date);
-    	if(fgs.length() > 0){
-    		sql +=" and gsdm = ? and fgsdm = ?";
-    		objList.add(gs);
-    		objList.add(fgs);
-    	} else if(gs.length() > 0){
-    		sql +=" and gsdm = ?";
-    		objList.add(gs);
-    	}
-    	
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
-    			objList.toArray(),
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode",rs.getString("xl"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("date"));
-						
-						m.put("jhszfcs", rs.getString("jhszfcs"));
-						m.put("sjszfczds", rs.getString("sjszfczds"));
-						
-						Date date = new Date();
-						date.setTime(rs.getTimestamp("create_date").getTime());
-						m.put("createDate", sdf.format(date));
-						return m;
-					}
-				});
-
-    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
-    	
-    	long jh = 0, sj = 0;
-    	
-    	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-	    		
-    			Long plan = Long.valueOf(t.get("jhszfcs").toString());
-    			Long real = Long.valueOf(t.get("sjszfczds").toString());
-    			
-	    		jh += plan;
-	    		sj += real;
-	    		
-	    		Map<String, Object> detail = new HashMap<String, Object>();
-	    		detail.put("lineName", t.get("lineName").toString());
-	    		detail.put("plan", plan);
-	    		detail.put("real", real);
-	    		detail.put("ratio", plan>0?new BigDecimal(real*100l).divide(
-	    				new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-	    		detailsList.add(detail);
-    		}
-    	}
-    	
-    	resMap.put("plan", jh);
-    	resMap.put("real", sj);
-    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
-    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-    	
-    	resMap.put("detailsList", detailsList);
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    /**给电科手机端查线路指标(挂牌线路发车准点率)
-     * 
-     */
-    @GET
-    @Path("/selectData/getPlateLineBus/{company}/{branchCompany}")
-    public JSONObject getPlateLineBus(@PathParam("company") String company,
-    		@PathParam("branchCompany") String branchCompany){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	
-    	String gpLineSql = "select * from bsth_c_line_plate";
-    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineName", rs.getString("line_name"));
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	
-    	Set<String> gpSet = new HashSet<String>();
-    	for(Map<String, Object> t : gpLineList){
-    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
-    			gpSet.add(t.get("lineCode").toString().trim());
-    		}
-    	}
-    	
-    	String date = sd.format(new Date());
-    	String gs = "", fgs = "";
-    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
-    		gs = company.trim();
-    	}
-    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
-    		fgs = branchCompany.trim();
-    	}
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	List<String> objList = new ArrayList<String>();
-    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
-    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
-    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
-    			+ " from bsth_c_calc_count "
-    			+ " where date = ? and gsdm != '77'";
-    	objList.add(date);
-    	if(fgs.length() > 0){
-    		sql +=" and gsdm = ? and fgsdm = ?";
-    		objList.add(gs);
-    		objList.add(fgs);
-    	} else if(gs.length() > 0){
-    		sql +=" and gsdm = ?";
-    		objList.add(gs);
-    	}
-    	
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
-    			objList.toArray(),
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode",rs.getString("xl"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("date"));
-						
-						m.put("jhszfcs", rs.getString("jhszfcs"));
-						m.put("sjszfczds", rs.getString("sjszfczds"));
-						
-						Date date = new Date();
-						date.setTime(rs.getTimestamp("create_date").getTime());
-						m.put("createDate", sdf.format(date));
-						return m;
-					}
-				});
-
-    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
-    	
-    	long jh = 0, sj = 0;
-    	
-    	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-	    		
-    			if(gpSet.contains(t.get("lineCode").toString())){
-    				
-	    			Long plan = Long.valueOf(t.get("jhszfcs").toString());
-	    			Long real = Long.valueOf(t.get("sjszfczds").toString());
-	    			
-		    		jh += plan;
-		    		sj += real;
-		    		
-		    		Map<String, Object> detail = new HashMap<String, Object>();
-		    		detail.put("lineName", t.get("lineName").toString());
-		    		detail.put("plan", plan);
-		    		detail.put("real", real);
-		    		detail.put("ratio", plan>0?new BigDecimal(real*100l).divide(
-		    				new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-		    		detailsList.add(detail);
-    			}
-    		}
-    	}
-    	
-    	resMap.put("plan", jh);
-    	resMap.put("real", sj);
-    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
-    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-    	
-    	resMap.put("detailsList", detailsList);
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    /**给电科手机端查线路指标(签卡率)
-     * 
-     */
-    @GET
-    @Path("/selectData/getCardSigning/{company}/{branchCompany}")
-    public JSONObject getCardSigning(@PathParam("company") String company,
-    		@PathParam("branchCompany") String branchCompany){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	String date = sd.format(new Date());
-    	String gs = "", fgs = "";
-    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
-    		gs = company.trim();
-    	}
-    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
-    		fgs = branchCompany.trim();
-    	}
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
-    	Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
-    	
-    	long jh = 0, sj = 0;
-    	
-    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
-		for(ScheduleRealInfo s : findAll){
-			if(s.getGsBm() != null && s.getFgsBm() != null){
-				if("77".equals(s.getGsBm())){
-					continue;
-				}
-				if(fgs.length() > 0){
-					if(!(s.getGsBm().equals(gs)) || !(s.getFgsBm().equals(gs))){
-						continue;
-					}
-				} else if(gs.length() > 0){
-					if(!(s.getGsBm().equals(gs))){
-						continue;
-					}
-				}
-    			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-	    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
-	    				long plan = 0, real = 0;
-	    				++plan;
-	    				++jh;
-	    				String sty = decimalToBinary(s.getRfidState());
-	    				Integer state = Integer.parseInt(sty);
-	    				if ((state & 4) == 4) {
-		    				++real;
-	    					++sj;
-	    				}
-	    				if(!(keyMap.containsKey(s.getXlBm()))){
-	    					Map<String, Object> m = new HashMap<String, Object>();
-	    					m = new HashMap<String, Object>();
-	    		    		m.put("lineName", s.getXlName());
-	    		    		m.put("plan", "0");
-	    		    		m.put("real", "0");
-	    		    		keyMap.put(s.getXlBm(), m);
-	    		    		detailsList.add(m);
-	    				}
-	    				Map<String, Object> m = keyMap.get(s.getXlBm());
-	    				m.put("plan", Long.valueOf(m.get("plan").toString()) + plan);
-	    				m.put("real", Long.valueOf(m.get("real").toString()) + real);
-	    			}
-    			}
-			}
-		}
-		
-		for(Map<String, Object> m : detailsList){
-			long plan = Long.valueOf(m.get("plan").toString());
-			long real = Long.valueOf(m.get("real").toString());
-			m.put("ratio", plan>0?new BigDecimal(real*100l).divide(
-	    			new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-		}
-    	
-    	resMap.put("plan", jh);
-    	resMap.put("real", sj);
-    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
-    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
-    	
-    	resMap.put("detailsList", detailsList);
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    @GET
-    @Path("/selectData/attendance")
-    public JSONObject attendance(){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-    	
-    	int day = 7;//天数
-    	
-    	Date dd = new Date();
-    	String date = sd.format(dd);	//yyyy-MM-dd 当天
-    	Date dd2 = new Date();
-    	dd2.setTime(dd.getTime() - ((long)(day-1))*1000*60*60*24);
-    	String date2 = sd.format(dd2);	//yyyy-MM-dd 6天前（加上当天就是取7天数据）
-    	
-    	String[] dates = new String[day];
-    	Map<String, Integer> datesMap = new HashMap<String, Integer>();
-    	
-    	for(int i = 0; i < day; i++){
-    		Date tempDate = new Date();
-    		tempDate.setTime(dd2.getTime() + ((long)i)*1000*60*60*24);
-    		String format = sd.format(tempDate);
-    		dates[i] = format;
-    		datesMap.put(format, i);
-    	}
-    	
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	
-    	List<Map<String, Object>> attList = new ArrayList<Map<String, Object>>();
-    	List<Map<String, Object>> lackList = new ArrayList<Map<String, Object>>();
-    	Set<String> lackSet = new HashSet<String>();
-    	
-    	for(int i = 0; i < dates.length; i++){
-    		Set<String> jhSet = new HashSet<String>();
-    		Set<String> sjSet = new HashSet<String>();
-        	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(dates[i]);
-        	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
-        	for(ScheduleRealInfo s : findAll){
-        		if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-        			if(!isInOut(s)){
-	        			Set<ChildTaskPlan> cts = s.getcTasks();
-	                    if (cts != null && cts.size() > 0) {
-	                    	list_s.add(s);
-	                    } else {
-	                        if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
-	                        	list_s.add(s);
-	                        }
-	                    }
-	                    
-	                    if(!s.isSflj() && !s.isCcService()){
-	                    	jhSet.add(s.getjGh() + "/" + s.getjName());
-	                    }
-        			}
-        		}
-        	}
-        	
-        	for(ScheduleRealInfo s : list_s){
-        		if(!(s.getStatus() == -1)){
-        			sjSet.add(s.getjGh() + "/" + s.getjName());
-        		}
-        	}
-        	
-        	for(ScheduleRealInfo s : findAll){
-        		try {
-	        		if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-		        		if (s.isSflj() || isInOut(s)){
-		                    continue;
-		        		}
-		        		
-	        			String time = s.getRealExecDate() + " " + s.getFcsj();
-	        			Date d = dateTime.parse(time);
-	        			if(dd.getTime() - d.getTime() < 300000l){ //只取当前时间5分钟前的数据
-	        				continue;
-	        			}
-	        			
-		        		Set<ChildTaskPlan> cts;
-		                cts = s.getcTasks();
-		        		//有子任务
-						if (cts != null && cts.size() > 0) {
-						    for(ChildTaskPlan c : cts){
-					    		if(c.getMileageType().equals("service") && c.getCcId() == null){
-				            		if(c.isDestroy() && (c.getDestroyReason()==null? "" : c.getDestroyReason()).equals("缺人")){
-				            			Map<String, Object> m = new HashMap<String, Object>();
-				            			m.put("gsName", s.getGsName());
-				            			m.put("lineName", s.getXlName());
-				            			m.put("driverCode", s.getjGh());
-				            			m.put("driverName", s.getjName());
-				            			m.put("cl", s.getClZbh());
-				            			m.put("date", s.getRealExecDate());
-				            			m.put("time", c.getStartDate());
-				            			if(c.getRemarks() != null && c.getRemarks().trim().length() > 0){
-				            				m.put("explain", c.getRemarks());
-				            			} else {
-				            				m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
-				            			}
-				            			
-				            			String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
-				            			if(lackSet.add(str)){
-				            				lackList.add(m);
-				            			}
-				            		}
-					    		}
-						    }
-						}
-						//主任务烂班
-						else if(s.getStatus() == -1 && s.getAdjustExps().equals("缺人")){
-		                	Map<String, Object> m = new HashMap<String, Object>();
-		        			m.put("gsName", s.getGsName());
-		        			m.put("lineName", s.getXlName());
-	            			m.put("driverCode", s.getjGh());
-		        			m.put("driverName", s.getjName());
-	            			m.put("cl", s.getClZbh());
-		        			m.put("date", s.getRealExecDate());
-		        			m.put("time", s.getFcsj());
-		        			m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
-		        			
-		        			String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
-		        			if(lackSet.add(str)){
-		        				lackList.add(m);
-		        			}
-			            }
-	        		}
-				} catch (Exception e) {
-					// TODO: handle exception
-					e.printStackTrace();
-				}
-        	}
-        	
-        	Map<String, Object> att = new HashMap<String, Object>();
-        	att.put("date", dates[i]);
-        	att.put("jh", jhSet.size());
-        	att.put("sj", sjSet.size());
-        	attList.add(att);
-    	}
-    	
-    	String gpLineSql = "select p.company_code, count(1) jsy"
-    			+ " from (select e.jsy from bsth_c_s_ecinfo e"
-    			+ " where e.is_cancel = 0 group by e.jsy) a"
-    			+ " left join bsth_c_personnel p on a.jsy = p.id"
-    			+ " group by p.company_code";
-    	List<Map<String, Object>> ecList=jdbcTemplate.query(gpLineSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("company", rs.getString("company_code"));
-						m.put("jsy", rs.getString("jsy"));
-						return m;
-					}
-				});
-    	
-    	List<Map<String, Object>> jsyList = new ArrayList<Map<String, Object>>();
-    	Map<String, Object> ygMap = new HashMap<String, Object>();
-    	ygMap.put("company", "杨高");
-    	ygMap.put("jsy", "0");
-    	Map<String, Object> snMap = new HashMap<String, Object>();
-    	snMap.put("company", "上南");
-    	snMap.put("jsy", "0");
-    	Map<String, Object> jgMap = new HashMap<String, Object>();
-    	jgMap.put("company", "金高");
-    	jgMap.put("jsy", "0");
-    	Map<String, Object> nhMap = new HashMap<String, Object>();
-    	nhMap.put("company", "南汇");
-    	nhMap.put("jsy", "0");
-    	for(Map<String, Object> m : ecList){		//顺序：杨高，上南，金高，南汇
-    		if("05".equals(m.get("company").toString())){
-//    			m.put("company", "杨高");
-    			ygMap.put("jsy", m.get("jsy").toString());
-    		}
-    		if("55".equals(m.get("company").toString())){
-//    			m.put("company", "上南");
-    			snMap.put("jsy", m.get("jsy").toString());
-    		}
-    		if("22".equals(m.get("company").toString())){
-//    			m.put("company", "金高");
-    			jgMap.put("jsy", m.get("jsy").toString());
-    		}
-    		if("26".equals(m.get("company").toString())){
-//    			m.put("company", "南汇");
-    			nhMap.put("jsy", m.get("jsy").toString());
-    		}
-    	}
-    	jsyList.add(ygMap);
-    	jsyList.add(snMap);
-    	jsyList.add(jgMap);
-    	jsyList.add(nhMap);
-    	
-    	String xlSql = "select a.jsy, b.spy, c.cl from"
-					+ " (select count(1) jsy from (select a.jsy from bsth_c_s_ecinfo a where a.is_cancel = 0 and a.spy is not null and a.jsy is not null group by jsy) a) a"
-					+ " LEFT JOIN"
-					+ " (select count(1) spy from (select b.spy from bsth_c_s_ecinfo b where b.is_cancel = 0 and b.spy is not null group by spy) b) b"
-					+ " on 1=1"
-					+ " LEFT JOIN"
-					+ " (select count(1) cl from (select c.cl from bsth_c_s_ccinfo c where c.is_cancel = 0 and c.cl is not null and c.xl in(select e.xl from bsth_c_s_ecinfo e where e.is_cancel = 0 and e.spy is not null) group by c.cl) c) c"
-					+ " on 1=1";
-    	List<Map<String, Object>> xlConfigList=jdbcTemplate.query(xlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("jsy", rs.getString("jsy"));
-						m.put("spy", rs.getString("spy"));
-						m.put("cl", rs.getString("cl"));
-						return m;
-					}
-				});
-    	long jsy = 0l, spy = 0l, cl = 0l;
-    	for(Map<String, Object> t : xlConfigList){
-    		if(t.get("jsy") != null){
-    			jsy += Long.valueOf(t.get("jsy").toString());
-    		}
-    		if(t.get("spy") != null){
-    			spy += Long.valueOf(t.get("spy").toString());
-    		}
-    		if(t.get("cl") != null){
-    			cl += Long.valueOf(t.get("cl").toString());
-    		}
-    	}
-    	
-    	resMap.put("jsyList", jsyList);
-    	resMap.put("attList", attList);
-    	resMap.put("lackList", lackList);
-    	resMap.put("salesmanJsy", jsy);
-    	resMap.put("salesmanSpy", spy);
-    	resMap.put("salesmanCl", cl);
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    @GET
-    @Path("/selectData/attendance/{gsdm}")
-    public JSONObject attendance(@PathParam("gsdm") String gsdm){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-    	
-    	int day = 7;//天数
-    	
-    	Date dd = new Date();
-    	String date = sd.format(dd);	//yyyy-MM-dd 当天
-    	Date dd2 = new Date();
-    	dd2.setTime(dd.getTime() - ((long)(day-1))*1000*60*60*24);
-    	String date2 = sd.format(dd2);	//yyyy-MM-dd 6天前（加上当天就是取7天数据）
-    	
-    	String[] dates = new String[day];
-    	Map<String, Integer> datesMap = new HashMap<String, Integer>();
-    	
-    	for(int i = 0; i < day; i++){
-    		Date tempDate = new Date();
-    		tempDate.setTime(dd2.getTime() + ((long)i)*1000*60*60*24);
-    		String format = sd.format(tempDate);
-    		dates[i] = format;
-    		datesMap.put(format, i);
-    	}
-    	
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	
-    	List<Map<String, Object>> attList = new ArrayList<Map<String, Object>>();
-    	List<Map<String, Object>> lackList = new ArrayList<Map<String, Object>>();
-    	Set<String> lackSet = new HashSet<String>();
-    	
-    	for(int i = 0; i < dates.length; i++){
-    		Set<String> jhSet = new HashSet<String>();
-    		Set<String> sjSet = new HashSet<String>();
-        	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(dates[i]);
-        	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
-        	for(ScheduleRealInfo s : findAll){
-        		if(s.getGsBm() != null && s.getGsBm().equals(gsdm)){//直属公司
-	        		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-	        			if(!isInOut(s)){
-		        			Set<ChildTaskPlan> cts = s.getcTasks();
-		                    if (cts != null && cts.size() > 0) {
-		                    	list_s.add(s);
-		                    } else {
-		                        if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
-		                        	list_s.add(s);
-		                        }
-		                    }
-		                    
-		                    if(!s.isSflj() && !s.isCcService()){
-		                    	jhSet.add(s.getjGh() + "/" + s.getjName());
-		                    }
-	        			}
-	        		}
-        		}
-        	}
-        	
-        	for(ScheduleRealInfo s : list_s){
-        		if(!(s.getStatus() == -1)){
-        			sjSet.add(s.getjGh() + "/" + s.getjName());
-        		}
-        	}
-        	
-        	for(ScheduleRealInfo s : findAll){
-        		try {
-	        		if(s.getGsBm() != null && s.getGsBm().equals(gsdm)){//直属公司
-		        		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-			        		if (s.isSflj() || isInOut(s)){
-			                    continue;
-			        		}
-			        		
-		        			String time = s.getRealExecDate() + " " + s.getFcsj();
-		        			Date d = dateTime.parse(time);
-		        			if(dd.getTime() - d.getTime() < 300000l){ //只取当前时间5分钟前的数据
-		        				continue;
-		        			}
-		        			
-			        		Set<ChildTaskPlan> cts;
-			                cts = s.getcTasks();
-			        		//有子任务
-							if (cts != null && cts.size() > 0) {
-							    for(ChildTaskPlan c : cts){
-						    		if(c.getMileageType().equals("service") && c.getCcId() == null){
-					            		if(c.isDestroy() && (c.getDestroyReason()==null? "" : c.getDestroyReason()).equals("缺人")){
-					            			Map<String, Object> m = new HashMap<String, Object>();
-					            			m.put("gsName", s.getGsName());
-					            			m.put("lineName", s.getXlName());
-					            			m.put("driverCode", s.getjGh());
-					            			m.put("driverName", s.getjName());
-					            			m.put("cl", s.getClZbh());
-					            			m.put("date", s.getRealExecDate());
-					            			m.put("time", c.getStartDate());
-					            			if(c.getRemarks() != null && c.getRemarks().trim().length() > 0){
-					            				m.put("explain", c.getRemarks());
-					            			} else {
-					            				m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
-					            			}
-					            			
-					            			String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
-					            			if(lackSet.add(str)){
-					            				lackList.add(m);
-					            			}
-					            		}
-						    		}
-							    }
-							}
-							//主任务烂班
-							else if(s.getStatus() == -1 && s.getAdjustExps().equals("缺人")){
-			                	Map<String, Object> m = new HashMap<String, Object>();
-			        			m.put("gsName", s.getGsName());
-			        			m.put("lineName", s.getXlName());
-		            			m.put("driverCode", s.getjGh());
-			        			m.put("driverName", s.getjName());
-			        			m.put("cl", s.getClZbh());
-			        			m.put("date", s.getRealExecDate());
-			        			m.put("time", s.getFcsj());
-			        			m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
-			        			
-			        			String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
-			        			if(lackSet.add(str)){
-			        				lackList.add(m);
-			        			}
-				            }
-		        		}
-	        		}
-				} catch (Exception e) {
-					// TODO: handle exception
-				}
-        	}
-        	
-        	Map<String, Object> att = new HashMap<String, Object>();
-        	att.put("date", dates[i]);
-        	att.put("jh", jhSet.size());
-        	att.put("sj", sjSet.size());
-        	attList.add(att);
-    	}
-    	
-    	String gpLineSql = "select p.branche_company_code, b.business_name, count(1) jsy"
-    			+ " from (select e.jsy from bsth_c_s_ecinfo e"
-    			+ " where e.is_cancel = 0 group by e.jsy) a"
-    			+ " left join bsth_c_personnel p on a.jsy = p.id"
-    			+ " left join bsth_c_business b on p.company_code = b.up_code"
-    			+ " and p.branche_company_code = b.business_code"
-    			+ " where p.company_code = ?"
-    			+ " group by p.branche_company_code, b.business_name"
-    			+ " order by p.branche_company_code";
-    	List<Map<String, Object>> ecList=jdbcTemplate.query(gpLineSql, new Object[]{gsdm},
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("company", rs.getString("branche_company_code"));
-						m.put("companyName", rs.getString("business_name"));
-						m.put("jsy", rs.getString("jsy"));
-						return m;
-					}
-				});
-    	
-    	List<Integer> keyList = new ArrayList<Integer>();
-    	Map<Integer, Map<String, Object>> keyMap = new HashMap<Integer, Map<String, Object>>();
-    	List<Map<String, Object>> jsyList = new ArrayList<Map<String, Object>>();
-    	for(Map<String, Object> m : ecList){
-    		if(m.get("company") != null && m.get("company").toString().trim().length() > 0){
-    			Integer i = Integer.valueOf(m.get("company").toString().trim());
-    			if(!keyMap.containsKey(i)){
-    				Map<String, Object> temp = new HashMap<String, Object>();
-    				temp.put("company", m.get("companyName").toString());
-    				temp.put("jsy", m.get("jsy").toString());
-    				keyMap.put(i, temp);
-    				keyList.add(i);
-    				jsyList.add(temp);
-    			}
-    		}
-    	}
-    	
-    	String xlSql = "select a.jsy, b.spy, c.cl from"
-					+ " (select count(1) jsy from (select a.jsy from bsth_c_s_ecinfo a"
-					+ " left join bsth_c_personnel p on a.jsy=p.id where a.is_cancel = 0"
-					+ " and a.spy is not null and a.jsy is not null"
-					+ " and p.company_code = ?"
-					+ " group by jsy) a) a"
-					+ " LEFT JOIN"
-					+ " (select count(1) spy from (select b.spy from bsth_c_s_ecinfo b"
-					+ " left join bsth_c_personnel p on b.spy=p.id where b.is_cancel = 0"
-					+ " and b.spy is not null and p.company_code = ?"
-					+ " group by spy) b) b"
-					+ " on 1=1"
-					+ " LEFT JOIN"
-					+ " (select count(1) cl from (select c.cl from bsth_c_s_ccinfo c"
-					+ " left join bsth_c_cars car on c.cl=car.id where c.is_cancel = 0"
-					+ " and c.cl is not null and car.business_code = ?"
-					+ " and c.xl in(select e.xl from bsth_c_s_ecinfo e"
-					+ " where e.is_cancel = 0 and e.spy is not null) group by c.cl) c) c"
-					+ " on 1=1";
-    	List<Map<String, Object>> xlConfigList=jdbcTemplate.query(xlSql, new Object[]{gsdm, gsdm, gsdm},
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("jsy", rs.getString("jsy"));
-						m.put("spy", rs.getString("spy"));
-						m.put("cl", rs.getString("cl"));
-						return m;
-					}
-				});
-    	long jsy = 0l, spy = 0l, cl = 0l;
-    	for(Map<String, Object> t : xlConfigList){
-    		if(t.get("jsy") != null){
-    			jsy += Long.valueOf(t.get("jsy").toString());
-    		}
-    		if(t.get("spy") != null){
-    			spy += Long.valueOf(t.get("spy").toString());
-    		}
-    		if(t.get("cl") != null){
-    			cl += Long.valueOf(t.get("cl").toString());
-    		}
-    	}
-    	
-    	resMap.put("jsyList", jsyList);
-    	resMap.put("attList", attList);
-    	resMap.put("lackList", lackList);
-    	resMap.put("salesmanJsy", jsy);
-    	resMap.put("salesmanSpy", spy);
-    	resMap.put("salesmanCl", cl);
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    /** 按月份查询统计指标 */
-    @GET
-    @Path("/selectData/getMonthly/{month}")
-    public JSONObject getMonthly(@PathParam("month") String month){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	
-    	String gpLineSql = "select * from bsth_c_line_plate";
-    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineName", rs.getString("line_name"));
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	
-    	Set<String> gpSet = new HashSet<String>();
-    	for(Map<String, Object> t : gpLineList){
-    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
-    			gpSet.add(t.get("lineCode").toString().trim());
-    		}
-    	}
-    	
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	
-    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
-    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
-    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
-    			+ " from bsth_c_calc_count "
-    			+ " where date like '%"+month+"%' and gsdm != '77'";
-    	
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode",rs.getString("xl"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("date"));
-						
-						m.put("jhbc", rs.getString("jhbc"));
-						m.put("sjbc", rs.getString("sjbc"));
-						m.put("bczxl", rs.getString("bczxl"));
-						m.put("jhbcz", rs.getString("jhbcz"));
-						
-						m.put("jhcc", rs.getString("jhcc"));
-						m.put("sjcc", rs.getString("sjcc"));
-						m.put("ccl", rs.getString("ccl"));
-						m.put("jhccz", rs.getString("jhccz"));
-						
-						m.put("jhyylc", rs.getString("jhyylc"));
-						m.put("sjyylc", rs.getString("sjyylc"));
-						m.put("jhyylcz", rs.getString("jhyylcz"));
-						m.put("jhkslc", rs.getString("jhkslc"));
-						m.put("sjkslc", rs.getString("sjkslc"));
-						m.put("jhkslcz", rs.getString("jhkslcz"));
-
-						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
-						m.put("sjgfbcs", rs.getString("sjgfbcs"));
-						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
-						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
-						m.put("sjdgbcs", rs.getString("sjdgbcs"));
-						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
-
-						m.put("jhsmbcs", rs.getString("jhsmbcs"));
-						m.put("sjsmbczds", rs.getString("sjsmbczds"));
-						m.put("smbczdl", rs.getString("smbczdl"));
-						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
-						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
-						m.put("smbczdlz", rs.getString("smbczdlz"));
-						
-						m.put("jhszfcs", rs.getString("jhszfcs"));
-						m.put("sjszfczds", rs.getString("sjszfczds"));
-						m.put("szfczdl", rs.getString("szfczdl"));
-						
-						m.put("jhzgl", rs.getString("jhzgl"));
-						m.put("sjzgl", rs.getString("sjzgl"));
-						
-						Date date = new Date();
-						date.setTime(rs.getTimestamp("create_date").getTime());
-						m.put("createDate", sdf.format(date));
-						return m;
-					}
-				});
-    	
-    	
-    	BigDecimal jhzgl = new BigDecimal(0), sjzgl = new BigDecimal(0);//
-    	long jhcc = 0, sjcc = 0, jhbc = 0, sjbc = 0, jhsmbc = 0, sjsmbc = 0,
-    			jhqqbc = 0, sjqqzd = 0, jhgpqqbc = 0, sjgpqqzd = 0;
-    	
-    	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-    			
-	    		jhzgl = jhzgl.add(new BigDecimal(t.get("jhzgl").toString()));
-	    		sjzgl = sjzgl.add(new BigDecimal(t.get("sjzgl").toString()));
-	    		
-	    		jhcc += Long.valueOf(t.get("jhccz").toString());
-	    		sjcc += Long.valueOf(t.get("sjcc").toString());
-	    		jhbc += Long.valueOf(t.get("jhbc").toString());
-	    		sjbc += Long.valueOf(t.get("sjbc").toString());
-	    		jhsmbc += Long.valueOf(t.get("jhsmbcs").toString());
-	    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
-	    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
-	    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
-	    		if(gpSet.contains(t.get("lineCode").toString())){
-	    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
-	    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
-	    		}
-	    		
-    		}
-    	}
-    	
-    	resMap.put("date", month);
-    	
-    	resMap.put("jhzgl", df.format(jhzgl));
-    	resMap.put("sjzgl", df.format(sjzgl));
-    	resMap.put("jhcc", jhcc);
-    	resMap.put("sjcc", sjcc);
-    	resMap.put("jhbc", jhbc);
-    	resMap.put("sjbc", sjbc);
-    	resMap.put("jhsm", jhsmbc);
-    	resMap.put("sjsm", sjsmbc);
-    	resMap.put("jhqq", jhqqbc);
-    	resMap.put("sjqq", sjqqzd);
-    	resMap.put("jhgp", jhgpqqbc);
-    	resMap.put("sjgp", sjgpqqzd);
-
-    	resMap.put("glzxl", jhzgl.doubleValue()>0?sjzgl.divide(jhzgl,
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("ccl", jhcc>0?new BigDecimal(sjcc).divide(new BigDecimal(jhcc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("bczxl", jhbc>0?new BigDecimal(sjbc).divide(new BigDecimal(jhbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("smbzdl", jhbc>0?new BigDecimal(sjsmbc).divide(new BigDecimal(jhsmbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("qqzzdl", jhbc>0?new BigDecimal(sjqqzd).divide(new BigDecimal(jhqqbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("gpzdl", jhbc>0?new BigDecimal(sjgpqqzd).divide(new BigDecimal(jhgpqqbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    /** 按月份查询直属公司统计指标 */
-    @GET
-    @Path("/selectData/getMonthly/{gsdm}/{month}")
-    public JSONObject getMonthly(@PathParam("gsdm") String gsdm, @PathParam("month") String month){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	
-    	String gpLineSql = "select * from bsth_c_line_plate";
-    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineName", rs.getString("line_name"));
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	
-    	Set<String> gpSet = new HashSet<String>();
-    	for(Map<String, Object> t : gpLineList){
-    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
-    			gpSet.add(t.get("lineCode").toString().trim());
-    		}
-    	}
-    	
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	
-    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
-    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
-    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
-    			+ " from bsth_c_calc_count "
-    			+ " where gsdm = '"+gsdm+"' and date like '%"+month+"%'";
-    	
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode",rs.getString("xl"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("date"));
-						
-						m.put("jhbc", rs.getString("jhbc"));
-						m.put("sjbc", rs.getString("sjbc"));
-						m.put("bczxl", rs.getString("bczxl"));
-						m.put("jhbcz", rs.getString("jhbcz"));
-						
-						m.put("jhcc", rs.getString("jhcc"));
-						m.put("sjcc", rs.getString("sjcc"));
-						m.put("ccl", rs.getString("ccl"));
-						m.put("jhccz", rs.getString("jhccz"));
-						
-						m.put("jhyylc", rs.getString("jhyylc"));
-						m.put("sjyylc", rs.getString("sjyylc"));
-						m.put("jhyylcz", rs.getString("jhyylcz"));
-						m.put("jhkslc", rs.getString("jhkslc"));
-						m.put("sjkslc", rs.getString("sjkslc"));
-						m.put("jhkslcz", rs.getString("jhkslcz"));
-
-						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
-						m.put("sjgfbcs", rs.getString("sjgfbcs"));
-						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
-						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
-						m.put("sjdgbcs", rs.getString("sjdgbcs"));
-						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
-
-						m.put("jhsmbcs", rs.getString("jhsmbcs"));
-						m.put("sjsmbczds", rs.getString("sjsmbczds"));
-						m.put("smbczdl", rs.getString("smbczdl"));
-						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
-						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
-						m.put("smbczdlz", rs.getString("smbczdlz"));
-						
-						m.put("jhszfcs", rs.getString("jhszfcs"));
-						m.put("sjszfczds", rs.getString("sjszfczds"));
-						m.put("szfczdl", rs.getString("szfczdl"));
-						
-						m.put("jhzgl", rs.getString("jhzgl"));
-						m.put("sjzgl", rs.getString("sjzgl"));
-						
-						Date date = new Date();
-						date.setTime(rs.getTimestamp("create_date").getTime());
-						m.put("createDate", sdf.format(date));
-						return m;
-					}
-				});
-    	
-    	
-    	BigDecimal jhzgl = new BigDecimal(0), sjzgl = new BigDecimal(0);//
-    	long jhcc = 0, sjcc = 0, jhbc = 0, sjbc = 0, jhsmbc = 0, sjsmbc = 0,
-    			jhqqbc = 0, sjqqzd = 0, jhgpqqbc = 0, sjgpqqzd = 0;
-    	
-    	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-    			
-	    		jhzgl = jhzgl.add(new BigDecimal(t.get("jhzgl").toString()));
-	    		sjzgl = sjzgl.add(new BigDecimal(t.get("sjzgl").toString()));
-	    		
-	    		jhcc += Long.valueOf(t.get("jhccz").toString());
-	    		sjcc += Long.valueOf(t.get("sjcc").toString());
-	    		jhbc += Long.valueOf(t.get("jhbc").toString());
-	    		sjbc += Long.valueOf(t.get("sjbc").toString());
-	    		jhsmbc += Long.valueOf(t.get("jhsmbcs").toString());
-	    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
-	    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
-	    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
-	    		if(gpSet.contains(t.get("lineCode").toString())){
-	    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
-	    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
-	    		}
-	    		
-    		}
-    	}
-    	
-    	resMap.put("date", month);
-    	
-    	resMap.put("jhzgl", df.format(jhzgl));
-    	resMap.put("sjzgl", df.format(sjzgl));
-    	resMap.put("jhcc", jhcc);
-    	resMap.put("sjcc", sjcc);
-    	resMap.put("jhbc", jhbc);
-    	resMap.put("sjbc", sjbc);
-    	resMap.put("jhsm", jhsmbc);
-    	resMap.put("sjsm", sjsmbc);
-    	resMap.put("jhqq", jhqqbc);
-    	resMap.put("sjqq", sjqqzd);
-    	resMap.put("jhgp", jhgpqqbc);
-    	resMap.put("sjgp", sjgpqqzd);
-
-    	resMap.put("glzxl", jhzgl.doubleValue()>0?sjzgl.divide(jhzgl,
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("ccl", jhcc>0?new BigDecimal(sjcc).divide(new BigDecimal(jhcc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("bczxl", jhbc>0?new BigDecimal(sjbc).divide(new BigDecimal(jhbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("smbzdl", jhsmbc>0?new BigDecimal(sjsmbc).divide(new BigDecimal(jhsmbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("qqzzdl", jhqqbc>0?new BigDecimal(sjqqzd).divide(new BigDecimal(jhqqbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	resMap.put("gpzdl", jhgpqqbc>0?new BigDecimal(sjgpqqzd).divide(new BigDecimal(jhgpqqbc),
-				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	
-    	return JSON.parseObject(JSON.toJSONString(resMap));
-    }
-    
-    /** 按日期查询四家直属公司统计指标 */
-    @GET
-    @Path("/selectData/getCompanyData/{date}")
-    public List<Map<String, Object>> getCompanyData(@PathParam("date") String date){
-    	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-    	
-//    	String date = sd.format(new Date());
-    	
-    	String gpLineSql = "select * from bsth_c_line_plate";
-    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineName", rs.getString("line_name"));
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	
-    	Set<String> gpSet = new HashSet<String>();
-    	for(Map<String, Object> t : gpLineList){
-    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
-    			gpSet.add(t.get("lineCode").toString().trim());
-    		}
-    	}
-    	
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	
-    	String gsSql="SELECT business_name, business_code from bsth_c_business ";
-    	List<Map<String, Object>> gsList=jdbcTemplate.query(gsSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("name", rs.getString("business_name")!=null?rs.getString("business_name"):"");
-						m.put("code", rs.getString("business_code")!=null?rs.getString("business_code"):"");
-						return m;
-					}
-				});
-    	final Map<String, String> gsMap = new HashMap<String, String>();
-    	for(Map<String, Object> t : gsList){
-    		if(t.get("code") != null && t.get("name") != null){
-    			gsMap.put(t.get("code").toString(), t.get("name").toString().substring(0, 2));
-    		}
-    	}
-    	
-    	
-    	String sql="select gsdm,xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
-    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
-    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
-    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
-    			+ " from bsth_c_calc_count "
-    			+ " where date = ? and gsdm != '77'";
-    	
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{date},
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("gs",rs.getString("gsdm")!=null?gsMap.get(rs.getString("gsdm")):"");
-						m.put("lineCode",rs.getString("xl"));
-						m.put("lineName", rs.getString("xl_name"));
-						m.put("date",  rs.getString("date"));
-						
-						m.put("jhbc", rs.getString("jhbc"));
-						m.put("sjbc", rs.getString("sjbc"));
-						m.put("bczxl", rs.getString("bczxl"));
-						m.put("jhbcz", rs.getString("jhbcz"));
-						
-						m.put("jhcc", rs.getString("jhcc"));
-						m.put("sjcc", rs.getString("sjcc"));
-						m.put("ccl", rs.getString("ccl"));
-						m.put("jhccz", rs.getString("jhccz"));
-						
-						m.put("jhyylc", rs.getString("jhyylc"));
-						m.put("sjyylc", rs.getString("sjyylc"));
-						m.put("jhyylcz", rs.getString("jhyylcz"));
-						m.put("jhkslc", rs.getString("jhkslc"));
-						m.put("sjkslc", rs.getString("sjkslc"));
-						m.put("jhkslcz", rs.getString("jhkslcz"));
-
-						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
-						m.put("sjgfbcs", rs.getString("sjgfbcs"));
-						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
-						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
-						m.put("sjdgbcs", rs.getString("sjdgbcs"));
-						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
-
-						m.put("jhsmbcs", rs.getString("jhsmbcs"));
-						m.put("sjsmbczds", rs.getString("sjsmbczds"));
-						m.put("smbczdl", rs.getString("smbczdl"));
-						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
-						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
-						m.put("smbczdlz", rs.getString("smbczdlz"));
-						
-						m.put("jhszfcs", rs.getString("jhszfcs"));
-						m.put("sjszfczds", rs.getString("sjszfczds"));
-						m.put("szfczdl", rs.getString("szfczdl"));
-						
-						m.put("jhzgl", rs.getString("jhzgl"));
-						m.put("sjzgl", rs.getString("sjzgl"));
-						
-						Date date = new Date();
-						date.setTime(rs.getTimestamp("create_date").getTime());
-						m.put("createDate", sdf.format(date));
-						return m;
-					}
-				});
-    	
-    	
-    	Map<String, Integer> sortMap = new HashMap<String, Integer>();
-    	sortMap.put("杨高", 0);
-    	sortMap.put("上南", 1);
-    	sortMap.put("金高", 2);
-    	sortMap.put("南汇", 3);
-    	sortMap.put("浦交", 4);
-    	Map<String, Object> ygMap = new HashMap<String, Object>();
-    	ygMap.put("gs", "杨高");
-    	resList.add(ygMap);
-    	Map<String, Object> snMap = new HashMap<String, Object>();
-    	snMap.put("gs", "上南");
-    	resList.add(snMap);
-    	Map<String, Object> jgMap = new HashMap<String, Object>();
-    	jgMap.put("gs", "金高");
-    	resList.add(jgMap);
-    	Map<String, Object> nhMap = new HashMap<String, Object>();
-    	nhMap.put("gs", "南汇");
-    	resList.add(nhMap);
-    	Map<String, Object> pjMap = new HashMap<String, Object>();
-    	pjMap.put("gs", "浦交");
-    	resList.add(pjMap);
-    	
-    	
-    	for(Map<String, Object> t : list){
-    		if(yyLine.contains(t.get("lineCode").toString())){
-    			if(sortMap.get(t.get("gs")) != null){
-	    			Map<String, Object> m = resList.get(sortMap.get(t.get("gs")));
-    				mapPut(m, "jhcc", t.get("jhccz").toString());
-    				mapPut(m, "sjcc", t.get("sjcc").toString());
-    				mapPut(m, "jhbc", t.get("jhbc").toString());
-    				mapPut(m, "sjbc", t.get("sjbc").toString());
-    				mapPut(m, "jhsmbc", t.get("jhsmbcs").toString());
-    				mapPut(m, "sjsmbc", t.get("sjsmbczds").toString());
-    				mapPut(m, "jhqqbc", t.get("jhszfcs").toString());
-    				mapPut(m, "sjqqzd", t.get("sjszfczds").toString());
-    				if(gpSet.contains(t.get("lineCode").toString())){
-        				mapPut(m, "jhgpqqbc", t.get("jhszfcs").toString());
-        				mapPut(m, "sjgpqqzd", t.get("sjszfczds").toString());
-    				}
-    				mapPut(m, "jhzgl", t.get("jhzgl").toString());
-    				mapPut(m, "sjzgl", t.get("sjzgl").toString());
-    			}
-    			
-				mapPut(pjMap, "jhcc", t.get("jhccz").toString());
-				mapPut(pjMap, "sjcc", t.get("sjcc").toString());
-				mapPut(pjMap, "jhbc", t.get("jhbc").toString());
-				mapPut(pjMap, "sjbc", t.get("sjbc").toString());
-				mapPut(pjMap, "jhsmbc", t.get("jhsmbcs").toString());
-				mapPut(pjMap, "sjsmbc", t.get("sjsmbczds").toString());
-				mapPut(pjMap, "jhqqbc", t.get("jhszfcs").toString());
-				mapPut(pjMap, "sjqqzd", t.get("sjszfczds").toString());
-				if(gpSet.contains(t.get("lineCode").toString())){
-    				mapPut(pjMap, "jhgpqqbc", t.get("jhszfcs").toString());
-    				mapPut(pjMap, "sjgpqqzd", t.get("sjszfczds").toString());
-				}
-				mapPut(pjMap, "jhzgl", t.get("jhzgl").toString());
-				mapPut(pjMap, "sjzgl", t.get("sjzgl").toString());
-    		}
-    	}
-    	
-    	
-    	//计算签卡率
-		List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
-		long jh = 0, sj = 0;
-		for(ScheduleRealInfo s : findAll){
-			if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-				if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
-					if(s.getGsBm()!=null && sortMap.get(gsMap.get(s.getGsBm()!=null?s.getGsBm():"")) != null){
-						Map<String, Object> m = resList.get(sortMap.get(gsMap.get(s.getGsBm())));
-						++jh;
-						mapPut(m, "bcs", 1);
-						String sty = decimalToBinary(s.getRfidState());
-	    				Integer state = Integer.parseInt(sty);
-	    				if ((state & 4) == 4) {
-	    					++sj;
-	    					mapPut(m, "qks", 1);
-	    				}
-					}
-				}
-			}
-		}
-		mapPut(pjMap, "bcs", jh);
-		mapPut(pjMap, "qks", sj);
-		
-		
-    	for(Map<String, Object> m : resList){
-    		m.put("date", date);
-    		
-    		m.put("glzxl", new BigDecimal(m.get("jhzgl").toString()).doubleValue()>0?
-    				new BigDecimal(m.get("sjzgl").toString()).divide(new BigDecimal(m.get("jhzgl").toString()),
-    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    		m.put("ccl", new BigDecimal(m.get("jhcc").toString()).doubleValue()>0?
-    				new BigDecimal(m.get("sjcc").toString()).divide(new BigDecimal(m.get("jhcc").toString()),
-    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    		m.put("bczxl", new BigDecimal(m.get("jhbc").toString()).doubleValue()>0?
-    				new BigDecimal(m.get("sjbc").toString()).divide(new BigDecimal(m.get("jhbc").toString()),
-    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    		m.put("smbzdl", new BigDecimal(m.get("jhsmbc").toString()).doubleValue()>0?
-    				new BigDecimal(m.get("sjsmbc").toString()).divide(new BigDecimal(m.get("jhsmbc").toString()),
-    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    		m.put("qqzzdl", new BigDecimal(m.get("jhqqbc").toString()).doubleValue()>0?
-    				new BigDecimal(m.get("sjqqzd").toString()).divide(new BigDecimal(m.get("jhqqbc").toString()),
-    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    		m.put("gpzdl", new BigDecimal(m.get("jhgpqqbc").toString()).doubleValue()>0?
-    				new BigDecimal(m.get("sjgpqqzd").toString()).divide(new BigDecimal(m.get("jhgpqqbc").toString()),
-    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    		m.put("qkl", new BigDecimal(m.get("bcs")!=null?m.get("bcs").toString():"0").doubleValue()>0?
-    				new BigDecimal(m.get("qks")!=null?m.get("qks").toString():"0").divide(new BigDecimal(m.get("bcs").toString()),
-    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
-    	}
-    	
-    	return resList;
-    }
-    
-    /** 报备登记查询接口 */
-    @GET
-    @Path("/selectData/getReport/startDate/{startDate}/endDate/{endDate}")
-    public List<Map<String, Object>> getReport(@PathParam("startDate") String starDate,
-    		@PathParam("endDate") String endDate){
-    	Date d1 = new Date(), d2 = new Date();
-    	try{
-    		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
-    		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    		d1 = sd.parse(starDate);
-    		d2 = sd.parse(endDate);
-    		d2.setTime(d2.getTime() + (1l*1000*60*60*24 - 1));
-    		starDate = sdf.format(d1);
-    		endDate = sdf.format(d2);
-    	}catch(ParseException e){
-			// TODO Auto-generated catch block
-    		e.printStackTrace();
-    		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-    		Map<String, Object> result = new HashMap<String, Object>();
-    		result.put("msg", "参数日期格式错误");
-    		list.add(result);
-    		return list;
-    	}
-    	String sql="SELECT ID,REPORT_TYPE,REPORT_GS,REPORT_FGS,REPORT_GSNAME,REPORT_FGSNAME,"
-    			+ " REPORT_DATE,REPORT_BBR,REPORT_XL,REPORT_XLNAME,REPORT_STATION,REPORT_DWSBBM,"
-    			+ " REPORT_DWSBSJ,REPORT_YWSJ,REPORT_SMBWD,REPORT_DJGSJ,REPORT_DJGYY,REPORT_TFSJ,"
-    			+ " REPORT_YXSJ,REPORT_YXBC,REPORT_TZCS,REPORT_SGBH,REPORT_ZBH,REPORT_PZH,REPORT_JSY,"
-    			+ " REPORT_SGSJ,REPORT_SGDD,REPORT_XSFX,REPORT_SGDX,REPORT_DXPZH,REPORT_SGGK,"
-    			+ " REPORT_SSRS,REPORT_SWRS,REPORT_BGR,REPORT_BGRDH,REPORT_BZ,REPORT_ROAD,STATUS,"
-    			+ " CREATE_BY,CREATE_DATE,UPDATE_BY,UPDATE_DATE"
-    			+ " from bsth_t_report "
-    			+ " where REPORT_DATE >= ? and REPORT_DATE <= ?";
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{starDate, endDate},
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("ID", rs.getString("ID"));
-						m.put("REPORT_TYPE", rs.getString("REPORT_TYPE"));
-						m.put("REPORT_GS", rs.getString("REPORT_GS"));
-						m.put("REPORT_FGS",rs.getString("REPORT_FGS"));
-						m.put("REPORT_GSNAME",rs.getString("REPORT_GSNAME"));
-						m.put("REPORT_FGSNAME",rs.getString("REPORT_FGSNAME"));
-						m.put("REPORT_DATE",rs.getString("REPORT_DATE"));
-						m.put("REPORT_BBR",rs.getString("REPORT_BBR"));
-						m.put("REPORT_XL",rs.getString("REPORT_XL"));
-						m.put("REPORT_XLNAME",rs.getString("REPORT_XLNAME"));
-						m.put("REPORT_STATION",rs.getString("REPORT_STATION"));
-						m.put("REPORT_DWSBBM",rs.getString("REPORT_DWSBBM"));
-						m.put("REPORT_DWSBSJ",rs.getString("REPORT_DWSBSJ"));
-						m.put("REPORT_YWSJ",rs.getString("REPORT_YWSJ"));
-						m.put("REPORT_SMBWD",rs.getString("REPORT_SMBWD"));
-						m.put("REPORT_DJGSJ",rs.getString("REPORT_DJGSJ"));
-						m.put("REPORT_DJGYY",rs.getString("REPORT_DJGYY"));
-						m.put("REPORT_TFSJ",rs.getString("REPORT_TFSJ"));
-						m.put("REPORT_YXSJ",rs.getString("REPORT_YXSJ"));
-						m.put("REPORT_YXBC",rs.getString("REPORT_YXBC"));
-						m.put("REPORT_TZCS",rs.getString("REPORT_TZCS"));
-						m.put("REPORT_SGBH",rs.getString("REPORT_SGBH"));
-						m.put("REPORT_ZBH",rs.getString("REPORT_ZBH"));
-						m.put("REPORT_PZH",rs.getString("REPORT_PZH"));
-						m.put("REPORT_JSY",rs.getString("REPORT_JSY"));
-						m.put("REPORT_SGSJ",rs.getString("REPORT_SGSJ"));
-						m.put("REPORT_SGDD",rs.getString("REPORT_SGDD"));
-						m.put("REPORT_XSFX", rs.getString("REPORT_XSFX"));
-						m.put("REPORT_SGDX", rs.getString("REPORT_SGDX"));
-						m.put("REPORT_DXPZH", rs.getString("REPORT_DXPZH"));
-						m.put("REPORT_SGGK", rs.getString("REPORT_SGGK"));
-						m.put("REPORT_SSRS", rs.getString("REPORT_SSRS"));
-						m.put("REPORT_SWRS", rs.getString("REPORT_SWRS"));
-						m.put("REPORT_BGR", rs.getString("REPORT_BGR"));
-						m.put("REPORT_BGRDH", rs.getString("REPORT_BGRDH"));
-						m.put("REPORT_BZ", rs.getString("REPORT_BZ"));
-						m.put("REPORT_ROAD", rs.getString("REPORT_ROAD"));
-						m.put("STATUS", rs.getString("STATUS"));
-						m.put("CREATE_BY", rs.getString("CREATE_BY"));
-						m.put("CREATE_DATE", rs.getString("CREATE_DATE"));
-						m.put("UPDATE_BY", rs.getString("UPDATE_BY"));
-						m.put("UPDATE_DATE", rs.getString("UPDATE_DATE"));
-						return m;
-					}
-				});
-    	
-    	return list;
-    }
-    
-    /** 按日期查询所有线路大间隔情况 */
-    @GET
-    @Path("/selectData/getLineInterval/{date}")
-    public List<Map<String, Object>> getLineInterval(@PathParam("date") String date){
-    	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-    	
-    	String gsSql="SELECT business_name, business_code, up_code from bsth_c_business ";
-    	List<Map<String, Object>> gsList=jdbcTemplate.query(gsSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("name", rs.getString("business_name")!=null?rs.getString("business_name"):"");
-						m.put("code", rs.getString("business_code")!=null?rs.getString("business_code"):"");
-						m.put("upCode", rs.getString("up_code")!=null?rs.getString("up_code"):"");
-						return m;
-					}
-				});
-    	
-    	Map<String, Object> gsMap = new HashMap<String, Object>();
-    	Map<String, Object> fgsMap = new HashMap<String, Object>();
-    	for(Map<String, Object> m : gsList){
-    		if(m.get("upCode") != null && m.get("upCode").toString().trim().length() > 0
-    				&& !("0".equals(m.get("upCode").toString().trim()))){
-    			if("88".equals(m.get("upCode").toString().trim())){
-    				gsMap.put(m.get("code").toString(), m.get("name").toString());
-    			} else {
-    				fgsMap.put(m.get("code").toString()+"_"+m.get("upCode").toString(), m.get("name").toString());
-    			}
-    		}
-    	}
-    	
-    	String calcIntervalSql = "select * from bsth_c_calc_interval where date = ? and sfyy = 1 and gsbm != '77'";
-    	List<Map<String, Object>> calcIntervalList=jdbcTemplate.query(calcIntervalSql,
-    			new Object[]{date},
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("gsbm", rs.getString("gsbm"));
-						m.put("fgsbm", rs.getString("fgsbm"));
-						m.put("date", rs.getString("date"));
-						m.put("xlBm", rs.getString("xl_bm"));
-						m.put("xlName", rs.getString("xl_name"));
-						m.put("level", rs.getString("level"));
-						return m;
-					}
-				});
-    	
-    	String calcIntervalDetailSql = "select * from bsth_c_calc_interval_detail where date = ?";
-    	List<Map<String, Object>> calcIntervalDetailList=jdbcTemplate.query(calcIntervalDetailSql,
-    			new Object[]{date},
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("date", rs.getString("date"));
-						m.put("xlBm", rs.getString("line_code"));
-						m.put("xlName", rs.getString("line_name"));
-						m.put("level", rs.getString("level"));
-						m.put("station", rs.getString("station"));
-						m.put("jhfc1", rs.getString("jhfc1"));
-						m.put("sjfc1", rs.getString("sjfc1"));
-						m.put("jhfc2", rs.getString("jhfc2"));
-						m.put("sjfc2", rs.getString("sjfc2"));
-						m.put("subTime", rs.getString("sub_time"));
-						m.put("remark", rs.getString("remark"));
-						return m;
-					}
-				});
-    	
-    	Map<String, Map<String, Object>> calcIntervalMap = new HashMap<String, Map<String, Object>>();
-    	
-    	for(Map<String, Object> m : calcIntervalList){
-    		calcIntervalMap.put(m.get("xlBm").toString(), m);
-    	}
-    	
-    	for(Map<String, Object> m : calcIntervalDetailList){
-    		String xlBm = m.get("xlBm").toString();
-    		if(calcIntervalMap.containsKey(xlBm)){
-    			Map<String, Object> map = calcIntervalMap.get(xlBm);
-    			m.put("gs", gsMap.get(map.get("gsbm").toString()));
-    			m.put("fgs", fgsMap.get(map.get("fgsbm").toString() + "_" + map.get("gsbm").toString()));
-    			resList.add(m);
-    		}
-    	}
-    	
-    	return resList;
-    }
-    
-    /** 按日期（加前7天共8天）查询所有线路大间隔次数 */
-    @GET
-    @Path("/selectData/getLastWeekIntervalSum/{date}")
-    public List<Map<String, Object>> getLastWeekIntervalSum(@PathParam("date") String date) throws ParseException{
-    	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-    	
-    	String gsSql="SELECT business_name, business_code, up_code from bsth_c_business ";
-    	List<Map<String, Object>> gsList=jdbcTemplate.query(gsSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("name", rs.getString("business_name")!=null?rs.getString("business_name"):"");
-						m.put("code", rs.getString("business_code")!=null?rs.getString("business_code"):"");
-						m.put("upCode", rs.getString("up_code")!=null?rs.getString("up_code"):"");
-						return m;
-					}
-				});
-    	Map<String, Object> gsMap = new HashMap<String, Object>();
-    	for(Map<String, Object> m : gsList){
-    		if(m.get("upCode") != null && m.get("upCode").toString().trim().length() > 0
-    				&& !("0".equals(m.get("upCode").toString().trim()))){
-    			if("88".equals(m.get("upCode").toString().trim())){
-    				gsMap.put(m.get("code").toString(), m.get("name").toString());
-    			}
-    		}
-    	}
-    	
-    	String[] gsS = {gsMap.get("05").toString(), gsMap.get("55").toString(), gsMap.get("22").toString(), gsMap.get("26").toString()};
-    	String[] levelS = {"A1", "A2", "A3", "B1", "B2", "B3", "C1", "C2", "D", "E"};
-    	List<String> keyList = new ArrayList<String>();
-    	for(String gs : gsS){
-    		for(String level : levelS){
-    			keyList.add(gs + "_" + level);
-    		}
-    	}
-    	
-    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-    	for(long l = 7l; l >= 0l; l--){
-    		Date d = sdf.parse(date);
-    		d.setTime(d.getTime() - l*1000*60*60*24);
-    		String date1 = sdf.format(d);
-        	
-        	String calcIntervalSql = "select * from bsth_c_calc_interval where date = ? and sfyy = 1 and gsbm != '77'";
-        	List<Map<String, Object>> calcIntervalList=jdbcTemplate.query(calcIntervalSql,
-        			new Object[]{date1},
-    				new RowMapper<Map<String, Object>>(){
-    					@Override
-    					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-    						Map<String, Object> m=new HashMap<String,Object>();
-    						m.put("gsbm", rs.getString("gsbm"));
-    						m.put("fgsbm", rs.getString("fgsbm"));
-    						m.put("date", rs.getString("date"));
-    						m.put("level", rs.getString("level"));
-    						m.put("djgAll", rs.getString("djg_all"));
-    						m.put("djgZgf", rs.getString("djg_zgf"));
-    						m.put("djgWgf", rs.getString("djg_wgf"));
-    						m.put("djgDg", rs.getString("djg_dg"));
-    						return m;
-    					}
-    				});
-        	
-        	Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
-        	for(Map<String, Object> m : calcIntervalList){
-        		String gsName = gsMap.get(m.get("gsbm").toString()).toString();
-        		String level = m.get("level").toString();
-        		String key = gsName + "_" + level;
-        		if(!(keyMap.containsKey(key))){
-        			Map<String, Object> map = new HashMap<String, Object>();
-        			map.put("date", date1);
-        			map.put("gs", gsName);
-        			map.put("level", level);
-        			map.put("djgAll", 0);
-        			map.put("djgZgf", 0);
-        			map.put("djgWgf", 0);
-        			map.put("djgDg", 0);
-        			keyMap.put(key, map);
-        		}
-        		if(m.get("djgAll") != null && m.get("djgAll").toString().trim().length() > 0
-        				&& Long.valueOf(m.get("djgAll").toString()) > 0l){
-            		Map<String, Object> map = keyMap.get(key);
-            		map.put("djgAll", Long.valueOf(map.get("djgAll").toString()) + Long.valueOf(m.get("djgAll").toString()));
-            		map.put("djgZgf", Long.valueOf(map.get("djgZgf").toString()) + Long.valueOf(m.get("djgZgf").toString()));
-            		map.put("djgWgf", Long.valueOf(map.get("djgWgf").toString()) + Long.valueOf(m.get("djgWgf").toString()));
-            		map.put("djgDg", Long.valueOf(map.get("djgDg").toString()) + Long.valueOf(m.get("djgDg").toString()));
-        		}
-        	}
-        	
-        	for(String key : keyList){
-        		if(keyMap.containsKey(key)){
-        			resList.add(keyMap.get(key));
-        		}
-        	}
-    	}
-    	
-    	return resList;
-    }
-    
-    /** 按日期查询所有线路首班末班班次数 */
-    @GET
-    @Path("/selectData/getFirstAndLast/{date}")
-    public List<Map<String, Object>> getFirstAndLast(@PathParam("date") String date){
-    	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-    	
-    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-		SimpleDateFormat sdf_ = new SimpleDateFormat("yyyy-MM-dd");
-		DecimalFormat df = new DecimalFormat("0.00");
-		Date createDate = new Date();
-		String sfss = "1";	//是否实时；=1为实时。
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	
-    	//key:线路编码；value：每日营运开始时间
-    	Map<String, Long> yyLine = new HashMap<String, Long>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			String lineCode = t.get("lineCode").toString();
-//    			yyLine.add(t.get("lineCode").toString());
-    			String minfcsj="02:00";
-    	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
-    	         		+ " id = ("
-    	         		+ "select max(id) from bsth_c_line_config where line = ?"
-    	         		+ ")";
-    	        List<String> list= jdbcTemplate.query(sqlMinYysj,
-            			new Object[]{lineCode},
-    					new RowMapper<String>(){
-    					@Override
-    					public String  mapRow(ResultSet rs, int rowNum) throws SQLException {
-    						String startopt=rs.getString("start_opt");
-    						return startopt;
-    					}
-    			});
-    	        if(list.size()>0){
-    	        	minfcsj=list.get(0);
-    	        }
-    			String[] minSjs = minfcsj.split(":");
-    			//车辆最早发车时间 用来过滤超第二天0点的数据
-    			Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
-    			
-    			yyLine.put(lineCode, minSj);
-    		}
-    	}
-    	
-    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
-    	Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
-    	Map<String, Map<String, Object>> lineXX = new HashMap<String, Map<String, Object>>();
-    	for(ScheduleRealInfo s : findAll){
-//			if(s.getBcType().equals("region") || s.getBcType().equals("venting")
-//					|| s.getBcType().equals("major") || isInOut(s)){
-			if(s.getBcType().equals("region") || isInOut(s)){
-				continue;	//区间班次、直放班次、放站班次与空驶班次不做首末班统计
-			}
-    		if(!("77".equals(s.getGsBm())) && yyLine.containsKey(s.getXlBm())){	//只统计营运线路
-    			if(!(keyMap.containsKey(s.getXlBm()))){
-    				keyMap.put(s.getXlBm(), new ArrayList<ScheduleRealInfo>());
-    			}
-    			keyMap.get(s.getXlBm()).add(s);
-    			
-    			if(!(lineXX.containsKey(s.getXlBm()))){
-    				lineXX.put(s.getXlBm(), new HashMap<String, Object>());
-    			}
-    			Map<String, Object> xx = lineXX.get(s.getXlBm());
-    			if(!(xx.containsKey("lineName")) && s.getXlName() != null && s.getXlName().trim().length() > 0){
-    				xx.put("lineName", s.getXlName());
-    			}
-    			if(!(xx.containsKey("gsBm")) && s.getGsBm() != null && s.getGsBm().trim().length() > 0){
-    				xx.put("gsBm", s.getGsBm());
-    			}
-    			if(!(xx.containsKey("gsName")) && s.getGsName() != null && s.getGsName().trim().length() > 0){
-    				xx.put("gsName", s.getGsName());
-    			}
-    			if(!(xx.containsKey("fgsBm")) && s.getFgsBm() != null && s.getFgsBm().trim().length() > 0){
-    				xx.put("fgsBm", s.getFgsBm());
-    			}
-    			if(!(xx.containsKey("fgsName")) && s.getFgsName() != null && s.getFgsName().trim().length() > 0){
-    				xx.put("fgsName", s.getFgsName());
-    			}
-    		}
-    	}
-    	
-    	for(String lineCode : keyMap.keySet()){
-    		List<ScheduleRealInfo> listjh0 = new ArrayList<ScheduleRealInfo>();
-    		List<ScheduleRealInfo> listjh1 = new ArrayList<ScheduleRealInfo>();
-    		List<ScheduleRealInfo> listsj0 = new ArrayList<ScheduleRealInfo>();
-    		List<ScheduleRealInfo> listsj1 = new ArrayList<ScheduleRealInfo>();
-    		Long minFcsj = yyLine.get(lineCode);
-    		for(ScheduleRealInfo s : keyMap.get(lineCode)){
-    			String[] fcsj = s.getFcsj().split(":");
-				Long fcsjL = Long.parseLong(fcsj[0]) * 60 + Long.parseLong(fcsj[1]);
-				Long fscjT = 0L;
-				if (fcsjL < minFcsj) {
-					Calendar calendar = new GregorianCalendar();
-					calendar.setTime(s.getScheduleDate());
-					calendar.add(calendar.DATE, 1);
-					Date d = calendar.getTime();
-					try {
-						fscjT = sdf.parse(sdf_.format(d) + " " + s.getFcsj()).getTime();
-					} catch (ParseException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				} else {
-					try {
-						fscjT = sdf.parse(s.getScheduleDateStr() + " " + s.getFcsj()).getTime();
-					} catch (ParseException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-
-				if (StringUtils.isEmpty(s.getFcsjActual())) {
-					s.setFcsjActualTime(0L);
-					s.setFcsjT(fscjT);
-				} else {
-					Long fcsjAcual = 0L;
-					try {
-						fcsjAcual = sdf.parse(s.getRealExecDate() + " " + s.getFcsjActual()).getTime();
-						if(fcsjAcual - fscjT > (20l*60*60*1000)){//如果实发比计发大20小时则认为日期有误，如实发在次日，计发为00:00,实发为23:59
-							fcsjAcual -= 1l*24*60*60*1000;
-						} if(fscjT - fcsjAcual > (20l*60*60*1000)){
-							fcsjAcual += 1l*24*60*60*1000;
-						}
-						s.setFcsjActualTime(fcsjAcual);
-						s.setFcsjT(fscjT);
-					} catch (ParseException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				
-				if (!(s.isSflj())) {
-					if (s.getXlDir().equals("0")) {
-						listjh0.add(s);
-					} else {
-						listjh1.add(s);
-					}
-				}
-				
-				if(s.getFcsjActual() != null && s.getFcsjActual().trim().length() > 0){
-					if (s.getXlDir().equals("0")) {
-						listsj0.add(s);
-					} else {
-						listsj1.add(s);
-					}
-				}
-    		}
-    		
-    		Collections.sort(listjh0, new ComparableJhfc());
-    		Collections.sort(listjh1, new ComparableJhfc());
-    		Collections.sort(listsj0, new ComparableAcual());
-    		Collections.sort(listsj1, new ComparableAcual());
-    		int jhFirst = 0, jhLast = 0, sjzdFirst = 0, sjzdLast = 0;
-    		
-    		//上行
-    		if(listjh0.size() > 0){
-    			ScheduleRealInfo jhsb = listjh0.get(0); //计划首班
-    			for(int f = 0; f < listjh0.size(); f++){
-    				jhsb = listjh0.get(f); //计划首班
-    				String bcType = jhsb.getBcType();
-    				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhsb.getSpId());
-    				if(oList.size() > 0 && oList.get(0) != null
-    						&& oList.get(0).trim().length() > 0){
-    					bcType = oList.get(0).trim();
-    				}
-    				if(bcType.equals("region") || bcType.equals("venting")
-    						|| bcType.equals("major") || isInOut(bcType)){
-    					continue;
-    				}
-    				break;
-    			}
-    			if("1".equals(sfss) ? createDate.getTime() > jhsb.getFcsjT() : true){
-    				jhFirst++;
-    				for(int i = 0; i < listsj0.size(); i++){
-    					ScheduleRealInfo sjsb = listsj0.get(i); //实际首班
-    					String bcType = sjsb.getBcType();
-    					if(bcType.equals("region") || bcType.equals("venting")
-        						|| bcType.equals("major") || isInOut(bcType)){
-        					continue;
-        				}
-    					long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
-    					if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
-    						sjzdFirst++;
-    						break;
-    					}
-    				}
-    			}
-    			
-    			if(listjh0.size() > 1){
-    				ScheduleRealInfo jhmb = listjh0.get(listjh0.size() - 1); //计划末班
-    				for(int l = listjh0.size() - 1; l >= 0; l--){
-    					jhmb = listjh0.get(l); //计划首班
-        				String bcType = jhmb.getBcType();
-        				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhmb.getSpId());
-        				if(oList.size() > 0 && oList.get(0) != null
-        						&& oList.get(0).trim().length() > 0){
-        					bcType = oList.get(0).trim();
-        				}
-        				if(bcType.equals("region") || bcType.equals("venting")
-        						|| bcType.equals("major") || isInOut(bcType)){
-        					continue;
-        				}
-        				break;
-        			}
-    				if("1".equals(sfss) ? createDate.getTime() > jhmb.getFcsjT() : true){
-    					jhLast++;
-						for(int i = listsj0.size() - 1; i >= 0; i--){
-							ScheduleRealInfo sjmb = listsj0.get(i); //实际末班
-							String bcType = sjmb.getBcType();
-	    					if(bcType.equals("region") || bcType.equals("venting")
-	        						|| bcType.equals("major") || isInOut(bcType)){
-	        					continue;
-	        				}
-							long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
-    						if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
-    							sjzdLast++;
-        						break;
-    						}
-						}
-    				}
-    			}
-    		}
-    		
-    		//下行
-    		if(listjh1.size() > 0){
-    			ScheduleRealInfo jhsb = listjh1.get(0); //计划首班
-    			for(int f = 0; f < listjh1.size(); f++){
-    				jhsb = listjh1.get(f); //计划首班
-    				String bcType = jhsb.getBcType();
-    				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhsb.getSpId());
-    				if(oList.size() > 0 && oList.get(0) != null
-    						&& oList.get(0).trim().length() > 0){
-    					bcType = oList.get(0).trim();
-    				}
-    				if(bcType.equals("region") || bcType.equals("venting")
-    						|| bcType.equals("major") || isInOut(bcType)){
-    					continue;
-    				}
-    				break;
-    			}
-    			if("1".equals(sfss) ? createDate.getTime() > jhsb.getFcsjT() : true){
-    				jhFirst++;
-    				for(int i = 0; i < listsj1.size(); i++){
-    					ScheduleRealInfo sjsb = listsj1.get(i); //实际首班
-    					String bcType = sjsb.getBcType();
-    					if(bcType.equals("region") || bcType.equals("venting")
-        						|| bcType.equals("major") || isInOut(bcType)){
-        					continue;
-        				}
-						long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
-    					if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
-    						sjzdFirst++;
-    						break;
-    					}
-					}
-    			}
-    			
-    			if(listjh1.size() > 1){
-    				ScheduleRealInfo jhmb = listjh1.get(listjh1.size() - 1); //计划末班
-    				for(int l = listjh1.size() - 1; l >= 0; l--){
-    					jhmb = listjh1.get(l); //计划首班
-        				String bcType = jhmb.getBcType();
-        				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhmb.getSpId());
-        				if(oList.size() > 0 && oList.get(0) != null
-        						&& oList.get(0).trim().length() > 0){
-        					bcType = oList.get(0).trim();
-        				}
-        				if(bcType.equals("region") || bcType.equals("venting")
-        						|| bcType.equals("major") || isInOut(bcType)){
-        					continue;
-        				}
-        				break;
-        			}
-    				if("1".equals(sfss) ? createDate.getTime() > jhmb.getFcsjT() : true){
-    					jhLast++;
-						for(int i = listsj1.size() - 1; i >= 0; i--){
-							ScheduleRealInfo sjmb = listsj1.get(i); //实际末班
-							String bcType = sjmb.getBcType();
-	    					if(bcType.equals("region") || bcType.equals("venting")
-	        						|| bcType.equals("major") || isInOut(bcType)){
-	        					continue;
-	        				}
-							long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
-    						if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
-    							sjzdLast++;
-        						break;
-    						}
-						}
-    				}
-    			}
-    		}
-    		
-    		Map<String, Object> map = new HashMap<String, Object>();
-    		map.put("lineCode", lineCode);
-    		Map<String, Object> xx = lineXX.get(lineCode);
-    		map.put("lineName", xx!=null&&xx.get("lineName")!=null?xx.get("lineName"):"");
-    		map.put("gsBm", xx!=null&&xx.get("gsBm")!=null?xx.get("gsBm"):"");
-    		map.put("gsName", xx!=null&&xx.get("gsName")!=null?xx.get("gsName"):"");
-    		map.put("fgsBm", xx!=null&&xx.get("fgsBm")!=null?xx.get("fgsBm"):"");
-    		map.put("fgsName", xx!=null&&xx.get("fgsName")!=null?xx.get("fgsName"):"");
-        	map.put("planFirst", jhFirst);
-        	map.put("planLast", jhLast);
-        	map.put("realFirst", sjzdFirst);
-        	map.put("realLast", sjzdLast);
-        	int jhbc = jhFirst + jhLast;
-        	int sjzdbc = sjzdFirst + sjzdLast;
-        	if(jhbc > 0){
-    	    	double zdl = (sjzdbc * 1.0) / (jhbc * 1.0) * 100;
-    			map.put("zdl", df.format(zdl));
-        	} else {
-        		map.put("zdl", "0");
-        	}
-        	if(jhFirst > 0){
-    	    	double zdlFirst = (sjzdFirst * 1.0) / (jhFirst * 1.0) * 100;
-    			map.put("zdlFirst", df.format(zdlFirst));
-        	} else {
-        		map.put("zdlFirst", "0");
-        	}
-        	if(jhLast > 0){
-    	    	double zdlLast = (sjzdLast * 1.0) / (jhLast * 1.0) * 100;
-    			map.put("zdlLast", df.format(zdlLast));
-        	} else {
-        		map.put("zdlLast", "0");
-        	}
-        	
-        	resList.add(map);
-    		
-    	}
-    	
-    	return resList;
-    }
-    
-    /** 按日期查询出车的早未到情况 */
-    @GET
-    @Path("/selectData/getNotYet/{date}")
-    public Map<String, Object> getNotYet(@PathParam("date") String date){
-    	Map<String, Object> resMap = new HashMap<String, Object>();
-    	
-    	String yyxlSql="SELECT line_code from bsth_c_line "
-    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
-    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
-				new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m=new HashMap<String,Object>();
-						m.put("lineCode", rs.getString("line_code"));
-						return m;
-					}
-				});
-    	Set<String> yyLine = new HashSet<String>();
-    	for(Map<String, Object> t : yyxlList){
-    		if(t.get("lineCode") != null){
-    			yyLine.add(t.get("lineCode").toString());
-    		}
-    	}
-    	
-    	String sqlMinYysj="select line, start_opt from bsth_c_line_config where "
-         		+ " id in (select max(id) from bsth_c_line_config group by line)";
-    	List<Map<String, Object>> minfcsjList = jdbcTemplate.query(sqlMinYysj,
-				new RowMapper<Map<String, Object>>(){
-				@Override
-				public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
-					Map<String, Object> map = new HashMap<String, Object>();
-					map.put("line", rs.getString("line")!=null?rs.getString("line"):"");
-					map.put("minfcsj", rs.getString("start_opt")!=null?rs.getString("start_opt"):"02:00");
-					return map;
-				}
-		});
-        
-    	Map<String, Object> minfcsjMap = new HashMap<String, Object>();
-        for(Map<String, Object> map : minfcsjList){
-        	minfcsjMap.put(map.get("line").toString(), map.get("minfcsj").toString());
-        }
-        
-        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
-        String format = sdf.format(new Date());
-
-    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
-    	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
-    	Map<String, ScheduleRealInfo> scheduleMap = new HashMap<String, ScheduleRealInfo>();
-    	for(ScheduleRealInfo s : findAll){
-    		if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
-    			Set<ChildTaskPlan> cts = s.getcTasks();
-    			if (cts != null && cts.size() > 0) {
-                    list_s.add(s);
-                } else if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
-                    list_s.add(s);
-                } else if(s.getStatus() != 0){
-                	list_s.add(s);
-                }
-    		}
-    	}
-    	
-    	for(ScheduleRealInfo s : list_s){
-    		if(!isInOut(s) && !s.isCcService()){
-    			String[] split = s.getFcsj().split(":");
-				Long time = Long.valueOf(split[0]) * 60 + Long.valueOf(split[1]);
-				String minfcsj = minfcsjMap.get(s.getXlBm())!=null?minfcsjMap.get(s.getXlBm()).toString():"02:00";
-				String[] split_min = minfcsj.trim().split(":");
-				Long min = Long.valueOf(split_min[0]) * 60 + Long.valueOf(split_min[1]);
-				if(time < min){
-					time += 1440;
-				}
-				s.setFcsjT(time);
-    			String cl = s.getClZbh();
-    			if(scheduleMap.containsKey(cl)){
-    				ScheduleRealInfo s2 = scheduleMap.get(cl);
-					if(time < s2.getFcsjT()){
-						scheduleMap.put(cl, s);
-					}
-    			} else {
-    				scheduleMap.put(cl, s);
-    			}
-    		}
-    	}
-    	
-    	List<ScheduleRealInfo> notYetList = new ArrayList<ScheduleRealInfo>();
-    	
-    	long sum = scheduleMap.keySet().size(), zwd = 0;//早未到数
-    	long yg_z = 0, sn_z = 0, jg_z = 0, nh_z = 0;
-    	long yg_zwd = 0, sn_zwd = 0, jg_zwd = 0, nh_zwd = 0;
-    	for(String key : scheduleMap.keySet()){
-    		ScheduleRealInfo s = scheduleMap.get(key);
-    		if("05".equals(s.getGsBm())){
-    			yg_z += 1;
-			} else if("55".equals(s.getGsBm())){
-				sn_z += 1;
-			} else if("22".equals(s.getGsBm())){
-				jg_z += 1;
-			} else if("26".equals(s.getGsBm())){
-				nh_z += 1;
-			}
-    		if("缺人".equals(s.getAdjustExps())){
-    			List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-    			list.add(s);
-    			BigDecimal sjgl = new BigDecimal(culateSjgl(list));
-    			BigDecimal ljgl = new BigDecimal(culateLjgl(list));
-    			BigDecimal zero = new BigDecimal(0.0);
-    			if(sjgl.compareTo(zero) == 0 && ljgl.compareTo(zero) == 0){
-    				zwd += 1;
-    				if("05".equals(s.getGsBm())){
-    					yg_zwd += 1;
-    				} else if("55".equals(s.getGsBm())){
-    					sn_zwd += 1;
-    				} else if("22".equals(s.getGsBm())){
-    					jg_zwd += 1;
-    				} else if("26".equals(s.getGsBm())){
-    					nh_zwd += 1;
-    				}
-    				notYetList.add(s);
-    			}
-    		}
-    	}
-    	
-    	resMap.put("sum", sum);
-    	resMap.put("notYet", zwd);
-    	resMap.put("sum_05", yg_z);
-    	resMap.put("notYet_05", yg_zwd);
-    	resMap.put("sum_55", sn_z);
-    	resMap.put("notYet_55", sn_zwd);
-    	resMap.put("sum_22", jg_z);
-    	resMap.put("notYet_22", jg_zwd);
-    	resMap.put("sum_26", nh_z);
-    	resMap.put("notYet_26", nh_zwd);
-    	resMap.put("notYetList", notYetList);
-    	return resMap;
-    }
-    
-//    public static void main(String[] args){
-//    	
-//    }
-    
-    public List<Map<String, Object>> createMap(String type, String[] dates){
-    	List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
-    	
-    	for(int i = 0; i < dates.length; i++){
-    		Map<String, Object> tempMap = new HashMap<String, Object>();
-    		tempMap.put("type", type);
-    		String[] split = dates[i].split("-");
-    		tempMap.put("date", split[1] + "/" + split[2]);
-    		tempMap.put("jh", "0");
-    		tempMap.put("sj", "0");
-    		mapList.add(tempMap);
-    	}
-    	
-    	return mapList;
-    }
-    
-    public void mapPut(Map<String, Object> m, String key, Object value){
-		if(m.get(key) != null){
-			m.put(key, new BigDecimal(m.get(key).toString()).add(new BigDecimal(value.toString())));
-		} else {
-			m.put(key, value);
-		}
-	}
-    
-    /**计划营运公里*/
-    public double culateJhgl(List<ScheduleRealInfo> lists) {
-		// TODO Auto-generated method stub
-		double jhgl=0;
-		for (int i = 0; i < lists.size(); i++) {
-			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!isInOut(scheduleRealInfo)) {
-				if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
-					jhgl=Arith.add(jhgl,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
-				}
-			}
-		}
-		return jhgl;
-	}
-    
-    /**实际营运公里（不包含临加）*/
-    public double culateSjgl(List<ScheduleRealInfo> lists) {
-		// TODO Auto-generated method stub
-		double sjgl=0;
-		for (int i = 0; i < lists.size(); i++) {
-			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!isInOut(scheduleRealInfo)) {
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-					if(!scheduleRealInfo.isSflj()){
-						if(childTaskPlans.isEmpty()){
-							if(!(scheduleRealInfo.getStatus() == -1)){
-								double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
-								double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-								if(jhlc-jhlcOrig>0){
-									sjgl=Arith.add(sjgl,jhlcOrig);
-								}else{
-									sjgl=Arith.add(sjgl,jhlc);
-								}
-							}
-						}else{
-							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-			                while (it.hasNext()) {
-			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if(childTaskPlan.getMileageType().equals("service")
-			                    		&&"正常".equals(childTaskPlan.getType1())
-			                    		&& childTaskPlan.getCcId()==null){
-			                    	 if (!childTaskPlan.isDestroy()) {
-			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-			 	                    	sjgl=Arith.add(sjgl,jhgl);
-			 	                    }
-			                    }
-			                }
-						}
-					}
-			}
-		}
-		return sjgl;
-	}
-    
-    /**临加公里*/
-    public double culateLjgl(List<ScheduleRealInfo> lists) {
-		// TODO Auto-generated method stub
-		double ljgl=0;
-		for (int i = 0; i < lists.size(); i++) {
-			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!isInOut(scheduleRealInfo)) {
-				if(!(scheduleRealInfo.getStatus() == -1)){
-					if(scheduleRealInfo.isSflj()){
-						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-						if(childTaskPlans.isEmpty()){
-							ljgl=Arith.add(ljgl,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
-						}else{
-							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-			                while (it.hasNext()) {
-			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if(childTaskPlan.getMileageType().equals("service")
-			                    		&& childTaskPlan.getCcId()==null){
-			                    	 if (!childTaskPlan.isDestroy()) {
-			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-			 	                    	ljgl=Arith.add(ljgl,jhgl);
-			 	                    } 
-			                    }
-			                }
-						}
-					}else{
-						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-						if(childTaskPlans.isEmpty()){
-							double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-							double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
-							double zjlc=Arith.sub(jhlc, jhlcOrig);
-							if(zjlc>0){
-								ljgl=Arith.add(zjlc, ljgl);
-							}
-						}else{
-							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-			                while (it.hasNext()) {
-			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if("service".equals(childTaskPlan.getMileageType())
-			                    		&& "临加".equals(childTaskPlan.getType1())
-			                    		&& childTaskPlan.getCcId()==null){
-			                    	if (!childTaskPlan.isDestroy()) {
-			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-			 	                    	ljgl=Arith.add(ljgl,jhgl);
-			 	                    }
-			                    }
-			                }
-						}
-					}
-				}
-			}
-		}
-		return ljgl;
-	}
-    
-    /**烂班（少驶）公里*/
-    public double culateCJLC(List<ScheduleRealInfo> list, String item) {
-		// TODO Auto-generated method stub
-		double sum = 0;
-        Set<ChildTaskPlan> cts;
-        for(ScheduleRealInfo sch : list){
-            if (sch.isSflj())
-                continue;
-            cts = sch.getcTasks();
-           if(isInOut(sch))
-                continue;
-            //有子任务
-            if (cts != null && cts.size() > 0) {
-                for(ChildTaskPlan c : cts){
-                	if(c.getCcId()==null){
-                		if(c.getMileageType().equals("service")){
-                			if(item.equals("其他")){
-    	                		if(c.isDestroy() && 
-    	                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
-    	                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
-    	                            sum = Arith.add(sum, c.getMileage());
-    	                	}else{
-    	                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
-    	                            sum = Arith.add(sum, c.getMileage());
-    	                	}
-                		}
-                	}
-                }
-            }
-           
-            //主任务烂班
-            else if(sch.getStatus() == -1 && !sch.isCcService()){
-                if(sch.getAdjustExps().equals(item) ||
-                        (StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("其他"))){
-                    sum = Arith.add(sum, sch.getJhlcOrig());
-                }
-            }
-            else if(item.equals("其他")){
-                double diff =  Arith.sub(sch.getJhlcOrig(), sch.getJhlc());
-                if(diff > 0){
-                    sum = Arith.add(sum, diff);
-                }
-            }
-        }
-        return sum;
-	}
-    
-    /**计划空驶公里*/
-    public double culateJhJccgl(List<ScheduleRealInfo> lists) {
-		// TODO Auto-generated method stub
-		double jcclc =0;
-		for (int i = 0; i < lists.size(); i++) {
-			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
-				if (isInOut(scheduleRealInfo)) {
-					jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
-				}
-			}
-		}
-		return jcclc;
-	}
-    
-    /**实际进出场空驶*/
-    public double culateJccgl(List<ScheduleRealInfo> lists) {
-		// TODO Auto-generated method stub
-		double jcclc =0;
-		for (int i = 0; i < lists.size(); i++) {
-			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (isInOut(scheduleRealInfo)) {
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				if(childTaskPlans.isEmpty()){
-					if(!(scheduleRealInfo.getStatus() == -1)){
-						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
-					}
-				}else{
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-	                while (it.hasNext()) {
-	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getMileageType().equals("empty")
-	                    		&& childTaskPlan.getCcId()==null){
-	                    	 if (!childTaskPlan.isDestroy()) {
-	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-	 	                    	jcclc=Arith.add(jcclc,jhgl);
-	 	                    } 
-	                    }
-	                }
-				}
-			}
-		}
-		return jcclc;
-	}
-    
-	/**实际非进出场空驶公里*/
-    public double culateKsgl(List<ScheduleRealInfo> lists) {
-		// TODO Auto-generated method stub
-		double ksgl =0;
-		for (int i = 0; i < lists.size(); i++) {
-			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!isInOut(scheduleRealInfo)) {
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				if(!childTaskPlans.isEmpty()){
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-	                while (it.hasNext()) {
-	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
-	                    	 if (!childTaskPlan.isDestroy()) {
-	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-	 	                    	ksgl=Arith.add(ksgl,jhgl);
-	 	                    } 
-	                    }
-	                }
-				}
-			}
-		}
-		return ksgl;
-	}
-    
-	class ComparableJhfc implements Comparator<ScheduleRealInfo>{
-
-		@Override
-		public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
-			// TODO Auto-generated method stub
-			return o1.getFcsjT().compareTo(o2.getFcsjT());
-		}
-	}
-	class ComparableAcual implements Comparator<ScheduleRealInfo>{
-
-		@Override
-		public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
-			// TODO Auto-generated method stub
-			return o1.getFcsjActualTime().compareTo(o2.getFcsjActualTime());
-		}
-	}
-	
-	public static String decimalToBinary(int n) {
-		String str = "";
-		if(n == 0){
-			return str = "0";
-		}
-		while (n != 0) {
-			str = n % 2 + str;
-			n = n / 2;
-		}
-		return str;
-	}
-    
-}
+package com.bsth.server_rs.bigdata;
+
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+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 org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.entity.ChildTaskPlan;
+import com.bsth.entity.ScheduleRealInfo;
+import com.bsth.repository.ScheduleRealInfoRepository;
+import com.bsth.util.Arith;
+
+@Component
+@Path("/bigscreen")
+@Produces({MediaType.APPLICATION_JSON})
+public class BigscreenService {
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+    
+    @Autowired
+    ScheduleRealInfoRepository scheduleRealInfoRepository;
+    
+	DecimalFormat df = new DecimalFormat("0.###");
+	
+	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	
+	SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+
+    /*
+     * 线路接口开始
+     */
+    private static String getNature(String natureCode){
+    	String natureName="";
+    	if("lj".equals(natureCode)){
+    		natureName="路救";
+    	}else if("bc".equals(natureCode)){
+    		natureName="备车";
+    	}else if("dbc".equals(natureCode)){
+    		natureName="定班车";
+    	}else if("yxl".equals(natureCode)){
+    		natureName="夜宵路";
+    	}else if("cgxl".equals(natureCode)){
+    		natureName="常规线路";
+    	}else if("gjxl".equals(natureCode)){
+    		natureName="过江线路";
+    	}else if("csbs".equals(natureCode)){
+    		natureName="穿梭巴士";
+    	}else if("tyxl".equals(natureCode)){
+    		natureName="特约线路";
+    	}else if("cctxl".equals(natureCode)){
+    		natureName="村村通线路";
+    	}else if("qt".equals(natureCode)){
+    		natureName="其他";
+    	}else {
+    		natureName="";
+    	}
+    	return natureName;
+    }
+    
+    private static String getGs(String gs){
+    	String name="";
+    	if("05".equals(gs)){
+    		name="杨高公司";
+    	}else if("22".equals(gs)){
+    		name="金高公司";
+    	}else if("26".equals(gs)){
+    		name="南汇公司";
+    	}else if("55".equals(gs)){
+    		name="上南公司";
+    	}else{
+    		name="";
+    	}
+    	return name;
+    }
+    
+    private static String getState(String carState){
+    	if(carState.equals("1")){
+    		return "在册未在用";
+    	}else if(carState.equals("2")){
+    		return "在册在用";
+    	}else if(carState.equals("3")){
+    		return "报废审核中";
+    	}else if(carState.equals("4")){
+    		return "报废待更新";
+    	}else if(carState.equals("5")){
+    		return "报废已更新";
+    	}else{
+    		return "";
+    	}
+    }
+    
+	public static boolean isInOut(ScheduleRealInfo s){
+		boolean fage=false;
+		if(s.getBcType().equals("in")){
+			fage=true;
+		}
+		if(s.getBcType().equals("out")){
+			fage=true;
+		}
+		if(s.getBcType().equals("ldks")){
+			fage=true;
+		}
+		return fage;
+	}
+    
+	public static boolean isInOut(String bcType){
+		boolean fage=false;
+		if(bcType.equals("in")){
+			fage=true;
+		}
+		if(bcType.equals("out")){
+			fage=true;
+		}
+		if(bcType.equals("ldks")){
+			fage=true;
+		}
+		return fage;
+	}
+    
+    public Map<String, Long> getEndtime(String date){
+    	Map<String, Long> map=new HashMap<String,Long>();
+    	String sql="select xl,endtime from bsth_c_calc_count "
+    			+ " where   date='"+date+"' ";
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+				new RowMapper<Map<String, Object>>(){
+			@Override
+			public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+				Map<String, Object> m=new HashMap<String, Object>();
+				m.put("line", rs.getString("xl"));
+				m.put("endtime", rs.getString("endtime"));
+				return m;
+			}
+		});
+    	for (int i = 0; i < list.size(); i++) {
+    		map.put(list.get(i).get("line").toString(), 
+    				Long.parseLong(list.get(i).get("endtime").toString()));
+		}
+    	return map;
+    }
+    
+    /**给大屏的线路数、班次、里程汇总接口
+     * 
+     */
+    @GET
+    @Path("/selectData/getBigScreen")
+    public JSONObject getBigScreen(){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	
+    	int day = 8;//天数
+    	
+    	Date dd = new Date();
+    	String date = sd.format(dd);	//yyyy-MM-dd 当天
+    	Date dd2 = new Date();
+    	dd2.setTime(dd.getTime() - ((long)(day-1))*1000*60*60*24);
+    	String date2 = sd.format(dd2);	//yyyy-MM-dd 7天前（加上当天就是取8天数据）
+    	
+    	String[] dates = new String[day];
+    	Map<String, Integer> datesMap = new HashMap<String, Integer>();
+    	
+    	for(int i = 0; i < day; i++){
+    		Date tempDate = new Date();
+    		tempDate.setTime(dd2.getTime() + ((long)i)*1000*60*60*24);
+    		String format = sd.format(tempDate);
+    		dates[i] = format;
+    		datesMap.put(format, i);
+    	}
+    	
+    	String gpLineSql = "select * from bsth_c_line_plate";
+    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineName", rs.getString("line_name"));
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	
+    	Set<String> gpSet = new HashSet<String>();
+    	for(Map<String, Object> t : gpLineList){
+    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
+    			gpSet.add(t.get("lineCode").toString().trim());
+    		}
+    	}
+    	
+    	String lineSql="SELECT b.start_opt,a.company,a.line_code,a.name,a.level,"
+    			+ " a.shanghai_linecode, a.nature from "
+    			+ " bsth_c_line a left join bsth_c_line_config b "
+    			+ " on a.id=b.line where "
+    			+ " a.shanghai_linecode is not null and a.shanghai_linecode !='' and a.destroy=0 "
+    			+ " and a.remove=0 and a.nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> lineList=jdbcTemplate.query(lineSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("state", rs.getString("start_opt"));
+						m.put("company", rs.getString("company"));
+						m.put("companyName", getGs(rs.getString("company")));
+						m.put("lineCode",rs.getString("line_code"));
+						m.put("name", rs.getString("name"));
+						m.put("level", rs.getString("level"));
+						m.put("shanghaiLinecode", rs.getString("shanghai_linecode"));
+						m.put("nature", getNature(rs.getString("nature")));
+						return m;
+					}
+				});
+    	
+    	int level1 = 0, level2 = 0;
+    	for(Map<String, Object> t : lineList){
+    		if(t.get("level") != null){
+    			if("1".equals(t.get("level").toString())){
+    				++level1;
+    			} else if("2".equals(t.get("level").toString())){
+    				++level2;
+    			}
+    		}
+    	}
+    	
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	
+    	List<String> objList = new ArrayList<String>();
+    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
+    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
+    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
+    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
+    			+ " from bsth_c_calc_count where gsdm != '77'"
+    			+ " and date >= ? and date <= ?";
+    	objList.add(date2);
+    	objList.add(date);
+    	
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    			objList.toArray(),
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode",rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						m.put("date",  rs.getString("date"));
+						
+						m.put("jhbc", rs.getString("jhbc"));
+						m.put("sjbc", rs.getString("sjbc"));
+						m.put("bczxl", rs.getString("bczxl"));
+						m.put("jhbcz", rs.getString("jhbcz"));
+						
+						m.put("jhcc", rs.getString("jhcc"));
+						m.put("sjcc", rs.getString("sjcc"));
+						m.put("ccl", rs.getString("ccl"));
+						m.put("jhccz", rs.getString("jhccz"));
+						
+						m.put("jhyylc", rs.getString("jhyylc"));
+						m.put("sjyylc", rs.getString("sjyylc"));
+						m.put("jhyylcz", rs.getString("jhyylcz"));
+						m.put("jhkslc", rs.getString("jhkslc"));
+						m.put("sjkslc", rs.getString("sjkslc"));
+						m.put("jhkslcz", rs.getString("jhkslcz"));
+
+						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
+						m.put("sjgfbcs", rs.getString("sjgfbcs"));
+						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
+						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
+						m.put("sjdgbcs", rs.getString("sjdgbcs"));
+						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
+
+						m.put("jhsmbcs", rs.getString("jhsmbcs"));
+						m.put("sjsmbczds", rs.getString("sjsmbczds"));
+						m.put("smbczdl", rs.getString("smbczdl"));
+						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
+						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
+						m.put("smbczdlz", rs.getString("smbczdlz"));
+						
+						m.put("jhszfcs", rs.getString("jhszfcs"));
+						m.put("sjszfczds", rs.getString("sjszfczds"));
+						m.put("szfczdl", rs.getString("szfczdl"));
+						
+						Date date = new Date();
+						date.setTime(rs.getTimestamp("create_date").getTime());
+						m.put("createDate", sdf.format(date));
+						return m;
+					}
+				});
+    	
+    	List<Map<String, Object>> bcDetail = new ArrayList<Map<String,Object>>();
+    	List<Map<String, Object>> smDetail = new ArrayList<Map<String,Object>>();
+    	List<Map<String, Object>> qqDetail = new ArrayList<Map<String,Object>>();
+    	List<Map<String, Object>> gpDetail = new ArrayList<Map<String,Object>>();
+    	
+    	List<Map<String, Object>> ccList = createMap("计划出车率", dates);
+    	List<Map<String, Object>> bcList = createMap("计划班次执行率", dates);
+    	List<Map<String, Object>> smList = createMap("首末班发车准点率", dates);
+    	List<Map<String, Object>> qqList = createMap("起讫站发车准点率", dates);
+    	List<Map<String, Object>> gpList = createMap("挂牌线路发车准点率", dates);
+    	List<Map<String, Object>> qkList = createMap("签卡率", dates);
+    	
+    	long sjbcs_z = 0l;//实时总班次
+    	BigDecimal yygl_z = new BigDecimal(0);//实时总营运里程
+    	long jhcc = 0, sjcc = 0, jhbc = 0, sjbc = 0, jhsmbc = 0, sjsmbc = 0,
+    			jhqqbc = 0, sjqqzd = 0, jhgpqqbc = 0, sjgpqqzd = 0, bcs_qk = 0, qks = 0;
+    	
+    	for(Map<String, Object> t : list){
+    		if(yyLine.contains(t.get("lineCode").toString())){
+    			String d = t.get("date").toString();
+	    		if(date.equals(d)){
+	    			sjbcs_z += Long.valueOf(t.get("sjbc").toString());
+		    		yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
+		    		
+		    		jhcc += Long.valueOf(t.get("jhccz").toString());
+		    		sjcc += Long.valueOf(t.get("sjcc").toString());
+		    		jhbc += Long.valueOf(t.get("jhbc").toString());
+		    		sjbc += Long.valueOf(t.get("sjbc").toString());
+		    		jhsmbc += Long.valueOf(t.get("jhsmbcs").toString());
+		    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
+		    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
+		    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
+		    		if(gpSet.contains(t.get("lineCode").toString())){
+		    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
+		    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
+		    		}
+		    		
+		    		Map<String, Object> bc = new HashMap<String, Object>();
+		    		bc.put("type", "班次执行详情");
+		    		bc.put("lineName", t.get("lineName").toString());
+		    		bc.put("jh", t.get("jhbc").toString());
+		    		bc.put("sj", t.get("sjbc").toString());
+		    		bcDetail.add(bc);
+		    		
+		    		Map<String, Object> sm = new HashMap<String, Object>();
+		    		sm.put("type", "首站发车详情");
+		    		sm.put("lineName", t.get("lineName").toString());
+		    		sm.put("jh", t.get("jhsmbcs").toString());
+		    		sm.put("sj", t.get("sjsmbczds").toString());
+		    		smDetail.add(sm);
+		    		
+		    		Map<String, Object> qq = new HashMap<String, Object>();
+		    		qq.put("type", "起讫站发车准点详情");
+		    		qq.put("lineName", t.get("lineName").toString());
+		    		qq.put("jh", t.get("jhszfcs").toString());
+		    		qq.put("sj", t.get("sjszfczds").toString());
+		    		qqDetail.add(qq);
+		    		
+		    		if(gpSet.contains(t.get("lineCode").toString())){
+		    			Map<String, Object> gp = new HashMap<String, Object>();
+			    		gp.put("type", "挂牌线路发车准点详情");
+			    		gp.put("lineName", t.get("lineName").toString());
+			    		gp.put("jh", t.get("jhszfcs").toString());
+			    		gp.put("sj", t.get("sjszfczds").toString());
+			    		gpDetail.add(gp);
+		    		}
+	    		}
+	    		
+	    		Map<String, Object> ccMap = ccList.get(datesMap.get(d));
+	    		Map<String, Object> bcMap = bcList.get(datesMap.get(d));
+	    		Map<String, Object> smMap = smList.get(datesMap.get(d));
+	    		Map<String, Object> qqMap = qqList.get(datesMap.get(d));
+	    		Map<String, Object> gpMap = gpList.get(datesMap.get(d));
+	    		
+	    		ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString()));
+	    		ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString()));
+	    		bcMap.put("jh", Long.valueOf(bcMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
+	    		bcMap.put("sj", Long.valueOf(bcMap.get("sj").toString()) + Long.valueOf(t.get("sjbc").toString()));
+	    		smMap.put("jh", Long.valueOf(smMap.get("jh").toString()) + Long.valueOf(t.get("jhsmbcs").toString()));
+	    		smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString()));
+	    		qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
+	    		qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
+	    		if(gpSet.contains(t.get("lineCode").toString())){
+	    			gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
+	    			gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
+	    		}
+	    		
+    		}
+    	}
+    	
+    	
+    	//计算签卡率
+    	for(String d : dates){
+    		if(d!=null && d.trim().length() > 0){
+    			List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(d);
+	    		Map<String, Object> qkMap = qkList.get(datesMap.get(d));
+	    		long jh = 0, sj = 0;
+	    		for(ScheduleRealInfo s : findAll){
+	    			if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+		    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
+		    				++jh;
+		    				//String sty = decimalToBinary(s.getRfidState());
+		    				String sty = decimalToBinary(0);
+		    				Integer state = Integer.parseInt(sty);
+		    				if ((state & 4) == 4) {
+		    					++sj;
+		    				}
+		    			}
+	    			}
+	    		}
+	    		qkMap.put("jh", jh);
+	    		qkMap.put("sj", sj);
+	    		
+	    		if(date.equals(d)){
+	    			bcs_qk = jh;
+	    			qks = sj;
+	    		}
+    		}
+    	}
+    	
+    	
+    	List<Map<String, Object>> zxlList = new ArrayList<Map<String, Object>>();
+    	zxlList.addAll(ccList);
+    	zxlList.addAll(bcList);
+    	zxlList.addAll(smList);
+    	zxlList.addAll(qqList);
+    	zxlList.addAll(gpList);
+    	zxlList.addAll(qkList);
+    	
+    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
+    	detailsList.addAll(bcDetail);
+    	detailsList.addAll(smDetail);
+    	detailsList.addAll(qqDetail);
+    	detailsList.addAll(gpDetail);
+    	
+    	for(Map<String, Object> t : zxlList){
+    		if(t.get("jh") != null && Long.valueOf(t.get("jh").toString()).longValue() > 0l){
+    			t.put("ratio", new BigDecimal(t.get("sj").toString()).divide(new BigDecimal(t.get("jh").toString()),
+    					4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue());
+    		} else {
+    			t.put("ratio", "0");
+    		}
+    	}
+    	
+    	List<Map<String, Object>> glList = new ArrayList<Map<String, Object>>();
+    	
+    	Date dd1 = new Date();
+    	dd1.setTime(dd.getTime() - 1l*1000*60*60*24);
+    	String date1 = sd.format(dd1);	//前一天
+    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date1);
+    	List<ScheduleRealInfo> listSche = new ArrayList<ScheduleRealInfo>();
+    	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
+    	for(ScheduleRealInfo s : findAll){
+    		if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+    			listSche.add(s);
+    			Set<ChildTaskPlan> cts = s.getcTasks();
+    			if (cts != null && cts.size() > 0) {
+                    list_s.add(s);
+                } else {
+                    if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
+                        list_s.add(s);
+                    }
+                }
+    		}
+    	}
+    	double jhyygl = culateJhgl(listSche);//计划营运公里
+    	double jhjccgl = culateJhJccgl(listSche);
+    	double jhzgl = Arith.add(jhyygl, jhjccgl);
+    	double sjgl = culateSjgl(list_s);//实际营运公里（不含临加）
+    	double sjljgl = culateLjgl(listSche);//实际临加公里
+    	double sjyygl = Arith.add(sjgl, sjljgl);//实际营运公里
+    	double sjjccgl = culateJccgl(list_s);
+    	double sjksgl = culateKsgl(list_s);
+    	double zksgl = Arith.add(sjjccgl, sjksgl);
+    	double sjzgl = Arith.add(sjyygl, zksgl);//实际总公里
+    	double lz = culateCJLC(listSche, "路阻");
+    	double dm = culateCJLC(listSche, "吊慢");
+    	double gz = culateCJLC(listSche, "故障");
+    	double jf = culateCJLC(listSche, "纠纷");
+    	double zs = culateCJLC(listSche, "肇事");
+    	double qr = culateCJLC(listSche, "缺人");
+    	double qc = culateCJLC(listSche, "缺车");
+    	double qrqc = Arith.add(qr, qc);//缺人缺车
+    	double kx = culateCJLC(listSche, "客稀");
+    	double qh = culateCJLC(listSche, "气候");
+    	double yw = culateCJLC(listSche, "援外");
+    	double lb_pc = culateCJLC(listSche, "配车");
+    	double lb_by = culateCJLC(listSche, "保养");
+    	double lb_cj = culateCJLC(listSche, "抽减");
+    	double lb_qt = culateCJLC(listSche, "其他");
+    	double qt = Arith.add(Arith.add(lb_pc, lb_by), Arith.add(lb_cj, lb_qt));//其他
+    	
+    	Map<String, Object> jhzglMap = new HashMap<String, Object>();
+    	jhzglMap.put("name", "计划总公里");
+    	jhzglMap.put("value", jhzgl);
+    	glList.add(jhzglMap);
+    	Map<String, Object> sjzglMap = new HashMap<String, Object>();
+    	sjzglMap.put("name", "实际总公里");
+    	sjzglMap.put("value", sjzgl);
+    	glList.add(sjzglMap);
+    	Map<String, Object> lzMap = new HashMap<String, Object>();
+    	lzMap.put("name", "路阻");
+    	lzMap.put("value", lz);
+    	glList.add(lzMap);
+    	Map<String, Object> dmMap = new HashMap<String, Object>();
+    	dmMap.put("name", "吊慢");
+    	dmMap.put("value", dm);
+    	glList.add(dmMap);
+    	Map<String, Object> gzMap = new HashMap<String, Object>();
+    	gzMap.put("name", "故障");
+    	gzMap.put("value", gz);
+    	glList.add(gzMap);
+    	Map<String, Object> jfMap = new HashMap<String, Object>();
+    	jfMap.put("name", "纠纷");
+    	jfMap.put("value", jf);
+    	glList.add(jfMap);
+    	Map<String, Object> zsMap = new HashMap<String, Object>();
+    	zsMap.put("name", "肇事");
+    	zsMap.put("value", zs);
+    	glList.add(zsMap);
+    	Map<String, Object> qrqcMap = new HashMap<String, Object>();
+    	qrqcMap.put("name", "缺人缺车");
+    	qrqcMap.put("value", qrqc);
+    	glList.add(qrqcMap);
+    	Map<String, Object> kxMap = new HashMap<String, Object>();
+    	kxMap.put("name", "客稀");
+    	kxMap.put("value", kx);
+    	glList.add(kxMap);
+    	Map<String, Object> qhMap = new HashMap<String, Object>();
+    	qhMap.put("name", "气候");
+    	qhMap.put("value", qh);
+    	glList.add(qhMap);
+    	Map<String, Object> ywMap = new HashMap<String, Object>();
+    	ywMap.put("name", "援外");
+    	ywMap.put("value", yw);
+    	glList.add(ywMap);
+    	Map<String, Object> qtMap = new HashMap<String, Object>();
+    	qtMap.put("name", "其他");
+    	qtMap.put("value", qt);
+    	glList.add(qtMap);
+    	
+    	
+    	resMap.put("lineCount", lineList.size());
+    	resMap.put("level1Count", level1);
+    	resMap.put("level2Count", level2);
+    	resMap.put("sjbcs", sjbcs_z);
+    	resMap.put("sjlcs", yygl_z.doubleValue());
+    	
+    	resMap.put("ccl", jhcc>0?new BigDecimal(sjcc).divide(new BigDecimal(jhcc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("bczxl", jhbc>0?new BigDecimal(sjbc).divide(new BigDecimal(jhbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("smbzdl", jhsmbc>0?new BigDecimal(sjsmbc).divide(new BigDecimal(jhsmbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("qqzzdl", jhqqbc>0?new BigDecimal(sjqqzd).divide(new BigDecimal(jhqqbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("gpzdl", jhgpqqbc>0?new BigDecimal(sjgpqqzd).divide(new BigDecimal(jhgpqqbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("qkl", bcs_qk>0?new BigDecimal(qks).divide(new BigDecimal(bcs_qk),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	
+    	resMap.put("ratioList", zxlList);
+    	
+    	resMap.put("detailsList", detailsList);
+    	
+    	resMap.put("mileageList", glList);
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    /**给大屏的线路数、班次、里程汇总接口
+     * 按直属公司查询
+     */
+    @GET
+    @Path("/selectData/getBigScreen/{gsdm}")
+    public JSONObject getBigScreen(@PathParam("gsdm") String gsdm){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	
+    	int day = 8;//天数
+    	
+    	Date dd = new Date();
+    	String date = sd.format(dd);	//yyyy-MM-dd 当天
+    	Date dd2 = new Date();
+    	dd2.setTime(dd.getTime() - ((long)(day-1))*1000*60*60*24);
+    	String date2 = sd.format(dd2);	//yyyy-MM-dd 7天前（加上当天就是取8天数据）
+    	
+    	String[] dates = new String[day];
+    	Map<String, Integer> datesMap = new HashMap<String, Integer>();
+    	
+    	for(int i = 0; i < day; i++){
+    		Date tempDate = new Date();
+    		tempDate.setTime(dd2.getTime() + ((long)i)*1000*60*60*24);
+    		String format = sd.format(tempDate);
+    		dates[i] = format;
+    		datesMap.put(format, i);
+    	}
+    	
+    	String gpLineSql = "select * from bsth_c_line_plate";
+    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineName", rs.getString("line_name"));
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	
+    	Set<String> gpSet = new HashSet<String>();
+    	for(Map<String, Object> t : gpLineList){
+    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
+    			gpSet.add(t.get("lineCode").toString().trim());
+    		}
+    	}
+    	
+    	String lineSql="SELECT b.start_opt,a.company,a.line_code,a.name,a.level,"
+    			+ " a.shanghai_linecode, a.nature from "
+    			+ " bsth_c_line a left join bsth_c_line_config b "
+    			+ " on a.id=b.line where "
+    			+ " a.shanghai_linecode is not null and a.shanghai_linecode !='' and a.destroy=0 "
+    			+ " and a.remove=0 and a.nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> lineList=jdbcTemplate.query(lineSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("state", rs.getString("start_opt"));
+						m.put("company", rs.getString("company"));
+						m.put("companyName", getGs(rs.getString("company")));
+						m.put("lineCode",rs.getString("line_code"));
+						m.put("name", rs.getString("name"));
+						m.put("level", rs.getString("level"));
+						m.put("shanghaiLinecode", rs.getString("shanghai_linecode"));
+						m.put("nature", getNature(rs.getString("nature")));
+						return m;
+					}
+				});
+    	
+    	int level1 = 0, level2 = 0, lineCount = 0;
+    	for(Map<String, Object> t : lineList){
+    		if(t.containsKey("company") && t.get("company").toString().trim().equals(gsdm)){
+    			++lineCount;
+	    		if(t.get("level") != null){
+	    			if("1".equals(t.get("level").toString())){
+	    				++level1;
+	    			} else if("2".equals(t.get("level").toString())){
+	    				++level2;
+	    			}
+	    		}
+    		}
+    	}
+    	
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	
+    	List<String> objList = new ArrayList<String>();
+    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
+    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
+    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
+    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
+    			+ " from bsth_c_calc_count "
+    			+ " where date >= ? and date <= ? and gsdm = ?";
+    	objList.add(date2);
+    	objList.add(date);
+    	objList.add(gsdm);
+    	
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    			objList.toArray(),
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode",rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						m.put("date",  rs.getString("date"));
+						
+						m.put("jhbc", rs.getString("jhbc"));
+						m.put("sjbc", rs.getString("sjbc"));
+						m.put("bczxl", rs.getString("bczxl"));
+						m.put("jhbcz", rs.getString("jhbcz"));
+						
+						m.put("jhcc", rs.getString("jhcc"));
+						m.put("sjcc", rs.getString("sjcc"));
+						m.put("ccl", rs.getString("ccl"));
+						m.put("jhccz", rs.getString("jhccz"));
+						
+						m.put("jhyylc", rs.getString("jhyylc"));
+						m.put("sjyylc", rs.getString("sjyylc"));
+						m.put("jhyylcz", rs.getString("jhyylcz"));
+						m.put("jhkslc", rs.getString("jhkslc"));
+						m.put("sjkslc", rs.getString("sjkslc"));
+						m.put("jhkslcz", rs.getString("jhkslcz"));
+
+						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
+						m.put("sjgfbcs", rs.getString("sjgfbcs"));
+						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
+						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
+						m.put("sjdgbcs", rs.getString("sjdgbcs"));
+						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
+
+						m.put("jhsmbcs", rs.getString("jhsmbcs"));
+						m.put("sjsmbczds", rs.getString("sjsmbczds"));
+						m.put("smbczdl", rs.getString("smbczdl"));
+						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
+						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
+						m.put("smbczdlz", rs.getString("smbczdlz"));
+						
+						m.put("jhszfcs", rs.getString("jhszfcs"));
+						m.put("sjszfczds", rs.getString("sjszfczds"));
+						m.put("szfczdl", rs.getString("szfczdl"));
+						
+						Date date = new Date();
+						date.setTime(rs.getTimestamp("create_date").getTime());
+						m.put("createDate", sdf.format(date));
+						return m;
+					}
+				});
+    	
+    	List<Map<String, Object>> bcDetail = new ArrayList<Map<String,Object>>();
+    	List<Map<String, Object>> smDetail = new ArrayList<Map<String,Object>>();
+    	List<Map<String, Object>> qqDetail = new ArrayList<Map<String,Object>>();
+    	List<Map<String, Object>> gpDetail = new ArrayList<Map<String,Object>>();
+    	
+    	List<Map<String, Object>> ccList = createMap("计划出车率", dates);
+    	List<Map<String, Object>> bcList = createMap("计划班次执行率", dates);
+    	List<Map<String, Object>> smList = createMap("首末班发车准点率", dates);
+    	List<Map<String, Object>> qqList = createMap("起讫站发车准点率", dates);
+    	List<Map<String, Object>> gpList = createMap("挂牌线路发车准点率", dates);
+    	List<Map<String, Object>> qkList = createMap("签卡率", dates);
+    	
+    	long sjbcs_z = 0l;//实时总班次
+    	BigDecimal yygl_z = new BigDecimal(0);//实时总营运里程
+    	long jhcc = 0, sjcc = 0, jhbc = 0, sjbc = 0, jhsmbc = 0, sjsmbc = 0,
+    			jhqqbc = 0, sjqqzd = 0, jhgpqqbc = 0, sjgpqqzd = 0, bcs_qk = 0, qks = 0;
+    	
+    	for(Map<String, Object> t : list){
+    		if(yyLine.contains(t.get("lineCode").toString())){
+    			String d = t.get("date").toString();
+	    		if(date.equals(d)){
+	    			sjbcs_z += Long.valueOf(t.get("sjbc").toString());
+		    		yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
+		    		
+		    		jhcc += Long.valueOf(t.get("jhccz").toString());
+		    		sjcc += Long.valueOf(t.get("sjcc").toString());
+		    		jhbc += Long.valueOf(t.get("jhbc").toString());
+		    		sjbc += Long.valueOf(t.get("sjbc").toString());
+		    		jhsmbc += Long.valueOf(t.get("jhsmbcs").toString());
+		    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
+		    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
+		    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
+		    		if(gpSet.contains(t.get("lineCode").toString())){
+		    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
+		    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
+		    		}
+		    		
+		    		Map<String, Object> bc = new HashMap<String, Object>();
+		    		bc.put("type", "班次执行详情");
+		    		bc.put("lineName", t.get("lineName").toString());
+		    		bc.put("jh", t.get("jhbc").toString());
+		    		bc.put("sj", t.get("sjbc").toString());
+		    		bcDetail.add(bc);
+		    		
+		    		Map<String, Object> sm = new HashMap<String, Object>();
+		    		sm.put("type", "首站发车详情");
+		    		sm.put("lineName", t.get("lineName").toString());
+		    		sm.put("jh", t.get("jhsmbcs").toString());
+		    		sm.put("sj", t.get("sjsmbczds").toString());
+		    		smDetail.add(sm);
+		    		
+		    		Map<String, Object> qq = new HashMap<String, Object>();
+		    		qq.put("type", "起讫站发车准点详情");
+		    		qq.put("lineName", t.get("lineName").toString());
+		    		qq.put("jh", t.get("jhszfcs").toString());
+		    		qq.put("sj", t.get("sjszfczds").toString());
+		    		qqDetail.add(qq);
+		    		
+		    		if(gpSet.contains(t.get("lineCode").toString())){
+		    			Map<String, Object> gp = new HashMap<String, Object>();
+			    		gp.put("type", "挂牌线路发车准点详情");
+			    		gp.put("lineName", t.get("lineName").toString());
+			    		gp.put("jh", t.get("jhszfcs").toString());
+			    		gp.put("sj", t.get("sjszfczds").toString());
+			    		gpDetail.add(gp);
+		    		}
+	    		}
+	    		
+	    		Map<String, Object> ccMap = ccList.get(datesMap.get(d));
+	    		Map<String, Object> bcMap = bcList.get(datesMap.get(d));
+	    		Map<String, Object> smMap = smList.get(datesMap.get(d));
+	    		Map<String, Object> qqMap = qqList.get(datesMap.get(d));
+	    		Map<String, Object> gpMap = gpList.get(datesMap.get(d));
+	    		
+	    		ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString()));
+	    		ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString()));
+	    		bcMap.put("jh", Long.valueOf(bcMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
+	    		bcMap.put("sj", Long.valueOf(bcMap.get("sj").toString()) + Long.valueOf(t.get("sjbc").toString()));
+	    		smMap.put("jh", Long.valueOf(smMap.get("jh").toString()) + Long.valueOf(t.get("jhsmbcs").toString()));
+	    		smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString()));
+	    		qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
+	    		qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
+	    		if(gpSet.contains(t.get("lineCode").toString())){
+	    			gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
+	    			gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
+	    		}
+	    		
+    		}
+    	}
+    	
+    	
+    	//计算签卡率
+    	for(String d : dates){
+    		if(d!=null && d.trim().length() > 0){
+    			List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(d);
+	    		Map<String, Object> qkMap = qkList.get(datesMap.get(d));
+	    		long jh = 0, sj = 0;
+	    		for(ScheduleRealInfo s : findAll){
+	    			if(s.getGsBm() != null && s.getGsBm().trim().equals(gsdm)){
+		    			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+			    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
+			    				++jh;
+			    				//String sty = decimalToBinary(s.getRfidState());
+			    				String sty = decimalToBinary(0);
+			    				Integer state = Integer.parseInt(sty);
+			    				if ((state & 4) == 4) {
+			    					++sj;
+			    				}
+			    			}
+		    			}
+	    			}
+	    		}
+	    		qkMap.put("jh", jh);
+	    		qkMap.put("sj", sj);
+	    		
+	    		if(date.equals(d)){
+	    			bcs_qk = jh;
+	    			qks = sj;
+	    		}
+    		}
+    	}
+    	
+    	
+    	List<Map<String, Object>> zxlList = new ArrayList<Map<String, Object>>();
+    	zxlList.addAll(ccList);
+    	zxlList.addAll(bcList);
+    	zxlList.addAll(smList);
+    	zxlList.addAll(qqList);
+    	zxlList.addAll(gpList);
+    	zxlList.addAll(qkList);
+    	
+    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
+    	detailsList.addAll(bcDetail);
+    	detailsList.addAll(smDetail);
+    	detailsList.addAll(qqDetail);
+    	detailsList.addAll(gpDetail);
+    	
+    	for(Map<String, Object> t : zxlList){
+    		if(t.get("jh") != null && Long.valueOf(t.get("jh").toString()).longValue() > 0l){
+    			t.put("ratio", new BigDecimal(t.get("sj").toString()).divide(new BigDecimal(t.get("jh").toString()),
+    					4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue());
+    		} else {
+    			t.put("ratio", "0");
+    		}
+    	}
+    	
+    	List<Map<String, Object>> glList = new ArrayList<Map<String, Object>>();
+    	
+    	Date dd1 = new Date();
+    	dd1.setTime(dd.getTime() - 1l*1000*60*60*24);
+    	String date1 = sd.format(dd1);	//前一天
+    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date1);
+    	List<ScheduleRealInfo> listSche = new ArrayList<ScheduleRealInfo>();
+    	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
+    	for(ScheduleRealInfo s : findAll){
+    		if(s.getGsBm() != null && s.getGsBm().trim().equals(gsdm)){
+	    		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+	    			listSche.add(s);
+	    			Set<ChildTaskPlan> cts = s.getcTasks();
+	    			if (cts != null && cts.size() > 0) {
+	                    list_s.add(s);
+	                } else {
+	                    if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
+	                        list_s.add(s);
+	                    }
+	                }
+	    		}
+    		}
+    	}
+    	double jhyygl = culateJhgl(listSche);//计划营运公里
+    	double jhjccgl = culateJhJccgl(listSche);
+    	double jhzgl = Arith.add(jhyygl, jhjccgl);
+    	double sjgl = culateSjgl(list_s);//实际营运公里（不含临加）
+    	double sjljgl = culateLjgl(listSche);//实际临加公里
+    	double sjyygl = Arith.add(sjgl, sjljgl);//实际营运公里
+    	double sjjccgl = culateJccgl(list_s);
+    	double sjksgl = culateKsgl(list_s);
+    	double zksgl = Arith.add(sjjccgl, sjksgl);
+    	double sjzgl = Arith.add(sjyygl, zksgl);//实际总公里
+    	double lz = culateCJLC(listSche, "路阻");
+    	double dm = culateCJLC(listSche, "吊慢");
+    	double gz = culateCJLC(listSche, "故障");
+    	double jf = culateCJLC(listSche, "纠纷");
+    	double zs = culateCJLC(listSche, "肇事");
+    	double qr = culateCJLC(listSche, "缺人");
+    	double qc = culateCJLC(listSche, "缺车");
+    	double qrqc = Arith.add(qr, qc);//缺人缺车
+    	double kx = culateCJLC(listSche, "客稀");
+    	double qh = culateCJLC(listSche, "气候");
+    	double yw = culateCJLC(listSche, "援外");
+    	double lb_pc = culateCJLC(listSche, "配车");
+    	double lb_by = culateCJLC(listSche, "保养");
+    	double lb_cj = culateCJLC(listSche, "抽减");
+    	double lb_qt = culateCJLC(listSche, "其他");
+    	double qt = Arith.add(Arith.add(lb_pc, lb_by), Arith.add(lb_cj, lb_qt));//其他
+    	
+    	Map<String, Object> jhzglMap = new HashMap<String, Object>();
+    	jhzglMap.put("name", "计划总公里");
+    	jhzglMap.put("value", jhzgl);
+    	glList.add(jhzglMap);
+    	Map<String, Object> sjzglMap = new HashMap<String, Object>();
+    	sjzglMap.put("name", "实际总公里");
+    	sjzglMap.put("value", sjzgl);
+    	glList.add(sjzglMap);
+    	Map<String, Object> lzMap = new HashMap<String, Object>();
+    	lzMap.put("name", "路阻");
+    	lzMap.put("value", lz);
+    	glList.add(lzMap);
+    	Map<String, Object> dmMap = new HashMap<String, Object>();
+    	dmMap.put("name", "吊慢");
+    	dmMap.put("value", dm);
+    	glList.add(dmMap);
+    	Map<String, Object> gzMap = new HashMap<String, Object>();
+    	gzMap.put("name", "故障");
+    	gzMap.put("value", gz);
+    	glList.add(gzMap);
+    	Map<String, Object> jfMap = new HashMap<String, Object>();
+    	jfMap.put("name", "纠纷");
+    	jfMap.put("value", jf);
+    	glList.add(jfMap);
+    	Map<String, Object> zsMap = new HashMap<String, Object>();
+    	zsMap.put("name", "肇事");
+    	zsMap.put("value", zs);
+    	glList.add(zsMap);
+    	Map<String, Object> qrqcMap = new HashMap<String, Object>();
+    	qrqcMap.put("name", "缺人缺车");
+    	qrqcMap.put("value", qrqc);
+    	glList.add(qrqcMap);
+    	Map<String, Object> kxMap = new HashMap<String, Object>();
+    	kxMap.put("name", "客稀");
+    	kxMap.put("value", kx);
+    	glList.add(kxMap);
+    	Map<String, Object> qhMap = new HashMap<String, Object>();
+    	qhMap.put("name", "气候");
+    	qhMap.put("value", qh);
+    	glList.add(qhMap);
+    	Map<String, Object> ywMap = new HashMap<String, Object>();
+    	ywMap.put("name", "援外");
+    	ywMap.put("value", yw);
+    	glList.add(ywMap);
+    	Map<String, Object> qtMap = new HashMap<String, Object>();
+    	qtMap.put("name", "其他");
+    	qtMap.put("value", qt);
+    	glList.add(qtMap);
+    	
+    	
+    	resMap.put("lineCount", lineCount);
+    	resMap.put("level1Count", level1);
+    	resMap.put("level2Count", level2);
+    	resMap.put("sjbcs", sjbcs_z);
+    	resMap.put("sjlcs", yygl_z.doubleValue());
+    	
+    	resMap.put("ccl", jhcc>0?new BigDecimal(sjcc).divide(new BigDecimal(jhcc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("bczxl", jhbc>0?new BigDecimal(sjbc).divide(new BigDecimal(jhbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("smbzdl", jhsmbc>0?new BigDecimal(sjsmbc).divide(new BigDecimal(jhsmbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("qqzzdl", jhqqbc>0?new BigDecimal(sjqqzd).divide(new BigDecimal(jhqqbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("gpzdl", jhgpqqbc>0?new BigDecimal(sjgpqqzd).divide(new BigDecimal(jhgpqqbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("qkl", bcs_qk>0?new BigDecimal(qks).divide(new BigDecimal(bcs_qk),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	
+    	resMap.put("ratioList", zxlList);
+    	
+    	resMap.put("detailsList", detailsList);
+    	
+    	resMap.put("mileageList", glList);
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    /**给大屏按日期查线路指标
+     * 
+     */
+    @GET
+    @Path("/selectData/getScheduleStatistics/{date}")
+    public JSONObject getScheduleStatistics(@PathParam("date") String date){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	
+    	String gpLineSql = "select * from bsth_c_line_plate";
+    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineName", rs.getString("line_name"));
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	
+    	Set<String> gpSet = new HashSet<String>();
+    	for(Map<String, Object> t : gpLineList){
+    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
+    			gpSet.add(t.get("lineCode").toString().trim());
+    		}
+    	}
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	
+    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
+    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
+    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
+    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
+    			+ " from bsth_c_calc_count "
+    			+ " where date = ? and gsdm != '77'";
+    	
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{date},
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode",rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						m.put("date",  rs.getString("date"));
+						
+						m.put("jhbc", rs.getString("jhbc"));
+						m.put("sjbc", rs.getString("sjbc"));
+						m.put("bczxl", rs.getString("bczxl"));
+						m.put("jhbcz", rs.getString("jhbcz"));
+						
+						m.put("jhcc", rs.getString("jhcc"));
+						m.put("sjcc", rs.getString("sjcc"));
+						m.put("ccl", rs.getString("ccl"));
+						m.put("jhccz", rs.getString("jhccz"));
+						
+						m.put("jhyylc", rs.getString("jhyylc"));
+						m.put("sjyylc", rs.getString("sjyylc"));
+						m.put("jhyylcz", rs.getString("jhyylcz"));
+						m.put("jhkslc", rs.getString("jhkslc"));
+						m.put("sjkslc", rs.getString("sjkslc"));
+						m.put("jhkslcz", rs.getString("jhkslcz"));
+
+						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
+						m.put("sjgfbcs", rs.getString("sjgfbcs"));
+						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
+						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
+						m.put("sjdgbcs", rs.getString("sjdgbcs"));
+						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
+
+						m.put("jhsmbcs", rs.getString("jhsmbcs"));
+						m.put("sjsmbczds", rs.getString("sjsmbczds"));
+						m.put("smbczdl", rs.getString("smbczdl"));
+						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
+						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
+						m.put("smbczdlz", rs.getString("smbczdlz"));
+						
+						m.put("jhszfcs", rs.getString("jhszfcs"));
+						m.put("sjszfczds", rs.getString("sjszfczds"));
+						m.put("szfczdl", rs.getString("szfczdl"));
+						
+						Date date = new Date();
+						date.setTime(rs.getTimestamp("create_date").getTime());
+						m.put("createDate", sdf.format(date));
+						return m;
+					}
+				});
+
+    	List<Map<String, Object>> ccDetail = new ArrayList<Map<String,Object>>();
+    	List<Map<String, Object>> bcDetail = new ArrayList<Map<String,Object>>();
+    	List<Map<String, Object>> smDetail = new ArrayList<Map<String,Object>>();
+    	List<Map<String, Object>> qqDetail = new ArrayList<Map<String,Object>>();
+    	List<Map<String, Object>> gpDetail = new ArrayList<Map<String,Object>>();
+    	List<Map<String, Object>> qkDetail = new ArrayList<Map<String,Object>>();
+    	
+    	long sjbcs_z = 0l;//实时总班次
+    	BigDecimal yygl_z = new BigDecimal(0);//实时总营运里程
+    	long jhcc = 0, sjcc = 0, jhbc = 0, sjbc = 0, jhsmbc = 0, sjsmbc = 0,
+    			jhqqbc = 0, sjqqzd = 0, jhgpqqbc = 0, sjgpqqzd = 0, bcs_qk = 0, qks = 0;
+    	
+    	for(Map<String, Object> t : list){
+    		if(yyLine.contains(t.get("lineCode").toString())){
+    			sjbcs_z += Long.valueOf(t.get("sjbc").toString());
+	    		yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
+	    		
+	    		jhcc += Long.valueOf(t.get("jhccz").toString());
+	    		sjcc += Long.valueOf(t.get("sjcc").toString());
+	    		jhbc += Long.valueOf(t.get("jhbc").toString());
+	    		sjbc += Long.valueOf(t.get("sjbc").toString());
+	    		jhsmbc += Long.valueOf(t.get("jhsmbcs").toString());
+	    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
+	    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
+	    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
+	    		if(gpSet.contains(t.get("lineCode").toString())){
+	    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
+	    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
+	    		}
+	    		
+	    		Map<String, Object> cc = new HashMap<String, Object>();
+	    		cc.put("type", "线路出车详情");
+	    		cc.put("lineName", t.get("lineName").toString());
+	    		cc.put("jh", t.get("jhcc").toString());
+	    		cc.put("sj", t.get("sjcc").toString());
+	    		ccDetail.add(cc);
+	    		
+	    		Map<String, Object> bc = new HashMap<String, Object>();
+	    		bc.put("type", "班次执行详情");
+	    		bc.put("lineName", t.get("lineName").toString());
+	    		bc.put("jh", t.get("jhbc").toString());
+	    		bc.put("sj", t.get("sjbc").toString());
+	    		bcDetail.add(bc);
+	    		
+	    		Map<String, Object> sm = new HashMap<String, Object>();
+	    		sm.put("type", "首站发车详情");
+	    		sm.put("lineName", t.get("lineName").toString());
+	    		sm.put("jh", t.get("jhsmbcs").toString());
+	    		sm.put("sj", t.get("sjsmbczds").toString());
+	    		smDetail.add(sm);
+	    		
+	    		Map<String, Object> qq = new HashMap<String, Object>();
+	    		qq.put("type", "起讫站发车准点详情");
+	    		qq.put("lineName", t.get("lineName").toString());
+	    		qq.put("jh", t.get("jhszfcs").toString());
+	    		qq.put("sj", t.get("sjszfczds").toString());
+	    		qqDetail.add(qq);
+	    		
+	    		if(gpSet.contains(t.get("lineCode").toString())){
+	    			Map<String, Object> gp = new HashMap<String, Object>();
+					gp.put("type", "挂牌线路发车准点详情");
+					gp.put("lineName", t.get("lineName").toString());
+					gp.put("jh", t.get("jhszfcs").toString());
+					gp.put("sj", t.get("sjszfczds").toString());
+					gpDetail.add(gp);
+				}
+			}
+		}
+    	
+    	Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
+    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
+		for(ScheduleRealInfo s : findAll){
+			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
+    				String xlName = s.getXlName();
+    				if(!(keyMap.containsKey(xlName))){
+    					Map<String, Object> qk = new HashMap<String, Object>();
+    					qk.put("type", "线路签卡详情");
+    					qk.put("lineName", xlName);
+    		    		qk.put("jh", 0);
+    		    		qk.put("sj", 0);
+    		    		keyMap.put(xlName, qk);
+    		    		qkDetail.add(qk);
+    				}
+    				Map<String, Object> qk = keyMap.get(xlName);
+    				qk.put("jh", Long.valueOf(qk.get("jh").toString()) + 1);
+    				++bcs_qk;
+    				//String sty = decimalToBinary(s.getRfidState());
+    				String sty = decimalToBinary(0);
+    				Integer state = Integer.parseInt(sty);
+    				if ((state & 4) == 4) {
+        				qk.put("sj", Long.valueOf(qk.get("sj").toString()) + 1);
+    					++qks;
+    				}
+    			}
+			}
+		}
+		
+		List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
+		detailsList.addAll(ccDetail);
+		detailsList.addAll(bcDetail);
+		detailsList.addAll(smDetail);
+		detailsList.addAll(qqDetail);
+		detailsList.addAll(gpDetail);
+		detailsList.addAll(qkDetail);
+		
+		resMap.put("ccl", jhcc>0?new BigDecimal(sjcc).divide(new BigDecimal(jhcc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+		resMap.put("bczxl", jhbc>0?new BigDecimal(sjbc).divide(new BigDecimal(jhbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+		resMap.put("smbzdl", jhsmbc>0?new BigDecimal(sjsmbc).divide(new BigDecimal(jhsmbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+		resMap.put("qqzzdl", jhqqbc>0?new BigDecimal(sjqqzd).divide(new BigDecimal(jhqqbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+		resMap.put("gpzdl", jhgpqqbc>0?new BigDecimal(sjgpqqzd).divide(new BigDecimal(jhgpqqbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+		resMap.put("qkl", bcs_qk>0?new BigDecimal(qks).divide(new BigDecimal(bcs_qk),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+		
+		resMap.put("detailsList", detailsList);
+		
+		return JSON.parseObject(JSON.toJSONString(resMap));
+	}
+    
+    /**给电科手机端查线路指标(出车率)
+     * 
+     */
+    @GET
+    @Path("/selectData/getDepartureBus/{company}/{branchCompany}")
+    public JSONObject getDepartureBus(@PathParam("company") String company,
+    		@PathParam("branchCompany") String branchCompany){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	String date = sd.format(new Date());
+    	String gs = "", fgs = "";
+    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
+    		gs = company.trim();
+    	}
+    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
+    		fgs = branchCompany.trim();
+    	}
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	List<String> objList = new ArrayList<String>();
+    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
+    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
+    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
+    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
+    			+ " from bsth_c_calc_count "
+    			+ " where date = ? and gsdm != '77'";
+    	objList.add(date);
+    	if(fgs.length() > 0){
+    		sql +=" and gsdm = ? and fgsdm = ?";
+    		objList.add(gs);
+    		objList.add(fgs);
+    	} else if(gs.length() > 0){
+    		sql +=" and gsdm = ?";
+    		objList.add(gs);
+    	}
+    	
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    			objList.toArray(),
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode",rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						m.put("date",  rs.getString("date"));
+						
+						m.put("jhcc", rs.getString("jhcc"));
+						m.put("sjcc", rs.getString("sjcc"));
+						m.put("jhccz", rs.getString("jhccz"));
+						
+						Date date = new Date();
+						date.setTime(rs.getTimestamp("create_date").getTime());
+						m.put("createDate", sdf.format(date));
+						return m;
+					}
+				});
+
+    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
+    	
+    	long jh = 0, sj = 0;
+    	
+    	for(Map<String, Object> t : list){
+    		if(yyLine.contains(t.get("lineCode").toString())){
+	    		
+    			Long plan = Long.valueOf(t.get("jhccz").toString());
+    			Long real = Long.valueOf(t.get("sjcc").toString());
+    			
+	    		jh += plan;
+	    		sj += real;
+	    		
+	    		Map<String, Object> detail = new HashMap<String, Object>();
+	    		detail.put("lineName", t.get("lineName").toString());
+	    		detail.put("plan", plan);
+	    		detail.put("real", real);
+	    		detail.put("ratio", plan>0?new BigDecimal(real*100l).divide(
+	    				new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+	    		detailsList.add(detail);
+    		}
+    	}
+    	
+    	resMap.put("plan", jh);
+    	resMap.put("real", sj);
+    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
+    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+    	
+    	resMap.put("detailsList", detailsList);
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    /**给电科手机端查线路指标(班次执行率)
+     * 
+     */
+    @GET
+    @Path("/selectData/getFinishScheduleBus/{company}/{branchCompany}")
+    public JSONObject getFinishScheduleBus(@PathParam("company") String company,
+    		@PathParam("branchCompany") String branchCompany){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	String date = sd.format(new Date());
+    	String gs = "", fgs = "";
+    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
+    		gs = company.trim();
+    	}
+    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
+    		fgs = branchCompany.trim();
+    	}
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	List<String> objList = new ArrayList<String>();
+    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
+    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
+    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
+    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
+    			+ " from bsth_c_calc_count "
+    			+ " where date = ? and gsdm != '77'";
+    	objList.add(date);
+    	if(fgs.length() > 0){
+    		sql +=" and gsdm = ? and fgsdm = ?";
+    		objList.add(gs);
+    		objList.add(fgs);
+    	} else if(gs.length() > 0){
+    		sql +=" and gsdm = ?";
+    		objList.add(gs);
+    	}
+    	
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    			objList.toArray(),
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode",rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						m.put("date",  rs.getString("date"));
+						
+						m.put("jhbc", rs.getString("jhbc"));
+						m.put("sjbc", rs.getString("sjbc"));
+						
+						Date date = new Date();
+						date.setTime(rs.getTimestamp("create_date").getTime());
+						m.put("createDate", sdf.format(date));
+						return m;
+					}
+				});
+
+    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
+    	
+    	long jh = 0, sj = 0;
+    	
+    	for(Map<String, Object> t : list){
+    		if(yyLine.contains(t.get("lineCode").toString())){
+	    		
+    			Long plan = Long.valueOf(t.get("jhbc").toString());
+    			Long real = Long.valueOf(t.get("sjbc").toString());
+    			
+	    		jh += plan;
+	    		sj += real;
+	    		
+	    		Map<String, Object> detail = new HashMap<String, Object>();
+	    		detail.put("lineName", t.get("lineName").toString());
+	    		detail.put("plan", plan);
+	    		detail.put("real", real);
+	    		detail.put("ratio", plan>0?new BigDecimal(real*100l).divide(
+	    				new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+	    		detailsList.add(detail);
+    		}
+    	}
+    	
+    	resMap.put("plan", jh);
+    	resMap.put("real", sj);
+    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
+    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+    	
+    	resMap.put("detailsList", detailsList);
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    /**给电科手机端查线路指标(首末班车发车准点率)
+     * 
+     */
+    @GET
+    @Path("/selectData/getBeginAndEnd/{company}/{branchCompany}")
+    public JSONObject getBeginAndEnd(@PathParam("company") String company,
+    		@PathParam("branchCompany") String branchCompany){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	String date = sd.format(new Date());
+    	String gs = "", fgs = "";
+    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
+    		gs = company.trim();
+    	}
+    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
+    		fgs = branchCompany.trim();
+    	}
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	List<String> objList = new ArrayList<String>();
+    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
+    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
+    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
+    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
+    			+ " from bsth_c_calc_count "
+    			+ " where date = ? and gsdm != '77'";
+    	objList.add(date);
+    	if(fgs.length() > 0){
+    		sql +=" and gsdm = ? and fgsdm = ?";
+    		objList.add(gs);
+    		objList.add(fgs);
+    	} else if(gs.length() > 0){
+    		sql +=" and gsdm = ?";
+    		objList.add(gs);
+    	}
+    	
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    			objList.toArray(),
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode",rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						m.put("date",  rs.getString("date"));
+						
+						m.put("jhsmbcs", rs.getString("jhsmbcs"));
+						m.put("sjsmbczds", rs.getString("sjsmbczds"));
+						
+						Date date = new Date();
+						date.setTime(rs.getTimestamp("create_date").getTime());
+						m.put("createDate", sdf.format(date));
+						return m;
+					}
+				});
+
+    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
+    	
+    	long jh = 0, sj = 0;
+    	
+    	for(Map<String, Object> t : list){
+    		if(yyLine.contains(t.get("lineCode").toString())){
+	    		
+    			Long plan = Long.valueOf(t.get("jhsmbcs").toString());
+    			Long real = Long.valueOf(t.get("sjsmbczds").toString());
+    			
+	    		jh += plan;
+	    		sj += real;
+	    		
+	    		Map<String, Object> detail = new HashMap<String, Object>();
+	    		detail.put("lineName", t.get("lineName").toString());
+	    		detail.put("plan", plan);
+	    		detail.put("real", real);
+	    		detail.put("ratio", plan>0?new BigDecimal(real*100l).divide(
+	    				new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+	    		detailsList.add(detail);
+    		}
+    	}
+    	
+    	resMap.put("plan", jh);
+    	resMap.put("real", sj);
+    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
+    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+    	
+    	resMap.put("detailsList", detailsList);
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    /**给电科手机端查线路指标(起讫站发车准点率)
+     * 
+     */
+    @GET
+    @Path("/selectData/getPunctualBus/{company}/{branchCompany}")
+    public JSONObject getPunctualBus(@PathParam("company") String company,
+    		@PathParam("branchCompany") String branchCompany){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	String date = sd.format(new Date());
+    	String gs = "", fgs = "";
+    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
+    		gs = company.trim();
+    	}
+    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
+    		fgs = branchCompany.trim();
+    	}
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	List<String> objList = new ArrayList<String>();
+    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
+    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
+    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
+    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
+    			+ " from bsth_c_calc_count "
+    			+ " where date = ? and gsdm != '77'";
+    	objList.add(date);
+    	if(fgs.length() > 0){
+    		sql +=" and gsdm = ? and fgsdm = ?";
+    		objList.add(gs);
+    		objList.add(fgs);
+    	} else if(gs.length() > 0){
+    		sql +=" and gsdm = ?";
+    		objList.add(gs);
+    	}
+    	
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    			objList.toArray(),
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode",rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						m.put("date",  rs.getString("date"));
+						
+						m.put("jhszfcs", rs.getString("jhszfcs"));
+						m.put("sjszfczds", rs.getString("sjszfczds"));
+						
+						Date date = new Date();
+						date.setTime(rs.getTimestamp("create_date").getTime());
+						m.put("createDate", sdf.format(date));
+						return m;
+					}
+				});
+
+    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
+    	
+    	long jh = 0, sj = 0;
+    	
+    	for(Map<String, Object> t : list){
+    		if(yyLine.contains(t.get("lineCode").toString())){
+	    		
+    			Long plan = Long.valueOf(t.get("jhszfcs").toString());
+    			Long real = Long.valueOf(t.get("sjszfczds").toString());
+    			
+	    		jh += plan;
+	    		sj += real;
+	    		
+	    		Map<String, Object> detail = new HashMap<String, Object>();
+	    		detail.put("lineName", t.get("lineName").toString());
+	    		detail.put("plan", plan);
+	    		detail.put("real", real);
+	    		detail.put("ratio", plan>0?new BigDecimal(real*100l).divide(
+	    				new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+	    		detailsList.add(detail);
+    		}
+    	}
+    	
+    	resMap.put("plan", jh);
+    	resMap.put("real", sj);
+    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
+    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+    	
+    	resMap.put("detailsList", detailsList);
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    /**给电科手机端查线路指标(挂牌线路发车准点率)
+     * 
+     */
+    @GET
+    @Path("/selectData/getPlateLineBus/{company}/{branchCompany}")
+    public JSONObject getPlateLineBus(@PathParam("company") String company,
+    		@PathParam("branchCompany") String branchCompany){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	
+    	String gpLineSql = "select * from bsth_c_line_plate";
+    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineName", rs.getString("line_name"));
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	
+    	Set<String> gpSet = new HashSet<String>();
+    	for(Map<String, Object> t : gpLineList){
+    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
+    			gpSet.add(t.get("lineCode").toString().trim());
+    		}
+    	}
+    	
+    	String date = sd.format(new Date());
+    	String gs = "", fgs = "";
+    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
+    		gs = company.trim();
+    	}
+    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
+    		fgs = branchCompany.trim();
+    	}
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	List<String> objList = new ArrayList<String>();
+    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
+    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
+    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
+    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
+    			+ " from bsth_c_calc_count "
+    			+ " where date = ? and gsdm != '77'";
+    	objList.add(date);
+    	if(fgs.length() > 0){
+    		sql +=" and gsdm = ? and fgsdm = ?";
+    		objList.add(gs);
+    		objList.add(fgs);
+    	} else if(gs.length() > 0){
+    		sql +=" and gsdm = ?";
+    		objList.add(gs);
+    	}
+    	
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    			objList.toArray(),
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode",rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						m.put("date",  rs.getString("date"));
+						
+						m.put("jhszfcs", rs.getString("jhszfcs"));
+						m.put("sjszfczds", rs.getString("sjszfczds"));
+						
+						Date date = new Date();
+						date.setTime(rs.getTimestamp("create_date").getTime());
+						m.put("createDate", sdf.format(date));
+						return m;
+					}
+				});
+
+    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
+    	
+    	long jh = 0, sj = 0;
+    	
+    	for(Map<String, Object> t : list){
+    		if(yyLine.contains(t.get("lineCode").toString())){
+	    		
+    			if(gpSet.contains(t.get("lineCode").toString())){
+    				
+	    			Long plan = Long.valueOf(t.get("jhszfcs").toString());
+	    			Long real = Long.valueOf(t.get("sjszfczds").toString());
+	    			
+		    		jh += plan;
+		    		sj += real;
+		    		
+		    		Map<String, Object> detail = new HashMap<String, Object>();
+		    		detail.put("lineName", t.get("lineName").toString());
+		    		detail.put("plan", plan);
+		    		detail.put("real", real);
+		    		detail.put("ratio", plan>0?new BigDecimal(real*100l).divide(
+		    				new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+		    		detailsList.add(detail);
+    			}
+    		}
+    	}
+    	
+    	resMap.put("plan", jh);
+    	resMap.put("real", sj);
+    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
+    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+    	
+    	resMap.put("detailsList", detailsList);
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    /**给电科手机端查线路指标(签卡率)
+     * 
+     */
+    @GET
+    @Path("/selectData/getCardSigning/{company}/{branchCompany}")
+    public JSONObject getCardSigning(@PathParam("company") String company,
+    		@PathParam("branchCompany") String branchCompany){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	String date = sd.format(new Date());
+    	String gs = "", fgs = "";
+    	if(company.trim().length() > 0 && !("all".equals(company.trim()))){
+    		gs = company.trim();
+    	}
+    	if(branchCompany.trim().length() > 0 && !("all".equals(branchCompany.trim()))){
+    		fgs = branchCompany.trim();
+    	}
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
+    	Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
+    	
+    	long jh = 0, sj = 0;
+    	
+    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
+		for(ScheduleRealInfo s : findAll){
+			if(s.getGsBm() != null && s.getFgsBm() != null){
+				if("77".equals(s.getGsBm())){
+					continue;
+				}
+				if(fgs.length() > 0){
+					if(!(s.getGsBm().equals(gs)) || !(s.getFgsBm().equals(gs))){
+						continue;
+					}
+				} else if(gs.length() > 0){
+					if(!(s.getGsBm().equals(gs))){
+						continue;
+					}
+				}
+    			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+	    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
+	    				long plan = 0, real = 0;
+	    				++plan;
+	    				++jh;
+	    				//String sty = decimalToBinary(s.getRfidState());
+	    				String sty = decimalToBinary(0);
+	    				Integer state = Integer.parseInt(sty);
+	    				if ((state & 4) == 4) {
+		    				++real;
+	    					++sj;
+	    				}
+	    				if(!(keyMap.containsKey(s.getXlBm()))){
+	    					Map<String, Object> m = new HashMap<String, Object>();
+	    					m = new HashMap<String, Object>();
+	    		    		m.put("lineName", s.getXlName());
+	    		    		m.put("plan", "0");
+	    		    		m.put("real", "0");
+	    		    		keyMap.put(s.getXlBm(), m);
+	    		    		detailsList.add(m);
+	    				}
+	    				Map<String, Object> m = keyMap.get(s.getXlBm());
+	    				m.put("plan", Long.valueOf(m.get("plan").toString()) + plan);
+	    				m.put("real", Long.valueOf(m.get("real").toString()) + real);
+	    			}
+    			}
+			}
+		}
+		
+		for(Map<String, Object> m : detailsList){
+			long plan = Long.valueOf(m.get("plan").toString());
+			long real = Long.valueOf(m.get("real").toString());
+			m.put("ratio", plan>0?new BigDecimal(real*100l).divide(
+	    			new BigDecimal(plan), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+		}
+    	
+    	resMap.put("plan", jh);
+    	resMap.put("real", sj);
+    	resMap.put("ratio", jh>0?new BigDecimal(sj*100l).divide(
+    			new BigDecimal(jh), 2, BigDecimal.ROUND_HALF_UP).doubleValue():"0");
+    	
+    	resMap.put("detailsList", detailsList);
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    @GET
+    @Path("/selectData/attendance")
+    public JSONObject attendance(){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    	
+    	int day = 7;//天数
+    	
+    	Date dd = new Date();
+    	String date = sd.format(dd);	//yyyy-MM-dd 当天
+    	Date dd2 = new Date();
+    	dd2.setTime(dd.getTime() - ((long)(day-1))*1000*60*60*24);
+    	String date2 = sd.format(dd2);	//yyyy-MM-dd 6天前（加上当天就是取7天数据）
+    	
+    	String[] dates = new String[day];
+    	Map<String, Integer> datesMap = new HashMap<String, Integer>();
+    	
+    	for(int i = 0; i < day; i++){
+    		Date tempDate = new Date();
+    		tempDate.setTime(dd2.getTime() + ((long)i)*1000*60*60*24);
+    		String format = sd.format(tempDate);
+    		dates[i] = format;
+    		datesMap.put(format, i);
+    	}
+    	
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	
+    	List<Map<String, Object>> attList = new ArrayList<Map<String, Object>>();
+    	List<Map<String, Object>> lackList = new ArrayList<Map<String, Object>>();
+    	Set<String> lackSet = new HashSet<String>();
+    	
+    	for(int i = 0; i < dates.length; i++){
+    		Set<String> jhSet = new HashSet<String>();
+    		Set<String> sjSet = new HashSet<String>();
+        	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(dates[i]);
+        	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
+        	for(ScheduleRealInfo s : findAll){
+        		if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+        			if(!isInOut(s)){
+	        			Set<ChildTaskPlan> cts = s.getcTasks();
+	                    if (cts != null && cts.size() > 0) {
+	                    	list_s.add(s);
+	                    } else {
+	                        if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
+	                        	list_s.add(s);
+	                        }
+	                    }
+	                    
+	                    if(!s.isSflj() && !s.isCcService()){
+	                    	jhSet.add(s.getjGh() + "/" + s.getjName());
+	                    }
+        			}
+        		}
+        	}
+        	
+        	for(ScheduleRealInfo s : list_s){
+        		if(!(s.getStatus() == -1)){
+        			sjSet.add(s.getjGh() + "/" + s.getjName());
+        		}
+        	}
+        	
+        	for(ScheduleRealInfo s : findAll){
+        		try {
+	        		if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+		        		if (s.isSflj() || isInOut(s)){
+		                    continue;
+		        		}
+		        		
+	        			String time = s.getRealExecDate() + " " + s.getFcsj();
+	        			Date d = dateTime.parse(time);
+	        			if(dd.getTime() - d.getTime() < 300000l){ //只取当前时间5分钟前的数据
+	        				continue;
+	        			}
+	        			
+		        		Set<ChildTaskPlan> cts;
+		                cts = s.getcTasks();
+		        		//有子任务
+						if (cts != null && cts.size() > 0) {
+						    for(ChildTaskPlan c : cts){
+					    		if(c.getMileageType().equals("service") && c.getCcId() == null){
+				            		if(c.isDestroy() && (c.getDestroyReason()==null? "" : c.getDestroyReason()).equals("缺人")){
+				            			Map<String, Object> m = new HashMap<String, Object>();
+				            			m.put("gsName", s.getGsName());
+				            			m.put("lineName", s.getXlName());
+				            			m.put("driverCode", s.getjGh());
+				            			m.put("driverName", s.getjName());
+				            			m.put("cl", s.getClZbh());
+				            			m.put("date", s.getRealExecDate());
+				            			m.put("time", c.getStartDate());
+				            			if(c.getRemarks() != null && c.getRemarks().trim().length() > 0){
+				            				m.put("explain", c.getRemarks());
+				            			} else {
+				            				m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
+				            			}
+				            			
+				            			String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
+				            			if(lackSet.add(str)){
+				            				lackList.add(m);
+				            			}
+				            		}
+					    		}
+						    }
+						}
+						//主任务烂班
+						else if(s.getStatus() == -1 && s.getAdjustExps().equals("缺人")){
+		                	Map<String, Object> m = new HashMap<String, Object>();
+		        			m.put("gsName", s.getGsName());
+		        			m.put("lineName", s.getXlName());
+	            			m.put("driverCode", s.getjGh());
+		        			m.put("driverName", s.getjName());
+	            			m.put("cl", s.getClZbh());
+		        			m.put("date", s.getRealExecDate());
+		        			m.put("time", s.getFcsj());
+		        			m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
+		        			
+		        			String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
+		        			if(lackSet.add(str)){
+		        				lackList.add(m);
+		        			}
+			            }
+	        		}
+				} catch (Exception e) {
+					// TODO: handle exception
+					e.printStackTrace();
+				}
+        	}
+        	
+        	Map<String, Object> att = new HashMap<String, Object>();
+        	att.put("date", dates[i]);
+        	att.put("jh", jhSet.size());
+        	att.put("sj", sjSet.size());
+        	attList.add(att);
+    	}
+    	
+    	String gpLineSql = "select p.company_code, count(1) jsy"
+    			+ " from (select e.jsy from bsth_c_s_ecinfo e"
+    			+ " where e.is_cancel = 0 group by e.jsy) a"
+    			+ " left join bsth_c_personnel p on a.jsy = p.id"
+    			+ " group by p.company_code";
+    	List<Map<String, Object>> ecList=jdbcTemplate.query(gpLineSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("company", rs.getString("company_code"));
+						m.put("jsy", rs.getString("jsy"));
+						return m;
+					}
+				});
+    	
+    	List<Map<String, Object>> jsyList = new ArrayList<Map<String, Object>>();
+    	Map<String, Object> ygMap = new HashMap<String, Object>();
+    	ygMap.put("company", "杨高");
+    	ygMap.put("jsy", "0");
+    	Map<String, Object> snMap = new HashMap<String, Object>();
+    	snMap.put("company", "上南");
+    	snMap.put("jsy", "0");
+    	Map<String, Object> jgMap = new HashMap<String, Object>();
+    	jgMap.put("company", "金高");
+    	jgMap.put("jsy", "0");
+    	Map<String, Object> nhMap = new HashMap<String, Object>();
+    	nhMap.put("company", "南汇");
+    	nhMap.put("jsy", "0");
+    	for(Map<String, Object> m : ecList){		//顺序：杨高，上南，金高，南汇
+    		if("05".equals(m.get("company").toString())){
+//    			m.put("company", "杨高");
+    			ygMap.put("jsy", m.get("jsy").toString());
+    		}
+    		if("55".equals(m.get("company").toString())){
+//    			m.put("company", "上南");
+    			snMap.put("jsy", m.get("jsy").toString());
+    		}
+    		if("22".equals(m.get("company").toString())){
+//    			m.put("company", "金高");
+    			jgMap.put("jsy", m.get("jsy").toString());
+    		}
+    		if("26".equals(m.get("company").toString())){
+//    			m.put("company", "南汇");
+    			nhMap.put("jsy", m.get("jsy").toString());
+    		}
+    	}
+    	jsyList.add(ygMap);
+    	jsyList.add(snMap);
+    	jsyList.add(jgMap);
+    	jsyList.add(nhMap);
+    	
+    	String xlSql = "select a.jsy, b.spy, c.cl from"
+					+ " (select count(1) jsy from (select a.jsy from bsth_c_s_ecinfo a where a.is_cancel = 0 and a.spy is not null and a.jsy is not null group by jsy) a) a"
+					+ " LEFT JOIN"
+					+ " (select count(1) spy from (select b.spy from bsth_c_s_ecinfo b where b.is_cancel = 0 and b.spy is not null group by spy) b) b"
+					+ " on 1=1"
+					+ " LEFT JOIN"
+					+ " (select count(1) cl from (select c.cl from bsth_c_s_ccinfo c where c.is_cancel = 0 and c.cl is not null and c.xl in(select e.xl from bsth_c_s_ecinfo e where e.is_cancel = 0 and e.spy is not null) group by c.cl) c) c"
+					+ " on 1=1";
+    	List<Map<String, Object>> xlConfigList=jdbcTemplate.query(xlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("jsy", rs.getString("jsy"));
+						m.put("spy", rs.getString("spy"));
+						m.put("cl", rs.getString("cl"));
+						return m;
+					}
+				});
+    	long jsy = 0l, spy = 0l, cl = 0l;
+    	for(Map<String, Object> t : xlConfigList){
+    		if(t.get("jsy") != null){
+    			jsy += Long.valueOf(t.get("jsy").toString());
+    		}
+    		if(t.get("spy") != null){
+    			spy += Long.valueOf(t.get("spy").toString());
+    		}
+    		if(t.get("cl") != null){
+    			cl += Long.valueOf(t.get("cl").toString());
+    		}
+    	}
+    	
+    	resMap.put("jsyList", jsyList);
+    	resMap.put("attList", attList);
+    	resMap.put("lackList", lackList);
+    	resMap.put("salesmanJsy", jsy);
+    	resMap.put("salesmanSpy", spy);
+    	resMap.put("salesmanCl", cl);
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    @GET
+    @Path("/selectData/attendance/{gsdm}")
+    public JSONObject attendance(@PathParam("gsdm") String gsdm){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    	
+    	int day = 7;//天数
+    	
+    	Date dd = new Date();
+    	String date = sd.format(dd);	//yyyy-MM-dd 当天
+    	Date dd2 = new Date();
+    	dd2.setTime(dd.getTime() - ((long)(day-1))*1000*60*60*24);
+    	String date2 = sd.format(dd2);	//yyyy-MM-dd 6天前（加上当天就是取7天数据）
+    	
+    	String[] dates = new String[day];
+    	Map<String, Integer> datesMap = new HashMap<String, Integer>();
+    	
+    	for(int i = 0; i < day; i++){
+    		Date tempDate = new Date();
+    		tempDate.setTime(dd2.getTime() + ((long)i)*1000*60*60*24);
+    		String format = sd.format(tempDate);
+    		dates[i] = format;
+    		datesMap.put(format, i);
+    	}
+    	
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	
+    	List<Map<String, Object>> attList = new ArrayList<Map<String, Object>>();
+    	List<Map<String, Object>> lackList = new ArrayList<Map<String, Object>>();
+    	Set<String> lackSet = new HashSet<String>();
+    	
+    	for(int i = 0; i < dates.length; i++){
+    		Set<String> jhSet = new HashSet<String>();
+    		Set<String> sjSet = new HashSet<String>();
+        	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(dates[i]);
+        	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
+        	for(ScheduleRealInfo s : findAll){
+        		if(s.getGsBm() != null && s.getGsBm().equals(gsdm)){//直属公司
+	        		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+	        			if(!isInOut(s)){
+		        			Set<ChildTaskPlan> cts = s.getcTasks();
+		                    if (cts != null && cts.size() > 0) {
+		                    	list_s.add(s);
+		                    } else {
+		                        if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
+		                        	list_s.add(s);
+		                        }
+		                    }
+		                    
+		                    if(!s.isSflj() && !s.isCcService()){
+		                    	jhSet.add(s.getjGh() + "/" + s.getjName());
+		                    }
+	        			}
+	        		}
+        		}
+        	}
+        	
+        	for(ScheduleRealInfo s : list_s){
+        		if(!(s.getStatus() == -1)){
+        			sjSet.add(s.getjGh() + "/" + s.getjName());
+        		}
+        	}
+        	
+        	for(ScheduleRealInfo s : findAll){
+        		try {
+	        		if(s.getGsBm() != null && s.getGsBm().equals(gsdm)){//直属公司
+		        		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+			        		if (s.isSflj() || isInOut(s)){
+			                    continue;
+			        		}
+			        		
+		        			String time = s.getRealExecDate() + " " + s.getFcsj();
+		        			Date d = dateTime.parse(time);
+		        			if(dd.getTime() - d.getTime() < 300000l){ //只取当前时间5分钟前的数据
+		        				continue;
+		        			}
+		        			
+			        		Set<ChildTaskPlan> cts;
+			                cts = s.getcTasks();
+			        		//有子任务
+							if (cts != null && cts.size() > 0) {
+							    for(ChildTaskPlan c : cts){
+						    		if(c.getMileageType().equals("service") && c.getCcId() == null){
+					            		if(c.isDestroy() && (c.getDestroyReason()==null? "" : c.getDestroyReason()).equals("缺人")){
+					            			Map<String, Object> m = new HashMap<String, Object>();
+					            			m.put("gsName", s.getGsName());
+					            			m.put("lineName", s.getXlName());
+					            			m.put("driverCode", s.getjGh());
+					            			m.put("driverName", s.getjName());
+					            			m.put("cl", s.getClZbh());
+					            			m.put("date", s.getRealExecDate());
+					            			m.put("time", c.getStartDate());
+					            			if(c.getRemarks() != null && c.getRemarks().trim().length() > 0){
+					            				m.put("explain", c.getRemarks());
+					            			} else {
+					            				m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
+					            			}
+					            			
+					            			String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
+					            			if(lackSet.add(str)){
+					            				lackList.add(m);
+					            			}
+					            		}
+						    		}
+							    }
+							}
+							//主任务烂班
+							else if(s.getStatus() == -1 && s.getAdjustExps().equals("缺人")){
+			                	Map<String, Object> m = new HashMap<String, Object>();
+			        			m.put("gsName", s.getGsName());
+			        			m.put("lineName", s.getXlName());
+		            			m.put("driverCode", s.getjGh());
+			        			m.put("driverName", s.getjName());
+			        			m.put("cl", s.getClZbh());
+			        			m.put("date", s.getRealExecDate());
+			        			m.put("time", s.getFcsj());
+			        			m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
+			        			
+			        			String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
+			        			if(lackSet.add(str)){
+			        				lackList.add(m);
+			        			}
+				            }
+		        		}
+	        		}
+				} catch (Exception e) {
+					// TODO: handle exception
+				}
+        	}
+        	
+        	Map<String, Object> att = new HashMap<String, Object>();
+        	att.put("date", dates[i]);
+        	att.put("jh", jhSet.size());
+        	att.put("sj", sjSet.size());
+        	attList.add(att);
+    	}
+    	
+    	String gpLineSql = "select p.branche_company_code, b.business_name, count(1) jsy"
+    			+ " from (select e.jsy from bsth_c_s_ecinfo e"
+    			+ " where e.is_cancel = 0 group by e.jsy) a"
+    			+ " left join bsth_c_personnel p on a.jsy = p.id"
+    			+ " left join bsth_c_business b on p.company_code = b.up_code"
+    			+ " and p.branche_company_code = b.business_code"
+    			+ " where p.company_code = ?"
+    			+ " group by p.branche_company_code, b.business_name"
+    			+ " order by p.branche_company_code";
+    	List<Map<String, Object>> ecList=jdbcTemplate.query(gpLineSql, new Object[]{gsdm},
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("company", rs.getString("branche_company_code"));
+						m.put("companyName", rs.getString("business_name"));
+						m.put("jsy", rs.getString("jsy"));
+						return m;
+					}
+				});
+    	
+    	List<Integer> keyList = new ArrayList<Integer>();
+    	Map<Integer, Map<String, Object>> keyMap = new HashMap<Integer, Map<String, Object>>();
+    	List<Map<String, Object>> jsyList = new ArrayList<Map<String, Object>>();
+    	for(Map<String, Object> m : ecList){
+    		if(m.get("company") != null && m.get("company").toString().trim().length() > 0){
+    			Integer i = Integer.valueOf(m.get("company").toString().trim());
+    			if(!keyMap.containsKey(i)){
+    				Map<String, Object> temp = new HashMap<String, Object>();
+    				temp.put("company", m.get("companyName").toString());
+    				temp.put("jsy", m.get("jsy").toString());
+    				keyMap.put(i, temp);
+    				keyList.add(i);
+    				jsyList.add(temp);
+    			}
+    		}
+    	}
+    	
+    	String xlSql = "select a.jsy, b.spy, c.cl from"
+					+ " (select count(1) jsy from (select a.jsy from bsth_c_s_ecinfo a"
+					+ " left join bsth_c_personnel p on a.jsy=p.id where a.is_cancel = 0"
+					+ " and a.spy is not null and a.jsy is not null"
+					+ " and p.company_code = ?"
+					+ " group by jsy) a) a"
+					+ " LEFT JOIN"
+					+ " (select count(1) spy from (select b.spy from bsth_c_s_ecinfo b"
+					+ " left join bsth_c_personnel p on b.spy=p.id where b.is_cancel = 0"
+					+ " and b.spy is not null and p.company_code = ?"
+					+ " group by spy) b) b"
+					+ " on 1=1"
+					+ " LEFT JOIN"
+					+ " (select count(1) cl from (select c.cl from bsth_c_s_ccinfo c"
+					+ " left join bsth_c_cars car on c.cl=car.id where c.is_cancel = 0"
+					+ " and c.cl is not null and car.business_code = ?"
+					+ " and c.xl in(select e.xl from bsth_c_s_ecinfo e"
+					+ " where e.is_cancel = 0 and e.spy is not null) group by c.cl) c) c"
+					+ " on 1=1";
+    	List<Map<String, Object>> xlConfigList=jdbcTemplate.query(xlSql, new Object[]{gsdm, gsdm, gsdm},
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("jsy", rs.getString("jsy"));
+						m.put("spy", rs.getString("spy"));
+						m.put("cl", rs.getString("cl"));
+						return m;
+					}
+				});
+    	long jsy = 0l, spy = 0l, cl = 0l;
+    	for(Map<String, Object> t : xlConfigList){
+    		if(t.get("jsy") != null){
+    			jsy += Long.valueOf(t.get("jsy").toString());
+    		}
+    		if(t.get("spy") != null){
+    			spy += Long.valueOf(t.get("spy").toString());
+    		}
+    		if(t.get("cl") != null){
+    			cl += Long.valueOf(t.get("cl").toString());
+    		}
+    	}
+    	
+    	resMap.put("jsyList", jsyList);
+    	resMap.put("attList", attList);
+    	resMap.put("lackList", lackList);
+    	resMap.put("salesmanJsy", jsy);
+    	resMap.put("salesmanSpy", spy);
+    	resMap.put("salesmanCl", cl);
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    /** 按月份查询统计指标 */
+    @GET
+    @Path("/selectData/getMonthly/{month}")
+    public JSONObject getMonthly(@PathParam("month") String month){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	
+    	String gpLineSql = "select * from bsth_c_line_plate";
+    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineName", rs.getString("line_name"));
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	
+    	Set<String> gpSet = new HashSet<String>();
+    	for(Map<String, Object> t : gpLineList){
+    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
+    			gpSet.add(t.get("lineCode").toString().trim());
+    		}
+    	}
+    	
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	
+    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
+    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
+    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
+    			+ " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
+    			+ " from bsth_c_calc_count "
+    			+ " where date like '%"+month+"%' and gsdm != '77'";
+    	
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode",rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						m.put("date",  rs.getString("date"));
+						
+						m.put("jhbc", rs.getString("jhbc"));
+						m.put("sjbc", rs.getString("sjbc"));
+						m.put("bczxl", rs.getString("bczxl"));
+						m.put("jhbcz", rs.getString("jhbcz"));
+						
+						m.put("jhcc", rs.getString("jhcc"));
+						m.put("sjcc", rs.getString("sjcc"));
+						m.put("ccl", rs.getString("ccl"));
+						m.put("jhccz", rs.getString("jhccz"));
+						
+						m.put("jhyylc", rs.getString("jhyylc"));
+						m.put("sjyylc", rs.getString("sjyylc"));
+						m.put("jhyylcz", rs.getString("jhyylcz"));
+						m.put("jhkslc", rs.getString("jhkslc"));
+						m.put("sjkslc", rs.getString("sjkslc"));
+						m.put("jhkslcz", rs.getString("jhkslcz"));
+
+						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
+						m.put("sjgfbcs", rs.getString("sjgfbcs"));
+						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
+						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
+						m.put("sjdgbcs", rs.getString("sjdgbcs"));
+						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
+
+						m.put("jhsmbcs", rs.getString("jhsmbcs"));
+						m.put("sjsmbczds", rs.getString("sjsmbczds"));
+						m.put("smbczdl", rs.getString("smbczdl"));
+						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
+						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
+						m.put("smbczdlz", rs.getString("smbczdlz"));
+						
+						m.put("jhszfcs", rs.getString("jhszfcs"));
+						m.put("sjszfczds", rs.getString("sjszfczds"));
+						m.put("szfczdl", rs.getString("szfczdl"));
+						
+						m.put("jhzgl", rs.getString("jhzgl"));
+						m.put("sjzgl", rs.getString("sjzgl"));
+						
+						Date date = new Date();
+						date.setTime(rs.getTimestamp("create_date").getTime());
+						m.put("createDate", sdf.format(date));
+						return m;
+					}
+				});
+    	
+    	
+    	BigDecimal jhzgl = new BigDecimal(0), sjzgl = new BigDecimal(0);//
+    	long jhcc = 0, sjcc = 0, jhbc = 0, sjbc = 0, jhsmbc = 0, sjsmbc = 0,
+    			jhqqbc = 0, sjqqzd = 0, jhgpqqbc = 0, sjgpqqzd = 0;
+    	
+    	for(Map<String, Object> t : list){
+    		if(yyLine.contains(t.get("lineCode").toString())){
+    			
+	    		jhzgl = jhzgl.add(new BigDecimal(t.get("jhzgl").toString()));
+	    		sjzgl = sjzgl.add(new BigDecimal(t.get("sjzgl").toString()));
+	    		
+	    		jhcc += Long.valueOf(t.get("jhccz").toString());
+	    		sjcc += Long.valueOf(t.get("sjcc").toString());
+	    		jhbc += Long.valueOf(t.get("jhbc").toString());
+	    		sjbc += Long.valueOf(t.get("sjbc").toString());
+	    		jhsmbc += Long.valueOf(t.get("jhsmbcs").toString());
+	    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
+	    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
+	    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
+	    		if(gpSet.contains(t.get("lineCode").toString())){
+	    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
+	    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
+	    		}
+	    		
+    		}
+    	}
+    	
+    	resMap.put("date", month);
+    	
+    	resMap.put("jhzgl", df.format(jhzgl));
+    	resMap.put("sjzgl", df.format(sjzgl));
+    	resMap.put("jhcc", jhcc);
+    	resMap.put("sjcc", sjcc);
+    	resMap.put("jhbc", jhbc);
+    	resMap.put("sjbc", sjbc);
+    	resMap.put("jhsm", jhsmbc);
+    	resMap.put("sjsm", sjsmbc);
+    	resMap.put("jhqq", jhqqbc);
+    	resMap.put("sjqq", sjqqzd);
+    	resMap.put("jhgp", jhgpqqbc);
+    	resMap.put("sjgp", sjgpqqzd);
+
+    	resMap.put("glzxl", jhzgl.doubleValue()>0?sjzgl.divide(jhzgl,
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("ccl", jhcc>0?new BigDecimal(sjcc).divide(new BigDecimal(jhcc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("bczxl", jhbc>0?new BigDecimal(sjbc).divide(new BigDecimal(jhbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("smbzdl", jhbc>0?new BigDecimal(sjsmbc).divide(new BigDecimal(jhsmbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("qqzzdl", jhbc>0?new BigDecimal(sjqqzd).divide(new BigDecimal(jhqqbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("gpzdl", jhbc>0?new BigDecimal(sjgpqqzd).divide(new BigDecimal(jhgpqqbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    /** 按月份查询直属公司统计指标 */
+    @GET
+    @Path("/selectData/getMonthly/{gsdm}/{month}")
+    public JSONObject getMonthly(@PathParam("gsdm") String gsdm, @PathParam("month") String month){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	
+    	String gpLineSql = "select * from bsth_c_line_plate";
+    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineName", rs.getString("line_name"));
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	
+    	Set<String> gpSet = new HashSet<String>();
+    	for(Map<String, Object> t : gpLineList){
+    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
+    			gpSet.add(t.get("lineCode").toString().trim());
+    		}
+    	}
+    	
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	
+    	String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
+    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
+    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
+    			+ " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
+    			+ " from bsth_c_calc_count "
+    			+ " where gsdm = '"+gsdm+"' and date like '%"+month+"%'";
+    	
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode",rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						m.put("date",  rs.getString("date"));
+						
+						m.put("jhbc", rs.getString("jhbc"));
+						m.put("sjbc", rs.getString("sjbc"));
+						m.put("bczxl", rs.getString("bczxl"));
+						m.put("jhbcz", rs.getString("jhbcz"));
+						
+						m.put("jhcc", rs.getString("jhcc"));
+						m.put("sjcc", rs.getString("sjcc"));
+						m.put("ccl", rs.getString("ccl"));
+						m.put("jhccz", rs.getString("jhccz"));
+						
+						m.put("jhyylc", rs.getString("jhyylc"));
+						m.put("sjyylc", rs.getString("sjyylc"));
+						m.put("jhyylcz", rs.getString("jhyylcz"));
+						m.put("jhkslc", rs.getString("jhkslc"));
+						m.put("sjkslc", rs.getString("sjkslc"));
+						m.put("jhkslcz", rs.getString("jhkslcz"));
+
+						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
+						m.put("sjgfbcs", rs.getString("sjgfbcs"));
+						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
+						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
+						m.put("sjdgbcs", rs.getString("sjdgbcs"));
+						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
+
+						m.put("jhsmbcs", rs.getString("jhsmbcs"));
+						m.put("sjsmbczds", rs.getString("sjsmbczds"));
+						m.put("smbczdl", rs.getString("smbczdl"));
+						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
+						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
+						m.put("smbczdlz", rs.getString("smbczdlz"));
+						
+						m.put("jhszfcs", rs.getString("jhszfcs"));
+						m.put("sjszfczds", rs.getString("sjszfczds"));
+						m.put("szfczdl", rs.getString("szfczdl"));
+						
+						m.put("jhzgl", rs.getString("jhzgl"));
+						m.put("sjzgl", rs.getString("sjzgl"));
+						
+						Date date = new Date();
+						date.setTime(rs.getTimestamp("create_date").getTime());
+						m.put("createDate", sdf.format(date));
+						return m;
+					}
+				});
+    	
+    	
+    	BigDecimal jhzgl = new BigDecimal(0), sjzgl = new BigDecimal(0);//
+    	long jhcc = 0, sjcc = 0, jhbc = 0, sjbc = 0, jhsmbc = 0, sjsmbc = 0,
+    			jhqqbc = 0, sjqqzd = 0, jhgpqqbc = 0, sjgpqqzd = 0;
+    	
+    	for(Map<String, Object> t : list){
+    		if(yyLine.contains(t.get("lineCode").toString())){
+    			
+	    		jhzgl = jhzgl.add(new BigDecimal(t.get("jhzgl").toString()));
+	    		sjzgl = sjzgl.add(new BigDecimal(t.get("sjzgl").toString()));
+	    		
+	    		jhcc += Long.valueOf(t.get("jhccz").toString());
+	    		sjcc += Long.valueOf(t.get("sjcc").toString());
+	    		jhbc += Long.valueOf(t.get("jhbc").toString());
+	    		sjbc += Long.valueOf(t.get("sjbc").toString());
+	    		jhsmbc += Long.valueOf(t.get("jhsmbcs").toString());
+	    		sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
+	    		jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
+	    		sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
+	    		if(gpSet.contains(t.get("lineCode").toString())){
+	    			jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
+	    			sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
+	    		}
+	    		
+    		}
+    	}
+    	
+    	resMap.put("date", month);
+    	
+    	resMap.put("jhzgl", df.format(jhzgl));
+    	resMap.put("sjzgl", df.format(sjzgl));
+    	resMap.put("jhcc", jhcc);
+    	resMap.put("sjcc", sjcc);
+    	resMap.put("jhbc", jhbc);
+    	resMap.put("sjbc", sjbc);
+    	resMap.put("jhsm", jhsmbc);
+    	resMap.put("sjsm", sjsmbc);
+    	resMap.put("jhqq", jhqqbc);
+    	resMap.put("sjqq", sjqqzd);
+    	resMap.put("jhgp", jhgpqqbc);
+    	resMap.put("sjgp", sjgpqqzd);
+
+    	resMap.put("glzxl", jhzgl.doubleValue()>0?sjzgl.divide(jhzgl,
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("ccl", jhcc>0?new BigDecimal(sjcc).divide(new BigDecimal(jhcc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("bczxl", jhbc>0?new BigDecimal(sjbc).divide(new BigDecimal(jhbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("smbzdl", jhsmbc>0?new BigDecimal(sjsmbc).divide(new BigDecimal(jhsmbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("qqzzdl", jhqqbc>0?new BigDecimal(sjqqzd).divide(new BigDecimal(jhqqbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	resMap.put("gpzdl", jhgpqqbc>0?new BigDecimal(sjgpqqzd).divide(new BigDecimal(jhgpqqbc),
+				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	
+    	return JSON.parseObject(JSON.toJSONString(resMap));
+    }
+    
+    /** 按日期查询四家直属公司统计指标 */
+    @GET
+    @Path("/selectData/getCompanyData/{date}")
+    public List<Map<String, Object>> getCompanyData(@PathParam("date") String date){
+    	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+    	
+//    	String date = sd.format(new Date());
+    	
+    	String gpLineSql = "select * from bsth_c_line_plate";
+    	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineName", rs.getString("line_name"));
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	
+    	Set<String> gpSet = new HashSet<String>();
+    	for(Map<String, Object> t : gpLineList){
+    		if(t.get("lineCode") != null && t.get("lineCode").toString().trim().length() > 0){
+    			gpSet.add(t.get("lineCode").toString().trim());
+    		}
+    	}
+    	
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	
+    	String gsSql="SELECT business_name, business_code from bsth_c_business ";
+    	List<Map<String, Object>> gsList=jdbcTemplate.query(gsSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("name", rs.getString("business_name")!=null?rs.getString("business_name"):"");
+						m.put("code", rs.getString("business_code")!=null?rs.getString("business_code"):"");
+						return m;
+					}
+				});
+    	final Map<String, String> gsMap = new HashMap<String, String>();
+    	for(Map<String, Object> t : gsList){
+    		if(t.get("code") != null && t.get("name") != null){
+    			gsMap.put(t.get("code").toString(), t.get("name").toString().substring(0, 2));
+    		}
+    	}
+    	
+    	
+    	String sql="select gsdm,xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
+    			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
+    			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
+    			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
+    			+ " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
+    			+ " from bsth_c_calc_count "
+    			+ " where date = ? and gsdm != '77'";
+    	
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{date},
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("gs",rs.getString("gsdm")!=null?gsMap.get(rs.getString("gsdm")):"");
+						m.put("lineCode",rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						m.put("date",  rs.getString("date"));
+						
+						m.put("jhbc", rs.getString("jhbc"));
+						m.put("sjbc", rs.getString("sjbc"));
+						m.put("bczxl", rs.getString("bczxl"));
+						m.put("jhbcz", rs.getString("jhbcz"));
+						
+						m.put("jhcc", rs.getString("jhcc"));
+						m.put("sjcc", rs.getString("sjcc"));
+						m.put("ccl", rs.getString("ccl"));
+						m.put("jhccz", rs.getString("jhccz"));
+						
+						m.put("jhyylc", rs.getString("jhyylc"));
+						m.put("sjyylc", rs.getString("sjyylc"));
+						m.put("jhyylcz", rs.getString("jhyylcz"));
+						m.put("jhkslc", rs.getString("jhkslc"));
+						m.put("sjkslc", rs.getString("sjkslc"));
+						m.put("jhkslcz", rs.getString("jhkslcz"));
+
+						m.put("jhgfbcs", rs.getString("jhssgfbcs"));
+						m.put("sjgfbcs", rs.getString("sjgfbcs"));
+						m.put("jhgfbcsz", rs.getString("jhgfbcsz"));
+						m.put("jhdgbcs", rs.getString("jhssdgbcs"));
+						m.put("sjdgbcs", rs.getString("sjdgbcs"));
+						m.put("jhdgbcsz", rs.getString("jhdgbcsz"));
+
+						m.put("jhsmbcs", rs.getString("jhsmbcs"));
+						m.put("sjsmbczds", rs.getString("sjsmbczds"));
+						m.put("smbczdl", rs.getString("smbczdl"));
+						m.put("jhsmbcsz", rs.getString("jhsmbcsz"));
+						m.put("sjsmbczdsz", rs.getString("sjsmbczdsz"));
+						m.put("smbczdlz", rs.getString("smbczdlz"));
+						
+						m.put("jhszfcs", rs.getString("jhszfcs"));
+						m.put("sjszfczds", rs.getString("sjszfczds"));
+						m.put("szfczdl", rs.getString("szfczdl"));
+						
+						m.put("jhzgl", rs.getString("jhzgl"));
+						m.put("sjzgl", rs.getString("sjzgl"));
+						
+						Date date = new Date();
+						date.setTime(rs.getTimestamp("create_date").getTime());
+						m.put("createDate", sdf.format(date));
+						return m;
+					}
+				});
+    	
+    	
+    	Map<String, Integer> sortMap = new HashMap<String, Integer>();
+    	sortMap.put("杨高", 0);
+    	sortMap.put("上南", 1);
+    	sortMap.put("金高", 2);
+    	sortMap.put("南汇", 3);
+    	sortMap.put("浦交", 4);
+    	Map<String, Object> ygMap = new HashMap<String, Object>();
+    	ygMap.put("gs", "杨高");
+    	resList.add(ygMap);
+    	Map<String, Object> snMap = new HashMap<String, Object>();
+    	snMap.put("gs", "上南");
+    	resList.add(snMap);
+    	Map<String, Object> jgMap = new HashMap<String, Object>();
+    	jgMap.put("gs", "金高");
+    	resList.add(jgMap);
+    	Map<String, Object> nhMap = new HashMap<String, Object>();
+    	nhMap.put("gs", "南汇");
+    	resList.add(nhMap);
+    	Map<String, Object> pjMap = new HashMap<String, Object>();
+    	pjMap.put("gs", "浦交");
+    	resList.add(pjMap);
+    	
+    	
+    	for(Map<String, Object> t : list){
+    		if(yyLine.contains(t.get("lineCode").toString())){
+    			if(sortMap.get(t.get("gs")) != null){
+	    			Map<String, Object> m = resList.get(sortMap.get(t.get("gs")));
+    				mapPut(m, "jhcc", t.get("jhccz").toString());
+    				mapPut(m, "sjcc", t.get("sjcc").toString());
+    				mapPut(m, "jhbc", t.get("jhbc").toString());
+    				mapPut(m, "sjbc", t.get("sjbc").toString());
+    				mapPut(m, "jhsmbc", t.get("jhsmbcs").toString());
+    				mapPut(m, "sjsmbc", t.get("sjsmbczds").toString());
+    				mapPut(m, "jhqqbc", t.get("jhszfcs").toString());
+    				mapPut(m, "sjqqzd", t.get("sjszfczds").toString());
+    				if(gpSet.contains(t.get("lineCode").toString())){
+        				mapPut(m, "jhgpqqbc", t.get("jhszfcs").toString());
+        				mapPut(m, "sjgpqqzd", t.get("sjszfczds").toString());
+    				}
+    				mapPut(m, "jhzgl", t.get("jhzgl").toString());
+    				mapPut(m, "sjzgl", t.get("sjzgl").toString());
+    			}
+    			
+				mapPut(pjMap, "jhcc", t.get("jhccz").toString());
+				mapPut(pjMap, "sjcc", t.get("sjcc").toString());
+				mapPut(pjMap, "jhbc", t.get("jhbc").toString());
+				mapPut(pjMap, "sjbc", t.get("sjbc").toString());
+				mapPut(pjMap, "jhsmbc", t.get("jhsmbcs").toString());
+				mapPut(pjMap, "sjsmbc", t.get("sjsmbczds").toString());
+				mapPut(pjMap, "jhqqbc", t.get("jhszfcs").toString());
+				mapPut(pjMap, "sjqqzd", t.get("sjszfczds").toString());
+				if(gpSet.contains(t.get("lineCode").toString())){
+    				mapPut(pjMap, "jhgpqqbc", t.get("jhszfcs").toString());
+    				mapPut(pjMap, "sjgpqqzd", t.get("sjszfczds").toString());
+				}
+				mapPut(pjMap, "jhzgl", t.get("jhzgl").toString());
+				mapPut(pjMap, "sjzgl", t.get("sjzgl").toString());
+    		}
+    	}
+    	
+    	
+    	//计算签卡率
+		List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
+		long jh = 0, sj = 0;
+		for(ScheduleRealInfo s : findAll){
+			if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+				if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
+					if(s.getGsBm()!=null && sortMap.get(gsMap.get(s.getGsBm()!=null?s.getGsBm():"")) != null){
+						Map<String, Object> m = resList.get(sortMap.get(gsMap.get(s.getGsBm())));
+						++jh;
+						mapPut(m, "bcs", 1);
+						//String sty = decimalToBinary(s.getRfidState());
+						String sty = decimalToBinary(0);
+	    				Integer state = Integer.parseInt(sty);
+	    				if ((state & 4) == 4) {
+	    					++sj;
+	    					mapPut(m, "qks", 1);
+	    				}
+					}
+				}
+			}
+		}
+		mapPut(pjMap, "bcs", jh);
+		mapPut(pjMap, "qks", sj);
+		
+		
+    	for(Map<String, Object> m : resList){
+    		m.put("date", date);
+    		
+    		m.put("glzxl", new BigDecimal(m.get("jhzgl").toString()).doubleValue()>0?
+    				new BigDecimal(m.get("sjzgl").toString()).divide(new BigDecimal(m.get("jhzgl").toString()),
+    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    		m.put("ccl", new BigDecimal(m.get("jhcc").toString()).doubleValue()>0?
+    				new BigDecimal(m.get("sjcc").toString()).divide(new BigDecimal(m.get("jhcc").toString()),
+    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    		m.put("bczxl", new BigDecimal(m.get("jhbc").toString()).doubleValue()>0?
+    				new BigDecimal(m.get("sjbc").toString()).divide(new BigDecimal(m.get("jhbc").toString()),
+    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    		m.put("smbzdl", new BigDecimal(m.get("jhsmbc").toString()).doubleValue()>0?
+    				new BigDecimal(m.get("sjsmbc").toString()).divide(new BigDecimal(m.get("jhsmbc").toString()),
+    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    		m.put("qqzzdl", new BigDecimal(m.get("jhqqbc").toString()).doubleValue()>0?
+    				new BigDecimal(m.get("sjqqzd").toString()).divide(new BigDecimal(m.get("jhqqbc").toString()),
+    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    		m.put("gpzdl", new BigDecimal(m.get("jhgpqqbc").toString()).doubleValue()>0?
+    				new BigDecimal(m.get("sjgpqqzd").toString()).divide(new BigDecimal(m.get("jhgpqqbc").toString()),
+    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    		m.put("qkl", new BigDecimal(m.get("bcs")!=null?m.get("bcs").toString():"0").doubleValue()>0?
+    				new BigDecimal(m.get("qks")!=null?m.get("qks").toString():"0").divide(new BigDecimal(m.get("bcs").toString()),
+    				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
+    	}
+    	
+    	return resList;
+    }
+    
+    /** 报备登记查询接口 */
+    @GET
+    @Path("/selectData/getReport/startDate/{startDate}/endDate/{endDate}")
+    public List<Map<String, Object>> getReport(@PathParam("startDate") String starDate,
+    		@PathParam("endDate") String endDate){
+    	Date d1 = new Date(), d2 = new Date();
+    	try{
+    		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+    		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    		d1 = sd.parse(starDate);
+    		d2 = sd.parse(endDate);
+    		d2.setTime(d2.getTime() + (1l*1000*60*60*24 - 1));
+    		starDate = sdf.format(d1);
+    		endDate = sdf.format(d2);
+    	}catch(ParseException e){
+			// TODO Auto-generated catch block
+    		e.printStackTrace();
+    		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+    		Map<String, Object> result = new HashMap<String, Object>();
+    		result.put("msg", "参数日期格式错误");
+    		list.add(result);
+    		return list;
+    	}
+    	String sql="SELECT ID,REPORT_TYPE,REPORT_GS,REPORT_FGS,REPORT_GSNAME,REPORT_FGSNAME,"
+    			+ " REPORT_DATE,REPORT_BBR,REPORT_XL,REPORT_XLNAME,REPORT_STATION,REPORT_DWSBBM,"
+    			+ " REPORT_DWSBSJ,REPORT_YWSJ,REPORT_SMBWD,REPORT_DJGSJ,REPORT_DJGYY,REPORT_TFSJ,"
+    			+ " REPORT_YXSJ,REPORT_YXBC,REPORT_TZCS,REPORT_SGBH,REPORT_ZBH,REPORT_PZH,REPORT_JSY,"
+    			+ " REPORT_SGSJ,REPORT_SGDD,REPORT_XSFX,REPORT_SGDX,REPORT_DXPZH,REPORT_SGGK,"
+    			+ " REPORT_SSRS,REPORT_SWRS,REPORT_BGR,REPORT_BGRDH,REPORT_BZ,REPORT_ROAD,STATUS,"
+    			+ " CREATE_BY,CREATE_DATE,UPDATE_BY,UPDATE_DATE"
+    			+ " from bsth_t_report "
+    			+ " where REPORT_DATE >= ? and REPORT_DATE <= ?";
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{starDate, endDate},
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("ID", rs.getString("ID"));
+						m.put("REPORT_TYPE", rs.getString("REPORT_TYPE"));
+						m.put("REPORT_GS", rs.getString("REPORT_GS"));
+						m.put("REPORT_FGS",rs.getString("REPORT_FGS"));
+						m.put("REPORT_GSNAME",rs.getString("REPORT_GSNAME"));
+						m.put("REPORT_FGSNAME",rs.getString("REPORT_FGSNAME"));
+						m.put("REPORT_DATE",rs.getString("REPORT_DATE"));
+						m.put("REPORT_BBR",rs.getString("REPORT_BBR"));
+						m.put("REPORT_XL",rs.getString("REPORT_XL"));
+						m.put("REPORT_XLNAME",rs.getString("REPORT_XLNAME"));
+						m.put("REPORT_STATION",rs.getString("REPORT_STATION"));
+						m.put("REPORT_DWSBBM",rs.getString("REPORT_DWSBBM"));
+						m.put("REPORT_DWSBSJ",rs.getString("REPORT_DWSBSJ"));
+						m.put("REPORT_YWSJ",rs.getString("REPORT_YWSJ"));
+						m.put("REPORT_SMBWD",rs.getString("REPORT_SMBWD"));
+						m.put("REPORT_DJGSJ",rs.getString("REPORT_DJGSJ"));
+						m.put("REPORT_DJGYY",rs.getString("REPORT_DJGYY"));
+						m.put("REPORT_TFSJ",rs.getString("REPORT_TFSJ"));
+						m.put("REPORT_YXSJ",rs.getString("REPORT_YXSJ"));
+						m.put("REPORT_YXBC",rs.getString("REPORT_YXBC"));
+						m.put("REPORT_TZCS",rs.getString("REPORT_TZCS"));
+						m.put("REPORT_SGBH",rs.getString("REPORT_SGBH"));
+						m.put("REPORT_ZBH",rs.getString("REPORT_ZBH"));
+						m.put("REPORT_PZH",rs.getString("REPORT_PZH"));
+						m.put("REPORT_JSY",rs.getString("REPORT_JSY"));
+						m.put("REPORT_SGSJ",rs.getString("REPORT_SGSJ"));
+						m.put("REPORT_SGDD",rs.getString("REPORT_SGDD"));
+						m.put("REPORT_XSFX", rs.getString("REPORT_XSFX"));
+						m.put("REPORT_SGDX", rs.getString("REPORT_SGDX"));
+						m.put("REPORT_DXPZH", rs.getString("REPORT_DXPZH"));
+						m.put("REPORT_SGGK", rs.getString("REPORT_SGGK"));
+						m.put("REPORT_SSRS", rs.getString("REPORT_SSRS"));
+						m.put("REPORT_SWRS", rs.getString("REPORT_SWRS"));
+						m.put("REPORT_BGR", rs.getString("REPORT_BGR"));
+						m.put("REPORT_BGRDH", rs.getString("REPORT_BGRDH"));
+						m.put("REPORT_BZ", rs.getString("REPORT_BZ"));
+						m.put("REPORT_ROAD", rs.getString("REPORT_ROAD"));
+						m.put("STATUS", rs.getString("STATUS"));
+						m.put("CREATE_BY", rs.getString("CREATE_BY"));
+						m.put("CREATE_DATE", rs.getString("CREATE_DATE"));
+						m.put("UPDATE_BY", rs.getString("UPDATE_BY"));
+						m.put("UPDATE_DATE", rs.getString("UPDATE_DATE"));
+						return m;
+					}
+				});
+    	
+    	return list;
+    }
+    
+    /** 按日期查询所有线路大间隔情况 */
+    @GET
+    @Path("/selectData/getLineInterval/{date}")
+    public List<Map<String, Object>> getLineInterval(@PathParam("date") String date){
+    	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+    	
+    	String gsSql="SELECT business_name, business_code, up_code from bsth_c_business ";
+    	List<Map<String, Object>> gsList=jdbcTemplate.query(gsSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("name", rs.getString("business_name")!=null?rs.getString("business_name"):"");
+						m.put("code", rs.getString("business_code")!=null?rs.getString("business_code"):"");
+						m.put("upCode", rs.getString("up_code")!=null?rs.getString("up_code"):"");
+						return m;
+					}
+				});
+    	
+    	Map<String, Object> gsMap = new HashMap<String, Object>();
+    	Map<String, Object> fgsMap = new HashMap<String, Object>();
+    	for(Map<String, Object> m : gsList){
+    		if(m.get("upCode") != null && m.get("upCode").toString().trim().length() > 0
+    				&& !("0".equals(m.get("upCode").toString().trim()))){
+    			if("88".equals(m.get("upCode").toString().trim())){
+    				gsMap.put(m.get("code").toString(), m.get("name").toString());
+    			} else {
+    				fgsMap.put(m.get("code").toString()+"_"+m.get("upCode").toString(), m.get("name").toString());
+    			}
+    		}
+    	}
+    	
+    	String calcIntervalSql = "select * from bsth_c_calc_interval where date = ? and sfyy = 1 and gsbm != '77'";
+    	List<Map<String, Object>> calcIntervalList=jdbcTemplate.query(calcIntervalSql,
+    			new Object[]{date},
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("gsbm", rs.getString("gsbm"));
+						m.put("fgsbm", rs.getString("fgsbm"));
+						m.put("date", rs.getString("date"));
+						m.put("xlBm", rs.getString("xl_bm"));
+						m.put("xlName", rs.getString("xl_name"));
+						m.put("level", rs.getString("level"));
+						return m;
+					}
+				});
+    	
+    	String calcIntervalDetailSql = "select * from bsth_c_calc_interval_detail where date = ?";
+    	List<Map<String, Object>> calcIntervalDetailList=jdbcTemplate.query(calcIntervalDetailSql,
+    			new Object[]{date},
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("date", rs.getString("date"));
+						m.put("xlBm", rs.getString("line_code"));
+						m.put("xlName", rs.getString("line_name"));
+						m.put("level", rs.getString("level"));
+						m.put("station", rs.getString("station"));
+						m.put("jhfc1", rs.getString("jhfc1"));
+						m.put("sjfc1", rs.getString("sjfc1"));
+						m.put("jhfc2", rs.getString("jhfc2"));
+						m.put("sjfc2", rs.getString("sjfc2"));
+						m.put("subTime", rs.getString("sub_time"));
+						m.put("remark", rs.getString("remark"));
+						return m;
+					}
+				});
+    	
+    	Map<String, Map<String, Object>> calcIntervalMap = new HashMap<String, Map<String, Object>>();
+    	
+    	for(Map<String, Object> m : calcIntervalList){
+    		calcIntervalMap.put(m.get("xlBm").toString(), m);
+    	}
+    	
+    	for(Map<String, Object> m : calcIntervalDetailList){
+    		String xlBm = m.get("xlBm").toString();
+    		if(calcIntervalMap.containsKey(xlBm)){
+    			Map<String, Object> map = calcIntervalMap.get(xlBm);
+    			m.put("gs", gsMap.get(map.get("gsbm").toString()));
+    			m.put("fgs", fgsMap.get(map.get("fgsbm").toString() + "_" + map.get("gsbm").toString()));
+    			resList.add(m);
+    		}
+    	}
+    	
+    	return resList;
+    }
+    
+    /** 按日期（加前7天共8天）查询所有线路大间隔次数 */
+    @GET
+    @Path("/selectData/getLastWeekIntervalSum/{date}")
+    public List<Map<String, Object>> getLastWeekIntervalSum(@PathParam("date") String date) throws ParseException{
+    	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+    	
+    	String gsSql="SELECT business_name, business_code, up_code from bsth_c_business ";
+    	List<Map<String, Object>> gsList=jdbcTemplate.query(gsSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("name", rs.getString("business_name")!=null?rs.getString("business_name"):"");
+						m.put("code", rs.getString("business_code")!=null?rs.getString("business_code"):"");
+						m.put("upCode", rs.getString("up_code")!=null?rs.getString("up_code"):"");
+						return m;
+					}
+				});
+    	Map<String, Object> gsMap = new HashMap<String, Object>();
+    	for(Map<String, Object> m : gsList){
+    		if(m.get("upCode") != null && m.get("upCode").toString().trim().length() > 0
+    				&& !("0".equals(m.get("upCode").toString().trim()))){
+    			if("88".equals(m.get("upCode").toString().trim())){
+    				gsMap.put(m.get("code").toString(), m.get("name").toString());
+    			}
+    		}
+    	}
+    	
+    	String[] gsS = {gsMap.get("05").toString(), gsMap.get("55").toString(), gsMap.get("22").toString(), gsMap.get("26").toString()};
+    	String[] levelS = {"A1", "A2", "A3", "B1", "B2", "B3", "C1", "C2", "D", "E"};
+    	List<String> keyList = new ArrayList<String>();
+    	for(String gs : gsS){
+    		for(String level : levelS){
+    			keyList.add(gs + "_" + level);
+    		}
+    	}
+    	
+    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+    	for(long l = 7l; l >= 0l; l--){
+    		Date d = sdf.parse(date);
+    		d.setTime(d.getTime() - l*1000*60*60*24);
+    		String date1 = sdf.format(d);
+        	
+        	String calcIntervalSql = "select * from bsth_c_calc_interval where date = ? and sfyy = 1 and gsbm != '77'";
+        	List<Map<String, Object>> calcIntervalList=jdbcTemplate.query(calcIntervalSql,
+        			new Object[]{date1},
+    				new RowMapper<Map<String, Object>>(){
+    					@Override
+    					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+    						Map<String, Object> m=new HashMap<String,Object>();
+    						m.put("gsbm", rs.getString("gsbm"));
+    						m.put("fgsbm", rs.getString("fgsbm"));
+    						m.put("date", rs.getString("date"));
+    						m.put("level", rs.getString("level"));
+    						m.put("djgAll", rs.getString("djg_all"));
+    						m.put("djgZgf", rs.getString("djg_zgf"));
+    						m.put("djgWgf", rs.getString("djg_wgf"));
+    						m.put("djgDg", rs.getString("djg_dg"));
+    						return m;
+    					}
+    				});
+        	
+        	Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
+        	for(Map<String, Object> m : calcIntervalList){
+        		String gsName = gsMap.get(m.get("gsbm").toString()).toString();
+        		String level = m.get("level").toString();
+        		String key = gsName + "_" + level;
+        		if(!(keyMap.containsKey(key))){
+        			Map<String, Object> map = new HashMap<String, Object>();
+        			map.put("date", date1);
+        			map.put("gs", gsName);
+        			map.put("level", level);
+        			map.put("djgAll", 0);
+        			map.put("djgZgf", 0);
+        			map.put("djgWgf", 0);
+        			map.put("djgDg", 0);
+        			keyMap.put(key, map);
+        		}
+        		if(m.get("djgAll") != null && m.get("djgAll").toString().trim().length() > 0
+        				&& Long.valueOf(m.get("djgAll").toString()) > 0l){
+            		Map<String, Object> map = keyMap.get(key);
+            		map.put("djgAll", Long.valueOf(map.get("djgAll").toString()) + Long.valueOf(m.get("djgAll").toString()));
+            		map.put("djgZgf", Long.valueOf(map.get("djgZgf").toString()) + Long.valueOf(m.get("djgZgf").toString()));
+            		map.put("djgWgf", Long.valueOf(map.get("djgWgf").toString()) + Long.valueOf(m.get("djgWgf").toString()));
+            		map.put("djgDg", Long.valueOf(map.get("djgDg").toString()) + Long.valueOf(m.get("djgDg").toString()));
+        		}
+        	}
+        	
+        	for(String key : keyList){
+        		if(keyMap.containsKey(key)){
+        			resList.add(keyMap.get(key));
+        		}
+        	}
+    	}
+    	
+    	return resList;
+    }
+    
+    /** 按日期查询所有线路首班末班班次数 */
+    @GET
+    @Path("/selectData/getFirstAndLast/{date}")
+    public List<Map<String, Object>> getFirstAndLast(@PathParam("date") String date){
+    	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+    	
+    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		SimpleDateFormat sdf_ = new SimpleDateFormat("yyyy-MM-dd");
+		DecimalFormat df = new DecimalFormat("0.00");
+		Date createDate = new Date();
+		String sfss = "1";	//是否实时；=1为实时。
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	
+    	//key:线路编码；value：每日营运开始时间
+    	Map<String, Long> yyLine = new HashMap<String, Long>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			String lineCode = t.get("lineCode").toString();
+//    			yyLine.add(t.get("lineCode").toString());
+    			String minfcsj="02:00";
+    	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+    	         		+ " id = ("
+    	         		+ "select max(id) from bsth_c_line_config where line = ?"
+    	         		+ ")";
+    	        List<String> list= jdbcTemplate.query(sqlMinYysj,
+            			new Object[]{lineCode},
+    					new RowMapper<String>(){
+    					@Override
+    					public String  mapRow(ResultSet rs, int rowNum) throws SQLException {
+    						String startopt=rs.getString("start_opt");
+    						return startopt;
+    					}
+    			});
+    	        if(list.size()>0){
+    	        	minfcsj=list.get(0);
+    	        }
+    			String[] minSjs = minfcsj.split(":");
+    			//车辆最早发车时间 用来过滤超第二天0点的数据
+    			Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
+    			
+    			yyLine.put(lineCode, minSj);
+    		}
+    	}
+    	
+    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
+    	Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
+    	Map<String, Map<String, Object>> lineXX = new HashMap<String, Map<String, Object>>();
+    	for(ScheduleRealInfo s : findAll){
+//			if(s.getBcType().equals("region") || s.getBcType().equals("venting")
+//					|| s.getBcType().equals("major") || isInOut(s)){
+			if(s.getBcType().equals("region") || isInOut(s)){
+				continue;	//区间班次、直放班次、放站班次与空驶班次不做首末班统计
+			}
+    		if(!("77".equals(s.getGsBm())) && yyLine.containsKey(s.getXlBm())){	//只统计营运线路
+    			if(!(keyMap.containsKey(s.getXlBm()))){
+    				keyMap.put(s.getXlBm(), new ArrayList<ScheduleRealInfo>());
+    			}
+    			keyMap.get(s.getXlBm()).add(s);
+    			
+    			if(!(lineXX.containsKey(s.getXlBm()))){
+    				lineXX.put(s.getXlBm(), new HashMap<String, Object>());
+    			}
+    			Map<String, Object> xx = lineXX.get(s.getXlBm());
+    			if(!(xx.containsKey("lineName")) && s.getXlName() != null && s.getXlName().trim().length() > 0){
+    				xx.put("lineName", s.getXlName());
+    			}
+    			if(!(xx.containsKey("gsBm")) && s.getGsBm() != null && s.getGsBm().trim().length() > 0){
+    				xx.put("gsBm", s.getGsBm());
+    			}
+    			if(!(xx.containsKey("gsName")) && s.getGsName() != null && s.getGsName().trim().length() > 0){
+    				xx.put("gsName", s.getGsName());
+    			}
+    			if(!(xx.containsKey("fgsBm")) && s.getFgsBm() != null && s.getFgsBm().trim().length() > 0){
+    				xx.put("fgsBm", s.getFgsBm());
+    			}
+    			if(!(xx.containsKey("fgsName")) && s.getFgsName() != null && s.getFgsName().trim().length() > 0){
+    				xx.put("fgsName", s.getFgsName());
+    			}
+    		}
+    	}
+    	
+    	for(String lineCode : keyMap.keySet()){
+    		List<ScheduleRealInfo> listjh0 = new ArrayList<ScheduleRealInfo>();
+    		List<ScheduleRealInfo> listjh1 = new ArrayList<ScheduleRealInfo>();
+    		List<ScheduleRealInfo> listsj0 = new ArrayList<ScheduleRealInfo>();
+    		List<ScheduleRealInfo> listsj1 = new ArrayList<ScheduleRealInfo>();
+    		Long minFcsj = yyLine.get(lineCode);
+    		for(ScheduleRealInfo s : keyMap.get(lineCode)){
+    			String[] fcsj = s.getFcsj().split(":");
+				Long fcsjL = Long.parseLong(fcsj[0]) * 60 + Long.parseLong(fcsj[1]);
+				Long fscjT = 0L;
+				if (fcsjL < minFcsj) {
+					Calendar calendar = new GregorianCalendar();
+					calendar.setTime(s.getScheduleDate());
+					calendar.add(calendar.DATE, 1);
+					Date d = calendar.getTime();
+					try {
+						fscjT = sdf.parse(sdf_.format(d) + " " + s.getFcsj()).getTime();
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				} else {
+					try {
+						fscjT = sdf.parse(s.getScheduleDateStr() + " " + s.getFcsj()).getTime();
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+
+				if (StringUtils.isEmpty(s.getFcsjActual())) {
+					s.setFcsjActualTime(0L);
+					s.setFcsjT(fscjT);
+				} else {
+					Long fcsjAcual = 0L;
+					try {
+						fcsjAcual = sdf.parse(s.getRealExecDate() + " " + s.getFcsjActual()).getTime();
+						if(fcsjAcual - fscjT > (20l*60*60*1000)){//如果实发比计发大20小时则认为日期有误，如实发在次日，计发为00:00,实发为23:59
+							fcsjAcual -= 1l*24*60*60*1000;
+						} if(fscjT - fcsjAcual > (20l*60*60*1000)){
+							fcsjAcual += 1l*24*60*60*1000;
+						}
+						s.setFcsjActualTime(fcsjAcual);
+						s.setFcsjT(fscjT);
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				
+				if (!(s.isSflj())) {
+					if (s.getXlDir().equals("0")) {
+						listjh0.add(s);
+					} else {
+						listjh1.add(s);
+					}
+				}
+				
+				if(s.getFcsjActual() != null && s.getFcsjActual().trim().length() > 0){
+					if (s.getXlDir().equals("0")) {
+						listsj0.add(s);
+					} else {
+						listsj1.add(s);
+					}
+				}
+    		}
+    		
+    		Collections.sort(listjh0, new ComparableJhfc());
+    		Collections.sort(listjh1, new ComparableJhfc());
+    		Collections.sort(listsj0, new ComparableAcual());
+    		Collections.sort(listsj1, new ComparableAcual());
+    		int jhFirst = 0, jhLast = 0, sjzdFirst = 0, sjzdLast = 0;
+    		
+    		//上行
+    		if(listjh0.size() > 0){
+    			ScheduleRealInfo jhsb = listjh0.get(0); //计划首班
+    			for(int f = 0; f < listjh0.size(); f++){
+    				jhsb = listjh0.get(f); //计划首班
+    				String bcType = jhsb.getBcType();
+    				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhsb.getSpId());
+    				if(oList.size() > 0 && oList.get(0) != null
+    						&& oList.get(0).trim().length() > 0){
+    					bcType = oList.get(0).trim();
+    				}
+    				if(bcType.equals("region") || bcType.equals("venting")
+    						|| bcType.equals("major") || isInOut(bcType)){
+    					continue;
+    				}
+    				break;
+    			}
+    			if("1".equals(sfss) ? createDate.getTime() > jhsb.getFcsjT() : true){
+    				jhFirst++;
+    				for(int i = 0; i < listsj0.size(); i++){
+    					ScheduleRealInfo sjsb = listsj0.get(i); //实际首班
+    					String bcType = sjsb.getBcType();
+    					if(bcType.equals("region") || bcType.equals("venting")
+        						|| bcType.equals("major") || isInOut(bcType)){
+        					continue;
+        				}
+    					long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
+    					if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
+    						sjzdFirst++;
+    						break;
+    					}
+    				}
+    			}
+    			
+    			if(listjh0.size() > 1){
+    				ScheduleRealInfo jhmb = listjh0.get(listjh0.size() - 1); //计划末班
+    				for(int l = listjh0.size() - 1; l >= 0; l--){
+    					jhmb = listjh0.get(l); //计划首班
+        				String bcType = jhmb.getBcType();
+        				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhmb.getSpId());
+        				if(oList.size() > 0 && oList.get(0) != null
+        						&& oList.get(0).trim().length() > 0){
+        					bcType = oList.get(0).trim();
+        				}
+        				if(bcType.equals("region") || bcType.equals("venting")
+        						|| bcType.equals("major") || isInOut(bcType)){
+        					continue;
+        				}
+        				break;
+        			}
+    				if("1".equals(sfss) ? createDate.getTime() > jhmb.getFcsjT() : true){
+    					jhLast++;
+						for(int i = listsj0.size() - 1; i >= 0; i--){
+							ScheduleRealInfo sjmb = listsj0.get(i); //实际末班
+							String bcType = sjmb.getBcType();
+	    					if(bcType.equals("region") || bcType.equals("venting")
+	        						|| bcType.equals("major") || isInOut(bcType)){
+	        					continue;
+	        				}
+							long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
+    						if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
+    							sjzdLast++;
+        						break;
+    						}
+						}
+    				}
+    			}
+    		}
+    		
+    		//下行
+    		if(listjh1.size() > 0){
+    			ScheduleRealInfo jhsb = listjh1.get(0); //计划首班
+    			for(int f = 0; f < listjh1.size(); f++){
+    				jhsb = listjh1.get(f); //计划首班
+    				String bcType = jhsb.getBcType();
+    				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhsb.getSpId());
+    				if(oList.size() > 0 && oList.get(0) != null
+    						&& oList.get(0).trim().length() > 0){
+    					bcType = oList.get(0).trim();
+    				}
+    				if(bcType.equals("region") || bcType.equals("venting")
+    						|| bcType.equals("major") || isInOut(bcType)){
+    					continue;
+    				}
+    				break;
+    			}
+    			if("1".equals(sfss) ? createDate.getTime() > jhsb.getFcsjT() : true){
+    				jhFirst++;
+    				for(int i = 0; i < listsj1.size(); i++){
+    					ScheduleRealInfo sjsb = listsj1.get(i); //实际首班
+    					String bcType = sjsb.getBcType();
+    					if(bcType.equals("region") || bcType.equals("venting")
+        						|| bcType.equals("major") || isInOut(bcType)){
+        					continue;
+        				}
+						long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
+    					if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
+    						sjzdFirst++;
+    						break;
+    					}
+					}
+    			}
+    			
+    			if(listjh1.size() > 1){
+    				ScheduleRealInfo jhmb = listjh1.get(listjh1.size() - 1); //计划末班
+    				for(int l = listjh1.size() - 1; l >= 0; l--){
+    					jhmb = listjh1.get(l); //计划首班
+        				String bcType = jhmb.getBcType();
+        				List<String> oList = scheduleRealInfoRepository.findoOriginalType(jhmb.getSpId());
+        				if(oList.size() > 0 && oList.get(0) != null
+        						&& oList.get(0).trim().length() > 0){
+        					bcType = oList.get(0).trim();
+        				}
+        				if(bcType.equals("region") || bcType.equals("venting")
+        						|| bcType.equals("major") || isInOut(bcType)){
+        					continue;
+        				}
+        				break;
+        			}
+    				if("1".equals(sfss) ? createDate.getTime() > jhmb.getFcsjT() : true){
+    					jhLast++;
+						for(int i = listsj1.size() - 1; i >= 0; i--){
+							ScheduleRealInfo sjmb = listsj1.get(i); //实际末班
+							String bcType = sjmb.getBcType();
+	    					if(bcType.equals("region") || bcType.equals("venting")
+	        						|| bcType.equals("major") || isInOut(bcType)){
+	        					continue;
+	        				}
+							long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
+    						if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
+    							sjzdLast++;
+        						break;
+    						}
+						}
+    				}
+    			}
+    		}
+    		
+    		Map<String, Object> map = new HashMap<String, Object>();
+    		map.put("lineCode", lineCode);
+    		Map<String, Object> xx = lineXX.get(lineCode);
+    		map.put("lineName", xx!=null&&xx.get("lineName")!=null?xx.get("lineName"):"");
+    		map.put("gsBm", xx!=null&&xx.get("gsBm")!=null?xx.get("gsBm"):"");
+    		map.put("gsName", xx!=null&&xx.get("gsName")!=null?xx.get("gsName"):"");
+    		map.put("fgsBm", xx!=null&&xx.get("fgsBm")!=null?xx.get("fgsBm"):"");
+    		map.put("fgsName", xx!=null&&xx.get("fgsName")!=null?xx.get("fgsName"):"");
+        	map.put("planFirst", jhFirst);
+        	map.put("planLast", jhLast);
+        	map.put("realFirst", sjzdFirst);
+        	map.put("realLast", sjzdLast);
+        	int jhbc = jhFirst + jhLast;
+        	int sjzdbc = sjzdFirst + sjzdLast;
+        	if(jhbc > 0){
+    	    	double zdl = (sjzdbc * 1.0) / (jhbc * 1.0) * 100;
+    			map.put("zdl", df.format(zdl));
+        	} else {
+        		map.put("zdl", "0");
+        	}
+        	if(jhFirst > 0){
+    	    	double zdlFirst = (sjzdFirst * 1.0) / (jhFirst * 1.0) * 100;
+    			map.put("zdlFirst", df.format(zdlFirst));
+        	} else {
+        		map.put("zdlFirst", "0");
+        	}
+        	if(jhLast > 0){
+    	    	double zdlLast = (sjzdLast * 1.0) / (jhLast * 1.0) * 100;
+    			map.put("zdlLast", df.format(zdlLast));
+        	} else {
+        		map.put("zdlLast", "0");
+        	}
+        	
+        	resList.add(map);
+    		
+    	}
+    	
+    	return resList;
+    }
+    
+    /** 按日期查询出车的早未到情况 */
+    @GET
+    @Path("/selectData/getNotYet/{date}")
+    public Map<String, Object> getNotYet(@PathParam("date") String date){
+    	Map<String, Object> resMap = new HashMap<String, Object>();
+    	
+    	String yyxlSql="SELECT line_code from bsth_c_line "
+    			+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+    	Set<String> yyLine = new HashSet<String>();
+    	for(Map<String, Object> t : yyxlList){
+    		if(t.get("lineCode") != null){
+    			yyLine.add(t.get("lineCode").toString());
+    		}
+    	}
+    	
+    	String sqlMinYysj="select line, start_opt from bsth_c_line_config where "
+         		+ " id in (select max(id) from bsth_c_line_config group by line)";
+    	List<Map<String, Object>> minfcsjList = jdbcTemplate.query(sqlMinYysj,
+				new RowMapper<Map<String, Object>>(){
+				@Override
+				public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+					Map<String, Object> map = new HashMap<String, Object>();
+					map.put("line", rs.getString("line")!=null?rs.getString("line"):"");
+					map.put("minfcsj", rs.getString("start_opt")!=null?rs.getString("start_opt"):"02:00");
+					return map;
+				}
+		});
+        
+    	Map<String, Object> minfcsjMap = new HashMap<String, Object>();
+        for(Map<String, Object> map : minfcsjList){
+        	minfcsjMap.put(map.get("line").toString(), map.get("minfcsj").toString());
+        }
+        
+        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+        String format = sdf.format(new Date());
+
+    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
+    	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
+    	Map<String, ScheduleRealInfo> scheduleMap = new HashMap<String, ScheduleRealInfo>();
+    	for(ScheduleRealInfo s : findAll){
+    		if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
+    			Set<ChildTaskPlan> cts = s.getcTasks();
+    			if (cts != null && cts.size() > 0) {
+                    list_s.add(s);
+                } else if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
+                    list_s.add(s);
+                } else if(s.getStatus() != 0){
+                	list_s.add(s);
+                }
+    		}
+    	}
+    	
+    	for(ScheduleRealInfo s : list_s){
+    		if(!isInOut(s) && !s.isCcService()){
+    			String[] split = s.getFcsj().split(":");
+				Long time = Long.valueOf(split[0]) * 60 + Long.valueOf(split[1]);
+				String minfcsj = minfcsjMap.get(s.getXlBm())!=null?minfcsjMap.get(s.getXlBm()).toString():"02:00";
+				String[] split_min = minfcsj.trim().split(":");
+				Long min = Long.valueOf(split_min[0]) * 60 + Long.valueOf(split_min[1]);
+				if(time < min){
+					time += 1440;
+				}
+				s.setFcsjT(time);
+    			String cl = s.getClZbh();
+    			if(scheduleMap.containsKey(cl)){
+    				ScheduleRealInfo s2 = scheduleMap.get(cl);
+					if(time < s2.getFcsjT()){
+						scheduleMap.put(cl, s);
+					}
+    			} else {
+    				scheduleMap.put(cl, s);
+    			}
+    		}
+    	}
+    	
+    	List<ScheduleRealInfo> notYetList = new ArrayList<ScheduleRealInfo>();
+    	
+    	long sum = scheduleMap.keySet().size(), zwd = 0;//早未到数
+    	long yg_z = 0, sn_z = 0, jg_z = 0, nh_z = 0;
+    	long yg_zwd = 0, sn_zwd = 0, jg_zwd = 0, nh_zwd = 0;
+    	for(String key : scheduleMap.keySet()){
+    		ScheduleRealInfo s = scheduleMap.get(key);
+    		if("05".equals(s.getGsBm())){
+    			yg_z += 1;
+			} else if("55".equals(s.getGsBm())){
+				sn_z += 1;
+			} else if("22".equals(s.getGsBm())){
+				jg_z += 1;
+			} else if("26".equals(s.getGsBm())){
+				nh_z += 1;
+			}
+    		if("缺人".equals(s.getAdjustExps())){
+    			List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+    			list.add(s);
+    			BigDecimal sjgl = new BigDecimal(culateSjgl(list));
+    			BigDecimal ljgl = new BigDecimal(culateLjgl(list));
+    			BigDecimal zero = new BigDecimal(0.0);
+    			if(sjgl.compareTo(zero) == 0 && ljgl.compareTo(zero) == 0){
+    				zwd += 1;
+    				if("05".equals(s.getGsBm())){
+    					yg_zwd += 1;
+    				} else if("55".equals(s.getGsBm())){
+    					sn_zwd += 1;
+    				} else if("22".equals(s.getGsBm())){
+    					jg_zwd += 1;
+    				} else if("26".equals(s.getGsBm())){
+    					nh_zwd += 1;
+    				}
+    				notYetList.add(s);
+    			}
+    		}
+    	}
+    	
+    	resMap.put("sum", sum);
+    	resMap.put("notYet", zwd);
+    	resMap.put("sum_05", yg_z);
+    	resMap.put("notYet_05", yg_zwd);
+    	resMap.put("sum_55", sn_z);
+    	resMap.put("notYet_55", sn_zwd);
+    	resMap.put("sum_22", jg_z);
+    	resMap.put("notYet_22", jg_zwd);
+    	resMap.put("sum_26", nh_z);
+    	resMap.put("notYet_26", nh_zwd);
+    	resMap.put("notYetList", notYetList);
+    	return resMap;
+    }
+    
+//    public static void main(String[] args){
+//    	
+//    }
+    
+    public List<Map<String, Object>> createMap(String type, String[] dates){
+    	List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
+    	
+    	for(int i = 0; i < dates.length; i++){
+    		Map<String, Object> tempMap = new HashMap<String, Object>();
+    		tempMap.put("type", type);
+    		String[] split = dates[i].split("-");
+    		tempMap.put("date", split[1] + "/" + split[2]);
+    		tempMap.put("jh", "0");
+    		tempMap.put("sj", "0");
+    		mapList.add(tempMap);
+    	}
+    	
+    	return mapList;
+    }
+    
+    public void mapPut(Map<String, Object> m, String key, Object value){
+		if(m.get(key) != null){
+			m.put(key, new BigDecimal(m.get(key).toString()).add(new BigDecimal(value.toString())));
+		} else {
+			m.put(key, value);
+		}
+	}
+    
+    /**计划营运公里*/
+    public double culateJhgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double jhgl=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!isInOut(scheduleRealInfo)) {
+				if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
+					jhgl=Arith.add(jhgl,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+				}
+			}
+		}
+		return jhgl;
+	}
+    
+    /**实际营运公里（不包含临加）*/
+    public double culateSjgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double sjgl=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!isInOut(scheduleRealInfo)) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					if(!scheduleRealInfo.isSflj()){
+						if(childTaskPlans.isEmpty()){
+							if(!(scheduleRealInfo.getStatus() == -1)){
+								double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+								double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+								if(jhlc-jhlcOrig>0){
+									sjgl=Arith.add(sjgl,jhlcOrig);
+								}else{
+									sjgl=Arith.add(sjgl,jhlc);
+								}
+							}
+						}else{
+							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+			                while (it.hasNext()) {
+			                    ChildTaskPlan childTaskPlan = it.next();
+			                    if(childTaskPlan.getMileageType().equals("service")
+			                    		&&"正常".equals(childTaskPlan.getType1())
+			                    		&& childTaskPlan.getCcId()==null){
+			                    	 if (!childTaskPlan.isDestroy()) {
+			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+			 	                    	sjgl=Arith.add(sjgl,jhgl);
+			 	                    }
+			                    }
+			                }
+						}
+					}
+			}
+		}
+		return sjgl;
+	}
+    
+    /**临加公里*/
+    public double culateLjgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double ljgl=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!isInOut(scheduleRealInfo)) {
+				if(!(scheduleRealInfo.getStatus() == -1)){
+					if(scheduleRealInfo.isSflj()){
+						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+						if(childTaskPlans.isEmpty()){
+							ljgl=Arith.add(ljgl,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+						}else{
+							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+			                while (it.hasNext()) {
+			                    ChildTaskPlan childTaskPlan = it.next();
+			                    if(childTaskPlan.getMileageType().equals("service")
+			                    		&& childTaskPlan.getCcId()==null){
+			                    	 if (!childTaskPlan.isDestroy()) {
+			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+			 	                    	ljgl=Arith.add(ljgl,jhgl);
+			 	                    } 
+			                    }
+			                }
+						}
+					}else{
+						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+						if(childTaskPlans.isEmpty()){
+							double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+							double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+							double zjlc=Arith.sub(jhlc, jhlcOrig);
+							if(zjlc>0){
+								ljgl=Arith.add(zjlc, ljgl);
+							}
+						}else{
+							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+			                while (it.hasNext()) {
+			                    ChildTaskPlan childTaskPlan = it.next();
+			                    if("service".equals(childTaskPlan.getMileageType())
+			                    		&& "临加".equals(childTaskPlan.getType1())
+			                    		&& childTaskPlan.getCcId()==null){
+			                    	if (!childTaskPlan.isDestroy()) {
+			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+			 	                    	ljgl=Arith.add(ljgl,jhgl);
+			 	                    }
+			                    }
+			                }
+						}
+					}
+				}
+			}
+		}
+		return ljgl;
+	}
+    
+    /**烂班（少驶）公里*/
+    public double culateCJLC(List<ScheduleRealInfo> list, String item) {
+		// TODO Auto-generated method stub
+		double sum = 0;
+        Set<ChildTaskPlan> cts;
+        for(ScheduleRealInfo sch : list){
+            if (sch.isSflj())
+                continue;
+            cts = sch.getcTasks();
+           if(isInOut(sch))
+                continue;
+            //有子任务
+            if (cts != null && cts.size() > 0) {
+                for(ChildTaskPlan c : cts){
+                	if(c.getCcId()==null){
+                		if(c.getMileageType().equals("service")){
+                			if(item.equals("其他")){
+    	                		if(c.isDestroy() && 
+    	                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
+    	                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
+    	                            sum = Arith.add(sum, c.getMileage());
+    	                	}else{
+    	                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
+    	                            sum = Arith.add(sum, c.getMileage());
+    	                	}
+                		}
+                	}
+                }
+            }
+           
+            //主任务烂班
+            else if(sch.getStatus() == -1 && !sch.isCcService()){
+                if(sch.getAdjustExps().equals(item) ||
+                        (StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("其他"))){
+                    sum = Arith.add(sum, sch.getJhlcOrig());
+                }
+            }
+            else if(item.equals("其他")){
+                double diff =  Arith.sub(sch.getJhlcOrig(), sch.getJhlc());
+                if(diff > 0){
+                    sum = Arith.add(sum, diff);
+                }
+            }
+        }
+        return sum;
+	}
+    
+    /**计划空驶公里*/
+    public double culateJhJccgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double jcclc =0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
+				if (isInOut(scheduleRealInfo)) {
+					jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+				}
+			}
+		}
+		return jcclc;
+	}
+    
+    /**实际进出场空驶*/
+    public double culateJccgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double jcclc =0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (isInOut(scheduleRealInfo)) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if(childTaskPlans.isEmpty()){
+					if(!(scheduleRealInfo.getStatus() == -1)){
+						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+					}
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("empty")
+	                    		&& childTaskPlan.getCcId()==null){
+	                    	 if (!childTaskPlan.isDestroy()) {
+	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+	 	                    	jcclc=Arith.add(jcclc,jhgl);
+	 	                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return jcclc;
+	}
+    
+	/**实际非进出场空驶公里*/
+    public double culateKsgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double ksgl =0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!isInOut(scheduleRealInfo)) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if(!childTaskPlans.isEmpty()){
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
+	                    	 if (!childTaskPlan.isDestroy()) {
+	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+	 	                    	ksgl=Arith.add(ksgl,jhgl);
+	 	                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return ksgl;
+	}
+    
+	class ComparableJhfc implements Comparator<ScheduleRealInfo>{
+
+		@Override
+		public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+			// TODO Auto-generated method stub
+			return o1.getFcsjT().compareTo(o2.getFcsjT());
+		}
+	}
+	class ComparableAcual implements Comparator<ScheduleRealInfo>{
+
+		@Override
+		public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+			// TODO Auto-generated method stub
+			return o1.getFcsjActualTime().compareTo(o2.getFcsjActualTime());
+		}
+	}
+	
+	public static String decimalToBinary(int n) {
+		String str = "";
+		if(n == 0){
+			return str = "0";
+		}
+		while (n != 0) {
+			str = n % 2 + str;
+			n = n / 2;
+		}
+		return str;
+	}
+    
+}
 package com.bsth.server_rs.dispatch;
  
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PathVariable;
  
 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.io.IOException;
@@ -24,6 +25,8 @@ import java.util.Map;
 @Produces({MediaType.APPLICATION_JSON})
 public class DispatchService {
  
+    private final static Logger log = LoggerFactory.getLogger(DispatchService.class);
+
     @Autowired
     private JdbcTemplate jdbcTemplate;
  
@@ -31,8 +34,9 @@ public class DispatchService {
  
     @GET
     @Path("/{rq}")
-    public List<SchEditInfo> findByRq(@PathVariable String rq) throws IOException {
+    public List<SchEditInfo> findByRq(@PathParam("rq") String rq) throws IOException {
         List<SchEditInfo> editInfos = jdbcTemplate.query("SELECT a.*,b.xl_name line_name,b.gs_name gsmc,b.fgs_name fgsmc,b.schedule_date_str,b.fcsj FROM logger_sch_modify a JOIN bsth_c_s_sp_info_real b ON a.sch_id = b.id WHERE a.rq = ? AND a.type = 'TZRC'", new Object[]{ rq }, BeanPropertyRowMapper.newInstance(SchEditInfo.class));
+        log.error(String.format("%s,%d", rq, editInfos.size()));
         for (SchEditInfo editInfo : editInfos) {
             editInfo.setDetail(mapper.readValue(editInfo.getJsonArray(), Map.class));
         }
@@ -3,7 +3,7 @@
 <configuration>
  
 	<!-- <property resource="application.properties" /> -->
-	<property name="LOG_BASE" value="E:/control_interface_logs" />
+	<property name="LOG_BASE" value="D:/control_interface_logs" />
 	<!-- 控制台输出 -->
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">