Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

潘钊
2 parents 2f9dd0cc 478e05ff
Showing 44 changed files with 6952 additions and 875 deletions
src/main/java/com/bsth/controller/calc/CalcWaybillController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/entity/calc/CalcInterval.java
src/main/java/com/bsth/entity/calc/CalcStatistics.java
src/main/java/com/bsth/repository/calc/CalcIntervalRepository.java
src/main/java/com/bsth/repository/calc/CalcStatisticsRepository.java
src/main/java/com/bsth/service/calc/CalcCulateMileageService.java
src/main/java/com/bsth/service/calc/CalcToolService.java
src/main/java/com/bsth/service/calc/CalcWaybillService.java
src/main/java/com/bsth/service/calc/impl/CalcCulateMileageServiceImpl.java
src/main/java/com/bsth/service/calc/impl/CalcToolServiceImpl.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/schedule/TTInfoDetailService.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTinfoDetailDynamicData.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
@@ -6,6 +6,7 @@ import java.util.Map;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
+import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.service.calc.CalcWaybillService;
@@ -26,19 +27,26 @@ public class CalcWaybillController extends BaseController&lt;CalcWaybill, Integer&gt; 
 	@RequestMapping(value="/generateNew")
 	public Map<String, Object> generateNews(@RequestParam Map<String, Object> map) throws Exception{
-		String date = "", line = "";
+		String date = "", line = "", key="";
 		if(map.get("date")!=null){
 			date=map.get("date").toString().trim();
 		}
 		if(map.get("line")!=null){
 			line=map.get("line").toString().trim();
 		}
+		if(map.get("key")!=null){
+			key=map.get("key").toString().trim();
+		}
 		Map<String, Object> m = new HashMap<String, Object>();
 		try {
 			m = calcWaybillService.generateNew(date, line);
+			if(key.length() == 0){
+				m.put("status", calcWaybillService.calcDaily(date, line));
+			}
+			
 		} catch (Exception e) {
 			// TODO: handle exception
 			e.printStackTrace();
@@ -82,4 +90,61 @@ public class CalcWaybillController extends BaseController&lt;CalcWaybill, Integer&gt; 
 		return calcWaybillService.statisticsDailyTj(gsdm,fgsdm,line,date,date2,xlName,type);
 	}
+	@RequestMapping(value="/generateDaliy")
+	public Map<String, Object> generateDaliy(@RequestParam Map<String, Object> map) throws Exception{
+		String date = "", line = "";
+		if(map.containsKey("date") && map.get("date")!=null){
+			date=map.get("date").toString().trim();
+		}
+		if(map.containsKey("line") && map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		
+		Map<String, Object> m = new HashMap<String, Object>();
+		try {
+			
+			m.put("status", calcWaybillService.calcDaily(date, line));
+			
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+			m.put("status", ResponseCode.ERROR);
+			return m;
+		}
+		return m;
+	}
+	
+	@RequestMapping(value="/calcStatisticsDaily")
+	public List<CalcStatistics> calcStatisticsDaily(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString().trim();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString().trim();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString().trim();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString().trim();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString().trim();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+		return calcWaybillService.calcStatisticsDaily(gsdm,fgsdm,line,date,date2,xlName,type);
+	}
+	
 }
@@ -6,6 +6,7 @@ import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import com.bsth.service.schedule.datatools.TTinfoDetailDynamicData;
+import com.bsth.service.schedule.timetable.ExcelFormatType;
 import com.bsth.service.schedule.utils.DataToolsFile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -41,13 +42,14 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
      */
     @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST)
     public Map<String, Object> validate_sheet(
-            String filename, String sheetname, Integer lineid, String linename, Integer lineversion) {
+            String filename, String sheetname, Integer lineid, String linename, Integer lineversion, String excelFormatType) {
         Map<String, Object> rtn = new HashMap<>();
         try {
             if (lineversion == null) {
                 throw new Exception("线路版本未知");
             }
-            ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, lineversion);
+            ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, lineversion,
+                    ExcelFormatType.getEnum(excelFormatType));
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -3,6 +3,7 @@ package com.bsth.data.schedule.thread;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
+import com.bsth.service.calc.CalcWaybillService;
 import com.bsth.service.oil.DlbService;
 import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.service.oil.YlbService;
@@ -31,6 +32,9 @@ public class CalcOilThread extends Thread{
     @Autowired
     DayOfDirectives dayOfDirectives;
+    
+    @Autowired
+    CalcWaybillService calcWaybillService;
     @Override
     public void run() {
@@ -42,6 +46,9 @@ public class CalcOilThread extends Thread{
             logger.info("开始计算班次准点率....");
             sheetService.saveSheetList("");
             logger.info("计算班次准点率结束！");
+            logger.info("开始保存统计日报....");
+            calcWaybillService.calcDaily("", "");
+            logger.info("统计日报保存完成！");
         } catch(Exception e){
             logger.error("计算路单里程加注量失败",e);
         }
+package com.bsth.entity.calc;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "calc_interval")
+public class CalcInterval {
+	/* 主键*/
+	@Id
+	@GeneratedValue
+	private Long id;
+	/* 公司代码*/
+	private String gsdm;
+	/* 公司名称*/
+	private String gsname;
+	/* 分公司代码*/
+	private String fgsdm;
+	/* 分公司名称*/
+	private String fgsname;
+	/* 日期*/
+	private Date rq;
+	/* 日期字符串*/
+	private String rqStr;
+	/* 线路编码*/
+	private String xl;
+	/* 线路名称*/
+	private String xlName;
+	/* 大间隔次数*/
+	private int djg;
+	/* 大间隔次数(早高峰)*/
+	private int djgM;
+	/* 大间隔次数(晚高峰)*/
+	private int djgA;
+	/* 最大大间隔时间*/
+	private int djgTime;
+	/* 备注*/
+	private String remark;
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getGsdm() {
+		return gsdm;
+	}
+	public void setGsdm(String gsdm) {
+		this.gsdm = gsdm;
+	}
+	public String getGsname() {
+		return gsname;
+	}
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+	public String getFgsdm() {
+		return fgsdm;
+	}
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+	public String getFgsname() {
+		return fgsname;
+	}
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
+	public Date getRq() {
+		return rq;
+	}
+	public void setRq(Date rq) {
+		this.rq = rq;
+	}
+	public String getRqStr() {
+		return rqStr;
+	}
+	public void setRqStr(String rqStr) {
+		this.rqStr = rqStr;
+	}
+	public String getXl() {
+		return xl;
+	}
+	public void setXl(String xl) {
+		this.xl = xl;
+	}
+	public String getXlName() {
+		return xlName;
+	}
+	public void setXlName(String xlName) {
+		this.xlName = xlName;
+	}
+	public int getDjg() {
+		return djg;
+	}
+	public void setDjg(int djg) {
+		this.djg = djg;
+	}
+	public int getDjgM() {
+		return djgM;
+	}
+	public void setDjgM(int djgM) {
+		this.djgM = djgM;
+	}
+	public int getDjgA() {
+		return djgA;
+	}
+	public void setDjgA(int djgA) {
+		this.djgA = djgA;
+	}
+	public int getDjgTime() {
+		return djgTime;
+	}
+	public void setDjgTime(int djgTime) {
+		this.djgTime = djgTime;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	
+}
+package com.bsth.entity.calc;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "calc_statistics")
+public class CalcStatistics {
+	/* 主键*/
+	@Id
+	@GeneratedValue
+	private Long id;
+	/* 日期*/
+	private Date date;
+	/* 日期字符串*/
+	private String dateStr;
+	/* 线路编码*/
+	private String xl;
+	/* 线路名称*/
+	private String xlName;
+	/* 公司代码*/
+	private String gsdm;
+	/* 分公司代码*/
+	private String fgsdm;
+	/* 计划总公里*/
+	private Double jhzlc;
+	/* 计划营运公里*/
+	private Double jhyylc;
+	/* 计划空驶公里*/
+	private Double jhkslc;
+	/* 实际总公里*/
+	private Double sjzlc;
+	/* 实际营运公里*/
+	private Double sjyylc;
+	/* 实际空驶公里*/
+	private Double sjkslc;
+	/* 少驶公里*/
+	private Double sslc;
+	/* 少驶班次*/
+	private int ssbc;
+	/* 路阻公里*/
+	private Double lzlc;
+	/* 吊慢公里*/
+	private Double dmlc;
+	/* 故障公里*/
+	private Double gzlc;
+	/* 纠纷公里*/
+	private Double jflc;
+	/* 肇事公里*/
+	private Double zslc;
+	/* 缺人公里*/
+	private Double qrlc;
+	/* 缺车公里*/
+	private Double qclc;
+	/* 客稀公里*/
+	private Double kxlc;
+	/* 气候公里*/
+	private Double qhlc;
+	/* 援外公里*/
+	private Double ywlc;
+	/* 其他公里*/
+	private Double qtlc;
+	/* 临加公里*/
+	private Double ljlc;
+	/* 计划班次*/
+	private int jhbcq;
+	/* 计划班次(早高峰)*/
+	private int jhbcz;
+	/* 计划班次(晚高峰)*/
+	private int jhbcw;
+	/* 实际班次*/
+	private int sjbcq;
+	/* 实际班次(早高峰)*/
+	private int sjbcz;
+	/* 实际班次(晚高峰)*/
+	private int sjbcw;
+	/* 临加班次*/
+	private int ljbcq;
+	/* 临加班次(早高峰)*/
+	private int ljbcz;
+	/* 临加班次(晚高峰)*/
+	private int ljbcw;
+	/* 放站班次*/
+	private int fzbcq;
+	/* 放站班次(早高峰)*/
+	private int fzbcz;
+	/* 放站班次(晚高峰)*/
+	private int fzbcw;
+	/* 调头班次*/
+	private int dtbcq;
+	/* 调头班次(早高峰)*/
+	private int dtbcz;
+	/* 调头班次(晚高峰)*/
+	private int dtbcw;
+	/* 大间隔次数*/
+	private int djgq;
+	/* 大间隔次数(早高峰)*/
+	private int djgz;
+	/* 大间隔次数(晚高峰)*/
+	private int djgw;
+	/* 最大大间隔时间*/
+	private int djgsj;
+	/* 备注*/
+	private String remark;
+	
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Date getDate() {
+		return date;
+	}
+	public void setDate(Date date) {
+		this.date = date;
+	}
+	public String getDateStr() {
+		return dateStr;
+	}
+	public void setDateStr(String dateStr) {
+		this.dateStr = dateStr;
+	}
+	public String getXl() {
+		return xl;
+	}
+	public void setXl(String xl) {
+		this.xl = xl;
+	}
+	public String getXlName() {
+		return xlName;
+	}
+	public void setXlName(String xlName) {
+		this.xlName = xlName;
+	}
+	public String getGsdm() {
+		return gsdm;
+	}
+	public void setGsdm(String gsdm) {
+		this.gsdm = gsdm;
+	}
+	public String getFgsdm() {
+		return fgsdm;
+	}
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+	public Double getJhzlc() {
+		return jhzlc;
+	}
+	public void setJhzlc(Double jhzlc) {
+		this.jhzlc = jhzlc;
+	}
+	public Double getJhyylc() {
+		return jhyylc;
+	}
+	public void setJhyylc(Double jhyylc) {
+		this.jhyylc = jhyylc;
+	}
+	public Double getJhkslc() {
+		return jhkslc;
+	}
+	public void setJhkslc(Double jhkslc) {
+		this.jhkslc = jhkslc;
+	}
+	public Double getSjzlc() {
+		return sjzlc;
+	}
+	public void setSjzlc(Double sjzlc) {
+		this.sjzlc = sjzlc;
+	}
+	public Double getSjyylc() {
+		return sjyylc;
+	}
+	public void setSjyylc(Double sjyylc) {
+		this.sjyylc = sjyylc;
+	}
+	public Double getSjkslc() {
+		return sjkslc;
+	}
+	public void setSjkslc(Double sjkslc) {
+		this.sjkslc = sjkslc;
+	}
+	public Double getSslc() {
+		return sslc;
+	}
+	public void setSslc(Double sslc) {
+		this.sslc = sslc;
+	}
+	public int getSsbc() {
+		return ssbc;
+	}
+	public void setSsbc(int ssbc) {
+		this.ssbc = ssbc;
+	}
+	public Double getLzlc() {
+		return lzlc;
+	}
+	public void setLzlc(Double lzlc) {
+		this.lzlc = lzlc;
+	}
+	public Double getDmlc() {
+		return dmlc;
+	}
+	public void setDmlc(Double dmlc) {
+		this.dmlc = dmlc;
+	}
+	public Double getGzlc() {
+		return gzlc;
+	}
+	public void setGzlc(Double gzlc) {
+		this.gzlc = gzlc;
+	}
+	public Double getJflc() {
+		return jflc;
+	}
+	public void setJflc(Double jflc) {
+		this.jflc = jflc;
+	}
+	public Double getZslc() {
+		return zslc;
+	}
+	public void setZslc(Double zslc) {
+		this.zslc = zslc;
+	}
+	public Double getQrlc() {
+		return qrlc;
+	}
+	public void setQrlc(Double qrlc) {
+		this.qrlc = qrlc;
+	}
+	public Double getQclc() {
+		return qclc;
+	}
+	public void setQclc(Double qclc) {
+		this.qclc = qclc;
+	}
+	public Double getKxlc() {
+		return kxlc;
+	}
+	public void setKxlc(Double kxlc) {
+		this.kxlc = kxlc;
+	}
+	public Double getQhlc() {
+		return qhlc;
+	}
+	public void setQhlc(Double qhlc) {
+		this.qhlc = qhlc;
+	}
+	public Double getYwlc() {
+		return ywlc;
+	}
+	public void setYwlc(Double ywlc) {
+		this.ywlc = ywlc;
+	}
+	public Double getQtlc() {
+		return qtlc;
+	}
+	public void setQtlc(Double qtlc) {
+		this.qtlc = qtlc;
+	}
+	public Double getLjlc() {
+		return ljlc;
+	}
+	public void setLjlc(Double ljlc) {
+		this.ljlc = ljlc;
+	}
+	public int getJhbcq() {
+		return jhbcq;
+	}
+	public void setJhbcq(int jhbcq) {
+		this.jhbcq = jhbcq;
+	}
+	public int getJhbcz() {
+		return jhbcz;
+	}
+	public void setJhbcz(int jhbcz) {
+		this.jhbcz = jhbcz;
+	}
+	public int getJhbcw() {
+		return jhbcw;
+	}
+	public void setJhbcw(int jhbcw) {
+		this.jhbcw = jhbcw;
+	}
+	public int getSjbcq() {
+		return sjbcq;
+	}
+	public void setSjbcq(int sjbcq) {
+		this.sjbcq = sjbcq;
+	}
+	public int getSjbcz() {
+		return sjbcz;
+	}
+	public void setSjbcz(int sjbcz) {
+		this.sjbcz = sjbcz;
+	}
+	public int getSjbcw() {
+		return sjbcw;
+	}
+	public void setSjbcw(int sjbcw) {
+		this.sjbcw = sjbcw;
+	}
+	public int getLjbcq() {
+		return ljbcq;
+	}
+	public void setLjbcq(int ljbcq) {
+		this.ljbcq = ljbcq;
+	}
+	public int getLjbcz() {
+		return ljbcz;
+	}
+	public void setLjbcz(int ljbcz) {
+		this.ljbcz = ljbcz;
+	}
+	public int getLjbcw() {
+		return ljbcw;
+	}
+	public void setLjbcw(int ljbcw) {
+		this.ljbcw = ljbcw;
+	}
+	public int getFzbcq() {
+		return fzbcq;
+	}
+	public void setFzbcq(int fzbcq) {
+		this.fzbcq = fzbcq;
+	}
+	public int getFzbcz() {
+		return fzbcz;
+	}
+	public void setFzbcz(int fzbcz) {
+		this.fzbcz = fzbcz;
+	}
+	public int getFzbcw() {
+		return fzbcw;
+	}
+	public void setFzbcw(int fzbcw) {
+		this.fzbcw = fzbcw;
+	}
+	public int getDtbcq() {
+		return dtbcq;
+	}
+	public void setDtbcq(int dtbcq) {
+		this.dtbcq = dtbcq;
+	}
+	public int getDtbcz() {
+		return dtbcz;
+	}
+	public void setDtbcz(int dtbcz) {
+		this.dtbcz = dtbcz;
+	}
+	public int getDtbcw() {
+		return dtbcw;
+	}
+	public void setDtbcw(int dtbcw) {
+		this.dtbcw = dtbcw;
+	}
+	public int getDjgq() {
+		return djgq;
+	}
+	public void setDjgq(int djgq) {
+		this.djgq = djgq;
+	}
+	public int getDjgz() {
+		return djgz;
+	}
+	public void setDjgz(int djgz) {
+		this.djgz = djgz;
+	}
+	public int getDjgw() {
+		return djgw;
+	}
+	public void setDjgw(int djgw) {
+		this.djgw = djgw;
+	}
+	public int getDjgsj() {
+		return djgsj;
+	}
+	public void setDjgsj(int djgsj) {
+		this.djgsj = djgsj;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	
+}
+package com.bsth.repository.calc;
+
+import java.util.List;
+
+import javax.transaction.Transactional;
+
+import com.bsth.entity.calc.CalcInterval;
+import com.bsth.repository.BaseRepository;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ */
+@Repository
+public interface CalcIntervalRepository extends BaseRepository<CalcInterval, Integer>{
+
+	//按照时间段统计，公司下线路
+	@Query(value="select DISTINCT c from CalcInterval c where c.xl like %?1%  and c.rqStr between ?2 and ?3  and c.gsdm like %?4% and c.fgsdm like %?5% order by c.xl")
+	List<CalcInterval> selectByDateAndLine(String line,String date,String date2,String gsdm,String fgsdm);
+	
+	//按照时间段统计，单条线路
+	@Query(value="select DISTINCT c from CalcInterval c where c.xl = ?1  and c.rqStr between ?2 and ?3 order by c.xl")
+	List<CalcInterval> selectByDateAndLine(String line,String date,String date2);
+	
+	//按照日期和线路删除数据
+	@Modifying
+	@Transactional
+	@Query(value = "delete CalcInterval c where c.rqStr=?1 and c.xl=?2")
+	void deleteByDateAndLine(String date, String line);
+
+	//按照日期删除数据
+	@Modifying
+	@Transactional
+	@Query(value = "delete CalcInterval c where c.rqStr=?1")
+	void deleteByDate(String date);
+
+}
+package com.bsth.repository.calc;
+
+import java.util.List;
+
+import javax.transaction.Transactional;
+
+import com.bsth.entity.calc.CalcStatistics;
+import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.repository.BaseRepository;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ */
+@Repository
+public interface CalcStatisticsRepository extends BaseRepository<CalcStatistics, Integer>{
+
+	//按照时间段统计，公司下线路
+	@Query(value="select DISTINCT c from CalcStatistics c where c.xl like %?1%  and c.dateStr between ?2 and ?3  and c.gsdm like %?4% and c.fgsdm like %?5% order by c.xl")
+	List<CalcStatistics> selectByDateAndLineTj(String line,String date,String date2,String gsdm,String fgsdm);
+	
+	//按照时间段统计，单条线路
+	@Query(value="select DISTINCT c from CalcStatistics c where c.xl = ?1  and c.dateStr between ?2 and ?3 order by c.xl")
+	List<CalcStatistics> selectByDateAndLineTj2(String line,String date,String date2);
+	
+	//按照日期和线路删除数据
+	@Modifying
+	@Transactional
+	@Query(value = "delete CalcStatistics c where c.dateStr=?1 and c.xl=?2")
+	void deleteByDateAndLine(String date, String line);
+
+	//按照日期删除数据
+	@Modifying
+	@Transactional
+	@Query(value = "delete CalcStatistics c where c.dateStr=?1")
+	void deleteByDate(String date);
+
+}
 package com.bsth.service.calc;
 import java.util.List;
+import java.util.Map;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.Interval;
 public interface CalcCulateMileageService {
@@ -25,6 +27,7 @@ public interface CalcCulateMileageService {
 	double culateLbgl(List<ScheduleRealInfo> lists);//烂班公里
 	double culateCJLC(List<ScheduleRealInfo> lists,String item);//烂班公里详细
 	int culateDtfzbc(List<ScheduleRealInfo> lists,String type,String item);//掉头放站班次
+	Map<String, Object> culateDjg(List<ScheduleRealInfo> lists,String line, List<Map<String, Object>> xlList, List<Interval> djgList);//大间隔
 }
 package com.bsth.service.calc;
 import java.util.List;
+import java.util.Map;
 import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.entity.sys.Interval;
 /**
  * Created by 17/11/16.
  */
 public interface CalcToolService {
-	List<CalcWaybill> findAll(String date, String line);
+	List<CalcWaybill> findAll(String date, String line, List<Map<String, Object>> xlList, List<Interval> djgList);
 }
@@ -3,6 +3,7 @@ package com.bsth.service.calc;
 import java.util.List;
 import java.util.Map;
+import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.service.BaseService;
@@ -14,5 +15,12 @@ public interface CalcWaybillService extends BaseService&lt;CalcWaybill, Integer&gt; {
 	Map<String, Object> generateNew(String date, String line) throws Exception;
 	List<Map<String, Object>> statisticsDailyTj(String gsdm,String fgsdm, String line, String date, String date2, String xlName, String type);
+
+	/**
+	 * @param rq 格式如：2018-03-22（留空""默认当前日期前一天）
+	 * @param line （留空""默认全部线路）
+	 */
+	String calcDaily(String rq, String line) throws Exception;
+	List<CalcStatistics> calcStatisticsDaily(String gsdm,String fgsdm, String line, String date, String date2, String xlName, String type);
 }
 package com.bsth.service.calc.impl;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang.StringUtils;
@@ -11,8 +19,10 @@ import org.springframework.stereotype.Service;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.Interval;
 import com.bsth.service.calc.CalcCulateMileageService;
 import com.bsth.util.Arith;
+import com.bsth.util.ComparableChild;
 @Service
 public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
@@ -234,7 +244,7 @@ public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
 		double sjgl =0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-//			if(!scheduleRealInfo.isSflj()){
+			if(!scheduleRealInfo.isSflj()){
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 				if(childTaskPlans.isEmpty()){
 					if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
@@ -264,7 +274,7 @@ public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
 	                    }
 	                }
 			   }
-//			}
+			}
 		}
 		return sjgl;
 	}
@@ -670,4 +680,196 @@ public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
 		}	
 		return bc;
 	}
+
+	public ScheduleRealInfo checkBc(ScheduleRealInfo s){
+		//如果班次有子任务 且 子任务中有属于营运的。把该子任务的发车时间设置成班次的发车时间
+		String fcsj=s.getFcsjActual()==null?"":s.getFcsjActual();
+		if(fcsj.equals("")){
+			Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+			if(!childTaskPlans.isEmpty()){
+					List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
+		       	    Collections.sort(listit, new ComparableChild());
+		       	    for (int i = 0; i < listit.size(); i++) {
+		       	    	ChildTaskPlan c=listit.get(i);
+		       	    	if(!c.isDestroy()){
+		       	    		if(c.getMileageType().equals("service")){
+		       	    			s.setFcsjActual(c.getStartDate());
+								break;
+							}
+							
+		       	    	}
+					}
+			}
+		}
+		return s;
+	}
+
+	public Map<String, Object> listDjg(int peak,int trough,List<ScheduleRealInfo> listInfo,String grade){
+		DecimalFormat  df   = new DecimalFormat("#0.00"); 
+		Collections.sort(listInfo, new ComparableAcuals());
+		List<ScheduleRealInfo> listInfo0=new ArrayList<ScheduleRealInfo>();
+		List<ScheduleRealInfo> listInfo1=new ArrayList<ScheduleRealInfo>();
+		for (int i = 0; i < listInfo.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			if(s.getXlDir().equals("0")){
+				listInfo0.add(s);
+			}else{
+				listInfo0.add(s);
+			}
+		}
+		Map<String, Object> map=new HashMap<String,Object>();
+		int djgcsz=0;
+		int djgcsw=0;
+		int djgcsq=0;
+		long djcsj=0l;
+		for (int i = 0; i < listInfo0.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			Long fcsjTime=s.getFcsjActualTime();
+			String time=s.getFcsjActual();
+			String[] fcsjStr = time.split(":");
+			long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+			if(i<listInfo.size()-1){
+				Long djg=0l;
+				Long fscjNext=listInfo.get(i+1).getFcsjActualTime();
+				if((fcsj>=zgf1&&fcsj<=zgf2)){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsz ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/60000;
+						}
+					}
+				}else if((fcsj>=wgf1&&fcsj<=wgf2)){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsw ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/60000;
+						}
+					}
+				}else{
+					djg = (long) (trough*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/60000;
+						}
+					}
+				}
+			}
+		}
+		for (int i = 0; i < listInfo1.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			Long fcsjTime=s.getFcsjActualTime();
+			String time=s.getFcsjActual();
+			String[] fcsjStr = time.split(":");
+			long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+			if(i<listInfo.size()-1){
+				Long djg=0l;
+				Long fscjNext=listInfo.get(i+1).getFcsjActualTime();
+				if(fcsj>=zgf1&&fcsj<=zgf2){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsz ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/60000;
+						}
+					}
+				}else if(fcsj>=wgf1&&fcsj<=wgf2){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsw ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/60000;
+						}
+					}
+				}else{
+					djg = (long) (trough*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/60000;
+						}
+					}
+				}
+			}
+		}
+		
+		map.put("djgcsz", djgcsz);
+		map.put("djgcsw", djgcsw);
+		map.put("djgcsq", djgcsq);
+		map.put("djgsj", djcsj);
+		return map;
+	}
+	
+	@Override
+	public Map<String, Object> culateDjg(List<ScheduleRealInfo> lists,
+			String line, List<Map<String, Object>> xlList, List<Interval> djgList) {
+		// TODO Auto-generated method stub
+		
+
+		// TODO Auto-generated method stub
+		List<ScheduleRealInfo> list=lists;
+		Map<String, Object> m=new HashMap<String,Object>();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+//			 Collections.sort(listInfo,new ComparableAcuals());
+			
+			 for (int i = 0; i < xlList.size(); i++) {
+				 String lineCode=xlList.get(i).get("line").toString();
+				 String grade =xlList.get(i).get("grade")==null?"1":xlList.get(i).get("grade").toString();
+				 int peak=0;
+				 int trough=0;
+				 for (int j = 0; j < djgList.size(); j++) {
+					Interval il=djgList.get(j);
+					if(il.getLevel().equals(grade)){
+						peak=il.getPeak();
+						trough=il.getTrough();
+						continue;
+					}
+			 }
+				List<ScheduleRealInfo> listInfo=new ArrayList<ScheduleRealInfo>();
+				 for (int j = 0; j < list.size(); j++) {
+					ScheduleRealInfo sinfo=list.get(j);
+					try {
+					if(sinfo.getXlBm().equals(lineCode)){
+						ScheduleRealInfo s=checkBc(sinfo);
+						String fcsj=s.getFcsjActual()==null?"":s.getFcsjActual();
+						if(!fcsj.equals("")){
+							Long fcsjAcual = sdf.parse(s.getRealExecDate() + " " + s.getFcsjActual()).getTime();
+							s.setFcsjActualTime(fcsjAcual);
+							s.setFcsjActual(fcsj);
+							listInfo.add(s);
+						}
+					}
+					} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			 }
+				 
+			 if(listInfo.size()>0){
+				  m=listDjg(peak,trough,listInfo,grade);
+			 }else{
+				 m.put("djgcsz", "0");
+				 m.put("djgcsw", "0");
+				 m.put("djgcsq", "0");
+				 m.put("djgsj", "0");
+			 }
+		}
+		return m;
+	}
 }
+
+class ComparableAcuals implements Comparator<ScheduleRealInfo>{
+
+	@Override
+	public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+		// TODO Auto-generated method stub
+		return o1.getFcsjActualTime().compareTo(o2.getFcsjActualTime());
+	}
+
+}
 \ No newline at end of file
@@ -9,9 +9,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.swing.text.Keymap;
+
+import com.bsth.entity.calc.CalcInterval;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.Interval;
+import com.bsth.repository.calc.CalcIntervalRepository;
 import com.bsth.repository.calc.CalcWaybillRepository;
 import com.bsth.service.calc.CalcToolService;
 import com.bsth.service.calc.CalcCulateMileageService;
@@ -35,11 +40,11 @@ public class CalcToolServiceImpl implements CalcToolService {
 	private CalcWaybillRepository clacRepository;
 	@Autowired
-	private CalcCulateMileageService culateMileageService;
+	private CalcIntervalRepository culcIntervalRepository;
 	@Autowired
-	private CulateMileageService culateMileageService2;
-	
+	private CalcCulateMileageService culateMileageService;
+    
 	@Autowired
 	JdbcTemplate jdbcTemplate;
@@ -48,7 +53,7 @@ public class CalcToolServiceImpl implements CalcToolService {
 	@Override
-    public List<CalcWaybill> findAll(String rq, String lineCode) {
+    public List<CalcWaybill> findAll(String rq, String lineCode, List<Map<String, Object>> xlList, List<Interval> djgList) {
     	List<CalcWaybill> listCal=new ArrayList<CalcWaybill>();
         List<ScheduleRealInfo> list = clacRepository.findAllSchedule(rq,lineCode);
         String sql ="select r.j_gh ,r.s_gh,r.cl_zbh,r.xl_bm, r.lp_name FROM"
@@ -104,9 +109,30 @@ public class CalcToolServiceImpl implements CalcToolService {
 			//计算方法
 			if(list_.size()>0){
-				listCal.addAll(this.cul(list_, lists_));
+				listCal.addAll(this.cul(list_, lists_, xlList, djgList));
 			}
 		}
+
+		//按线路计算大间隔
+        if(list.size() > 0){
+			ScheduleRealInfo s = list.get(0);
+			Map<String, Object> culateDjg = culateMileageService.culateDjg(list, lineCode, xlList, djgList);
+			CalcInterval interval = new CalcInterval();
+			interval.setGsdm(s.getGsBm());
+			interval.setGsname(s.getGsName());
+			interval.setFgsdm(s.getFgsBm());
+			interval.setFgsname(s.getFgsName());
+			interval.setRq(s.getScheduleDate());
+			interval.setRqStr(s.getScheduleDateStr());
+			interval.setXl(s.getXlBm());
+			interval.setXlName(s.getXlName());
+			interval.setDjg(Integer.valueOf(culateDjg.get("djgcsq").toString()));
+			interval.setDjgM(Integer.valueOf(culateDjg.get("djgcsz").toString()));
+			interval.setDjgA(Integer.valueOf(culateDjg.get("djgcsw").toString()));
+			interval.setDjgTime(Integer.valueOf(culateDjg.get("djgsj").toString()));
+			culcIntervalRepository.save(interval);
+        }
+		
         while(true){
 			int i = 0, l = 0;
 			boolean flag = false;
@@ -145,7 +171,7 @@ public class CalcToolServiceImpl implements CalcToolService {
     }
     //list_ 全部班次  lists_执行了的班次（实到实发不为空）
-    private List<CalcWaybill> cul(List<ScheduleRealInfo> list_,List<ScheduleRealInfo> lists_){
+    private List<CalcWaybill> cul(List<ScheduleRealInfo> list_,List<ScheduleRealInfo> list_s, List<Map<String, Object>> xlList, List<Interval> djgList){
     	List<CalcWaybill> list=new ArrayList<CalcWaybill>();
     	if(list_.size()>0){
     		Date date=list_.get(0).getScheduleDate();
@@ -167,20 +193,20 @@ public class CalcToolServiceImpl implements CalcToolService {
     		int jhyybcWgf=culateMileageService.culateJhyybc(list_, "wgf");
     		double jhyylc=culateMileageService.culateJhyylc(list_);
     		double jhfyylc=culateMileageService.culateJhfyylc(list_);
-    		int sjyybc=culateMileageService.culateSjyybc(lists_, "");
-    		int sjyybcZgf=culateMileageService.culateSjyybc(lists_, "zgf");
-    		int sjyybcWgf=culateMileageService.culateSjyybc(lists_, "wgf");
-    		double sjyylc=culateMileageService.culateSjyylc(lists_);//驾售共有
-    		double sjyylc_j=culateMileageService.culateSjyylc_j(lists_);//无售
-    		double sjfyylc=culateMileageService.culateSjfyylc(lists_);//驾售
-    		double sjfyylc_j=culateMileageService.culateSjfyylc_j(lists_);//无售
-    		int ljbc=culateMileageService.culateLjbc(lists_, "");
-    		int ljbcZgf=culateMileageService.culateLjbc(lists_, "zgf");
-    		int ljbcWgf=culateMileageService.culateLjbc(lists_, "wgf");
-    		double ljyylc=culateMileageService.culateLjyylc(lists_);//驾售
-    		double ljyylc_j=culateMileageService.culateLjyylc_j(lists_);//无售
-    		double ljfyylc=culateMileageService.culateLjfyylc(lists_);//驾售
-    		double ljfyylc_j=culateMileageService.culateLjfyylc_j(lists_);//无售
+    		int sjyybc=culateMileageService.culateSjyybc(list_s, "");
+    		int sjyybcZgf=culateMileageService.culateSjyybc(list_s, "zgf");
+    		int sjyybcWgf=culateMileageService.culateSjyybc(list_s, "wgf");
+    		double sjyylc=culateMileageService.culateSjyylc(list_s);//驾售共有
+    		double sjyylc_j=culateMileageService.culateSjyylc_j(list_s);//无售
+    		double sjfyylc=culateMileageService.culateSjfyylc(list_s);//驾售
+    		double sjfyylc_j=culateMileageService.culateSjfyylc_j(list_s);//无售
+    		int ljbc=culateMileageService.culateLjbc(list_s, "");
+    		int ljbcZgf=culateMileageService.culateLjbc(list_s, "zgf");
+    		int ljbcWgf=culateMileageService.culateLjbc(list_s, "wgf");
+    		double ljyylc=culateMileageService.culateLjyylc(list_s);//驾售
+    		double ljyylc_j=culateMileageService.culateLjyylc_j(list_s);//无售
+    		double ljfyylc=culateMileageService.culateLjfyylc(list_s);//驾售
+    		double ljfyylc_j=culateMileageService.culateLjfyylc_j(list_s);//无售
     		int lbbc=culateMileageService.culateLbbc(list_);
     		double lblc=culateMileageService.culateLbgl(list_);
     		double ssgl_lz= culateMileageService.culateCJLC(list_, "路阻");
@@ -199,12 +225,12 @@ public class CalcToolServiceImpl implements CalcToolService {
             double ssgl_cj=culateMileageService.culateCJLC(list_, "抽减");
             double ssgl_qt=culateMileageService.culateCJLC(list_, "其他");
     		double ssgl_qtz=Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj,ssgl_qt));
-    		int fzbc=culateMileageService.culateDtfzbc(lists_, "major", "");//放站
-    		int fzbcZgf=culateMileageService.culateDtfzbc(lists_, "major", "zgf");
-    		int fzbcWgf=culateMileageService.culateDtfzbc(lists_, "major", "wgf");
-    		int zfbc=culateMileageService.culateDtfzbc(lists_, "venting", "");//直放
-    		int zfbcZgf=culateMileageService.culateDtfzbc(lists_, "venting", "zgf");
-    		int zfbcWgf=culateMileageService.culateDtfzbc(lists_, "venting", "wgf");
+    		int fzbc=culateMileageService.culateDtfzbc(list_s, "major", "");//放站
+    		int fzbcZgf=culateMileageService.culateDtfzbc(list_s, "major", "zgf");
+    		int fzbcWgf=culateMileageService.culateDtfzbc(list_s, "major", "wgf");
+    		int zfbc=culateMileageService.culateDtfzbc(list_s, "venting", "");//直放
+    		int zfbcZgf=culateMileageService.culateDtfzbc(list_s, "venting", "zgf");
+    		int zfbcWgf=culateMileageService.culateDtfzbc(list_s, "venting", "wgf");
 	    	CalcWaybill t=new CalcWaybill();
 	    	t.setRq(date);
 	    	t.setRqStr(dateStr);
@@ -2,9 +2,15 @@ package com.bsth.service.calc.impl;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+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.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -12,13 +18,25 @@ import java.util.Set;
 import javax.transaction.Transactional;
 import com.bsth.common.ResponseCode;
+import com.bsth.entity.calc.CalcInterval;
+import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.Interval;
+import com.bsth.repository.calc.CalcIntervalRepository;
+import com.bsth.repository.calc.CalcStatisticsRepository;
 import com.bsth.repository.calc.CalcWaybillRepository;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.calc.CalcToolService;
 import com.bsth.service.calc.CalcWaybillService;
 import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
-import com.bsth.util.BatchSaveUtils;
+import com.bsth.util.ReportUtils;
+import com.github.stuxuhai.jpinyin.PinyinException;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,12 +52,24 @@ import org.springframework.stereotype.Service;
 public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer> implements CalcWaybillService {
 	@Autowired
-	private CalcWaybillRepository clacRepository;
+	private CalcWaybillRepository calcRepository;
 	@Autowired
-	private CalcToolService calcToolService;
+	private CalcIntervalRepository calcIntervalRepository;
 	@Autowired
+	private CalcStatisticsRepository calcStatisticsRepository;
+
+	@Autowired
+	private CalcToolService calcToolService;
+
+    @Autowired
+    private CulateMileageService culateService;
+    
+    @Autowired
+    private ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+	@Autowired
 	JdbcTemplate jdbcTemplate;
@@ -54,9 +84,11 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		try {
 			if(date.length() != 0 && line.length() != 0){
-				clacRepository.deleteByDateAndLine(date, line);
+				calcRepository.deleteByDateAndLine(date, line);
+				calcIntervalRepository.deleteByDateAndLine(date, line);
 			} else if(date.length() != 0){
-				clacRepository.deleteByDate(date);
+				calcRepository.deleteByDate(date);
+				calcIntervalRepository.deleteByDate(date);
 			} else {
 				newMap.put("status", ResponseCode.ERROR);
 				logger.error("save erro.", "日期不能为空");
@@ -84,21 +116,60 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 						m.put("start_opt", rs.getString("start_opt"));
 						m.put("line_code", rs.getString("line_code"));
 						return m;
-					}});
-					
+			}});
+			
+			String xlSql="select line_code,spac_grade from bsth_c_line";
+			if(line.length() != 0){
+				xlSql += " where line_code ='"+line+"'";
+			}
+			List<Map<String, Object>> xlList=jdbcTemplate.query(xlSql, new RowMapper<Map<String, Object>>() {
+				@Override
+				public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Map<String, Object> map=new HashMap<String,Object>();
+					map.put("line",arg0.getString("line_code"));
+					map.put("grade", arg0.getString("spac_grade"));
+					return map;
+			}});
+			Map<String, List<Map<String, Object>>> xlMap = new HashMap<String, List<Map<String, Object>>>();
+			for(Map<String, Object> m : xlList){
+				if(m.containsKey("line") && m.get("line").toString().trim().length() > 0){
+					String key = m.get("line").toString();
+					if(!xlMap.containsKey(key))
+						xlMap.put(key, new ArrayList<Map<String, Object>>());
+					xlMap.get(key).add(m);
+				}
+			}
+			//查询大间隔时间
+			String djgSql="select * from bsth_c_interval";
+			List<Interval> djgList=jdbcTemplate.query(djgSql, new RowMapper<Interval>() {
+				@Override
+				public Interval mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Interval m=new Interval();
+					m.setLevel(arg0.getString("level"));
+					m.setPeak(arg0.getInt("peak"));
+					m.setTrough(arg0.getInt("trough"));
+					return m;
+			}});
+			
 			Set<String> lineSet = new HashSet<String>();
 			for (int i = 0; i < listLineConfig.size(); i++) {
 				Map<String, Object> m =listLineConfig.get(i);
 				String lineCode=m.get("line_code").toString().trim();
-				String startOpt=m.get("start_opt").toString().trim();
+//				String startOpt=m.get("start_opt").toString().trim();
 				if(!lineSet.add(lineCode))
 					continue;
-				List<CalcWaybill> findAll = calcToolService.findAll(date, lineCode);
+				List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+				if(xlMap.containsKey(lineCode) && xlMap.get(lineCode) != null){
+					tempList = xlMap.get(lineCode);
+				}
-//				new BatchSaveUtils<CalcWaybill>().saveList2(findAll, CalcWaybill.class);
+				List<CalcWaybill> findAll = calcToolService.findAll(date, lineCode, tempList, djgList);
-				clacRepository.save(findAll);
+//				new BatchSaveUtils<CalcWaybill>().saveList2(findAll, CalcWaybill.class);
+
+//				if(xlMap.get(lineCode).size() == 0)
+				calcRepository.save(findAll);
 			}
 			newMap.put("status", ResponseCode.SUCCESS);
@@ -116,28 +187,41 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	public List<Map<String, Object>> statisticsDailyTj(String gsdm,
 			String fgsdm, String line, String date, String date2,
 			String xlName, String type) {
-		
+
+		List<String> keyList = new ArrayList<String>();
 		List<CalcWaybill> list = new ArrayList<CalcWaybill>();
 		List<CalcWaybill> lists = new ArrayList<CalcWaybill>();
+		List<CalcInterval> list_ = new ArrayList<CalcInterval>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, List<CalcWaybill>> keyMap = new HashMap<String, List<CalcWaybill>>();
+		Map<String, List<CalcInterval>> keyMap_ = new HashMap<String, List<CalcInterval>>();
 		if(line.equals("")){
             //查询所有线路
-            list = clacRepository.scheduleByDateAndLineTj(line,date,date2,gsdm,fgsdm);
+            list = calcRepository.scheduleByDateAndLineTj(line,date,date2,gsdm,fgsdm);
+            list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2, gsdm, fgsdm);
         }else{
             //查询单条线路
-            list = clacRepository.scheduleByDateAndLineTj2(line,date,date2);
+            list = calcRepository.scheduleByDateAndLineTj2(line,date,date2);
+            list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2);
         }
 		for(CalcWaybill c : list){
 			String key = c.getXlName();
 			if(!keyMap.containsKey(key)){
 				keyMap.put(key, new ArrayList<CalcWaybill>());
+				keyList.add(key);
 			}
 			keyMap.get(key).add(c);
 		}
-		for(String key : keyMap.keySet()){
+		for(CalcInterval c : list_){
+			String key = c.getXlName();
+			if(!keyMap_.containsKey(key))
+				keyMap_.put(key, new ArrayList<CalcInterval>());
+			keyMap_.get(key).add(c);
+		}
+		Collections.sort(keyList, new AccountXlbmStr());
+		for(String key : keyList){
 			CalcWaybill calc = keyMap.get(key).get(0);
 			for(int i = 1; i < keyMap.get(key).size(); i++){
 				CalcWaybill c= keyMap.get(key).get(i);
@@ -171,15 +255,32 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				calc.setFzbc(calc.getFzbc() + c.getFzbc());
 				calc.setFzbczgf(calc.getFzbczgf() + c.getFzbczgf());
 				calc.setFzbcwgf(calc.getFzbcwgf() + c.getFzbcwgf());
-				calc.setDtbc(calc.getDtbc() + c.getFzbc());
+				calc.setDtbc(calc.getDtbc() + c.getDtbc());
 				calc.setDtbczgf(calc.getDtbczgf() + c.getDtbczgf());
 				calc.setDtbcwgf(calc.getDtbcwgf() + c.getDtbcwgf());
-				
 			}
 			calc.setSjyylc(Arith.add(calc.getSjyylc(), calc.getLjyylc()));
-			System.out.println();
 			lists.add(calc);
 		}
+		CalcInterval sum_ = new CalcInterval();
+		sum_.setXlName("合计");
+		sum_.setDjgTime(0);
+		for(String key : keyMap_.keySet()){
+			CalcInterval calc = keyMap_.get(key).get(0);
+			for(int i = 1; i < keyMap_.get(key).size(); i++){
+				CalcInterval calc_ = keyMap_.get(key).get(i);
+				calc.setDjg(calc.getDjg() + calc_.getDjg());
+				calc.setDjgM(calc.getDjgM() + calc_.getDjgM());
+				calc.setDjgA(calc.getDjgA() + calc_.getDjgA());
+				if(calc_.getDjgTime() > calc.getDjgTime())
+					calc.setDjgTime(calc_.getDjgTime());
+			}
+			sum_.setDjg(sum_.getDjg() + calc.getDjg());
+			sum_.setDjgM(sum_.getDjgM() + calc.getDjgM());
+			sum_.setDjgA(sum_.getDjgA() + calc.getDjgA());
+			if(calc.getDjgTime() > sum_.getDjgTime())
+				sum_.setDjgTime(calc.getDjgTime());
+		}
 		CalcWaybill sum = new CalcWaybill();
 		sum.setXlName("合计");
@@ -187,7 +288,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			sum.setJhyylc(Arith.add(sum.getJhyylc()!=null?sum.getJhyylc():0, c.getJhyylc()));
 			sum.setJhfyylc(Arith.add(sum.getJhfyylc()!=null?sum.getJhfyylc():0, c.getJhfyylc()));
 			sum.setSjyylc(Arith.add(sum.getSjyylc()!=null?sum.getSjyylc():0, c.getSjyylc()));
+			sum.setLjyylc(Arith.add(sum.getLjyylc()!=null?sum.getLjyylc():0, c.getLjyylc()));
 			sum.setSjfyylc(Arith.add(sum.getSjfyylc()!=null?sum.getSjfyylc():0, c.getSjfyylc()));
+			sum.setLjfyylc(Arith.add(sum.getLjfyylc()!=null?sum.getLjfyylc():0, c.getLjfyylc()));
 			sum.setLblc(Arith.add(sum.getLblc()!=null?sum.getLblc():0, c.getLblc()));
 			sum.setLbbc(sum.getLbbc() + c.getLbbc());
 			sum.setLblcLz(Arith.add(sum.getLblcLz()!=null?sum.getLblcLz():0, c.getLblcLz()));
@@ -214,7 +317,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			sum.setFzbc(sum.getFzbc() + c.getFzbc());
 			sum.setFzbczgf(sum.getFzbczgf() + c.getFzbczgf());
 			sum.setFzbcwgf(sum.getFzbcwgf() + c.getFzbcwgf());
-			sum.setDtbc(sum.getDtbc() + c.getFzbc());
+			sum.setDtbc(sum.getDtbc() + c.getDtbc());
 			sum.setDtbczgf(sum.getDtbczgf() + c.getDtbczgf());
 			sum.setDtbcwgf(sum.getDtbcwgf() + c.getDtbcwgf());
 		}
@@ -228,9 +331,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			m.put("jhzlc", Arith.add(c.getJhyylc(), c.getJhfyylc()));
 			m.put("jhlc", c.getJhyylc());
 			m.put("jcclc", c.getJhfyylc());
-			m.put("sjzgl", Arith.add(c.getSjyylc(), c.getSjfyylc()));
-			m.put("sjgl", c.getSjyylc());
-			m.put("sjksgl", c.getSjfyylc());
+			m.put("sjzgl", Arith.add(Arith.add(c.getSjyylc(), c.getLjyylc()), Arith.add(c.getSjfyylc(), c.getLjfyylc())));
+			m.put("sjgl", Arith.add(c.getSjyylc(), c.getLjyylc()));
+			m.put("sjksgl", Arith.add(c.getSjfyylc(), c.getLjfyylc()));
 			m.put("ssgl", c.getLblc());
 			m.put("ssbc", c.getLbbc());
 			m.put("ssgl_lz", c.getLblcLz());
@@ -260,14 +363,350 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			m.put("dtbc", c.getDtbc());
 			m.put("dtbc_m", c.getDtbczgf());
 			m.put("dtbc_a", c.getDtbcwgf());
-			m.put("djg", 0);
-			m.put("djg_m", 0);
-			m.put("djg_a", 0);
-			m.put("djg_time", 0);
+			if(keyMap_.containsKey(c.getXlName()) || c.getXlName().equals("合计")){
+				CalcInterval calc;
+				if(c.getXlName().equals("合计"))
+					calc = sum_;
+				else
+					calc = keyMap_.get(c.getXlName()).get(0);
+				m.put("djg", calc.getDjg());
+				m.put("djg_m", calc.getDjgM());
+				m.put("djg_a", calc.getDjgA());
+				m.put("djg_time", calc.getDjgTime());
+			} else {
+				m.put("djg", 0);
+				m.put("djg_m", 0);
+				m.put("djg_a", 0);
+				m.put("djg_time", 0);
+			}
 			resList.add(m);
 		}
 		return resList;
 	}
+	/**
+	 * @param rq 格式如：2018-03-22（留空""默认当前日期前一天）
+	 * @param line （留空""默认全部线路）
+	 */
+	@Transactional
+	@Override
+	public String calcDaily(String rq, String line) throws Exception{
+		String result = "";
+		try {
+			if(rq == null || rq.trim().length() == 0){
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+				Date dNow = new Date();   //当前时间
+				Date dBefore = new Date();
+				Calendar calendar = Calendar.getInstance(); //得到日历
+				calendar.setTime(dNow);//把当前时间赋给日历
+				calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
+				dBefore = calendar.getTime();   //得到前一天的时间
+				rq = sdf.format(dBefore);
+			} else {
+				rq = rq.trim();
+			}
+			if(line == null || line.trim().length() == 0){
+				line = "";
+			} else {
+				line = line.trim();
+			}
+
+	        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+	        List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
+	        List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
+	        
+	        String xlSql="select gs_bm, fgs_bm from bsth_c_s_sp_info_real where schedule_date_str = '"+rq+"'";
+	        if(line.trim().length() > 0)
+	        	xlSql += " and xl_bm = '"+line+"'";
+			xlSql += " group by gs_bm, fgs_bm";
+			List<Map<String, String>> gsList=jdbcTemplate.query(xlSql, new RowMapper<Map<String, String>>() {
+				@Override
+				public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Map<String, String> m = new HashMap<String, String>();
+					m.put("gsdm", arg0.getString("gs_bm"));
+					m.put("fgsdm", arg0.getString("fgs_bm"));
+					return m;
+			}});
+
+	        //查询所有线路
+			for(Map<String, String> m : gsList){
+				list.addAll(scheduleRealInfoRepository.scheduleByDateAndLineTj(line, rq, rq, m.get("gsdm"), m.get("fgsdm")));
+			}
+	        
+	        for (int i = 0; i < list.size(); i++) {
+	            ScheduleRealInfo s=list.get(i);
+	            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);
+		            }
+	            }
+	        }
+	        List<CalcStatistics> lMap = new ArrayList<CalcStatistics>();
+	        for (int i = 0; i < list.size(); i++) {
+	            if(i<list.size()-1){
+	                if(list.get(i+1).getXlBm().equals(list.get(i).getXlBm())){
+	                    lists.add(list.get(i));
+	                }else{
+	                    lists.add(list.get(i));
+	                    CalcStatistics s=staticTj(lists);
+	                    lMap.add(s);
+	                    lists=new ArrayList<ScheduleRealInfo>();
+	                }
+	            }else{
+	                if(list.get(i).getXlBm().equals(list.get(i-1).getXlBm())){
+	                    lists.add(list.get(i));
+	                    CalcStatistics s=staticTj(lists);
+	                    lMap.add(s);
+	                }else{
+	                    lists=new  ArrayList<ScheduleRealInfo>();
+	                    lists.add(list.get(i));
+	                    CalcStatistics s=staticTj(lists);
+	                    lMap.add(s);
+	                }
+	            }
+	        }
+//	        Collections.sort(lMap,new AccountXlbm());
+	        
+	        if(line.trim().length() > 0){
+	        	calcStatisticsRepository.deleteByDateAndLine(rq, line);
+	        } else {
+	        	calcStatisticsRepository.deleteByDate(rq);
+	        }
+	        calcStatisticsRepository.save(lMap);
+	        result = "success";
+		} catch (Exception e) {
+			// TODO: handle exception
+			throw e;
+		}finally{
+			logger.info("result:"+result);
+		}
+		return result;
+	}
+	
+    public final CalcStatistics staticTj(List<ScheduleRealInfo> list){
+        
+        List<ScheduleRealInfo>  lists=new ArrayList<ScheduleRealInfo>();
+        for(int i=0;i<list.size();i++){
+            ScheduleRealInfo s=list.get(i);
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+            	lists.add(s);
+            }else{
+	            if(s.getZdsjActual()!=null&& s.getFcsjActual()!=null){
+	            	lists.add(s);
+	            }
+            }
+        }
+//		Map<String, Object> map = new HashMap<String, Object>();
+        CalcStatistics s = new CalcStatistics();
+    	if(list.size() > 0){
+    		ScheduleRealInfo sche = list.get(0);
+    		s.setXl(sche.getXlBm());
+    		s.setXlName(sche.getXlName());
+    		s.setDate(sche.getScheduleDate());
+    		s.setDateStr(sche.getScheduleDateStr());
+    		s.setGsdm(sche.getGsBm());
+    		s.setFgsdm(sche.getFgsBm());
+    		
+	        double jhyygl=culateService.culateJhgl(list);//计划营运公里
+	        double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
+	        s.setJhyylc(jhyygl);
+	        s.setJhkslc(jhjcclc);
+	        s.setJhzlc(Arith.add(jhyygl, jhjcclc));
+	
+	        double ljgl= culateService.culateLjgl(lists);
+	        double sjyygl= culateService.culateSjgl(lists);
+	        double zyygl= Arith.add(sjyygl,ljgl);
+	
+	        double sjjccgl=culateService.culateJccgl(lists);
+	        double sjksgl=culateService.culateKsgl(lists);
+	        double zksgl=Arith.add(sjjccgl, sjksgl);
+	        s.setSjyylc(zyygl);
+	        s.setSjkslc(zksgl);
+	        s.setSjzlc(Arith.add(zyygl, zksgl));
+	        
+	        s.setSslc(culateService.culateLbgl(list));
+	        s.setSsbc(culateService.culateLbbc(list));
+	        
+	        //计划+临加-少驶=实驶
+//	        double jl=Arith.sub(Arith.add(jhyygl, ljgl),ssgl);
+//	        if(jl==zyygl){
+//	        	map.put("zt", 0);
+//	        }else{
+//	        	map.put("zt", 1);
+//	        }
+	        
+	        s.setLzlc(culateService.culateCJLC(list, "路阻"));
+	        s.setDmlc(culateService.culateCJLC(list, "吊慢"));
+	        s.setGzlc(culateService.culateCJLC(list, "故障"));
+	        s.setJflc(culateService.culateCJLC(list, "纠纷"));
+	        s.setZslc(culateService.culateCJLC(list, "肇事"));
+	        s.setQrlc(culateService.culateCJLC(list, "缺人"));
+	        s.setQclc(culateService.culateCJLC(list, "缺车"));
+	        s.setKxlc(culateService.culateCJLC(list, "客稀"));
+	        s.setQhlc(culateService.culateCJLC(list, "气候"));
+	        s.setYwlc(culateService.culateCJLC(list, "援外"));
+	        double ssgl_pc=culateService.culateCJLC(list, "配车");
+	        double ssgl_by=culateService.culateCJLC(list, "保养");
+	        double ssgl_cj=culateService.culateCJLC(list, "抽减");
+	        double ssgl_qt=culateService.culateCJLC(list, "其他");
+	        s.setQtlc(Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
+	        s.setLjlc(ljgl);
+	        
+	        s.setJhbcq(culateService.culateJhbc(list,""));
+	        s.setJhbcz(culateService.culateJhbc(list, "zgf"));
+	        s.setJhbcw(culateService.culateJhbc(list, "wgf"));
+	        s.setSjbcq(culateService.culateSjbc(lists,""));
+	        s.setSjbcz(culateService.culateSjbc(lists,"zgf"));
+	        s.setSjbcw(culateService.culateSjbc(lists,"wgf"));
+	        s.setLjbcq(culateService.culateLjbc(lists,""));
+	        s.setLjbcz(culateService.culateLjbc(lists,"zgf"));
+	        s.setLjbcw(culateService.culateLjbc(lists,"wgf"));
+	        s.setFzbcq(culateService.culateFzbc(lists, ""));
+	        s.setFzbcz(culateService.culateFzbc(lists, "zgf"));
+	        s.setFzbcw(culateService.culateFzbc(lists, "wgf"));
+	        s.setDtbcq(0);
+	        s.setDtbcz(0);
+	        s.setDtbcw(0);
+	        Map<String, Object> m_=culateService.culateDjg(lists, list.get(0).getXlBm());
+	        if(m_.containsKey("djgcsq") && m_.get("djgcsq")!=null)
+	        	s.setDjgq(Integer.valueOf(m_.get("djgcsq").toString()));
+	        else
+	        	s.setDjgq(0);
+	        if(m_.containsKey("djgcsz") && m_.get("djgcsz")!=null)
+	        	s.setDjgz(Integer.valueOf(m_.get("djgcsz").toString()));
+	        else
+	        	s.setDjgz(0);
+	        if(m_.containsKey("djgcsw") && m_.get("djgcsw")!=null)
+	        	s.setDjgw(Integer.valueOf(m_.get("djgcsw").toString()));
+	        else
+	        	s.setDjgw(0);
+	        if(m_.containsKey("djgsj") && m_.get("djgsj")!=null)
+	        	s.setDjgsj(Integer.valueOf(m_.get("djgsj").toString()));
+	        else
+	        	s.setDjgsj(0);
+    	}
+        return s;
+    }
+    
+    class AccountXlbm implements Comparator<Map<String, Object>>{
+   	 @Override
+   		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+   			// TODO Auto-generated method stub
+//   		 PinyinHelper.convertToPinyinString(ppy.getName(),
+//   		 "" , PinyinFormat.WITHOUT_TONE)
+   			return  o1.get("xlNamePy").toString().compareTo(
+   					o2.get("xlNamePy").toString());
+   		}
+	}
+
+    class AccountXlbmStr implements Comparator<String>{
+   	 @Override
+   		public int compare(String o1, String o2) {
+   			// TODO Auto-generated method stub
+   			return  o1.compareTo(o2);
+   		}
+	}
+
+	@Override
+	public List<CalcStatistics> calcStatisticsDaily(String gsdm, String fgsdm,
+			String line, String date, String date2, String xlName, String type) {
+		// TODO Auto-generated method stub
+		List<CalcStatistics> list = new ArrayList<CalcStatistics>();
+		if(line.length() > 0){
+			list = calcStatisticsRepository.selectByDateAndLineTj2(line, date, date2);
+		} else {
+			list = calcStatisticsRepository.selectByDateAndLineTj(line, date, date2, gsdm, fgsdm);
+		}
+		
+		List<CalcStatistics> resList = new ArrayList<CalcStatistics>();
+		Map<String, List<CalcStatistics>> keyMap = new HashMap<String, List<CalcStatistics>>();
+		List<String> keyList = new ArrayList<String>();
+		
+		for(CalcStatistics s : list){
+    		try {
+				String key = PinyinHelper.convertToPinyinString(s.getXlName(), "" , PinyinFormat.WITHOUT_TONE);
+				if(!keyMap.containsKey(key)){
+					keyMap.put(key, new ArrayList<CalcStatistics>());
+					keyList.add(key);
+				}
+				keyMap.get(key).add(s);
+			} catch (PinyinException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		Collections.sort(keyList, new AccountXlbmStr());
+		
+		for(String key : keyList){
+			if(keyMap.get(key).size() > 0){
+				CalcStatistics s = keyMap.get(key).get(0);
+				if(keyMap.get(key).size() > 1)
+					for(int i = 1; i < keyMap.get(key).size(); i++){
+						CalcStatistics s_ = keyMap.get(key).get(i);
+						s = addStatistics(s, s_);
+					}
+				resList.add(s);
+			}
+		}
+		
+		if(resList.size() > 0){
+			CalcStatistics temp = new CalcStatistics();
+			temp.setXlName("合计");
+			for(CalcStatistics s : resList){
+				temp = addStatistics(temp, s);
+			}
+			resList.add(temp);
+		}
+		
+		return resList;
+	}
+    
+	public CalcStatistics addStatistics(CalcStatistics s, CalcStatistics s_){
+		s.setJhzlc(Arith.add(s.getJhzlc()!=null?s.getJhzlc():0, s_.getJhzlc()));
+		s.setJhyylc(Arith.add(s.getJhyylc()!=null?s.getJhyylc():0, s_.getJhyylc()));
+		s.setJhkslc(Arith.add(s.getJhkslc()!=null?s.getJhkslc():0, s_.getJhkslc()));
+		s.setSjzlc(Arith.add(s.getSjzlc()!=null?s.getSjzlc():0, s_.getSjzlc()));
+		s.setSjyylc(Arith.add(s.getSjyylc()!=null?s.getSjyylc():0, s_.getSjyylc()));
+		s.setSjkslc(Arith.add(s.getSjkslc()!=null?s.getSjkslc():0, s_.getSjkslc()));
+		s.setSslc(Arith.add(s.getSslc()!=null?s.getSslc():0, s_.getSslc()));
+		s.setSsbc(s.getSsbc() + s_.getSsbc());
+		s.setLzlc(Arith.add(s.getLzlc()!=null?s.getLzlc():0, s_.getLzlc()));
+		s.setDmlc(Arith.add(s.getDmlc()!=null?s.getDmlc():0, s_.getDmlc()));
+		s.setGzlc(Arith.add(s.getGzlc()!=null?s.getGzlc():0, s_.getGzlc()));
+		s.setJflc(Arith.add(s.getJflc()!=null?s.getJflc():0, s_.getJflc()));
+		s.setZslc(Arith.add(s.getZslc()!=null?s.getZslc():0, s_.getZslc()));
+		s.setQrlc(Arith.add(s.getQrlc()!=null?s.getQrlc():0, s_.getQrlc()));
+		s.setQclc(Arith.add(s.getQclc()!=null?s.getQclc():0, s_.getQclc()));
+		s.setKxlc(Arith.add(s.getKxlc()!=null?s.getKxlc():0, s_.getKxlc()));
+		s.setQhlc(Arith.add(s.getQhlc()!=null?s.getQhlc():0, s_.getQhlc()));
+		s.setYwlc(Arith.add(s.getYwlc()!=null?s.getYwlc():0, s_.getYwlc()));
+		s.setQtlc(Arith.add(s.getQtlc()!=null?s.getQtlc():0, s_.getQtlc()));
+		s.setLjlc(Arith.add(s.getLjlc()!=null?s.getLjlc():0, s_.getLjlc()));
+		s.setJhbcq(s.getJhbcq() + s_.getJhbcq());
+		s.setJhbcz(s.getJhbcz() + s_.getJhbcz());
+		s.setJhbcw(s.getJhbcw() + s_.getJhbcw());
+		s.setSjbcq(s.getSjbcq() + s_.getSjbcq());
+		s.setSjbcz(s.getSjbcz() + s_.getSjbcz());
+		s.setSjbcw(s.getSjbcw() + s_.getSjbcw());
+		s.setLjbcq(s.getLjbcq() + s_.getLjbcq());
+		s.setLjbcz(s.getLjbcz() + s_.getLjbcz());
+		s.setLjbcw(s.getLjbcw() + s_.getLjbcw());
+		s.setFzbcq(s.getFzbcq() + s_.getFzbcq());
+		s.setFzbcz(s.getFzbcz() + s_.getFzbcz());
+		s.setFzbcw(s.getFzbcw() + s_.getFzbcw());
+		s.setDtbcq(s.getDtbcq() + s_.getDtbcq());
+		s.setDtbcz(s.getDtbcz() + s_.getDtbcz());
+		s.setDtbcw(s.getDtbcw() + s_.getDtbcw());
+		s.setDjgq(s.getDjgq() + s_.getDjgq());
+		s.setDjgz(s.getDjgz() + s_.getDjgz());
+		s.setDjgw(s.getDjgw() + s_.getDjgw());
+		s.setDjgsj(s.getDjgsj()>s_.getDjgsj()?s.getDjgsj():s_.getDjgsj());
+		return s;
+	}
+	
 }
@@ -1005,8 +1005,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 					List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
 					if(sobje.size()==1) {
-						int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
-						sleepStr =  "\t" +  String.valueOf(dsleepStr);
+//						int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
+//						sleepStr =  "\t" +  String.valueOf(dsleepStr);
+						double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
+						sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
 					}else if(sobje.size()>1){
 						for(int j =0;j<sobje.size();j++) {
 							double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
@@ -324,37 +324,24 @@ public class ReportServiceImpl implements ReportService{
 	        }
 		return list;
 	}
+	
 	@Override
 	public Map<String, Object> tbodyTime1(String line, String ttinfo) {
 		DecimalFormat df = new DecimalFormat("#0.00");
+		Map<String, Object> map=new HashMap<String,Object>();
 		// TODO Auto-generated method stub
+		
 		//查询配车
-		String sqlPc="  select count(*) from bsth_c_cars where id in("
-				+ " select cl from bsth_c_s_ccinfo where  xl in ( "
-				+ " select id from bsth_c_line where line_code='"+line+"' )"
-				+ " group by equipment_code ) ";
-
-		Map<String, Object> map=new HashMap<String,Object>();
-
-		/*List<Map<String, Object>> listPc= jdbcTemplate.query(sqlPc,
-				 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("zbh", rs.getString("cl_zbh"));
-				 return m;
-			 }
-		});*/
+		String sqlPc=" select count(*) from (select lp, count(*) from"
+				+ " bsth_c_s_ttinfo_detail where ttinfo ='"+ttinfo+"'"
+				+ " group by lp ) a";
 		//配车
 		int pcs=jdbcTemplate.queryForObject(sqlPc, Integer.class);
+		
 		String sqlPlan=" SELECT jhlc,bc_type,fcsj FROM bsth_c_s_ttinfo_detail "
 				+" where ttinfo ='"+ttinfo+"' ";
-		//班次
-		int zgf_0 = 6*60+31,zgf_1 = 8*60+30,wgf_0 = 16*60+1,wgf_1 = 18*60;
-		int qcBc=0,qjBc=0,zqcBc=0,zqjBc=0,wqcBc=0,wqjBc=0;
-		double zlc = 0 , yylc = 0,kslc=0;
 		//查询班次
 		List<Map<String, Object>> listPlan= jdbcTemplate.query(sqlPlan,
 				new RowMapper<Map<String, Object>>(){
@@ -368,6 +355,11 @@ public class ReportServiceImpl implements ReportService{
 					}
 				});
+		//班次
+		int zgf_0 = 6*60+31,zgf_1 = 8*60+30,wgf_0 = 16*60+1,wgf_1 = 18*60;
+		int qcBc=0,qjBc=0,zqcBc=0,zqjBc=0,wqcBc=0,wqjBc=0;
+		double zlc = 0 , yylc = 0,kslc=0;
+		
 		for (int i = 0; i < listPlan.size(); i++) {
 			Map<String, Object> m=listPlan.get(i);
 			double jhlc=Double.parseDouble(m.get("jhlc").toString());
@@ -423,21 +415,23 @@ public class ReportServiceImpl implements ReportService{
 		String minfcsj="02:00";
         List<Line> lineList=lineRepository.findLineByCode(line);
         if(lineList.size()>0){
-	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
-	         		+ " id = ("
-	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
-	         		+ ")";
-	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        	String sql = "select count(*) from bsth_c_line_config where line = '"+lineList.get(0).getId()+"'";
+        	if(jdbcTemplate.queryForObject(sql, Integer.class) > 0){
+		        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+		         		+ " id = ("
+		         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+		         		+ ")";
+		        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        	}
         }
 		String[] minSjs = minfcsj.split(":");
 		int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
 		//查询时间里程
-		String sqlPc=" (SELECT jhlc,fcsj,bc_type,lp,2 as xh, ists FROM bsth_c_s_ttinfo_detail "
+		String sqlPc=" (SELECT jhlc,fcsj,bc_type,bcsj,lp,2 as xh, ists FROM bsth_c_s_ttinfo_detail "
 				+ " where ttinfo ='"+ttinfo+"' and fcsj <='"+minfcsj+"' ) "
 				+ " union "
-				+ " (SELECT jhlc,fcsj,bc_type,lp,1 as xh, ists FROM bsth_c_s_ttinfo_detail "
-				+ " where ttinfo ='"+ttinfo+"' and fcsj > '"+minfcsj+"') order by lp,xh,fcsj";
-
+				+ " (SELECT jhlc,fcsj,bc_type,bcsj,lp,1 as xh, ists FROM bsth_c_s_ttinfo_detail "
+				+ " where ttinfo ='"+ttinfo+"' and fcsj > '"+minfcsj+"' ) order by lp,xh,fcsj";
 		Map<String, Object> map=new HashMap<String,Object>();
 		List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
 				new RowMapper<Map<String, Object>>(){
@@ -447,26 +441,31 @@ public class ReportServiceImpl implements ReportService{
 						m.put("fcsj", rs.getString("fcsj"));
 						m.put("yygl", rs.getString("jhlc")==null?"0":rs.getString("jhlc"));
 						m.put("bcType", rs.getString("bc_type"));
+						m.put("bcsj", rs.getString("bcsj"));
 						m.put("lp", rs.getString("lp"));
 						m.put("ists", rs.getObject("ists")==null?"0":rs.getString("ists"));
 						return m;
 					}
 				});
-		int yysj=0 ;
+		
+		int yysj=0;
 		double yycs=0 ,yygl=0;
 		String lp ="0";
-		int sj=0;
-
+		int sj=0, bcsj = 0;
+		int temp = 0;
 		for(int i=0;i<list.size();i++){
 			Map<String, Object> m=list.get(i);
 			String time=m.get("fcsj").toString();
 			String[] times = time.split(":");
+			int sjT = Integer.parseInt(times[0])*60+Integer.parseInt(times[1]);
 			if(lp.equals(m.get("lp").toString())){
-				if(Integer.parseInt(times[0])*60+Integer.parseInt(times[1]) <=minSj){
+				if(sjT <= minSj){
 					if(m.get("bcType").equals("in") || m.get("bcType").equals("out")){
 						if(m.get("bcType").equals("in")){
 							if(sj!=0){
-								yysj +=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1])-sj;
+//								yysj += sjT + (24*60) - sj;
+								yysj += bcsj;
+								bcsj = 0;
 							}
 							sj=0;
 						}
@@ -474,45 +473,62 @@ public class ReportServiceImpl implements ReportService{
 						yygl += Double.parseDouble(m.get("yygl").toString());
 						if(sj==0){
-							sj=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1]);
+							sj = sjT + (24*60);
 						}else{
-							yysj +=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1])-sj;
-							sj=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1]);
+							yysj += sjT + (24*60) - sj;
+							if(m.containsKey("ists") && m.get("ists").equals("1")){
+								yysj += Integer.valueOf(m.get("bcsj").toString());
+							} else {
+								sj = sjT + (24*60);
+							}
 						}
 					}
 				}else{
 					if(m.get("bcType").equals("in") || m.get("bcType").equals("out")){
 						if(m.get("bcType").equals("in")){
 							if(sj!=0){
-								yysj +=Integer.parseInt(times[0])*60+Integer.parseInt(times[1])-sj;
+//								yysj += sjT - sj;
+								yysj += bcsj;
+								bcsj = 0;
 							}
 							sj=0;
 						}
-					}else{
+					} else {
 						yygl += Double.parseDouble(m.get("yygl").toString());
 						if(sj==0){
-							sj=Integer.parseInt(times[0])*60+Integer.parseInt(times[1]);
+							sj = sjT;
 						}else{
-							yysj +=Integer.parseInt(times[0])*60+Integer.parseInt(times[1])-sj;
-							sj=Integer.parseInt(times[0])*60+Integer.parseInt(times[1]);
+							yysj += sjT - sj;
+							if(m.containsKey("ists") && m.get("ists").equals("1")){
+								yysj += Integer.valueOf(m.get("bcsj").toString());
+							} else {
+								sj = sjT;
+							}
 						}
 					}
 				}
 			}else{
+				if(sj == 0){
+					yysj += bcsj;
+					bcsj = 0;
+				}
 				if( !(m.get("bcType").equals("in") || m.get("bcType").equals("out"))){
 					yygl += Double.parseDouble(m.get("yygl").toString());
-					sj =Integer.parseInt(times[0])*60+Integer.parseInt(times[1]);
+					sj = sjT;
 				}else{
 					sj=0;
 				}
 				lp=m.get("lp").toString();
-
 			}
+			
 			if(m.containsKey("ists") && m.get("ists").equals("1")){
 				sj = 0;
 			}
+			if( !(m.get("bcType").equals("in") || m.get("bcType").equals("out")))
+				bcsj = Integer.valueOf(m.get("bcsj").toString());
 		}
+		
 		if(yysj>0){
 			yycs =yygl/(yysj*1.0/60);
 		}
@@ -522,6 +538,7 @@ public class ReportServiceImpl implements ReportService{
 		map.put("yysj", hh+":"+mm);
 		map.put("yycs", df.format(yycs)+"公里/小时");
 //		map.put(key, value)
+		
 		return map;
 	}
@@ -529,126 +546,15 @@ public class ReportServiceImpl implements ReportService{
 		System.out.println(609360/60);
 		System.out.println(609360%60);
 	}
-	/*	@Override
-        public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
-            // TODO Auto-generated method stub
-            List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
-
-
-
-            String sqlZd="select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqc' AS lx from ("
-                    + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"' "
-                    + " and bc_type ='normal'"
-                    + " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
-                    + " group by cl_zbh,qdz_name) a group by a.qdz_name"
-                    + " union "
-                    + " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqc' AS lx from ("
-                    + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
-                    + " and bc_type ='normal' "
-                    + " and fcsj >'16:01' and fcsj<'18:00' group by cl_zbh,qdz_name "
-                    + " ) a group by a.qdz_name "
-                    + " union "
-                    + " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqj' AS lx from ("
-                    + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
-                    + " and bc_type ='region' "
-                    + " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
-                    + " group by cl_zbh,qdz_name) a group by a.qdz_name"
-                    + " union "
-                    + " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqj' AS lx from ("
-                    + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
-                    + " and bc_type ='region' and fcsj >'16:01' and fcsj<'18:00'"
-                    + " group by cl_zbh,qdz_name) a group by a.qdz_name";
-            List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
-                     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("zdm", rs.getString("qdz_name"));
-                     m.put("cls", rs.getString("cls"));
-                     m.put("lx", rs.getString("lx"));
-                     return m;
-                 }
-            });
-            int a=0;
-            int b=0;
-            int c=0;
-            int d=0;
-            for(int i=0;i<lists.size();i++){
-                boolean fage=true;
-                Map<String, Object> newMap= new HashMap<String, Object>();
-                list.add(newMap);
-                Map<String, Object> maps=lists.get(i);
-                if(maps.get("lx").equals("zqc")){
-                    list.get(a).put("zqcZm", maps.get("zdm"));
-                    list.get(a).put("zqcCls", maps.get("cls"));
-                    a++;
-                    fage=false;
-                }else if(maps.get("lx").equals("wqc")){
-                    list.get(b).put("wqcZm", maps.get("zdm"));
-                    list.get(b).put("wqcCls", maps.get("cls"));
-                    b++;
-                    fage=false;
-                }else if(maps.get("lx").equals("zqj")){
-                    list.get(c).put("zqjZm", maps.get("zdm"));
-                    list.get(c).put("zqjCls", maps.get("cls"));
-                    c++;
-                    fage=false;
-                }else if(maps.get("lx").equals("wqj")){
-                    list.get(d).put("wqjZm", maps.get("zdm"));
-                    list.get(d).put("wqjCls", maps.get("cls"));
-                    d++;
-                    fage=false;
-                }
-                if(fage){
-                    break;
-                }
-            }
-            boolean status=true;
-            while (status) {
-                for (int i = 0; i < list.size(); i++) {
-                    if(list.get(i).isEmpty()){
-                        list.remove(i);
-                        status=true;
-                    }else{
-                        status=false;
-                    }
-                }
-
-            }
-            return list;
-        }*/
+	
 	@Override
 	public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
 		// TODO Auto-generated method stub
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
 		List<Map<String, Object>> list_s=new ArrayList<Map<String,Object>>();
-
-		/*String sqlZd="select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqc' AS lx from ("
-				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"' "
-				+ " and bc_type ='normal'"
-				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
-				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
-				+ " union "
-				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqc' AS lx from ("
-				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
-				+ " and bc_type ='normal' "
-				+ " and fcsj >'16:01' and fcsj<'18:00' group by cl_zbh,qdz_name "
-				+ " ) a group by a.qdz_name "
-				+ " union "
-				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqj' AS lx from ("
-				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
-				+ " and bc_type ='region' "
-				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
-				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
-				+ " union "
-				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqj' AS lx from ("
-				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
-				+ " and bc_type ='region' and fcsj >'16:01' and fcsj<'18:00'"
-				+ " group by cl_zbh,qdz_name) a group by a.qdz_name";*/
-
-		String sqlCl="SELECT cl_zbh,qdz_name,bc_type,fcsj,bcsj FROM"
-				+ "  bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
+		String sqlCl="SELECT lp cl_zbh,qdz_name,bc_type,fcsj,bcsj FROM"
+				+ "  bsth_c_s_ttinfo_detail WHERE ttinfo = '"+ttinfo+"' "
 				+ " AND  (bc_type = 'normal' or bc_type='region') order by qdz_name";
 		List<Map<String, Object>> listj= jdbcTemplate.query(sqlCl,
@@ -665,7 +571,7 @@ public class ReportServiceImpl implements ReportService{
 					}
 				});
-		String sqlZd="select qdz_name ,bc_type from  bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
+		String sqlZd="select qdz_name,bc_type from bsth_c_s_ttinfo_detail WHERE ttinfo = '"+ttinfo+"' "
 				+ " AND (bc_type = 'normal' or bc_type='region') group by qdz_name ,bc_type "
 				+ " order by qdz_name";
 		List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
@@ -807,6 +713,8 @@ public class ReportServiceImpl implements ReportService{
 		}
 		boolean status=true;
 		while (status) {
+			if(list.size() == 0)
+				break;
 			for (int i = 0; i < list.size(); i++) {
 				if(list.get(i).isEmpty()){
 					list.remove(i);
@@ -815,8 +723,8 @@ public class ReportServiceImpl implements ReportService{
 					status=false;
 				}
 			}
-
 		}
+		
 		return list;
 	}
@@ -828,11 +736,14 @@ public class ReportServiceImpl implements ReportService{
 		String minfcsj="02:00";
         List<Line> lineList=lineRepository.findLineByCode(line);
         if(lineList.size()>0){
-	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
-	         		+ " id = ("
-	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
-	         		+ ")";
-	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        	String sql = "select count(*) from bsth_c_line_config where line = '"+lineList.get(0).getId()+"'";
+        	if(jdbcTemplate.queryForObject(sql, Integer.class) > 0){
+		        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+		         		+ " id = ("
+		         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+		         		+ ")";
+		        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        	}
         }
 		//查询全程
@@ -917,11 +828,14 @@ public class ReportServiceImpl implements ReportService{
 		String minfcsj="02:00";
         List<Line> lineList=lineRepository.findLineByCode(line);
         if(lineList.size()>0){
-	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
-	         		+ " id = ("
-	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
-	         		+ ")";
-	        minfcsj= jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        	String sql = "select count(*) from bsth_c_line_config where line = '"+lineList.get(0).getId()+"'";
+        	if(jdbcTemplate.queryForObject(sql, Integer.class) > 0){
+		        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+		         		+ " id = ("
+		         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+		         		+ ")";
+		        minfcsj= jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        	}
         }
 		String[] minSjs = minfcsj.split(":");
 		int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
@@ -4,6 +4,7 @@ import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import com.bsth.service.schedule.datatools.TTinfoDetailDynamicData;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.timetable.ExcelFormatType;
 import com.bsth.service.schedule.utils.DataToolsFile;
 import java.util.List;
@@ -45,13 +46,15 @@ public interface TTInfoDetailService extends BService&lt;TTInfoDetail, Long&gt; {
      * @param sheetname sheet名字
      * @param lineid 线路id
      * @param lineversion 线路版本
+     * @param excelFormatType 版本
      */
     void validateExcelSheet(
             String filename,
             String sheetname,
             Integer lineid,
             String linename,
-            Integer lineversion) throws ScheduleException;
+            Integer lineversion,
+            ExcelFormatType excelFormatType) throws ScheduleException;
     /**
      * 验证关联的线路标准信息（以后放到规则引擎里去做）。
 package com.bsth.service.schedule.datatools;
-import com.bsth.entity.Station;
-import com.bsth.service.StationService;
+import com.bsth.entity.StationRoute;
+import com.bsth.service.StationRouteService;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.timetable.ExcelFormatType;
 import com.bsth.service.schedule.utils.*;
 import jxl.Sheet;
 import jxl.Workbook;
@@ -14,10 +15,13 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.WorkbookUtil;
+import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.joda.time.DateTime;
+import org.joda.time.LocalTime;
+import org.joda.time.format.DateTimeFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,9 +46,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
     /** 日志记录器 */
     private final static Logger LOGGER = LoggerFactory.getLogger(TTInfoDetailDataToolsImpl.class);
-    // TODO：之后改了
     @Autowired
-    private StationService stationService;
+    private StationRouteService stationRouteService;
     @Autowired
     @Qualifier(value = "dataToolsServiceImpl")
@@ -98,7 +101,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             Integer lineid = Integer.valueOf(String.valueOf(params.get("lineinfo"))); // 线路标准id
             String xlname = String.valueOf(params.get("xlname")); // 线路名字
             String ttname = String.valueOf(params.get("ttname")); // 时刻表名字
-            Integer lineversion = Integer.valueOf(params.get("lineversion").toString());
+            Integer lineversion = Integer.valueOf(params.get("lineversion").toString()); // 线路路由版本
+            ExcelFormatType excelFormatType = ExcelFormatType.getEnum(String.valueOf(params.get("excelFormatType"))); // 格式
             LOGGER.info("参数1, xls文件名={},sheet名字={}", filename, sheetname);
             LOGGER.info("参数2, 线路id={},线路名字={}", xlid, xlname);
@@ -175,6 +179,10 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             // 实际数据ktr
             File ktrFile2_version = new File(this.getClass().getResource(
                     dataToolsProperties.getTtinfodetailDatainputktr2version()).toURI());
+            // 实际数据ktr2
+            File ktrFile2_version2 = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailDatainputktr2version2()).toURI());
+
             // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
             ktrParms.put("transpath", mktrFile.getAbsolutePath());
@@ -182,7 +190,14 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
             // 附加参数
-            ktrParms.put("injectktrfile", ktrFile2_version.getAbsolutePath()); // 注入元数据的ktr文件
+            if (excelFormatType == ExcelFormatType.Normal) {
+                ktrParms.put("injectktrfile", ktrFile2_version.getAbsolutePath()); // 注入元数据的ktr文件
+            } else if (excelFormatType == ExcelFormatType.Dynamic) {
+                ktrParms.put("injectktrfile", ktrFile2_version2.getAbsolutePath()); // 注入元数据的ktr文件
+            } else {
+                throw new ScheduleException("未知ExcelFormatType");
+            }
+
             ktrParms.put("sheetname", sheetname); // sheet工作区的名字
             ktrParms.put("lineinfoid", lineid); // 线路标准id
             ktrParms.put("xlname", xlname); // 线路名称
@@ -441,8 +456,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         // 构造表头
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short)0, "路牌", new Color(0x96b9d7));
-        Station station1 = stationService.findById(lpObjList.get(0).getStationRouteId1());
-        Station station2 = stationService.findById(lpObjList.get(1).getStationRouteId2());
+        StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
+        StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
         for (int i = 0; i < groupCount; i++) {
             PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (i * 2 + 1),
                     station1.getStationName(), new Color(0x96b9d7));
@@ -553,8 +568,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         // 构造表头，添加一个进场，添加一个出场
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short)0, "路牌", new Color(0x96b9d7));
-        Station station1 = stationService.findById(lpObjList.get(0).getStationRouteId1());
-        Station station2 = stationService.findById(lpObjList.get(1).getStationRouteId2());
+        StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
+        StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (1),
                 "报到", new Color(0x96b9d7));
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (2),
@@ -565,8 +580,12 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (i * 2 + 2),
                     station2.getStationName(), new Color(0x96b9d7));
         }
+
+        // 最后一个进场需要变成三个班次
+        // 1个分班进场班次插入到前面的班次
+        // 后面添加两个班次，1个到场班次，1个离场班次
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 3),
-                "进场", new Color(0x96b9d7));
+                "到场", new Color(0x96b9d7));
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 4),
                 "离场", new Color(0x96b9d7));
@@ -589,56 +608,74 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             LpObj lpObj = lpObjList.get(i);
             XSSFRow lpRow = sheet.createRow((short) (i + 1));
             PoiUtils.createStringXSSFCell(wb, lpRow, (short) 0, lpObj.getLpname());
-            PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (1));
-            PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (2));
-            for (int j = 1; j <= groupCount; j++) {
-                PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (j * 2 + 1));
-                PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (j * 2 + 2));
-            }
-            PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (groupCount * 2 + 3));
-            PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (groupCount * 2 + 4));
+            // 创建空白单元格，并设置字符串格式
+            XSSFCell xssfCell = null;
-            for (BcObj bcObj : lpObj.getBcObjList()) {
-                if (bcObj.getBcType() == BcType.NORMAL) {
-                    Cell cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
-                    cell.setCellValue(bcObj.getFcsj());
+            xssfCell = PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (1));
+            PoiUtils.setStringStyleXSSFCellStyle(wb, xssfCell);
-                } else if (bcObj.getBcType() == BcType.BD) {
-                    if (bcObj.getGroupNo() == -1) {
-                        Cell cell = lpRow.getCell((short) 1);
-                        cell.setCellValue(bcObj.getFcsj());
-                    } else if (bcObj.getGroupNo() > 0) { // 分班报到
-                        Cell cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
-                        cell.setCellValue("报" + bcObj.getFcsj());
+            xssfCell = PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (2));
+            PoiUtils.setStringStyleXSSFCellStyle(wb, xssfCell);
-                    }
-
-                } else if (bcObj.getBcType() == BcType.OUT) {
-                    if (bcObj.getGroupNo() == -1) {
-                        Cell cell = lpRow.getCell((short) (2));
-                        cell.setCellValue(bcObj.getFcsj());
-                    } else if (bcObj.getGroupNo() > 0) { // 分班出场
-                        Cell cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
-                        cell.setCellValue("出" + bcObj.getFcsj());
-                    }
+            for (int j = 1; j <= groupCount; j++) {
+                xssfCell = PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (j * 2 + 1));
+                PoiUtils.setStringStyleXSSFCellStyle(wb, xssfCell);
+                xssfCell = PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (j * 2 + 2));
+                PoiUtils.setStringStyleXSSFCellStyle(wb, xssfCell);
+            }
-                } else if (bcObj.getBcType() == BcType.IN) {
-                    if (bcObj.getGroupNo() == -2) {
-                        Cell cell = lpRow.getCell((short) (groupCount * 2 + 3));
+            xssfCell = PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (groupCount * 2 + 3));
+            PoiUtils.setStringStyleXSSFCellStyle(wb, xssfCell);
+            xssfCell = PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (groupCount * 2 + 4));
+            PoiUtils.setStringStyleXSSFCellStyle(wb, xssfCell);
+
+            for (int j = 0; j < lpObj.getBcObjList().size(); j++) {
+                BcObj bcObj = lpObj.getBcObjList().get(j); // 当前班次
+                Cell cell = null; // 待处理的单元格
+
+                switch (bcObj.getBcType()) {
+                    case BD: // 报到班次
+                        if (bcObj.getIsFb()) { // 分班-两个车次链
+                            cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
+                            cell.setCellValue("报" + bcObj.getFcsj());
+                        } else { // 一个车次链
+                            cell = lpRow.getCell((short) 1);
+                            cell.setCellValue(bcObj.getFcsj());
+                        }
+                        break;
+                    case OUT: // 出场班次
+                        if (bcObj.getIsFb()) { // 分班-两个车次链
+                            cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
+                            cell.setCellValue("出" + bcObj.getFcsj());
+                        } else { // 一个车次链
+                            cell = lpRow.getCell((short) (2));
+                            cell.setCellValue(bcObj.getFcsj());
+                        }
+                        break;
+                    case NORMAL: // 正常班次
+                        cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
                         cell.setCellValue(bcObj.getFcsj());
-                    } else if (bcObj.getGroupNo() > 0) { //分班进场
-                        Cell cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
-                        // 停驶用 ※
-                        cell.setCellValue(bcObj.getFcsj() + "X");
-                    }
-
-                } else if (bcObj.getBcType() == BcType.LC) {
-                    if (bcObj.getGroupNo() == -2) {
-                        Cell cell = lpRow.getCell((short) (groupCount * 2 + 4));
+                        break;
+                    case IN: // 进场班次
+                        if (bcObj.getIsFb()) { // 分班-两个车次链
+                            cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
+                            // TODO：停驶用 ※
+                            cell.setCellValue(bcObj.getFcsj() + "X");
+                        } else { // 一个车次链
+                            cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
+                            cell.setCellValue(bcObj.getFcsj() + "X");
+                        }
+                        break;
+                    case LC:
+                        // 这个是到场，准备离场班次
+                        cell = lpRow.getCell((short) (groupCount * 2 + 3));
                         cell.setCellValue(bcObj.getFcsj());
-                    }
-
+                        // 加10分钟表示真正离场时间
+                        cell = lpRow.getCell((short) (groupCount * 2 + 4));
+                        LocalTime localTime = LocalTime.parse(bcObj.getFcsj(), DateTimeFormat.forPattern("HH:mm"));
+                        cell.setCellValue(localTime.plusMinutes(10).toString(DateTimeFormat.forPattern("HH:mm")));
+                        break;
                 }
             }
@@ -647,9 +684,9 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             PoiUtils.createDoubleXSSFCell(wb, lpRow, (short) (groupCount * 2 + 6), lpObj.getYylc());
             PoiUtils.createDoubleXSSFCell(wb, lpRow, (short) (groupCount * 2 + 7), lpObj.getKslc());
             PoiUtils.createStringXSSFCell(wb, lpRow, (short) (groupCount * 2 + 8),
-                    String.format("%d小时%d分钟", (int) (lpObj.getZgs() / 60), (int) (lpObj.getZgs() % 60)));
+                    String.format("%d%s%d", (int) (lpObj.getZgs() / 60), ":", (int) (lpObj.getZgs() % 60)));
             PoiUtils.createStringXSSFCell(wb, lpRow, (short) (groupCount * 2 + 9),
-                    String.format("%d小时%d分钟", (int) (lpObj.getYygs() / 60), (int) (lpObj.getYygs() % 60)));
+                    String.format("%d%s%d", (int) (lpObj.getYygs() / 60), ":", (int) (lpObj.getYygs() % 60)));
             PoiUtils.createIntegerXSSFCell(wb, lpRow, (short) (groupCount * 2 + 10), lpObj.getYybc());
         }
@@ -54,6 +54,9 @@ public interface TTinfoDetailDynamicData {
         /** 是否上行 */
         private Boolean isUp;
+        /** 是否分班 */
+        private Boolean isFb;
+
         /** 班次类型 */
         private BcType bcType;
         /** 发车时刻 */
@@ -154,14 +157,6 @@ public interface TTinfoDetailDynamicData {
             this.groupBcNo = groupBcNo;
         }
-        public Boolean getUp() {
-            return isUp;
-        }
-
-        public void setUp(Boolean up) {
-            isUp = up;
-        }
-
         public String getFcsjDesc() {
             return fcsjDesc;
         }
@@ -169,6 +164,14 @@ public interface TTinfoDetailDynamicData {
         public void setFcsjDesc(String fcsjDesc) {
             this.fcsjDesc = fcsjDesc;
         }
+
+        public Boolean getIsFb() {
+            return isFb;
+        }
+
+        public void setIsFb(Boolean fb) {
+            isFb = fb;
+        }
     }
     public static class LpObj { // 路牌对象
@@ -314,6 +317,7 @@ public interface TTinfoDetailDynamicData {
         public void setYybc(Integer yybc) {
             this.yybc = yybc;
         }
+
     }
     public static class StatInfo { // 统计数据对象
@@ -565,7 +565,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
+			String sql = "select schedule_date_str,xl_name,bc_type,gs_name,fgs_name,bcs,fcno,"
+					+"fcsj,fcsj_actual,zdsj,zdsj_actual,bcsj,qdz_name,sp_id,cc_service"
+					+" from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate
+					+"' and schedule_date_str <= '"+endDate+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -636,8 +639,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			if(model.length() != 0){
 //				sql = "select * from bsth_c_s_ttinfo_detail where ttinfo = '"+model+"' and bc_type != 'in' and bc_type != 'out'";
-				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out'" +
-						" and bc_type != 'ldks' and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
+				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out'"
+						+ " and bc_type != 'ldks' and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
 				if(line.length() != 0){
 					sql += " and xl_bm = '"+line+"'";
 				}
@@ -656,21 +659,21 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			e.printStackTrace();
 		}
+		Set<Long> ttSet = new HashSet<Long>();
+		for(Long tt : ttList){
+			ttSet.add(tt);
+		}
 		//分组计算 同时判断是否所选时刻信息
 		for(ScheduleRealInfo schedule : list){
 			if(schedule.isCcService()){
 				continue;
 			}
-			DO:{
 				if(model.length() != 0){
-					for(Long tt : ttList){
-						if((long)tt == (long)schedule.getSpId()){
-							String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj();
-							if(!keyMap.containsKey(key))
-								keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-							keyMap.get(key).add(schedule);
-							break DO;
-						}
+					if(ttSet.contains(schedule.getSpId())){
+						String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj();
+						if(!keyMap.containsKey(key))
+							keyMap.put(key, new ArrayList<ScheduleRealInfo>());
+						keyMap.get(key).add(schedule);
 					}
 				} else {
 					String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj();
@@ -678,7 +681,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 						keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 					keyMap.get(key).add(schedule);
 				}
-			}
 		}
 		String companyName = "", subCompanyName = "";
 		for(String key : keyMap.keySet()){
@@ -800,7 +802,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		if(page.length() != 0 && type.equals("query")){
 			int currPage = Integer.valueOf(page);
 			modelMap.put("totalPage", resList.size()%10>0?(resList.size()/10 + 1):resList.size()/10);
-			modelMap.put("dataList", resList.subList(currPage*10,((currPage+1)*10)>=resList.size()?resList.size():(currPage+1)*10));
+//			modelMap.put("dataList", resList.subList(currPage*10,((currPage+1)*10)>=resList.size()?resList.size():(currPage+1)*10));
+			modelMap.put("dataList", resList);
 		} else {
 			modelMap.put("dataList", resList);
 		}
 package com.bsth.service.schedule.impl;
-import com.bsth.entity.Line;
 import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.repository.BusinessRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.schedule.*;
 import com.bsth.service.schedule.SchedulePlanService;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.plan.DroolsSchedulePlan;
 import com.bsth.service.schedule.rules.ScheduleRuleService;
-import com.bsth.service.schedule.rules.plan.PlanCalcuParam_input;
-import com.bsth.service.schedule.rules.plan.PlanResult;
-import com.bsth.service.schedule.rules.rerun.RerunRule_input;
-import com.bsth.service.schedule.rules.rerun.RerunRule_param;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
-import com.bsth.service.schedule.rules.ttinfo.*;
 import com.bsth.service.schedule.rules.ttinfo2.CalcuParam;
 import com.bsth.service.schedule.rules.ttinfo2.Result;
-import com.bsth.service.schedule.rules.validate.ValidateParam;
-import com.bsth.service.schedule.rules.validate.ValidateResults_output;
-import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
@@ -37,6 +24,9 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
 /**
  * Created by xu on 16/6/16.
@@ -44,12 +34,12 @@ import java.util.*;
 @Service
 public class SchedulePlanServiceImpl extends BServiceImpl<SchedulePlan, Long> implements SchedulePlanService {
     @Autowired
-    @Qualifier("kb1")
-    private KieBase kieBase;
+    @Qualifier("coreKBase")
+    private KieBase coreKBase;
     @Autowired
-    @Qualifier("kb2")
-    private KieBase kieBase2;
+    @Qualifier("preKBase")
+    private KieBase preKBase;
     @Autowired
     private ScheduleRule1FlatRepository scheduleRule1FlatRepository;
@@ -73,398 +63,62 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     /** 日志记录器 */
     private Logger logger = LoggerFactory.getLogger(SchedulePlanServiceImpl.class);
-    /**
-     * 计算规则输入。
-     * @param schedulePlan
-     * @return
-     */
-    private List<ScheduleRule_input> calcuSrfList(SchedulePlan schedulePlan) {
-        // 1-1、构造drools规则输入数据，输出数据
-        // 全局计算参数
-        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input(schedulePlan);
-
-        // 规则输出数据
-        List<ScheduleRule_input> scheduleRule_inputs = new ArrayList<>();
-
-        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
-        // 创建session，内部配置的是stateful
-        KieSession session = kieBase2.newKieSession();
-        // 设置gloable对象，在drl中通过别名使用
-        session.setGlobal("sriList", scheduleRule_inputs);
-        session.setGlobal("log", logger); // 设置日志
-
-        session.setGlobal("srf", scheduleRule1FlatRepository);
-        session.setGlobal("rrr", rerunRuleRepository);
-        session.setGlobal("srservice", scheduleRuleService);
-
-        // 载入数据
-        session.insert(scheduleCalcuParam_input);
-
-        // 执行rule
-        session.fireAllRules();
-
-        // 执行完毕销毁，有日志的也要关闭
-        session.dispose();
-
-        return scheduleRule_inputs;
-    }
-
-    /**
-     * 循环规则输出。
-     * @param schedulePlan 排班计划对象
-     * @param lpInfoResults_output 时刻表每日路牌的情况
-     */
-    private ScheduleResults_output loopRuleOutput(
-            SchedulePlan schedulePlan,
-            LpInfoResults_output lpInfoResults_output) {
-        // 1-1、构造drools规则输入数据，输出数据
-        // 全局计算参数
-        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input(schedulePlan);
-        // 每个规则对应的输入参数
-        List<ScheduleRule_input> scheduleRule_inputs = calcuSrfList(schedulePlan);
-
-        // 规则输出数据
-        ScheduleResults_output scheduleResults_output = new ScheduleResults_output();
-
-        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
-        // 创建session，内部配置的是stateful
-        KieSession session = kieBase.newKieSession();
-        // 设置gloable对象，在drl中通过别名使用
-        session.setGlobal("scheduleResult", scheduleResults_output);
-        session.setGlobal("log", logger); // 设置日志
-        session.setGlobal("scheduleRuleService", scheduleRuleService);
-
-        // 载入数据
-        session.insert(scheduleCalcuParam_input);
-        for (ScheduleRule_input scheduleRule_input : scheduleRule_inputs) {
-            session.insert(scheduleRule_input);
-        }
-        // 每日时刻表路牌数据
-        for (LpInfoResult_output lpInfoResult_output: lpInfoResults_output.getLpInfoResult_outputs()) {
-            session.insert(lpInfoResult_output);
-        }
-        // 执行rule
-        session.fireAllRules();
-
-        // 执行完毕销毁，有日志的也要关闭
-        session.dispose();
-
-        // 保存循环规则结果数据
-        scheduleRuleService.generateRuleResult(scheduleResults_output.getSchedulePlanRuleResults());
-
-//        logger.info("循环规则输出={}", scheduleResults_output.showGuideboardDesc1());
-
-        return scheduleResults_output;
-    }
-
-    /**
-     * 时刻表选择（判定每天使用的时刻表，以及路牌数据输出）。
-     * @param schedulePlan 排班计划对象
-     * @return TTInfoResults_output, LpInfoResults_output
-     */
-    private Object[] ttInfoOutput(SchedulePlan schedulePlan) {
-        // 获取线路的所有未作废的时刻表
-        List<TTInfo> ttInfos = ttInfoRepository.findInCanceledByXl(schedulePlan.getXl());
-
-        // 1-1、构造drools规则输入数据，输出数据
-        // 全局计算参数
-        TTInfoCalcuParam_input ttInfoCalcuParam_input =
-                new TTInfoCalcuParam_input(
-                        new DateTime(schedulePlan.getScheduleFromTime()),
-                        new DateTime(schedulePlan.getScheduleToTime()),
-                        String.valueOf(schedulePlan.getXl().getId())
-                );
-        // 规则输出数据
-        TTInfoResults_output ttInfoResults_output = new TTInfoResults_output();
-        LpInfoResults_output lpInfoResults_output = new LpInfoResults_output();
-
-        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
-        // 创建session，内部配置的是stateful
-        KieSession session = kieBase.newKieSession();
-
-        // 设置gloable对象，在drl中通过别名使用
-        session.setGlobal("results", ttInfoResults_output);
-        session.setGlobal("lpInfoResults_output", lpInfoResults_output);
-        session.setGlobal("log", logger); // 设置日志
-        session.setGlobal("tTInfoDetailRepository", ttInfoDetailRepository);
-
-        // 载入数据
-        session.insert(ttInfoCalcuParam_input);
-        for (TTInfo ttInfo : ttInfos) {
-            TTInfo_input ttInfo_input = new TTInfo_input(ttInfo);
-            session.insert(ttInfo_input);
-        }
-
-        // 载入数据2（计算规则最早启用时间）
-        List<ScheduleRule1Flat> scheduleRule1Flats = scheduleRule1FlatRepository.findByXl(schedulePlan.getXl());
-
-        for (ScheduleRule1Flat scheduleRule1Flat: scheduleRule1Flats) {
-            ScheduleRule_input scheduleRule_input = new ScheduleRule_input(scheduleRule1Flat);
-            session.insert(scheduleRule_input);
-        }
-
-        // 执行rule
-        session.fireAllRules();
-
-        // 执行完毕销毁，有日志的也要关闭
-        session.dispose();
-
-        return new Object[] {ttInfoResults_output, lpInfoResults_output};
-
-    }
-
-    /**
-     * 排班生成。
-     * @param schedulePlan 排班计划对象
-     * @param scheduleResults_output loopRuleOutput方法规则输出
-     * @param ttInfoResults_output ttInfoOutput方法规则输出
-     * @return PlanResult
-     */
-    private PlanResult planResultOutput(
-            SchedulePlan schedulePlan,
-            ScheduleResults_output scheduleResults_output,
-            TTInfoResults_output ttInfoResults_output) {
-
-        // 1-1、构造drools规则输入数据，输出数据
-        PlanCalcuParam_input planCalcuParam_input = new PlanCalcuParam_input(
-                schedulePlan,
-                scheduleResults_output,
-                ttInfoResults_output
-        );
-        // 规则输出数据
-        PlanResult planResult = new PlanResult();
-        planResult.setXlId(schedulePlan.getXl().getId().toString());
-
-        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
-        // 创建session，内部配置的是stateful
-        KieSession session = kieBase.newKieSession();
-
-        // 设置gloable对象，在drl中通过别名使用
-        session.setGlobal("planResult", planResult);
-        session.setGlobal("log", logger); // 设置日志
-
-        session.setGlobal("tTInfoDetailRepository", ttInfoDetailRepository);
-        session.setGlobal("carConfigInfoRepository", carConfigInfoRepository);
-        session.setGlobal("employeeConfigInfoRepository", employeeConfigInfoRepository);
-        session.setGlobal("lineRepository", lineRepository);
-        session.setGlobal("businessRepository", businessRepository);
-
-        // 载入数据
-        session.insert(planCalcuParam_input);
-
-        // 执行rule
-        session.fireAllRules();
-
-        // 执行完毕销毁，有日志的也要关闭
-        session.dispose();
-
-        return planResult;
-
-    }
-
-    /**
-     * 生成线路排班（不含套跑规则）。
-     * @param schedulePlan
-     * @return
-     */
-    private PlanResult schedulePlanWithOutRerun(SchedulePlan schedulePlan) {
-        // 1、时刻表数据及每日路牌数据计算
-        Date start1 = new Date();
-        Object[] ttInfoRets = ttInfoOutput(schedulePlan);
-        TTInfoResults_output ttInfoResults_output = (TTInfoResults_output) ttInfoRets[0];
-        LpInfoResults_output lpInfoResults_output = (LpInfoResults_output) ttInfoRets[1];
-        Date end1 = new Date();
-        // 2、循环规则计算输出
-        Date start2 = new Date();
-        ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan, lpInfoResults_output);
-        Date end2 = new Date();
-
-        logger.info("规则计算结果={}", scheduleResults_output.showGuideboardDesc1());
-
-        // 3、计划输出
-        Date start3 = new Date();
-        PlanResult planResult = planResultOutput(schedulePlan, scheduleResults_output, ttInfoResults_output);
-        Date end3 = new Date();
-
-        logger.info("drool时刻表每日路牌计算 {} ms，drool循环规则计算 {} ms，drool计划数据 {} ms",
-                end1.getTime() - start1.getTime(),
-                end2.getTime() - start2.getTime(),
-                end3.getTime() - start3.getTime());
-
-        // TODO：将lpInfoResults_output 也要返回
-
-        return planResult;
-    }
-
-    /**
-     * 套跑计划排班数据。
-     * @param planResult
-     */
-    private void rerunPlanResult(PlanResult planResult, SchedulePlan schedulePlan) {
-        List<RerunRule_input> rerunRule_inputs = scheduleRuleService.findRerunrule(Integer.parseInt(planResult.getXlId()));
-        logger.info("套跑数量 {} 组", rerunRule_inputs.size());
-
-        // 主线路id
-        Integer mainXlId = schedulePlan.getXl().getId();
-
-        if (rerunRule_inputs.size() > 0) {
-            // 找出是对应路牌类型的线路，计算循环规则输出
-            Set<String> xlids = new HashSet<>();
-            for (RerunRule_input rerunRule_input: rerunRule_inputs) {
-                if ("dylp".equals(rerunRule_input.getType())) {
-                    xlids.add(rerunRule_input.getS_xl()); // 参与套跑的线路
-                }
-            }
-
-            List<ScheduleResults_output> scheduleResults_outputs = new ArrayList<>();
-            Date start1 = new Date();
-            for (String xlid: xlids) {
-                schedulePlan.getXl().setId(Integer.parseInt(xlid)); // 套跑的线路默认跟着主线路设定走
-                // 获取套跑线路的循环规则计算输出
-                Object[] ttInfoRets = ttInfoOutput(schedulePlan);
-                LpInfoResults_output lpInfoResults_output = (LpInfoResults_output) ttInfoRets[1];
-                ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan, lpInfoResults_output);
-                scheduleResults_outputs.add(scheduleResults_output);
-            }
-
-            // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
-            // 创建session，内部配置的是stateful
-            KieSession session = kieBase.newKieSession();
-
-            // 设置gloable对象，在drl中通过别名使用
-            session.setGlobal("planResult", planResult);
-            session.setGlobal("log", logger); // 设置日志
-
-            session.setGlobal("carConfigInfoRepository", carConfigInfoRepository);
-            session.setGlobal("employeeConfigInfoRepository", employeeConfigInfoRepository);
-
-            // 载入数据
-            RerunRule_param rerunRule_param = new RerunRule_param();
-            rerunRule_param.setMxlid(planResult.getXlId());
-            rerunRule_param.setXlIds_dylp(xlids);
-            session.insert(rerunRule_param);
-            for (RerunRule_input rri: rerunRule_inputs) {
-                session.insert(rri);
-            }
-            for (SchedulePlanInfo spi: planResult.getSchedulePlanInfos()) {
-                session.insert(spi);
+    /** 线路独占锁 */
+    private ConcurrentHashMap<Integer, ReentrantLock> lineXLatchMaps = new ConcurrentHashMap<>();
+    private ReentrantLock getLineXLatch(Integer xlid) {
+        ReentrantLock lineXLatch = lineXLatchMaps.get(xlid);
+        if (lineXLatch == null) {
+            lineXLatch = new ReentrantLock();
+            ReentrantLock pre = lineXLatchMaps.putIfAbsent(xlid, lineXLatch);
+            if (pre != null) {
+                lineXLatch = pre;
             }
-            for (ScheduleResults_output sro: scheduleResults_outputs) {
-                session.insert(sro);
-            }
-
-            // 执行rule
-            session.fireAllRules();
-
-            // 执行完毕销毁，有日志的也要关闭
-            session.dispose();
-
-            Date end1 = new Date();
-            logger.info("套跑规则计算，耗时 {} ms", end1.getTime() - start1.getTime());
-
-            schedulePlan.getXl().setId(mainXlId);
-
-        }
-
-    }
-
-    /**
-     * 验证排班结果。
-     * @param planResult
-     * @param schedulePlan
-     */
-    public void validPlanResult(PlanResult planResult, SchedulePlan schedulePlan) {
-        // 1-1、构造drools规则输入数据，输出数据
-        ValidateParam validateParam = new ValidateParam(
-                new DateTime(schedulePlan.getScheduleFromTime()),
-                new DateTime(schedulePlan.getScheduleToTime())
-        );
-        // 规则输出数据
-        ValidateResults_output result = new ValidateResults_output();
-
-        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
-        // 创建session，内部配置的是stateful
-        KieSession session = kieBase.newKieSession();
-
-        // 设置gloable对象，在drl中通过别名使用
-        session.setGlobal("validResult", result);
-        session.setGlobal("log", logger); // 设置日志
-
-        // 载入数据
-        session.insert(validateParam);
-        for (SchedulePlanInfo schedulePlanInfo: planResult.getSchedulePlanInfos()) {
-            session.insert(schedulePlanInfo);
-        }
-
-        // 执行rule
-        session.fireAllRules();
-
-        // 执行完毕销毁，有日志的也要关闭
-        session.dispose();
-
-//        logger.info("错误总数={}", result.getInfos().size());
-//        for (ValidateResults_output.ValidInfo validInfo: result.getInfos()) {
-//            logger.info(validInfo.getDesc());
-//        }
-
-        // 取10条错误
-        int size = result.getInfos().size() > 10 ? 10: result.getInfos().size();
-        List<String> desclist = new ArrayList<>();
-        for (int i = 0; i < size; i++) {
-            desclist.add(result.getInfos().get(i).getDesc());
-        }
-        if (desclist.size() > 0) {
-            schedulePlan.setPlanResult(StringUtils.join(desclist, "</br>"));
-        } else {
-            schedulePlan.setPlanResult("ok");
         }
-
-        // TODO：设定错误信息
+        return lineXLatch;
     }
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     public SchedulePlan save(SchedulePlan schedulePlan) {
-        // pre、如果排班的数据之前已经有了，删除之前的数据
-        Date startpre = new Date();
-        scheduleRuleService.deleteSchedulePlanInfo(
-                schedulePlan.getXl().getLineCode(),
-                schedulePlan.getScheduleFromTime(),
-                schedulePlan.getScheduleToTime());
-        Date endpre = new Date();
-
-        // 1、查找线路，这是主线路
-        Line xl = lineRepository.findOne(schedulePlan.getXl().getId());
-        logger.info("<--- 排班master线路 id={}, name={}, 开始排班", xl.getId(), xl.getName());
-
-        // 2、确定主线路排班（包含完全套跑路牌规则，所谓完全套跑路牌规则指整个路牌的班次都是套跑规则指定的）
-        PlanResult planResult = schedulePlanWithOutRerun(schedulePlan);
-
-        // 3、确定套跑规则
-        rerunPlanResult(planResult, schedulePlan);
-
-        // TODO：3-1、验证排班结果
-        validPlanResult(planResult, schedulePlan);
+        ReentrantLock lineXLatch = getLineXLatch(schedulePlan.getXl().getId());
+        try {
+            if (lineXLatch.tryLock(1, TimeUnit.SECONDS)) {
+                // pre、如果排班的数据之前已经有了，删除之前的数据
+                Date startPre = new Date();
+                scheduleRuleService.deleteSchedulePlanInfo(
+                        schedulePlan.getXl().getLineCode(),
+                        schedulePlan.getScheduleFromTime(),
+                        schedulePlan.getScheduleToTime());
+                Date endPre = new Date();
+                logger.info("删除数据 {} ms --->", endPre.getTime() - startPre.getTime());
+
+                // core、生成排班计划
+                DroolsSchedulePlan droolsSchedulePlan = new DroolsSchedulePlan(
+                        schedulePlan,
+                        lineRepository, scheduleRule1FlatRepository,
+                        ttInfoRepository, ttInfoDetailRepository,
+                        carConfigInfoRepository, employeeConfigInfoRepository,
+                        rerunRuleRepository, businessRepository,
+                        scheduleRuleService,
+                        preKBase, coreKBase,
+                        logger
+                );
+                droolsSchedulePlan.generatePlan();
-        // TODO：3-2、去除完全套跑遗漏班次（以后放到规则中执行）
-        Iterator<SchedulePlanInfo> infoIterator = planResult.getSchedulePlanInfos().iterator();
-        while (infoIterator.hasNext()) {
-            SchedulePlanInfo schedulePlanInfo = infoIterator.next();
-            if (schedulePlanInfo.getCl() == null) {
-                infoIterator.remove();
+                return new SchedulePlan();
+            } else {
+                throw new ScheduleException("当前线路正在排班，请稍后再操作...");
             }
-        }
+        } catch (Exception exp) {
+            throw new RuntimeException(exp);
+        } finally {
+            try {
+                lineXLatch.unlock();
+            } catch (Exception exp2) {
-        // 4、保存数据（jdbcTemplate 批量插入）
-        Date start4 = new Date();
-        scheduleRuleService.generateSchedulePlan(schedulePlan, planResult.getSchedulePlanInfos());
-        Date end4 = new Date();
+            }
-        logger.info("删除数据 {} ms，保存主线路数据 {} 条 耗时 {} ms --->",
-                endpre.getTime() - startpre.getTime(),
-                planResult.getSchedulePlanInfos().size(),
-                end4.getTime() - start4.getTime());
+        }
-        return new SchedulePlan();
     }
     @Override
@@ -475,10 +129,12 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     @Override
     public SchedulePlan findSchedulePlanTommorw() {
         DateTime today = new DateTime(new Date());
-        DateTime tommorw = new DateTime(today.getYear(), today.getMonthOfYear(), today.getDayOfMonth(), 0, 0).plusDays(1);
+        DateTime tommorw = new DateTime(
+                today.getYear(), today.getMonthOfYear(),
+                today.getDayOfMonth(), 0, 0).plusDays(1);
         Map<String, Object> param = new HashMap<>();
         param.put("scheduleFromTime_le", tommorw.toDate());
-        param.put("scheduleToTime_ge", tommorw.toDate()     );
+        param.put("scheduleToTime_ge", tommorw.toDate());
         Iterator<SchedulePlan> schedulePlanIterator = this.list(param).iterator();
         if (schedulePlanIterator.hasNext()) {
             return schedulePlanIterator.next();
@@ -490,7 +146,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     public Result validateTTInfo(Integer xlid, Date from, Date to) {
         // 构造drools session->载入数据->启动规则->计算->销毁session
         // 创建session，内部配置的是stateful
-        KieSession session = kieBase.newKieSession();
+        KieSession session = coreKBase.newKieSession();
         // 设置gloable对象，在drl中通过别名使用
         session.setGlobal("log", logger);
         session.setGlobal("lineRepository", lineRepository);
@@ -513,7 +169,6 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // 执行完毕销毁，有日志的也要关闭
         session.dispose();
-
         return rs;
     }
 }
@@ -15,12 +15,15 @@ import com.bsth.repository.schedule.TTInfoRepository;
 import com.bsth.repository.sys.SysUserRepository;
 import com.bsth.service.CarParkService;
 import com.bsth.service.LineInformationService;
+import com.bsth.service.LineService;
 import com.bsth.service.StationRouteService;
 import com.bsth.service.schedule.GuideboardInfoService;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import com.bsth.service.schedule.datatools.TTinfoDetailDynamicData;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.timetable.ExcelData;
+import com.bsth.service.schedule.timetable.ExcelFormatType;
 import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.schedule.utils.DataToolsFileType;
 import com.bsth.service.schedule.utils.DataToolsService;
@@ -77,6 +80,8 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     private SysUserRepository sysUserRepository;
     @Autowired
     private GuideboardInfoRepository guideboardInfoRepository;
+    @Autowired
+    private LineService lineService;
     @Autowired
     @Qualifier(value = "ttInfoDetail_dataTool")
@@ -155,130 +160,13 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     }
     @Override
-    public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename, Integer lineversion) throws ScheduleException {
-        try {
-            File file = new File(filename);
-            Workbook workbook;
-
-            if (DataToolsFileType.XLS.isThisType(file)) {
-                workbook = DataToolsFileType.XLS.getWorkBook(file);
-            } else if (DataToolsFileType.XLSX.isThisType(file)) {
-                workbook = DataToolsFileType.XLSX.getWorkBook(file);
-            } else {
-                throw new Exception("不是xls xlsx文件！");
-            }
-
-            Sheet sheet = workbook.getSheet(sheetname);
-            int rowNums = sheet.getLastRowNum() + 1; // 基于0 base的，长度加1
-            int colNums = sheet.getRow(0).getLastCellNum(); // 不需要加1，就是长度
-
-            if (rowNums == 0 || colNums == 0) { // 工作区是否为空
-                throw new Exception(String.format("%s 工作区没有数据！", sheetname));
-            } else {
-                if (rowNums <= 1 || rowNums <= 1) {
-                    throw new Exception(String.format("工作区至少包含2行2列的数据"));
-                } else {
-                    Row firstRow = sheet.getRow(0); // 获取第一行数据列
-                    for (int i = 0; i < colNums; i++) {
-                        String cell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(firstRow.getCell(i))); // trimToEmpty
-
-                        if (StringUtils.isEmpty(cell_con)) {
-                            throw new Exception(String.format("第1行，第%d列数据不能为空", i + 1));
-                        } else {
-                            // 正则表达式去除右侧数字
-//                            cell_con = cell_con.replaceAll("[\\d+]", "");
-//                            cell_con = cell_con.replaceAll("(\\d+)$", "");
-
-                            // 如果站名中有类似->{数字}，使用正则表达式过滤掉
-                            cell_con = cell_con.replaceAll("(->\\d+)", "");
-
-                            if (i == 0) { // 第一列必须是路牌2个字
-                                if (!"路牌".equals(cell_con.trim())) {
-                                    throw new Exception("第1行，第1列数据必须是路牌2个字");
-                                }
-                            } else { // 排除出场，进场，其余内容到站点路由里查询，以各个方向的起点站为查询依据
-                                if ((!"出场".equals(cell_con.trim())) &&
-                                        (!"进场".equals(cell_con.trim()))) {
-                                    Map<String, Object> p1 = new HashMap<>();
-                                    p1.put("line.id_eq", lineid);
-                                    p1.put("stationName_eq", cell_con.trim());
-                                    p1.put("stationMark_eq", "B"); // 起点站
-                                    p1.put("destroy_eq", 0); // 未撤销
-                                    p1.put("versions_eq", lineversion); // 带线路版本
-
-                                    List<LsStationRoute> lsStationRoutes = (List<LsStationRoute>) stationRouteService.list_ls(p1);
-                                    if (CollectionUtils.isEmpty(lsStationRoutes)) {
-                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename));
-                                    } else if (lsStationRoutes.size() > 1) {
-                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename));
-                                    } else if (StringUtils.isEmpty(lsStationRoutes.get(0).getStationCode())) {
-                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中没有站点编码", i + 1, cell_con.trim(), linename));
-                                    }
-
-                                }
-
-                            }
-                        }
-                    }
-
-                    // 验证路牌内容
-                    Map<String, Integer> gbindexmap = new HashMap<>(); // 记录每个路牌在第几行
-                    for (int i = 1; i < rowNums; i++) { // 从第2行开始验证数据
-                        Cell cell = sheet.getRow(i).getCell(0); // 获取第1列
-                        String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(cell)); // trimToEmpty
-                        if (StringUtils.isEmpty(bcell_con)) {
-                            throw new Exception(String.format("第%d行，第1列路牌无数据", i + 1));
-                        } else if (gbindexmap.get(bcell_con.trim()) != null) {
-                            throw new Exception(String.format("第%d行，第1列的路牌数据与第%d行，第1列数据重复",
-                                    i + 1,
-                                    gbindexmap.get(bcell_con.trim())));
-                        } else {
-                            Map<String, Object> p2 = new HashMap<>();
-                            p2.put("xl.id_eq", lineid);
-                            p2.put("lpName_eq", bcell_con.trim());
-                            p2.put("isCancel_eq", false);
-                            List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2);
-                            if (CollectionUtils.isEmpty(guideboardInfoList)) {
-                                throw new Exception(String.format("第%d行，第1列的路牌在%s中不存在", i + 1, linename));
-                            } else if (guideboardInfoList.size() > 1) {
-                                throw new Exception(String.format("第%d行，第1列的路牌在%s中重复", i + 1, linename));
-                            } else {
-                                gbindexmap.put(bcell_con.trim(), i + 1);
-                            }
-                        }
-                    }
-
-                    // 班次时间验证，正则表达式，格式hh:mm或者hhmm
-                    String rex1 = "^([01]?[0-9]|2[0-3]):[0-5][0-9]$"; // hh:mm格式
-                    String rex2 = "^([01]?[0-9]|2[0-3]),[0-5][0-9]$"; // hh,mm格式
-                    String rex3 = "^([01]?[0-9]|2[0-3])[0-5][0-9]$"; // hhmm格式
-                    Pattern p1 = Pattern.compile(rex1);
-                    Pattern p2 = Pattern.compile(rex2);
-                    Pattern p3 = Pattern.compile(rex3);
-
-                    for (int i = 1; i < rowNums; i++) { // 从第2行开始验证数据
-                        Row row = sheet.getRow(i);
-                        for (int j = 1; j < colNums; j++) { // 从第2列开始
-                            String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))).replaceAll("\\s*", ""); // trimToEmpty
-                            if (StringUtils.isNotEmpty(bcell_con)) {
-                                Matcher m1 = p1.matcher(bcell_con.trim());
-                                Matcher m2 = p2.matcher(bcell_con.trim());
-                                Matcher m3 = p3.matcher(bcell_con.trim());
-                                if ((!m1.matches()) && (!m2.matches()) && (!m3.matches())) {
-                                    throw new Exception(String.format("第%d行，第%d列的发车时间格式不正确，格式应为hh:mm或hh,mm或hhmm", i + 1, j + 1));
-                                }
-                            }
-                        }
-                    }
-                }
-
-            }
-
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            throw new ScheduleException(exp.getMessage());
-        }
-
+    public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename, Integer lineversion, ExcelFormatType excelFormatType) throws ScheduleException {
+        ExcelData excelData = new ExcelData(
+                filename, sheetname, lineid,
+                lineService, guideboardInfoService,
+                lineversion, stationRouteService,
+                excelFormatType);
+        excelData.validateExcelSheet();
     }
     @Override
+package com.bsth.service.schedule.plan;
+
+import com.bsth.entity.Line;
+import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.schedule.TTInfo;
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.repository.BusinessRepository;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.schedule.*;
+import com.bsth.service.schedule.rules.ScheduleRuleService;
+import com.bsth.service.schedule.rules.plan.PlanCalcuParam_input;
+import com.bsth.service.schedule.rules.plan.PlanResult;
+import com.bsth.service.schedule.rules.rerun.RerunRule_input;
+import com.bsth.service.schedule.rules.rerun.RerunRule_param;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.rules.ttinfo.*;
+import com.bsth.service.schedule.rules.validate.ValidateParam;
+import com.bsth.service.schedule.rules.validate.ValidateResults_output;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.kie.api.KieBase;
+import org.kie.api.runtime.KieSession;
+import org.slf4j.Logger;
+
+import java.util.*;
+
+/**
+ * 排班计划（使用Drools）。
+ */
+public class DroolsSchedulePlan {
+    /** 主线路 */
+    private Line mainLine;
+    /** 套跑辅线路规则 */
+    private List<RerunRule_input> rerunRule_inputs;
+
+    /** 开始排班时间 */
+    private Date from;
+    /** 结束排班时间 */
+    private Date to;
+    /** 排班计划entity */
+    private SchedulePlan schedulePlan;
+
+    //-------------------- 相关的Repo，service服务 --------------------//
+    /** 线路Repo */
+    private LineRepository lineRepository;
+    /** 排班规则Repo */
+    private ScheduleRule1FlatRepository scheduleRule1FlatRepository;
+    /** 时刻表Repo */
+    private TTInfoRepository ttInfoRepository;
+    /** 时刻表明细Repo */
+    private TTInfoDetailRepository ttInfoDetailRepository;
+    /** 车辆配置Repo */
+    private CarConfigInfoRepository carConfigInfoRepository;
+    /** 人员配置Repo */
+    private EmployeeConfigInfoRepository employeeConfigInfoRepository;
+    /** 套跑规则Repo */
+    private RerunRuleRepository rerunRuleRepository;
+    /** 营运状态Repo */
+    private BusinessRepository businessRepository;
+
+    /** 排班规则service */
+    private ScheduleRuleService scheduleRuleService;
+
+    //-------------------- Drools KBase实例 ------------------//
+    /** 排班预处理KBase */
+    private KieBase preKBase;
+    /** 排班核心KBase */
+    private KieBase coreKBase;
+
+    //-------------------- 日志记录器 ---------------------//
+    private Logger logger;
+
+    public DroolsSchedulePlan(
+            SchedulePlan schedulePlan,
+            LineRepository lineRepository, ScheduleRule1FlatRepository scheduleRule1FlatRepository,
+            TTInfoRepository ttInfoRepository, TTInfoDetailRepository ttInfoDetailRepository,
+            CarConfigInfoRepository carConfigInfoRepository,
+            EmployeeConfigInfoRepository employeeConfigInfoRepository,
+            RerunRuleRepository rerunRuleRepository,
+            BusinessRepository businessRepository,
+            ScheduleRuleService scheduleRuleService,
+            KieBase preKBase, KieBase coreKBase,
+            Logger logger) {
+
+        // 验证SchedulePlan实体
+        if (schedulePlan == null) {
+            throw new RuntimeException("排班用SchedulePlan为空！");
+        }
+        if (schedulePlan.getXl() == null) {
+            throw new RuntimeException("排班线路为空！");
+        } else {
+            // 获取主线路
+            this.mainLine = lineRepository.findOne(schedulePlan.getXl().getId());
+            if (this.mainLine == null) {
+                throw new RuntimeException("线路id=" + schedulePlan.getXl().getId() + "不存在！");
+            }
+            // 获取主线路套跑信息
+            this.rerunRule_inputs = scheduleRuleService.findRerunrule(this.mainLine.getId());
+        }
+        if (schedulePlan.getScheduleFromTime() == null) {
+            throw new RuntimeException("排班开始时间为空！");
+        }
+        if (schedulePlan.getScheduleToTime() == null) {
+            throw new RuntimeException("排班结束时间为空！");
+        }
+        this.from = schedulePlan.getScheduleFromTime();
+        this.to = schedulePlan.getScheduleToTime();
+        if (schedulePlan.getTtInfoIds() == null) {
+            throw new RuntimeException("排班关联的时刻表ids为空！");
+        }
+        if (schedulePlan.getTtInfoNames() == null) {
+            throw new RuntimeException("排班关联的时刻表名字s为空！");
+        }
+        this.schedulePlan = schedulePlan;
+
+        this.lineRepository = lineRepository;
+        this.scheduleRule1FlatRepository = scheduleRule1FlatRepository;
+        this.ttInfoRepository = ttInfoRepository;
+        this.ttInfoDetailRepository = ttInfoDetailRepository;
+        this.carConfigInfoRepository = carConfigInfoRepository;
+        this.employeeConfigInfoRepository = employeeConfigInfoRepository;
+        this.rerunRuleRepository = rerunRuleRepository;
+        this.businessRepository = businessRepository;
+        this.scheduleRuleService = scheduleRuleService;
+        this.preKBase = preKBase;
+        this.coreKBase = coreKBase;
+
+        this.logger = logger;
+
+    }
+
+    public void generatePlan() {
+        logger.info("<--- 排班master线路 id={}, name={}, 开始排班",
+                this.mainLine.getId(), this.mainLine.getName());
+
+        // 1、确定主线路排班（包含完全套跑路牌规则，所谓完全套跑路牌规则指整个路牌的班次都是套跑规则指定的）
+        PlanResult planResult = this.schedulePlanWithOutRerun();
+
+        // 2、确定套跑规则
+        this.rerunPlanResult(planResult);
+
+        // TODO：3-1、验证排班结果
+        this.validPlanResult(planResult);
+
+        // TODO：3-2、去除完全套跑遗漏班次（以后放到规则中执行）
+        Iterator<SchedulePlanInfo> infoIterator = planResult.getSchedulePlanInfos().iterator();
+        while (infoIterator.hasNext()) {
+            SchedulePlanInfo schedulePlanInfo = infoIterator.next();
+            if (schedulePlanInfo.getCl() == null) {
+                infoIterator.remove();
+            }
+        }
+
+        // 4、保存数据（jdbcTemplate 批量插入）
+        Date start4 = new Date();
+        this.scheduleRuleService.generateSchedulePlan(
+                this.schedulePlan, planResult.getSchedulePlanInfos());
+        Date end4 = new Date();
+
+        this.logger.info("保存主线路数据 {} 条 耗时 {} ms --->",
+                planResult.getSchedulePlanInfos().size(),
+                end4.getTime() - start4.getTime());
+    }
+
+    /**
+     * 计算规则输入。
+     * @return
+     */
+    private List<ScheduleRule_input> calcuSrfList(Line line) {
+        // 1-1、构造drools规则输入数据，输出数据
+        // 全局计算参数
+        SchedulePlan schedulePlan = new SchedulePlan();
+        schedulePlan.setXl(line);
+        schedulePlan.setScheduleFromTime(this.from);
+        schedulePlan.setScheduleToTime(this.to);
+        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input(schedulePlan);
+
+        // 规则输出数据
+        List<ScheduleRule_input> scheduleRule_inputs = new ArrayList<>();
+
+        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
+        // 创建session，内部配置的是stateful
+        KieSession session = preKBase.newKieSession();
+        // 设置gloable对象，在drl中通过别名使用
+        session.setGlobal("sriList", scheduleRule_inputs);
+        session.setGlobal("log", logger); // 设置日志
+
+        session.setGlobal("srf", scheduleRule1FlatRepository);
+        session.setGlobal("rrr", rerunRuleRepository);
+        session.setGlobal("srservice", scheduleRuleService);
+
+        // 载入数据
+        session.insert(scheduleCalcuParam_input);
+
+        // 执行rule
+        session.fireAllRules();
+
+        // 执行完毕销毁，有日志的也要关闭
+        session.dispose();
+
+        return scheduleRule_inputs;
+    }
+
+    /**
+     * 时刻表选择（判定每天使用的时刻表，以及路牌数据输出）。
+     * @return [TTInfoResults_output, LpInfoResults_output]
+     */
+    private Object[] ttInfoOutput(Line line) {
+        // 获取线路的所有未作废的时刻表
+        List<TTInfo> ttInfos = ttInfoRepository.findInCanceledByXl(line);
+
+        // 1-1、构造drools规则输入数据，输出数据
+        // 全局计算参数
+        TTInfoCalcuParam_input ttInfoCalcuParam_input =
+                new TTInfoCalcuParam_input(
+                        new DateTime(this.from),
+                        new DateTime(this.to),
+                        String.valueOf(line.getId())
+                );
+        // 规则输出数据
+        TTInfoResults_output ttInfoResults_output = new TTInfoResults_output();
+        LpInfoResults_output lpInfoResults_output = new LpInfoResults_output();
+
+        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
+        // 创建session，内部配置的是stateful
+        KieSession session = coreKBase.newKieSession();
+
+        // 设置gloable对象，在drl中通过别名使用
+        session.setGlobal("results", ttInfoResults_output);
+        session.setGlobal("lpInfoResults_output", lpInfoResults_output);
+        session.setGlobal("log", logger); // 设置日志
+        session.setGlobal("tTInfoDetailRepository", ttInfoDetailRepository);
+
+        // 载入数据
+        session.insert(ttInfoCalcuParam_input);
+        for (TTInfo ttInfo : ttInfos) {
+            TTInfo_input ttInfo_input = new TTInfo_input(ttInfo);
+            session.insert(ttInfo_input);
+        }
+
+        // 载入数据2（计算规则最早启用时间）
+        List<ScheduleRule1Flat> scheduleRule1Flats = scheduleRule1FlatRepository.findByXl(line);
+
+        for (ScheduleRule1Flat scheduleRule1Flat: scheduleRule1Flats) {
+            ScheduleRule_input scheduleRule_input = new ScheduleRule_input(scheduleRule1Flat);
+            session.insert(scheduleRule_input);
+        }
+
+        // 执行rule
+        session.fireAllRules();
+
+        // 执行完毕销毁，有日志的也要关闭
+        session.dispose();
+
+        return new Object[] {ttInfoResults_output, lpInfoResults_output};
+
+    }
+
+    /**
+     * 循环规则输出。
+     * @param lpInfoResults_output 时刻表每日路牌的情况
+     */
+    private ScheduleResults_output loopRuleOutput(Line line, LpInfoResults_output lpInfoResults_output) {
+        // 1-1、构造drools规则输入数据，输出数据
+        // 全局计算参数
+        SchedulePlan schedulePlan = new SchedulePlan();
+        schedulePlan.setXl(line);
+        schedulePlan.setScheduleFromTime(this.from);
+        schedulePlan.setScheduleToTime(this.to);
+        schedulePlan.setIsHistoryPlanFirst(this.schedulePlan.getIsHistoryPlanFirst());
+        schedulePlan.setCreateBy(this.schedulePlan.getCreateBy());
+        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input(schedulePlan);
+        // 每个规则对应的输入参数
+        List<ScheduleRule_input> scheduleRule_inputs = this.calcuSrfList(line);
+
+        // 规则输出数据
+        ScheduleResults_output scheduleResults_output = new ScheduleResults_output();
+
+        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
+        // 创建session，内部配置的是stateful
+        KieSession session = coreKBase.newKieSession();
+        // 设置gloable对象，在drl中通过别名使用
+        session.setGlobal("scheduleResult", scheduleResults_output);
+        session.setGlobal("log", logger); // 设置日志
+        session.setGlobal("scheduleRuleService", scheduleRuleService);
+
+        // 载入数据
+        session.insert(scheduleCalcuParam_input);
+        for (ScheduleRule_input scheduleRule_input : scheduleRule_inputs) {
+            session.insert(scheduleRule_input);
+        }
+        // 每日时刻表路牌数据
+        for (LpInfoResult_output lpInfoResult_output: lpInfoResults_output.getLpInfoResult_outputs()) {
+            session.insert(lpInfoResult_output);
+        }
+        // 执行rule
+        session.fireAllRules();
+
+        // 执行完毕销毁，有日志的也要关闭
+        session.dispose();
+
+        // 保存循环规则结果数据
+        scheduleRuleService.generateRuleResult(scheduleResults_output.getSchedulePlanRuleResults());
+
+//        logger.info("循环规则输出={}", scheduleResults_output.showGuideboardDesc1());
+
+        return scheduleResults_output;
+    }
+
+    /**
+     * 排班生成。
+     * @param scheduleResults_output loopRuleOutput方法规则输出
+     * @param ttInfoResults_output ttInfoOutput方法规则输出
+     * @return PlanResult
+     */
+    private PlanResult planResultOutput(
+            Line line,
+            ScheduleResults_output scheduleResults_output,
+            TTInfoResults_output ttInfoResults_output) {
+
+        SchedulePlan schedulePlan = new SchedulePlan();
+        schedulePlan.setXl(line);
+        schedulePlan.setScheduleFromTime(this.from);
+        schedulePlan.setScheduleToTime(this.to);
+        schedulePlan.setCreateBy(this.schedulePlan.getCreateBy());
+        schedulePlan.setUpdateBy(this.schedulePlan.getUpdateBy());
+
+        // 1-1、构造drools规则输入数据，输出数据
+        PlanCalcuParam_input planCalcuParam_input = new PlanCalcuParam_input(
+                schedulePlan,
+                scheduleResults_output,
+                ttInfoResults_output
+        );
+        // 规则输出数据
+        PlanResult planResult = new PlanResult();
+        planResult.setXlId(schedulePlan.getXl().getId().toString());
+
+        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
+        // 创建session，内部配置的是stateful
+        KieSession session = this.coreKBase.newKieSession();
+
+        // 设置gloable对象，在drl中通过别名使用
+        session.setGlobal("planResult", planResult);
+        session.setGlobal("log", this.logger); // 设置日志
+
+        session.setGlobal("tTInfoDetailRepository", this.ttInfoDetailRepository);
+        session.setGlobal("carConfigInfoRepository", this.carConfigInfoRepository);
+        session.setGlobal("employeeConfigInfoRepository", this.employeeConfigInfoRepository);
+        session.setGlobal("lineRepository", this.lineRepository);
+        session.setGlobal("businessRepository", this.businessRepository);
+
+        // 载入数据
+        session.insert(planCalcuParam_input);
+
+        // 执行rule
+        session.fireAllRules();
+
+        // 执行完毕销毁，有日志的也要关闭
+        session.dispose();
+
+        return planResult;
+
+    }
+
+    /**
+     * 生成线路排班（不含套跑规则）。
+     * @param schedulePlan
+     * @return
+     */
+    private PlanResult schedulePlanWithOutRerun() {
+        // 1、时刻表数据及每日路牌数据计算
+        Date start1 = new Date();
+        Object[] ttInfoRets = this.ttInfoOutput(this.mainLine);
+        TTInfoResults_output ttInfoResults_output = (TTInfoResults_output) ttInfoRets[0];
+        LpInfoResults_output lpInfoResults_output = (LpInfoResults_output) ttInfoRets[1];
+        Date end1 = new Date();
+        // 2、循环规则计算输出
+        Date start2 = new Date();
+        ScheduleResults_output scheduleResults_output = this.loopRuleOutput(
+                this.mainLine, lpInfoResults_output);
+        Date end2 = new Date();
+
+        logger.info("规则计算结果={}", scheduleResults_output.showGuideboardDesc1());
+
+        // 3、计划输出
+        Date start3 = new Date();
+        PlanResult planResult = planResultOutput(
+                this.mainLine, scheduleResults_output, ttInfoResults_output);
+        Date end3 = new Date();
+
+        logger.info("drool时刻表每日路牌计算 {} ms，drool循环规则计算 {} ms，drool计划数据 {} ms",
+                end1.getTime() - start1.getTime(),
+                end2.getTime() - start2.getTime(),
+                end3.getTime() - start3.getTime());
+
+        // TODO：将lpInfoResults_output 也要返回
+
+        return planResult;
+    }
+
+    /**
+     * 套跑计划排班数据。
+     * @param planResult
+     */
+    private void rerunPlanResult(PlanResult planResult) {
+        logger.info("套跑数量 {} 组", this.rerunRule_inputs.size());
+
+        if (this.rerunRule_inputs.size() > 0) {
+            // 找出是对应路牌类型的线路，计算循环规则输出
+            Set<String> dylpxlids = new HashSet<>();
+            for (RerunRule_input rerunRule_input: rerunRule_inputs) {
+                if ("dylp".equals(rerunRule_input.getType())) {
+                    dylpxlids.add(rerunRule_input.getS_xl()); // 参与套跑的线路
+                }
+            }
+
+            List<ScheduleResults_output> scheduleResults_outputs = new ArrayList<>();
+            Date start1 = new Date();
+            for (String xlid: dylpxlids) {
+                Line dylpline = new Line(); // 套跑的线路默认跟着主线路设定走
+                dylpline.setId(Integer.parseInt(xlid));
+                // 获取套跑线路的循环规则计算输出
+                Object[] ttInfoRets = this.ttInfoOutput(dylpline);
+                LpInfoResults_output lpInfoResults_output = (LpInfoResults_output) ttInfoRets[1];
+                ScheduleResults_output scheduleResults_output = this.loopRuleOutput(
+                        dylpline, lpInfoResults_output);
+                scheduleResults_outputs.add(scheduleResults_output);
+            }
+
+            // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
+            // 创建session，内部配置的是stateful
+            KieSession session = this.coreKBase.newKieSession();
+
+            // 设置gloable对象，在drl中通过别名使用
+            session.setGlobal("planResult", planResult);
+            session.setGlobal("log", this.logger); // 设置日志
+
+            session.setGlobal("carConfigInfoRepository", this.carConfigInfoRepository);
+            session.setGlobal("employeeConfigInfoRepository", this.employeeConfigInfoRepository);
+
+            // 载入数据
+            RerunRule_param rerunRule_param = new RerunRule_param();
+            rerunRule_param.setMxlid(planResult.getXlId());
+            rerunRule_param.setXlIds_dylp(dylpxlids);
+            session.insert(rerunRule_param);
+            for (RerunRule_input rri: this.rerunRule_inputs) {
+                session.insert(rri);
+            }
+            for (SchedulePlanInfo spi: planResult.getSchedulePlanInfos()) {
+                session.insert(spi);
+            }
+            for (ScheduleResults_output sro: scheduleResults_outputs) {
+                session.insert(sro);
+            }
+
+            // 执行rule
+            session.fireAllRules();
+
+            // 执行完毕销毁，有日志的也要关闭
+            session.dispose();
+
+            Date end1 = new Date();
+            logger.info("套跑规则计算，耗时 {} ms", end1.getTime() - start1.getTime());
+
+        }
+
+    }
+
+    /**
+     * 验证排班结果。
+     * @param planResult
+     * @param schedulePlan
+     */
+    public void validPlanResult(PlanResult planResult) {
+        // 1-1、构造drools规则输入数据，输出数据
+        ValidateParam validateParam = new ValidateParam(
+                new DateTime(this.from), new DateTime(this.to));
+        // 规则输出数据
+        ValidateResults_output result = new ValidateResults_output();
+
+        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
+        // 创建session，内部配置的是stateful
+        KieSession session = this.coreKBase.newKieSession();
+
+        // 设置gloable对象，在drl中通过别名使用
+        session.setGlobal("validResult", result);
+        session.setGlobal("log", this.logger); // 设置日志
+
+        // 载入数据
+        session.insert(validateParam);
+        for (SchedulePlanInfo schedulePlanInfo: planResult.getSchedulePlanInfos()) {
+            session.insert(schedulePlanInfo);
+        }
+
+        // 执行rule
+        session.fireAllRules();
+
+        // 执行完毕销毁，有日志的也要关闭
+        session.dispose();
+
+//        logger.info("错误总数={}", result.getInfos().size());
+//        for (ValidateResults_output.ValidInfo validInfo: result.getInfos()) {
+//            logger.info(validInfo.getDesc());
+//        }
+
+        // 取10条错误
+        int size = result.getInfos().size() > 10 ? 10: result.getInfos().size();
+        List<String> desclist = new ArrayList<>();
+        for (int i = 0; i < size; i++) {
+            desclist.add(result.getInfos().get(i).getDesc());
+        }
+        if (desclist.size() > 0) {
+            this.schedulePlan.setPlanResult(StringUtils.join(desclist, "</br>"));
+        } else {
+            this.schedulePlan.setPlanResult("ok");
+        }
+
+        // TODO：设定错误信息
+    }
+
+}
@@ -28,7 +28,7 @@ public class MyDroolsConfiguration {
      * 返回一个kiebase知识库，直接冲文件系统读入drl规则文件，
      * TODO：以后需要从数据库读入规则文件，并重新创建kbase知识库。
      */
-    @Bean(name = "kb1")
+    @Bean(name = "coreKBase")
     public KieBase myKieBase() {
         // Drools 6开始引入kie统一接口（jboss的jbpm工作流也使用kie接口了），整个定义方式和5差别很大
         // 这里使用全api方式创建知识库对象，不使用xml的方式，提供最大的灵活性
@@ -105,7 +105,7 @@ public class MyDroolsConfiguration {
      * 返回一个kiebase知识库，直接冲文件系统读入drl规则文件，
      * TODO：以后需要从数据库读入规则文件，并重新创建kbase知识库。
      */
-    @Bean(name = "kb2")
+    @Bean(name = "preKBase")
     public KieBase myKieBase2() {
         // Drools 6开始引入kie统一接口（jboss的jbpm工作流也使用kie接口了），整个定义方式和5差别很大
         // 这里使用全api方式创建知识库对象，不使用xml的方式，提供最大的灵活性
+package com.bsth.service.schedule.timetable;
+
+import com.bsth.entity.Line;
+import com.bsth.entity.LsStationRoute;
+import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.service.LineService;
+import com.bsth.service.StationRouteService;
+import com.bsth.service.schedule.GuideboardInfoService;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
+import com.bsth.service.schedule.utils.DataToolsFileType;
+import com.bsth.service.schedule.utils.PoiUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.util.CollectionUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 时刻表Excel数据类。
+ */
+public class ExcelData {
+
+    /** 导入后的Excel文件对象 */
+    private DataToolsFile dataToolsFile;
+    /** 数据sheet名 */
+    private String sheetName;
+    /** 线路 */
+    private Line line;
+    /** 线路路由列表（包含上下行的起终点站） */
+    private List<LsStationRoute> lsStationRouteList;
+    /** 路牌列表 */
+    private List<GuideboardInfo> guideboardInfoList;
+    /** excel数据格式 */
+    private ExcelFormatType excelFormatType;
+
+    public DataToolsFile getDataToolsFile() {
+        return dataToolsFile;
+    }
+
+    public void setDataToolsFile(DataToolsFile dataToolsFile) {
+        this.dataToolsFile = dataToolsFile;
+    }
+
+    public String getSheetName() {
+        return sheetName;
+    }
+
+    public void setSheetName(String sheetName) {
+        this.sheetName = sheetName;
+    }
+
+    public Line getLine() {
+        return line;
+    }
+
+    public void setLine(Line line) {
+        this.line = line;
+    }
+
+    public List<LsStationRoute> getLsStationRouteList() {
+        return lsStationRouteList;
+    }
+
+    public void setLsStationRouteList(List<LsStationRoute> lsStationRouteList) {
+        this.lsStationRouteList = lsStationRouteList;
+    }
+
+    public List<GuideboardInfo> getGuideboardInfoList() {
+        return guideboardInfoList;
+    }
+
+    public void setGuideboardInfoList(List<GuideboardInfo> guideboardInfoList) {
+        this.guideboardInfoList = guideboardInfoList;
+    }
+
+    public ExcelFormatType getExcelFormatType() {
+        return excelFormatType;
+    }
+
+    public void setExcelFormatType(ExcelFormatType excelFormatType) {
+        this.excelFormatType = excelFormatType;
+    }
+
+    /**
+     * 构造函数
+     * @param filePath 文件路径
+     * @param sheetName sheet名字
+     * @param lineId 线路Id
+     * @param lineService LineServiceImpl
+     * @param guideboardInfoService GuideboardInfoServiceImpl
+     * @param lineRouteVersion 线路路由版本
+     * @param stationRouteService StationRouteServiceImpl
+     * @param excelFormatType excel数据格式
+     * @throws ScheduleException
+     * @see com.bsth.service.impl.LineServiceImpl
+     * @see com.bsth.service.schedule.impl.GuideboardInfoServiceImpl
+     * @see com.bsth.service.impl.StationRouteServiceImpl
+     */
+    public ExcelData(
+            String filePath, String sheetName,
+            Integer lineId, LineService lineService, GuideboardInfoService guideboardInfoService,
+            Integer lineRouteVersion, StationRouteService stationRouteService,
+            ExcelFormatType excelFormatType) throws ScheduleException {
+        // 获取Excel文件对象，类型
+        File file = new File(filePath);
+        this.dataToolsFile = new DataToolsFile();
+        this.dataToolsFile.setFile(file);
+        if (DataToolsFileType.XLS.isThisType(file)) {
+            this.dataToolsFile.setFileType(DataToolsFileType.XLS);
+        } else if (DataToolsFileType.XLSX.isThisType(file)) {
+            this.dataToolsFile.setFileType(DataToolsFileType.XLSX);
+        } else {
+            throw new ScheduleException("不是xls xlsx文件！");
+        }
+
+        // sheet名字
+        this.sheetName = sheetName;
+        // 线路
+        this.line = lineService.findById(lineId);
+        // 线路路由列表
+        Map<String, Object> p1 = new HashMap<>();
+        p1.put("line.id_eq", lineId);
+        p1.put("stationMark_in", "B,E"); // 起点站
+        p1.put("destroy_eq", 0); // 未撤销
+        p1.put("versions_eq", lineRouteVersion); // 带线路版本
+        lsStationRouteList = (List<LsStationRoute>) stationRouteService.list_ls(p1);
+        // 路牌列表
+        p1.clear();
+        p1.put("xl.id_eq", lineId);
+        p1.put("isCancel_eq", false);
+        guideboardInfoList = guideboardInfoService.list(p1);
+
+        // excel数据格式
+        this.excelFormatType = excelFormatType;
+    }
+
+    /**
+     * 验证路由名字。
+     * @param colNum 列标号（从0开始）
+     * @param routeName 路由名字
+     * @throws ScheduleException
+     */
+    private void validateRouteName(int colNum, String routeName) throws ScheduleException {
+        List<LsStationRoute> lsStationRoutes = new ArrayList<>();
+        for (LsStationRoute lsStationRoute : this.lsStationRouteList) {
+            if ("B".equals(lsStationRoute.getStationMark()) && routeName.equals(lsStationRoute.getStationName())) {
+                lsStationRoutes.add(lsStationRoute);
+            }
+        }
+
+        if (CollectionUtils.isEmpty(lsStationRoutes)) {
+            throw new ScheduleException(String.format("第1行，第%d列数据%s在%s站点路由中不是起点站",
+                    colNum + 1, routeName, this.line.getName()));
+        } else if (lsStationRoutes.size() > 1) {
+            throw new ScheduleException(String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站",
+                    colNum + 1, routeName, this.line.getName()));
+        } else if (StringUtils.isEmpty(lsStationRoutes.get(0).getStationCode())) {
+            throw new ScheduleException(String.format("第1行，第%d列数据%s在%s站点路由中没有站点编码",
+                    colNum + 1, routeName, this.line.getName()));
+        }
+
+    }
+
+    /**
+     * 验证路牌名字。
+     * @param colNum excelSheet 列index
+     * @param guideboardName 路牌名字
+     * @throws ScheduleException
+     */
+    private void validateGuideboardName(int colNum, String guideboardName) throws ScheduleException {
+        List<GuideboardInfo> guideboardInfos = new ArrayList<>();
+        for (GuideboardInfo guideboardInfo : this.guideboardInfoList) {
+            if (guideboardName.equals(guideboardInfo.getLpName())) {
+                guideboardInfos.add(guideboardInfo);
+            }
+        }
+
+        if (CollectionUtils.isEmpty(guideboardInfos)) {
+            throw new ScheduleException(String.format("第%d行，第1列的路牌在%s中不存在",
+                    colNum + 1, this.line.getName()));
+        } else if (guideboardInfos.size() > 1) {
+            throw new ScheduleException(String.format("第%d行，第1列的路牌在%s中重复",
+                    colNum + 1, this.line.getName()));
+        }
+    }
+
+    /**
+     * 验证发车时间内容。
+     * @param rowNum excelSheet 行index
+     * @param colNum excelSheet 列index
+     * @param fcsjContent 发车时间内容
+     * @throws ScheduleException
+     */
+    private void validateFcsjContent(int rowNum, int colNum, String fcsjContent) throws ScheduleException {
+        if (this.excelFormatType == ExcelFormatType.Normal) {
+            // 班次时间验证，正则表达式，格式hh:mm或者hhmm
+            String rex1 = "^([01]?[0-9]|2[0-3]):[0-5][0-9]$"; // hh:mm格式
+            String rex2 = "^([01]?[0-9]|2[0-3]),[0-5][0-9]$"; // hh,mm格式
+            String rex3 = "^([01]?[0-9]|2[0-3])[0-5][0-9]$"; // hhmm格式
+            Pattern p1 = Pattern.compile(rex1);
+            Pattern p2 = Pattern.compile(rex2);
+            Pattern p3 = Pattern.compile(rex3);
+
+            Matcher m1 = p1.matcher(fcsjContent.trim());
+            Matcher m2 = p2.matcher(fcsjContent.trim());
+            Matcher m3 = p3.matcher(fcsjContent.trim());
+            if ((!m1.matches()) && (!m2.matches()) && (!m3.matches())) {
+                throw new ScheduleException(String.format("第%d行，第%d列的发车时间格式不正确，格式应为hh:mm或hh,mm或hhmm",
+                        rowNum + 1, colNum + 1));
+            }
+        } else if (this.excelFormatType == ExcelFormatType.Dynamic) {
+            String rex1 = "^(\u62a5|\u51fa)?([01]?[0-9]|2[0-3]):[0-5][0-9]$"; // (报|出)hh:mm格式
+            String rex2 = "^([01]?[0-9]|2[0-3]):[0-5][0-9](X|\u203b)?$"; // hh:mm(X|※)格式
+            Pattern p1 = Pattern.compile(rex1);
+            Pattern p2 = Pattern.compile(rex2);
+            Matcher m1 = p1.matcher(fcsjContent.trim());
+            Matcher m2 = p2.matcher(fcsjContent.trim());
+            if ((!m1.matches()) && (!m2.matches())) {
+                throw new ScheduleException(String.format(
+                        "第%d行，第%d列的发车时间格式不正确，格式应为(报|出)hh:mm或hh:mm(X|※)",
+                        rowNum + 1, colNum + 1));
+            }
+        } else {
+            throw new ScheduleException("未知ExcelFormatType");
+        }
+
+    }
+
+    private List<Integer> calcuExcelSheetColIndexList(Workbook workbook) throws ScheduleException {
+        // 有些列不需要参与计算，找出参与计算的列
+        List<Integer> colIndexList = new ArrayList<>();
+        Sheet sheet = workbook.getSheet(this.sheetName);
+        Row firstRow = sheet.getRow(0); // 获取第一行数据列
+        for (int i = 0; i < firstRow.getLastCellNum(); i++) {
+            if (excelFormatType == ExcelFormatType.Normal) {
+                colIndexList.add(i);
+            } else if (excelFormatType == ExcelFormatType.Dynamic) {
+                String cell_con = StringUtils.trimToEmpty(
+                        PoiUtils.getStringValueFromCell(firstRow.getCell(i))); // trimToEmpty
+                if ("报到".equals(cell_con) ||
+                        "到场".equals(cell_con) ||
+                        "离场".equals(cell_con) ||
+                        "总公里".equals(cell_con) ||
+                        "营业公里".equals(cell_con) ||
+                        "空驶公里".equals(cell_con) ||
+                        "总工时".equals(cell_con) ||
+                        "营业工时".equals(cell_con) ||
+                        "营运班次".equals(cell_con)) {
+                    // 这些列全部祛除
+                    continue;
+                } else {
+                    colIndexList.add(i);
+                }
+            } else {
+                throw new ScheduleException("未知excelFormatType");
+            }
+        }
+        return colIndexList;
+    }
+
+    /**
+     * 验证老系统ExcelSheet格式。
+     * @throws ScheduleException
+     */
+    public void validateExcelSheet() throws ScheduleException {
+        try {
+            Workbook workbook = this.dataToolsFile.getFileType().getWorkBook(
+                    this.dataToolsFile.getFile()
+            );
+
+            Sheet sheet = workbook.getSheet(this.sheetName);
+            int rowNums = sheet.getLastRowNum() + 1; // 基于0 base的，长度加1
+            int colNums = sheet.getRow(0).getLastCellNum(); // 不需要加1，就是长度
+
+            if (rowNums == 0 || colNums == 0) { // 工作区是否为空
+                throw new Exception(String.format("%s 工作区没有数据！", this.sheetName));
+            } else {
+                if (rowNums <= 1 || rowNums <= 1) {
+                    throw new Exception(String.format("工作区至少包含2行2列的数据"));
+                } else {
+                    List<Integer> colIndexList = this.calcuExcelSheetColIndexList(workbook);
+                    Row firstRow = sheet.getRow(0); // 获取第一行数据列
+                    for (int n = 0; n < colIndexList.size(); n++) {
+                        int i = colIndexList.get(n);
+                        String cell_con = StringUtils.trimToEmpty(
+                                PoiUtils.getStringValueFromCell(firstRow.getCell(i))); // trimToEmpty
+
+                        if (StringUtils.isEmpty(cell_con)) {
+                            throw new Exception(String.format("第1行，第%d列数据不能为空", i + 1));
+                        } else {
+                            // 正则表达式去除右侧数字
+//                            cell_con = cell_con.replaceAll("[\\d+]", "");
+//                            cell_con = cell_con.replaceAll("(\\d+)$", "");
+
+                            // 如果站名中有类似->{数字}，使用正则表达式过滤掉
+                            cell_con = cell_con.replaceAll("(->\\d+)", "");
+
+                            if (i == 0) { // 第一列必须是路牌2个字
+                                if (!"路牌".equals(cell_con.trim())) {
+                                    throw new Exception("第1行，第1列数据必须是路牌2个字");
+                                }
+                            } else { // 排除出场，进场，其余内容到站点路由里查询，以各个方向的起点站为查询依据
+                                if ((!"出场".equals(cell_con.trim())) &&
+                                        (!"进场".equals(cell_con.trim()))) {
+                                    validateRouteName(i, cell_con.trim()); // 验证路由名字
+                                }
+
+                            }
+                        }
+                    }
+
+                    // 验证路牌内容
+                    Map<String, Integer> gbindexmap = new HashMap<>(); // 记录每个路牌在第几行
+                    for (int i = 1; i < rowNums; i++) { // 从第2行开始验证数据
+                        Cell cell = sheet.getRow(i).getCell(0); // 获取第1列
+                        String bcell_con = StringUtils.trimToEmpty(
+                                PoiUtils.getStringValueFromCell(cell)); // trimToEmpty
+                        if (StringUtils.isEmpty(bcell_con)) {
+                            throw new Exception(String.format("第%d行，第1列路牌无数据", i + 1));
+                        } else if (gbindexmap.get(bcell_con.trim()) != null) {
+                            throw new Exception(String.format("第%d行，第1列的路牌数据与第%d行，第1列数据重复",
+                                    i + 1,
+                                    gbindexmap.get(bcell_con.trim())));
+                        } else {
+                            validateGuideboardName(i, bcell_con.trim()); // 验证路牌名字
+                            gbindexmap.put(bcell_con.trim(), i + 1);
+                        }
+                    }
+
+                    // 验证发车时间格式
+                    for (int i = 1; i < rowNums; i++) { // 从第2行开始验证数据
+                        Row row = sheet.getRow(i);
+                        for (int n = 1; n < colIndexList.size(); n++) { // 从第2列开始
+                            int j = colIndexList.get(n);
+                            String bcell_con = StringUtils.trimToEmpty(
+                                    PoiUtils.getStringValueFromCell(
+                                            row.getCell(j))).replaceAll("\\s*", ""); // trimToEmpty
+                            if (StringUtils.isNotEmpty(bcell_con)) {
+                                validateFcsjContent(i, j, bcell_con);
+                            }
+                        }
+                    }
+                }
+
+            }
+
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+}
+package com.bsth.service.schedule.timetable;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * 导入时刻表时，excel的数据格式类型。
+ */
+public enum ExcelFormatType {
+    Normal("normal"), // 老系统格式
+    Dynamic("dynamic"); // 自动生成的导出格式
+
+    private String flag;
+
+    @JsonCreator
+    ExcelFormatType(String flag) {
+        this.flag = flag;
+    }
+
+    @JsonValue
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
+    public static ExcelFormatType getEnum(String str) {
+        if ("normal".equals(str)) {
+            return Normal;
+        } else if ("dynamic".equals(str)) {
+            return Dynamic;
+        } else {
+            throw new IllegalArgumentException("未知ExcelFormatType");
+        }
+    }
+}
@@ -76,7 +76,8 @@ public enum DataToolsFileType {
             // application/x-tika-ooxml
             if ("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equals(type) ||
-                    "application/x-tika-ooxml".equals(type)) {
+                    "application/x-tika-ooxml".equals(type) ||
+                    "application/zip".equals(type)) {
                 // .xlsx 2007之后的格式
                 return true;
             } else {
@@ -81,6 +81,9 @@ public class DataToolsProperties {
     /** 时刻表明细信息导入2（带版本） */
     @NotNull
     private String ttinfodetailDatainputktr2version;
+    /** 时刻表明细信息导入2（带版本），使用生成时刻表格式 */
+    @NotNull
+    private String ttinfodetailDatainputktr2version2;
     /** 排班规则信息导入 */
     @NotNull
     private String scheduleruleDatainputktr;
@@ -353,4 +356,12 @@ public class DataToolsProperties {
     public void setTransTemplatedir(String transTemplatedir) {
         this.transTemplatedir = transTemplatedir;
     }
+
+    public String getTtinfodetailDatainputktr2version2() {
+        return ttinfodetailDatainputktr2version2;
+    }
+
+    public void setTtinfodetailDatainputktr2version2(String ttinfodetailDatainputktr2version2) {
+        this.ttinfodetailDatainputktr2version2 = ttinfodetailDatainputktr2version2;
+    }
 }
@@ -2,7 +2,6 @@ package com.bsth.service.schedule.utils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.WorkbookUtil;
 import org.apache.poi.xssf.usermodel.*;
 import java.awt.Color;
@@ -58,7 +57,7 @@ public class PoiUtils {
     public static XSSFCell createStringXSSFCell(
             XSSFWorkbook xssfWorkbook, XSSFRow xssfRow, short column, String value,
             Color backgroundColor) {
-        return createXSSFCell(
+        XSSFCell xssfCell = createXSSFCell(
                 xssfWorkbook, xssfRow, column,
                 value, XSSFCell.CELL_TYPE_STRING,
                 HorizontalAlignment.CENTER, VerticalAlignment.CENTER,
@@ -66,11 +65,14 @@ public class PoiUtils {
                 (short) 13, new Color(0x2765A7), "宋体",
                 backgroundColor, FillPatternType.SOLID_FOREGROUND
         );
+        DataFormat dataFormat = xssfWorkbook.createDataFormat();
+        xssfCell.getCellStyle().setDataFormat(dataFormat.getFormat("@"));
+        return xssfCell;
     }
     public static XSSFCell createStringXSSFCell(
             XSSFWorkbook xssfWorkbook, XSSFRow xssfRow, short column, String value) {
-        return createXSSFCell(
+        XSSFCell xssfCell = createXSSFCell(
             xssfWorkbook, xssfRow, column,
                 value, XSSFCell.CELL_TYPE_STRING,
                 HorizontalAlignment.CENTER, VerticalAlignment.CENTER,
@@ -78,6 +80,9 @@ public class PoiUtils {
                 (short) 13, new Color(0x2765A7), "宋体",
                 new Color(0xffffff), FillPatternType.SOLID_FOREGROUND
         );
+        DataFormat dataFormat = xssfWorkbook.createDataFormat();
+        xssfCell.getCellStyle().setDataFormat(dataFormat.getFormat("@"));
+        return xssfCell;
     }
     public static XSSFCell createDoubleXSSFCell(
@@ -120,6 +125,12 @@ public class PoiUtils {
         );
     }
+    public static XSSFCell setStringStyleXSSFCellStyle(XSSFWorkbook xssfWorkbook, XSSFCell xssfCell) {
+        DataFormat dataFormat = xssfWorkbook.createDataFormat();
+        xssfCell.getCellStyle().setDataFormat(dataFormat.getFormat("@"));
+        return xssfCell;
+    }
+
     public static XSSFCell setIntegerStyleXSSFCellStyle(XSSFWorkbook xssfWorkbook, XSSFCell xssfCell) {
         CreationHelper creationHelper = xssfWorkbook.getCreationHelper();
         XSSFCellStyle xssfCellStyle = xssfCell.getCellStyle();
@@ -150,8 +161,9 @@ public class PoiUtils {
         // 设定值
         if (valueType == XSSFCell.CELL_TYPE_STRING) {
-            cell.setCellValue(creationHelper.createRichTextString(
-                    WorkbookUtil.createSafeSheetName(String.valueOf(value))));
+//            cell.setCellValue(creationHelper.createRichTextString(
+//                    WorkbookUtil.createSafeSheetName(String.valueOf(value))));
+            cell.setCellValue(creationHelper.createRichTextString(String.valueOf(value)));
         } else if (valueType == XSSFCell.CELL_TYPE_NUMERIC) {
             if (value instanceof Date) { // 日期
                 cellStyle.setDataFormat(creationHelper.createDataFormat().getFormat("yyyy-mm-dd"));
@@ -8,7 +8,6 @@ import com.bsth.util.DateUtils;
 import com.bsth.util.db.DBUtils_MS;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
+package com.bsth.util.db;
+
+import com.mchange.v2.c3p0.DataSources;
+import org.apache.log4j.Logger;
+
+import javax.sql.DataSource;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * 网关ms库连接池
+ * @author PanZhao
+ *
+ */
+//@Component
+public class DBUtils_traffic {
+
+	private static String url = null;
+
+	private static String username = null;
+
+	private static String pwd = null;
+
+	private static DataSource ds_pooled;
+
+	static Logger logger = Logger.getLogger(DBUtils_traffic.class);
+	
+	static {
+		Properties env = new Properties();
+
+		try {
+			env.load(DBUtils_traffic.class.getClassLoader().getResourceAsStream("traffic-jdbc.properties"));
+			// 1. 加载驱动类
+			Class.forName(env.getProperty("ms.mysql.driver"));
+
+			url = env.getProperty("ms.mysql.url");
+			username = env.getProperty("ms.mysql.username");
+			pwd = env.getProperty("ms.mysql.password");
+
+			// 设置连接数据库的配置信息
+			DataSource ds_unpooled = DataSources.unpooledDataSource(url,
+					username, pwd);
+
+			Map<String, Object> pool_conf = new HashMap<String, Object>();
+			// 设置最大连接数
+			pool_conf.put("maxPoolSize", 10);
+			
+			pool_conf.put("testConnectionOnCheckout", false);
+			//异步检测连接的有效性
+			pool_conf.put("testConnectionOnCheckin", true);
+			//30秒检测一次
+			pool_conf.put("idleConnectionTestPeriod", 30);
+			ds_pooled = DataSources.pooledDataSource(ds_unpooled, pool_conf);
+		} catch (FileNotFoundException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (IOException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (SQLException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 获取连接对象
+	 */
+	public static Connection getConnection() throws SQLException {
+		return ds_pooled.getConnection();
+	}
+
+	/**
+	 * 释放连接池资源
+	 */
+	public static void clearup() {
+		if (ds_pooled != null) {
+			try {
+				DataSources.destroy(ds_pooled);
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * 资源关闭
+	 * 
+	 * @param rs
+	 * @param stmt
+	 * @param conn
+	 */
+	public static void close(ResultSet rs, Statement stmt, Connection conn) {
+		if (rs != null) {
+			try {
+				rs.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (stmt != null) {
+			try {
+				stmt.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (conn != null) {
+			try {
+				conn.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public static DataSource getDataSource(){
+		return ds_pooled;
+	}
+}
@@ -10,7 +10,7 @@ datatools.kvars_dbuname=root
 #数据库密码
 datatools.kvars_dbpwd=
 #数据库库名
-datatools.kvars_dbdname=control
+datatools.kvars_dbdname=test_control
 # 3、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
@@ -41,6 +41,8 @@ datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
 datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
 # 时刻表明细信息导入2（版本化）
 datatools.ttinfodetail_datainputktr2version=/datatools/ktrs/ttinfodetailDataInput2_version.ktr
+# 时刻表明细信息导入2（版本化），使用生成时刻表格式
+datatools.ttinfodetail_datainputktr2version2=/datatools/ktrs/ttinfodetailDataInput2_version_2.ktr
 # 车辆配置信息导入
 datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr
@@ -42,6 +42,8 @@ datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
 datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
 # 时刻表明细信息导入2（版本化）
 datatools.ttinfodetail_datainputktr2version=/datatools/ktrs/ttinfodetailDataInput2_version.ktr
+# 时刻表明细信息导入2（版本化），使用生成时刻表格式
+datatools.ttinfodetail_datainputktr2version2=/datatools/ktrs/ttinfodetailDataInput2_version_2.ktr
 # 车辆配置信息导入
 datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr
+<?xml version="1.0" encoding="UTF-8"?>
+<transformation>
+  <info>
+    <name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x5bfc;&#x5165;-&#x7ad9;&#x70b9;&#x8def;&#x7531;&#x7248;&#x672c;2</name>
+    <description>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</description>
+    <extended_description>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;&#xff0c;&#x4f7f;&#x7528;&#x751f;&#x6210;&#x65f6;&#x523b;&#x8868;&#x683c;&#x5f0f;</extended_description>
+    <trans_version/>
+    <trans_type>Normal</trans_type>
+    <trans_status>0</trans_status>
+    <directory>&#x2f;</directory>
+    <parameters>
+    </parameters>
+    <log>
+<trans-log-table><connection/>
+<schema/>
+<table/>
+<size_limit_lines/>
+<interval/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STATUS</id><enabled>Y</enabled><name>STATUS</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name><subject/></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name><subject/></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name><subject/></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name><subject/></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name><subject/></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name><subject/></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>STARTDATE</id><enabled>Y</enabled><name>STARTDATE</name></field><field><id>ENDDATE</id><enabled>Y</enabled><name>ENDDATE</name></field><field><id>LOGDATE</id><enabled>Y</enabled><name>LOGDATE</name></field><field><id>DEPDATE</id><enabled>Y</enabled><name>DEPDATE</name></field><field><id>REPLAYDATE</id><enabled>Y</enabled><name>REPLAYDATE</name></field><field><id>LOG_FIELD</id><enabled>Y</enabled><name>LOG_FIELD</name></field><field><id>EXECUTING_SERVER</id><enabled>N</enabled><name>EXECUTING_SERVER</name></field><field><id>EXECUTING_USER</id><enabled>N</enabled><name>EXECUTING_USER</name></field><field><id>CLIENT</id><enabled>N</enabled><name>CLIENT</name></field></trans-log-table>
+<perf-log-table><connection/>
+<schema/>
+<table/>
+<interval/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>SEQ_NR</id><enabled>Y</enabled><name>SEQ_NR</name></field><field><id>LOGDATE</id><enabled>Y</enabled><name>LOGDATE</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STEPNAME</id><enabled>Y</enabled><name>STEPNAME</name></field><field><id>STEP_COPY</id><enabled>Y</enabled><name>STEP_COPY</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>INPUT_BUFFER_ROWS</id><enabled>Y</enabled><name>INPUT_BUFFER_ROWS</name></field><field><id>OUTPUT_BUFFER_ROWS</id><enabled>Y</enabled><name>OUTPUT_BUFFER_ROWS</name></field></perf-log-table>
+<channel-log-table><connection/>
+<schema/>
+<table/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>LOGGING_OBJECT_TYPE</id><enabled>Y</enabled><name>LOGGING_OBJECT_TYPE</name></field><field><id>OBJECT_NAME</id><enabled>Y</enabled><name>OBJECT_NAME</name></field><field><id>OBJECT_COPY</id><enabled>Y</enabled><name>OBJECT_COPY</name></field><field><id>REPOSITORY_DIRECTORY</id><enabled>Y</enabled><name>REPOSITORY_DIRECTORY</name></field><field><id>FILENAME</id><enabled>Y</enabled><name>FILENAME</name></field><field><id>OBJECT_ID</id><enabled>Y</enabled><name>OBJECT_ID</name></field><field><id>OBJECT_REVISION</id><enabled>Y</enabled><name>OBJECT_REVISION</name></field><field><id>PARENT_CHANNEL_ID</id><enabled>Y</enabled><name>PARENT_CHANNEL_ID</name></field><field><id>ROOT_CHANNEL_ID</id><enabled>Y</enabled><name>ROOT_CHANNEL_ID</name></field></channel-log-table>
+<step-log-table><connection/>
+<schema/>
+<table/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STEPNAME</id><enabled>Y</enabled><name>STEPNAME</name></field><field><id>STEP_COPY</id><enabled>Y</enabled><name>STEP_COPY</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>LOG_FIELD</id><enabled>N</enabled><name>LOG_FIELD</name></field></step-log-table>
+<metrics-log-table><connection/>
+<schema/>
+<table/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>METRICS_DATE</id><enabled>Y</enabled><name>METRICS_DATE</name></field><field><id>METRICS_CODE</id><enabled>Y</enabled><name>METRICS_CODE</name></field><field><id>METRICS_DESCRIPTION</id><enabled>Y</enabled><name>METRICS_DESCRIPTION</name></field><field><id>METRICS_SUBJECT</id><enabled>Y</enabled><name>METRICS_SUBJECT</name></field><field><id>METRICS_TYPE</id><enabled>Y</enabled><name>METRICS_TYPE</name></field><field><id>METRICS_VALUE</id><enabled>Y</enabled><name>METRICS_VALUE</name></field></metrics-log-table>
+    </log>
+    <maxdate>
+      <connection/>
+      <table/>
+      <field/>
+      <offset>0.0</offset>
+      <maxdiff>0.0</maxdiff>
+    </maxdate>
+    <size_rowset>10000</size_rowset>
+    <sleep_time_empty>50</sleep_time_empty>
+    <sleep_time_full>50</sleep_time_full>
+    <unique_connections>N</unique_connections>
+    <feedback_shown>Y</feedback_shown>
+    <feedback_size>50000</feedback_size>
+    <using_thread_priorities>Y</using_thread_priorities>
+    <shared_objects_file/>
+    <capture_step_performance>N</capture_step_performance>
+    <step_performance_capturing_delay>1000</step_performance_capturing_delay>
+    <step_performance_capturing_size_limit>100</step_performance_capturing_size_limit>
+    <dependencies>
+    </dependencies>
+    <partitionschemas>
+    </partitionschemas>
+    <slaveservers>
+    </slaveservers>
+    <clusterschemas>
+    </clusterschemas>
+  <created_user>-</created_user>
+  <created_date>2016&#x2f;06&#x2f;30 12&#x3a;21&#x3a;57.536</created_date>
+  <modified_user>-</modified_user>
+  <modified_date>2016&#x2f;06&#x2f;30 12&#x3a;21&#x3a;57.536</modified_date>
+    <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA&#x3d;</key_for_session_key>
+    <is_key_private>N</is_key_private>
+  </info>
+  <notepads>
+    <notepad>
+      <note>&#x5b57;&#x5178;&#x8868;&#x5bf9;&#x5e94;&#xff08;&#x4ee5;&#x540e;&#x76f4;&#x63a5;&#x67e5;&#x627e;&#x8868; bsth_c_sys_dictionary&#xff09;&#xa;&#x7c7b;&#x578b;           &#x4ee3;&#x7801;      &#x540d;&#x79f0;&#xa;LineTrend      0        &#x4e0a;&#x884c;&#xa;LineTrend      1        &#x4e0b;&#x884c;&#xa;ScheduleType   normal   &#x6b63;&#x5e38;&#x73ed;&#x6b21;&#xa;ScheduleType   out      &#x51fa;&#x573a;&#xa;ScheduleType   in       &#x8fdb;&#x573a;&#xa;ScheduleType   temp     &#x4e34;&#x52a0;&#xa;ScheduleType   region   &#x533a;&#x95f4;&#xa;ScheduleType   venting  &#x653e;&#x7a7a;&#xa;ScheduleType   major    &#x653e;&#x5927;&#x7ad9;</note>
+      <xloc>606</xloc>
+      <yloc>129</yloc>
+      <width>332</width>
+      <heigth>186</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
+    <notepad>
+      <note>&#x56e0;&#x4e3a;&#x65f6;&#x523b;&#x8868;&#x8f93;&#x5165;&#x683c;&#x5f0f;&#x4e0d;&#x786e;&#x5b9a;&#x6027;&#xff0c;&#x4e3b;&#x8981;&#x56e0;&#x4e3a;&#x8868;&#x7ed3;&#x6784;&#x662f;&#x53cd;&#x8303;&#x5f0f;&#x5316;&#x7684;&#xff0c;&#xa;&#x6240;&#x4ee5;&#x9700;&#x8981;&#x5916;&#x90e8;&#x52a8;&#x6001;&#x6307;&#x5b9a;&#x613f;&#x6570;&#x636e;&#xff0c;&#x5934;&#x4e09;&#x4e2a;step&#x52a8;&#x6001;&#x6307;&#x5b9a;&#x613f;&#x6570;&#x636e;&#xa;&#xa;</note>
+      <xloc>24</xloc>
+      <yloc>208</yloc>
+      <width>346</width>
+      <heigth>74</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
+    <notepad>
+      <note>&#x8fd9;&#x91cc;&#x6709;&#x4e9b;&#x95ee;&#x9898;&#xa;&#x5728;window2012&#x7684;&#x73af;&#x5883;&#x4e0b;&#xff0c;&#xa;MySql&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x4e2d;&#x5982;&#x679c;&#x8fd4;&#x56de;&#x4e2d;&#x6587;&#x5185;&#x5bb9;&#x7684;&#x5b57;&#x6bb5;&#xff0c;&#x8fd9;&#x4e2a;&#x5185;&#x5bb9;&#x4e71;&#x7801;&#xa;&#x89e3;&#x51b3;&#x529e;&#x6cd5;&#xff0c;&#x5c31;&#x662f;&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x5168;&#x90e8;&#x7f13;&#x5b58;&#xff0c;&#x5c31;&#x4e0d;&#x4e71;&#x7801;&#xa;linux&#x73af;&#x5883;&#x4e0b;&#x6ca1;&#x95ee;&#x9898;</note>
+      <xloc>721</xloc>
+      <yloc>762</yloc>
+      <width>333</width>
+      <heigth>90</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
+    <notepad>
+      <note>&#x51fa;&#x573a;&#x73ed;&#x6b21;&#xff0c;&#x65b9;&#x5411;&#x6709;&#x65f6;&#x786e;&#x5b9a;&#x4e0d;&#x51c6;&#xff0c;&#xa;&#x7a7a;&#x7684;&#x60c5;&#x51b5;&#x4e0b;&#x8bbe;&#x5b9a;&#x4e3a;0&#xff08;&#x4e0a;&#x884c;&#xff09;</note>
+      <xloc>104</xloc>
+      <yloc>939</yloc>
+      <width>178</width>
+      <heigth>42</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
+    <notepad>
+      <note>&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#xff0c;&#x65b9;&#x5411;&#x6709;&#x65f6;&#x786e;&#x5b9a;&#x4e0d;&#x51c6;&#xff0c;&#xa;&#x7a7a;&#x7684;&#x60c5;&#x51b5;&#x4e0b;&#x8bbe;&#x5b9a;&#x4e3a;0&#xff08;&#x4e0a;&#x884c;&#xff09;</note>
+      <xloc>578</xloc>
+      <yloc>1084</yloc>
+      <width>178</width>
+      <heigth>42</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
+  </notepads>
+  <connection>
+    <name>192.168.168.1_jwgl_dw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>jwgl_dw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb13b977d2adabcd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>bus_control_variable</name>
+    <server>&#x24;&#x7b;v_db_ip&#x7d;</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>&#x24;&#x7b;v_db_dname&#x7d;</database>
+    <port>3306</port>
+    <username>&#x24;&#x7b;v_db_uname&#x7d;</username>
+    <password>&#x24;&#x7b;v_db_pwd&#x7d;</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>bus_control_&#x516c;&#x53f8;_201</name>
+    <server>localhost</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>control</database>
+    <port>3306</port>
+    <username>root</username>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>bus_control_&#x672c;&#x673a;</name>
+    <server>localhost</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>control</database>
+    <port>3306</port>
+    <username>root</username>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>NHJW_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>nhjw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10d09aa5cd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>PDGJ_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>pdgj</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10ce96a8d0</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>xlab_mysql_youle</name>
+    <server>101.231.124.8</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>xlab_youle</database>
+    <port>45687</port>
+    <username>xlab-youle</username>
+    <password>Encrypted 2be98afc86aa78a88aa1be369d187a3df</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>45687</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>xlab_mysql_youle&#xff08;&#x672c;&#x673a;&#xff09;</name>
+    <server>localhost</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>xlab_youle</database>
+    <port>3306</port>
+    <username>root</username>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>xlab_youle</name>
+    <server/>
+    <type>MYSQL</type>
+    <access>JNDI</access>
+    <database>xlab_youle</database>
+    <port>1521</port>
+    <username/>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <order>
+  <hop> <from>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</from><to>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6dfb;&#x52a0;&#x5bf9;&#x5e94;&#x73ed;&#x6b21;&#x6570;</from><to>&#x5904;&#x7406;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x65f6;&#x523b;&#x8868;&#x57fa;&#x7840;&#x4fe1;&#x606f;&#x5173;&#x8054;</from><to>&#x67e5;&#x627e;&#x8def;&#x724c;&#x5173;&#x8054;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x5173;&#x8054;</from><to>&#x67e5;&#x627e;&#x65f6;&#x523b;&#x8868;&#x57fa;&#x7840;&#x4fe1;&#x606f;&#x5173;&#x8054;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178;</from><to>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178; 2</from><to>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178; 3</from><to>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 3</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5339;&#x914d;&#x4e0a;&#x4e0b;&#x884c;&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x7c7b;&#x578b;&#x4fee;&#x6b63;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;1</from><to>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;1</from><to>&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;2</from><to>&#x51fa;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;2</from><to>&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x6240;&#x6709;&#x7ebf;&#x8def;&#x4e0a;&#x4e0b;&#x884c;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x5339;&#x914d;&#x4e0a;&#x4e0b;&#x884c;&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;</from><to>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</from><to>&#x67e5;&#x627e;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6b63;&#x5e38;&#x73ed;&#x6b21;_&#x5904;&#x7406;&#x6570;&#x636e;</from><to>&#x67e5;&#x627e;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x6570;&#x636e;</from><to>&#x6b63;&#x5e38;&#x73ed;&#x6b21;_&#x5904;&#x7406;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178;</from><to>&#x67e5;&#x627e;&#x6240;&#x6709;&#x7ebf;&#x8def;&#x4e0a;&#x4e0b;&#x884c;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 2</from><to>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x51fa;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 3</from><to>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x8fdb;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8ba1;&#x7b97;&#x73ed;&#x6b21;&#x7c7b;&#x578b;</from><to>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;1</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x51fa;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</from><to>&#x67e5;&#x627e;&#x505c;&#x8f66;&#x573a;1</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x505c;&#x8f66;&#x573a;1</from><to>&#x51fa;&#x573a;&#x73ed;&#x6b21;_&#x786e;&#x5b9a;&#x7ec8;&#x70b9;&#x7ad9;&#x540d;&#x5b57;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x51fa;&#x573a;&#x73ed;&#x6b21;_&#x786e;&#x5b9a;&#x7ec8;&#x70b9;&#x7ad9;&#x540d;&#x5b57;</from><to>&#x67e5;&#x627e;&#x51fa;&#x573a;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x51fa;&#x573a;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</from><to>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178; 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</from><to>&#x67e5;&#x627e;&#x505c;&#x8f66;&#x573a;2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x505c;&#x8f66;&#x573a;2</from><to>&#x8fdb;&#x573a;&#x73ed;&#x6b21;_&#x786e;&#x5b9a;&#x8d77;&#x70b9;&#x7ad9;&#x540d;&#x5b57;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8fdb;&#x573a;&#x73ed;&#x6b21;_&#x786e;&#x5b9a;&#x8d77;&#x70b9;&#x7ad9;&#x540d;&#x5b57;</from><to>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ebf;&#x8def;&#x65b9;&#x5411;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ebf;&#x8def;&#x65b9;&#x5411;</from><to>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x5e76;&#x4f5c;&#x4e3a;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5206;&#x7ec4;&#x5404;&#x4e2a;&#x8def;&#x724c;&#x7684;&#x7ad9;</from><to>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x5173;&#x8054;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x589e;&#x52a0;&#x65f6;&#x523b;&#x8868;&#x540d;&#x5b57;&#xff0c;&#x7ebf;&#x8def;&#x540d;&#x5b57;&#xff0c;&#x505c;&#x8f66;&#x573a;&#x540d;&#x5b57;</from><to>&#x8bb0;&#x5f55;&#x5173;&#x8054; &#x28;&#x7b1b;&#x5361;&#x5c14;&#x8f93;&#x51fa;&#x29;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</from><to>&#x8bb0;&#x5f55;&#x5173;&#x8054; &#x28;&#x7b1b;&#x5361;&#x5c14;&#x8f93;&#x51fa;&#x29;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8bb0;&#x5f55;&#x5173;&#x8054; &#x28;&#x7b1b;&#x5361;&#x5c14;&#x8f93;&#x51fa;&#x29;</from><to>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x7c7b;&#x578b;&#x4fee;&#x6b63;</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x5e76;&#x4f5c;&#x4e3a;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;</from><to>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</from><to>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178; 3</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x51fa;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x5339;&#x914d;&#x51fa;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x8fdb;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x5339;&#x914d;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5339;&#x914d;&#x51fa;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x4e0a;&#x4e0b;&#x884c;NULL&#x5224;&#x5b9a;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x4e0a;&#x4e0b;&#x884c;NULL&#x5224;&#x5b9a;</from><to>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 2</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5339;&#x914d;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x4e0a;&#x4e0b;&#x884c;&#x5224;&#x5b9a; 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x4e0a;&#x4e0b;&#x884c;&#x5224;&#x5b9a; 2</from><to>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 3</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 3</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 3</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x8def;&#x724c;&#x5173;&#x8054;</from><to>&#x7ad9;&#x70b9;&#x8def;&#x7531;&#x7248;&#x672c;&#x7c7b;&#x578b;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x7ad9;&#x70b9;&#x8def;&#x7531;&#x7248;&#x672c;&#x7c7b;&#x578b;</from><to>&#x8ba1;&#x7b97;&#x73ed;&#x6b21;&#x7c7b;&#x578b;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x7ad9;&#x70b9;&#x8def;&#x7531;&#x7248;&#x672c;&#x7c7b;&#x578b;</from><to>&#x66f4;&#x65b0;&#x65f6;&#x523b;&#x8868;&#x4e3b;&#x8868;&#x7248;&#x672c;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6dfb;&#x52a0;&#x53d1;&#x8f66;&#x987a;&#x5e8f;&#x53f7;</from><to>&#x6dfb;&#x52a0;&#x5bf9;&#x5e94;&#x73ed;&#x6b21;&#x6570;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5904;&#x7406;&#x6570;&#x636e;</from><to>&#x8fc7;&#x6ee4;&#x8bb0;&#x5f55;&#xff08;&#x53d1;&#x8f66;&#x65f6;&#x95f4;&#x4e3a;&#x7a7a;&#xff09;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8fc7;&#x6ee4;&#x8bb0;&#x5f55;&#xff08;&#x53d1;&#x8f66;&#x65f6;&#x95f4;&#x4e3a;&#x7a7a;&#xff09;</from><to>&#x5206;&#x7ec4;&#x5404;&#x4e2a;&#x8def;&#x724c;&#x7684;&#x7ad9;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</from><to>&#x6dfb;&#x52a0;&#x53d1;&#x8f66;&#x987a;&#x5e8f;&#x53f7;</to><enabled>Y</enabled> </hop>
+  </order>
+  <step>
+    <name>&#x4e0a;&#x4e0b;&#x884c;NULL&#x5224;&#x5b9a;</name>
+    <type>IfNull</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+      <replaceAllByValue/>
+      <replaceAllMask/>
+      <selectFields>Y</selectFields>
+      <selectValuesType>N</selectValuesType>
+      <setEmptyStringAll>N</setEmptyStringAll>
+    <valuetypes>
+      </valuetypes>
+    <fields>
+      <field>
+        <name>sxx</name>
+        <value>0</value>
+        <mask/>
+        <set_empty_string>N</set_empty_string>
+        </field>
+      </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>335</xloc>
+      <yloc>938</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x4e0a;&#x4e0b;&#x884c;&#x5224;&#x5b9a; 2</name>
+    <type>IfNull</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+      <replaceAllByValue/>
+      <replaceAllMask/>
+      <selectFields>Y</selectFields>
+      <selectValuesType>N</selectValuesType>
+      <setEmptyStringAll>N</setEmptyStringAll>
+    <valuetypes>
+      </valuetypes>
+    <fields>
+      <field>
+        <name>sxx2</name>
+        <value>0</value>
+        <mask/>
+        <set_empty_string>N</set_empty_string>
+        </field>
+      </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>804</xloc>
+      <yloc>1081</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178;</name>
+    <type>ValueMapper</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <field_to_use>sxx</field_to_use>
+    <target_field>sxx_desc</target_field>
+    <non_match_default/>
+    <fields>
+      <field>
+        <source_value>0</source_value>
+        <target_value>&#x4e0a;&#x884c;</target_value>
+      </field>
+      <field>
+        <source_value>1</source_value>
+        <target_value>&#x4e0b;&#x884c;</target_value>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>147</xloc>
+      <yloc>403</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178; 2</name>
+    <type>ValueMapper</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <field_to_use>sxx</field_to_use>
+    <target_field>sxx_desc</target_field>
+    <non_match_default/>
+    <fields>
+      <field>
+        <source_value>0</source_value>
+        <target_value>&#x4e0a;&#x884c;</target_value>
+      </field>
+      <field>
+        <source_value>1</source_value>
+        <target_value>&#x4e0b;&#x884c;</target_value>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>331</xloc>
+      <yloc>598</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178; 3</name>
+    <type>ValueMapper</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <field_to_use>sxx</field_to_use>
+    <target_field>sxx_desc</target_field>
+    <non_match_default/>
+    <fields>
+      <field>
+        <source_value>0</source_value>
+        <target_value>&#x4e0a;&#x884c;</target_value>
+      </field>
+      <field>
+        <source_value>1</source_value>
+        <target_value>&#x4e0b;&#x884c;</target_value>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>553</xloc>
+      <yloc>859</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x51fa;&#x573a;&#x73ed;&#x6b21;_&#x786e;&#x5b9a;&#x7ec8;&#x70b9;&#x7ad9;&#x540d;&#x5b57;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var zdzname &#x3d; cc_groups&#x5b;gno&#x5d;&#x3b; &#x2f;&#x2f; &#x51fa;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#x662f;&#x4e0b;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x59cb;&#x7ad9;&#xa;var endZdtype &#x3d; &#x27;B&#x27;&#x3b;&#xa;&#x2f;&#x2f; var endZdtype &#x3d; &#x27;E&#x27;&#x3b;&#xa;&#xa;var destory &#x3d; 0&#x3b; &#x2f;&#x2f; &#x672a;&#x64a4;&#x9500;flag</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>zdzname</name>
+        <rename>zdzname</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>endZdtype</name>
+        <rename>endZdtype</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>destory</name>
+        <rename>destory</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>575</xloc>
+      <yloc>502</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x51fa;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</name>
+    <type>Dummy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>869</xloc>
+      <yloc>504</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5206;&#x7ec4;&#x5404;&#x4e2a;&#x8def;&#x724c;&#x7684;&#x7ad9;</name>
+    <type>GroupBy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+      <all_rows>Y</all_rows>
+      <ignore_aggregate>N</ignore_aggregate>
+      <field_ignore/>
+      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
+      <prefix>grp</prefix>
+      <add_linenr>Y</add_linenr>
+      <linenr_fieldname>gno</linenr_fieldname>
+      <give_back_row>N</give_back_row>
+      <group>
+        <field>
+          <name>lp</name>
+        </field>
+      </group>
+      <fields>
+        <field>
+          <aggregate>qdzgroups</aggregate>
+          <subject>qdzname</subject>
+          <type>CONCAT_STRING</type>
+          <valuefield>,</valuefield>
+        </field>
+      </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>892</xloc>
+      <yloc>44</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5339;&#x914d;&#x4e0a;&#x4e0b;&#x884c;&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var jhlc&#x3b; &#x2f;&#x2f; &#x8ba1;&#x5212;&#x91cc;&#x7a0b;&#xa;var bcsj&#x3b; &#x2f;&#x2f; &#x73ed;&#x6b21;&#x65f6;&#x95f4;&#xa;&#xa;&#x2f;&#x2f; &#x65f6;&#x95f4;&#x8303;&#x56f4;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#xa;var timeRex &#x3d; &#x2f;&#x5e;&#x28;&#x5b;01&#x5d;&#x3f;&#x5b;0-9&#x5d;&#x7c;2&#x5b;0-3&#x5d;&#x29;&#x3a;&#x5b;0-5&#x5d;&#x5b;0-9&#x5d;&#x24;&#x2f;&#x3b;&#xa;&#x2f;&#x2f; &#x53d1;&#x8f66;&#x65f6;&#x95f4;&#x8f6c;&#x6362;&#x6210;&#x65e5;&#x671f;&#xa;var fcsj_hour &#x3d; str2num&#x28;sendtime_calcu.substr&#x28;0, 2&#x29;, &#x22;&#x23;&#x22;&#x29;&#x3b;&#xa;var fcsj_min &#x3d; str2num&#x28;sendtime_calcu.substr&#x28;3, 2&#x29;, &#x22;&#x23;&#x22;&#x29;&#x3b;&#xa;var fcsj_date &#x3d; new Date&#x28;2000,1,1,fcsj_hour,fcsj_min,0&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x5224;&#x5b9a;&#x662f;&#x5426;&#x65e9;&#x9ad8;&#x5cf0;&#xa;var isZgf &#x3d; false&#x3b;&#xa;if &#x28;timeRex.test&#x28;early_start_time&#x29; &#x26;&#x26; timeRex.test&#x28;early_end_time&#x29; &#x26;&#x26; early_up_time &#x21;&#x3d; null &#x26;&#x26; early_down_time &#x21;&#x3d; null&#x29; &#x7b;&#xa;	var early_s_hour &#x3d; str2num&#x28;early_start_time.substr&#x28;0, 2&#x29;, &#x22;&#x23;&#x22;&#x29;&#x3b;&#xa;	var early_s_min &#x3d; str2num&#x28;early_start_time.substr&#x28;3, 2&#x29;, &#x22;&#x23;&#x22;&#x29;&#x3b;&#xa;	var early_s_date &#x3d; new Date&#x28;2000,1,1,early_s_hour,early_s_min,0&#x29;&#x3b;&#xa;&#xa;	var early_e_hour &#x3d; str2num&#x28;early_end_time.substr&#x28;0, 2&#x29;, &#x22;&#x23;&#x22;&#x29;&#x3b;&#xa;	var early_e_min &#x3d; str2num&#x28;early_end_time.substr&#x28;3, 2&#x29;, &#x22;&#x23;&#x22;&#x29;&#x3b;&#xa;	var early_e_date &#x3d; new Date&#x28;2000,1,1,early_e_hour,early_e_min,0&#x29;&#x3b;&#xa;&#xa;	if &#x28;fcsj_date &#x3e;&#x3d; early_s_date &#x26;&#x26; fcsj_date &#x3c;&#x3d; early_e_date&#x29; &#x7b;&#xa;		isZgf &#x3d; true&#x3b;&#xa;	&#x7d;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5224;&#x5b9a;&#x662f;&#x5426;&#x665a;&#x9ad8;&#x5cf0;&#xa;var isWgf &#x3d; false&#x3b;&#xa;if &#x28;timeRex.test&#x28;late_start_time&#x29; &#x26;&#x26; timeRex.test&#x28;late_end_time&#x29; &#x26;&#x26; late_up_time &#x21;&#x3d; null &#x26;&#x26; late_down_time &#x21;&#x3d; null&#x29; &#x7b;&#xa;	var late_s_hour &#x3d; str2num&#x28;late_start_time.substr&#x28;0, 2&#x29;, &#x22;&#x23;&#x22;&#x29;&#x3b;&#xa;	var late_s_min &#x3d; str2num&#x28;late_start_time.substr&#x28;3, 2&#x29;, &#x22;&#x23;&#x22;&#x29;&#x3b;&#xa;	var late_s_date &#x3d; new Date&#x28;2000,1,1,late_s_hour,late_s_min,0&#x29;&#x3b;&#xa;&#xa;	var late_e_hour &#x3d; str2num&#x28;late_end_time.substr&#x28;0, 2&#x29;, &#x22;&#x23;&#x22;&#x29;&#x3b;&#xa;	var late_e_min &#x3d; str2num&#x28;late_end_time.substr&#x28;3, 2&#x29;, &#x22;&#x23;&#x22;&#x29;&#x3b;&#xa;	var late_e_date &#x3d; new Date&#x28;2000,1,1,late_e_hour,late_e_min,0&#x29;&#x3b;&#xa;&#xa;	if &#x28;fcsj_date &#x3e;&#x3d; late_s_date &#x26;&#x26; fcsj_date &#x3c;&#x3d; late_e_date&#x29; &#x7b;&#xa;		isWgf &#x3d; true&#x3b;&#xa;	&#x7d;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5224;&#x5b9a;&#x662f;&#x5426;&#x665a;&#x9ad8;&#x5cf0;&#xa;&#xa;if &#x28;sxx &#x3d;&#x3d; 0&#x29; &#x7b; &#x2f;&#x2f; &#x4e0a;&#x884c;&#xa;	if &#x28;isZgf&#x29; &#x7b;&#xa;		jhlc &#x3d; up_mileage&#x3b;&#xa;		bcsj &#x3d; early_up_time &#x21;&#x3d; 0 &#x3f; early_up_time &#x3a; up_travel_time&#x3b;&#xa;	&#x7d; else if &#x28;isWgf&#x29; &#x7b;&#xa;		jhlc &#x3d; up_mileage&#x3b;&#xa;		bcsj &#x3d; late_up_time &#x21;&#x3d; 0 &#x3f; late_up_time &#x3a; up_travel_time&#x3b;&#xa;	&#x7d; else &#x7b;&#xa;		jhlc &#x3d; up_mileage&#x3b;&#xa;		bcsj &#x3d; up_travel_time&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else &#x7b; &#x2f;&#x2f; sxx &#x3d;&#x3d; 1 &#x4e0b;&#x884c;&#xa;	if &#x28;isZgf&#x29; &#x7b;&#xa;		jhlc &#x3d; down_mileage&#x3b;&#xa;		bcsj &#x3d; early_down_time &#x21;&#x3d; 0 &#x3f; early_down_time &#x3a; down_travel_time&#x3b;&#xa;	&#x7d; else if &#x28;isWgf&#x29; &#x7b;&#xa;		jhlc &#x3d; down_mileage&#x3b;&#xa;		bcsj &#x3d; late_down_time &#x21;&#x3d; 0 &#x3f; late_down_time &#x3a; down_travel_time&#x3b;&#xa;	&#x7d; else &#x7b;&#xa;		jhlc &#x3d; down_mileage&#x3b;&#xa;		bcsj &#x3d; down_travel_time&#x3b;&#xa;	&#x7d;&#xa;&#x7d;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>jhlc</name>
+        <rename>jhlc</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>bcsj</name>
+        <rename>bcsj</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>148</xloc>
+      <yloc>674</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5339;&#x914d;&#x51fa;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var out_mileage&#x3b; &#x2f;&#x2f; &#x51fa;&#x573a;&#x8ba1;&#x5212;&#x91cc;&#x7a0b;&#xa;var out_time&#x3b; &#x2f;&#x2f; &#x51fa;&#x573a;&#x8ba1;&#x5212;&#x65f6;&#x95f4;&#xa;&#xa;if &#x28;sxx &#x3d;&#x3d; 0&#x29; &#x7b; &#x2f;&#x2f; &#x4e0a;&#x884c;&#xa;	out_mileage &#x3d; up_out_mileage&#x3b;&#xa;	out_time &#x3d; up_out_timer&#x3b;&#xa;&#x7d; else &#x7b; &#x2f;&#x2f; sxx &#x3d;&#x3d; 1 &#x4e0b;&#x884c;&#xa;	out_mileage &#x3d; down_out_mileage&#x3b;&#xa;	out_time &#x3d; down_out_timer&#x3b;&#xa;&#x7d;&#xa;&#xa;&#xa;&#xa;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>out_mileage</name>
+        <rename>out_mileage</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>out_time</name>
+        <rename>out_time</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>336</xloc>
+      <yloc>862</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5339;&#x914d;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var parade_mileage&#x3b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x8ba1;&#x5212;&#x91cc;&#x7a0b;&#xa;var parade_time&#x3b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x8ba1;&#x5212;&#x65f6;&#x95f4;&#xa;&#xa;if &#x28;sxx2 &#x3d;&#x3d; 0&#x29; &#x7b; &#x2f;&#x2f; &#x4e0a;&#x884c;&#xa;	parade_mileage &#x3d; up_in_mileage&#x3b;&#xa;	parade_time &#x3d; up_in_timer&#x3b;&#xa;&#x7d; else &#x7b; &#x2f;&#x2f; sxx &#x3d;&#x3d; 1 &#x4e0b;&#x884c;&#xa;	parade_mileage &#x3d; down_in_mileage&#x3b;&#xa;	parade_time &#x3d; down_in_timer&#x3b;&#xa;&#x7d;&#xa;&#xa;&#xa;&#xa;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>parade_mileage</name>
+        <rename>parade_mileage</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>parade_time</name>
+        <rename>parade_time</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>726</xloc>
+      <yloc>1005</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x589e;&#x52a0;&#x65f6;&#x523b;&#x8868;&#x540d;&#x5b57;&#xff0c;&#x7ebf;&#x8def;&#x540d;&#x5b57;&#xff0c;&#x505c;&#x8f66;&#x573a;&#x540d;&#x5b57;</name>
+    <type>DataGrid</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>
+    </fields>
+    <data>
+      <line>  </line>
+    </data>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>110</xloc>
+      <yloc>133</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5904;&#x7406;&#x6570;&#x636e;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x751f;&#x6210;&#x65f6;&#x523b;&#x8868;&#x7684;&#x683c;&#x5f0f;&#x6570;&#x636e;&#x5904;&#x7406;&#xa;&#x2f;&#x2f; &#x5df2;&#x7ecf;&#x8fc7;&#x6ee4;&#x4e86; &#x62a5;&#x5230;&#xff0c;&#x5230;&#x573a;&#xff0c;&#x79bb;&#x573a;&#xff0c;&#x603b;&#x516c;&#x91cc;&#xff0c;&#x8425;&#x4e1a;&#x516c;&#x91cc;&#xff0c;&#x7a7a;&#x9a76;&#x516c;&#x91cc;&#xff0c;&#x603b;&#x5de5;&#x65f6;&#xff0c;&#x8425;&#x4e1a;&#x5de5;&#x65f6;&#xff0c;&#x8425;&#x8fd0;&#x73ed;&#x6b21; &#x6570;&#x636e;&#xa;&#x2f;&#x2f; sendtime&#x9700;&#x8981;&#x5904;&#x7406; &#x28;&#x62a5;&#x7c;&#x51fa;&#x29;hh&#x3a;mm&#x683c;&#x5f0f; hh&#x3a;mm&#x28;X&#x7c;&#x203b;&#x29;&#x683c;&#x5f0f;&#xa;&#xa;&#x2f;&#x2f; &#x5982;&#x679c;&#x7ad9;&#x540d;&#x4e2d;&#x6709;&#x7c7b;&#x4f3c;-&#x3e;&#x7b;&#x6570;&#x5b57;&#x7d;&#xff0c;&#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x8fc7;&#x6ee4;&#x6389;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;-&#x3e;&#x5c;d&#x2b;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;qdzname &#x3d;&#x3d; &#x22;&#x62a5;&#x5230;&#x22; &#x7c;&#x7c; &#xa;	qdzname &#x3d;&#x3d; &#x22;&#x5230;&#x573a;&#x22; &#x7c;&#x7c; &#xa;	qdzname &#x3d;&#x3d; &#x22;&#x79bb;&#x573a;&#x22; &#x7c;&#x7c; &#xa;	qdzname &#x3d;&#x3d; &#x22;&#x603b;&#x516c;&#x91cc;&#x22; &#x7c;&#x7c; &#xa;	qdzname &#x3d;&#x3d; &#x22;&#x8425;&#x4e1a;&#x516c;&#x91cc;&#x22; &#x7c;&#x7c; &#xa;	qdzname &#x3d;&#x3d; &#x22;&#x7a7a;&#x9a76;&#x516c;&#x91cc;&#x22; &#x7c;&#x7c; &#xa;	qdzname &#x3d;&#x3d; &#x22;&#x603b;&#x5de5;&#x65f6;&#x22; &#x7c;&#x7c; &#xa;	qdzname &#x3d;&#x3d; &#x22;&#x8425;&#x4e1a;&#x5de5;&#x65f6;&#x22; &#x7c;&#x7c; &#xa;	qdzname &#x3d;&#x3d; &#x22;&#x8425;&#x8fd0;&#x73ed;&#x6b21;&#x22;&#x29; &#x7b;&#xa;	sendtime_calcu &#x3d; null&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	if &#x28;sendtime &#x3d;&#x3d; null&#x29; &#x7b;&#xa;		sendtime_calcu &#x3d; null&#x3b;&#xa;	&#x7d; else &#x7b;&#xa;		sendtime_calcu &#x3d; sendtime.replace&#x28;&#x2f;&#x5c;s&#x2f;g, &#x22;&#x22;&#x29;&#x3b;&#xa;		if &#x28;sendtime_calcu.indexOf&#x28;&#x22;&#x62a5;&#x22;&#x29; &#x3e;&#x3d; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5206;&#x73ed;&#x62a5;&#x5230;&#x73ed;&#x6b21;&#x795b;&#x9664;&#xa;			sendtime_calcu &#x3d; null&#x3b;&#xa;		&#x7d; else &#x7b;&#xa;			if &#x28;sendtime_calcu.indexOf&#x28;&#x22;X&#x22;&#x29; &#x3e;&#x3d; 0&#x29; &#x7b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x73ed;&#x6b21;&#xa;				qdzname &#x3d; &#x22;&#x8fdb;&#x573a;&#x22;&#x3b;&#xa;				sendtime_calcu &#x3d; sendtime_calcu.substr&#x28;0, sendtime_calcu.indexOf&#x28;&#x22;X&#x22;&#x29;&#x29;&#x3b;&#xa;			&#x7d; else if &#x28;sendtime_calcu.indexOf&#x28;&#x22;&#x51fa;&#x22;&#x29; &#x3e;&#x3d; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5206;&#x73ed;&#x51fa;&#x573a;&#x73ed;&#x6b21;&#xa;				qdzname &#x3d; &#x22;&#x51fa;&#x573a;&#x22;&#x3b;&#xa;				sendtime_calcu &#x3d; sendtime_calcu.substr&#x28;1&#x29;&#x3b;&#xa;			&#x7d; else if &#x28;sendtime_calcu.indexOf&#x28;&#x22;&#x203b;&#x22;&#x29; &#x3e;&#x3d; 0&#x29; &#x7b; &#x2f;&#x2f; &#x505c;&#x9a76;&#x73ed;&#x6b21;&#xa;				sendtime_calcu &#x3d; sendtime_calcu.substr&#x28;0, sendtime_calcu.indexOf&#x28;&#x22;X&#x22;&#x29;&#x29;&#x3b;&#xa;			&#x7d; else &#x7b;&#xa;				&#x2f;&#x2f; &#x6b63;&#x5e38;&#x73ed;&#x6b21;&#xa;			&#x7d;&#xa;&#xa;			&#x2f;&#x2f; &#x5904;&#x7406;&#x65f6;&#x95f4;&#x683c;&#x5f0f;&#xa;			&#x2f;&#x2f; &#x56e0;&#x4e3a;&#x683c;&#x5f0f;&#x53ea;&#x652f;&#x6301; &#x3a; &#x5206;&#x9694;&#xff0c;&#x6240;&#x4ee5;&#x8865;0&#x5c31;&#x53ef;&#x4ee5;&#x4e86;&#xa;			if &#x28;sendtime_calcu.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;				sendtime_calcu &#x3d; &#x22;0&#x22; &#x2b; sendtime_calcu&#x3b;&#xa;			&#x7d;		&#xa;		&#x7d;&#xa;&#xa;	&#x7d;&#xa;&#x7d;&#xa;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname</name>
+        <rename>qdzname</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>Y</replace>
+      </field>      <field>        <name>isfb</name>
+        <rename>isfb</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>iscanceled</name>
+        <rename>iscanceled</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>sendtime_calcu</name>
+        <rename>sendtime_calcu</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>ists</name>
+        <rename>ists</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>654</xloc>
+      <yloc>45</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>      <field>        <name>&#x8def;&#x724c;</name>
+        <rename>lp</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x7ad9;&#x70b9;&#x540d;&#x79f0;</name>
+        <rename>qdzname</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x53d1;&#x8f66;&#x65f6;&#x95f4;</name>
+        <rename>sendtime</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>        <select_unspecified>Y</select_unspecified>
+    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>441</xloc>
+      <yloc>133</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;1</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to>&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x6570;&#x636e;</send_true_to>
+<send_false_to>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;2</send_false_to>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <leftvalue>bctype</leftvalue>
+ <function>&#x3d;</function>
+ <rightvalue/>
+ <value><name>constant</name><type>String</type><text>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</text><length>-1</length><precision>-1</precision><isnull>N</isnull><mask/></value> </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>860</xloc>
+      <yloc>401</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;2</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to>&#x51fa;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</send_true_to>
+<send_false_to>&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</send_false_to>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <leftvalue>bctype</leftvalue>
+ <function>&#x3d;</function>
+ <rightvalue/>
+ <value><name>constant</name><type>String</type><text>&#x51fa;&#x573a;</text><length>-1</length><precision>-1</precision><isnull>N</isnull><mask/></value> </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>995</xloc>
+      <yloc>503</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail</name>
+    <type>InsertUpdate</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <commit>100</commit>
+    <update_bypassed>N</update_bypassed>
+    <lookup>
+      <schema/>
+      <table>bsth_c_s_ttinfo_detail</table>
+      <key>
+        <name>xlid</name>
+        <field>xl</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>ttid</name>
+        <field>ttinfo</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>lpid</name>
+        <field>lp</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>fcno</name>
+        <field>fcno</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>bcs</name>
+        <field>bcs</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>lp</name>
+        <rename>lpid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>bc_type</name>
+        <rename>bctype_code</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>bcs</name>
+        <rename>bcs</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>bcsj</name>
+        <rename>bcsj</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>fcno</name>
+        <rename>fcno</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>jhlc</name>
+        <rename>jhlc</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>fcsj</name>
+        <rename>sendtime_calcu</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>ttinfo</name>
+        <rename>ttid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>xl</name>
+        <rename>xlid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>qdz</name>
+        <rename>qdzid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>zdz</name>
+        <rename>zdzid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>xl_dir</name>
+        <rename>sxx</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>isfb</name>
+        <rename>isfb</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>qdz_code</name>
+        <rename>qdzcode</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>qdz_name</name>
+        <rename>qdzname_</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>zdz_code</name>
+        <rename>zdzcode</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>zdz_name</name>
+        <rename>zdzname</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>ists</name>
+        <rename>ists</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>line_version</name>
+        <rename>version</rename>
+        <update>Y</update>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>143</xloc>
+      <yloc>860</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 2</name>
+    <type>InsertUpdate</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <commit>100</commit>
+    <update_bypassed>N</update_bypassed>
+    <lookup>
+      <schema/>
+      <table>bsth_c_s_ttinfo_detail</table>
+      <key>
+        <name>xlid</name>
+        <field>xl</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>ttid</name>
+        <field>ttinfo</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>lpid</name>
+        <field>lp</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>fcno</name>
+        <field>fcno</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>bcs</name>
+        <field>bcs</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>tcc</name>
+        <rename>qdzid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>zdz</name>
+        <rename>zdzid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>xl</name>
+        <rename>xlid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>ttinfo</name>
+        <rename>ttid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>xl_dir</name>
+        <rename>sxx</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>lp</name>
+        <rename>lpid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>jhlc</name>
+        <rename>out_mileage</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>fcsj</name>
+        <rename>sendtime_calcu</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>bcsj</name>
+        <rename>out_time</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>bcs</name>
+        <rename>bcs</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>fcno</name>
+        <rename>fcno</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>bc_type</name>
+        <rename>bctype_code</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>isfb</name>
+        <rename>isfb</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>qdz_code</name>
+        <rename>qdzcode</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>qdz_name</name>
+        <rename>tn</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>zdz_code</name>
+        <rename>zdzcode</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>zdz_name</name>
+        <rename>zdzname_</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>ists</name>
+        <rename>ists</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>line_version</name>
+        <rename>version</rename>
+        <update>Y</update>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>340</xloc>
+      <yloc>1087</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 3</name>
+    <type>InsertUpdate</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <commit>100</commit>
+    <update_bypassed>N</update_bypassed>
+    <lookup>
+      <schema/>
+      <table>bsth_c_s_ttinfo_detail</table>
+      <key>
+        <name>xlid</name>
+        <field>xl</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>ttid</name>
+        <field>ttinfo</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>lpid</name>
+        <field>lp</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>fcno</name>
+        <field>fcno</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>bcs</name>
+        <field>bcs</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>fcno</name>
+        <rename>fcno</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>bcs</name>
+        <rename>bcs</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>xl</name>
+        <rename>xlid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>ttinfo</name>
+        <rename>ttid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>lp</name>
+        <rename>lpid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>bc_type</name>
+        <rename>bctype_code</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>bcsj</name>
+        <rename>parade_time</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>jhlc</name>
+        <rename>parade_mileage</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>fcsj</name>
+        <rename>sendtime_calcu</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>xl_dir</name>
+        <rename>sxx2</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>qdz</name>
+        <rename>qdzid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>tcc</name>
+        <rename>zdzid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>isfb</name>
+        <rename>isfb</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>qdz_code</name>
+        <rename>qdzcode</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>qdz_name</name>
+        <rename>qname</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>zdz_code</name>
+        <rename>zdzcode</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>zdz_name</name>
+        <rename>tn</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>ists</name>
+        <rename>ists</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>line_version</name>
+        <rename>version</rename>
+        <update>Y</update>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>845</xloc>
+      <yloc>899</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</name>
+    <type>ExcelInput</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <header>Y</header>
+    <noempty>Y</noempty>
+    <stoponempty>N</stoponempty>
+    <filefield/>
+    <sheetfield/>
+    <sheetrownumfield/>
+    <rownumfield/>
+    <sheetfield/>
+    <filefield/>
+    <limit>0</limit>
+    <encoding/>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <accept_filenames>N</accept_filenames>
+    <accept_field/>
+    <accept_stepname/>
+    <file>
+      <name/>
+      <filemask/>
+      <exclude_filemask/>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+    </file>
+    <fields>
+    </fields>
+    <sheets>
+      <sheet>
+        <name/>
+        <startrow>0</startrow>
+        <startcol>0</startcol>
+        </sheet>
+    </sheets>
+    <strict_types>N</strict_types>
+    <error_ignored>N</error_ignored>
+    <error_line_skipped>N</error_line_skipped>
+    <bad_line_files_destination_directory/>
+    <bad_line_files_extension>warning</bad_line_files_extension>
+    <error_line_files_destination_directory/>
+    <error_line_files_extension>error</error_line_files_extension>
+    <line_number_files_destination_directory/>
+    <line_number_files_extension>line</line_number_files_extension>
+    <shortFileFieldName/>
+    <pathFieldName/>
+    <hiddenFieldName/>
+    <lastModificationTimeFieldName/>
+    <uriNameFieldName/>
+    <rootUriNameFieldName/>
+    <extensionFieldName/>
+    <sizeFieldName/>
+    <spreadsheet_type>JXL</spreadsheet_type>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>112</xloc>
+      <yloc>44</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x66f4;&#x65b0;&#x65f6;&#x523b;&#x8868;&#x4e3b;&#x8868;&#x7248;&#x672c;</name>
+    <type>Update</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <skip_lookup>N</skip_lookup>
+    <commit>100</commit>
+    <use_batch>N</use_batch>
+    <error_ignored>N</error_ignored>
+    <ignore_flag_field/>
+    <lookup>
+      <schema/>
+      <table>bsth_c_s_ttinfo</table>
+      <key>
+        <name>ttid</name>
+        <field>id</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+        </key>
+      <value>
+        <name>line_version</name>
+        <rename>version</rename>
+        </value>
+      </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>863</xloc>
+      <yloc>338</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x505c;&#x8f66;&#x573a;1</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_car_park</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>tccname_</name>
+        <field>park_name</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>id</name>
+        <rename>qdzid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+      <value>
+        <name>park_code</name>
+        <rename>qdzcode</rename>
+        <default/>
+        <type>String</type>
+      </value>
+      <value>
+        <name>park_name</name>
+        <rename>tn</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>755</xloc>
+      <yloc>504</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x505c;&#x8f66;&#x573a;2</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_car_park</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>tccname_</name>
+        <field>park_name</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>id</name>
+        <rename>zdzid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+      <value>
+        <name>park_code</name>
+        <rename>zdzcode</rename>
+        <default/>
+        <type>String</type>
+      </value>
+      <value>
+        <name>park_name</name>
+        <rename>tn</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>887</xloc>
+      <yloc>608</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x51fa;&#x573a;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_ls_stationroute</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>line</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>version</name>
+        <field>versions</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>zdzname</name>
+        <field>station_name</field>
+        <condition>LIKE</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>endZdtype</name>
+        <field>station_mark</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>station</name>
+        <rename>zdzid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+      <value>
+        <name>directions</name>
+        <rename>sxx</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+      <value>
+        <name>station_code</name>
+        <rename>zdzcode</rename>
+        <default/>
+        <type>String</type>
+      </value>
+      <value>
+        <name>station_name</name>
+        <rename>zdzname_</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>329</xloc>
+      <yloc>505</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x6240;&#x6709;&#x7ebf;&#x8def;&#x4e0a;&#x4e0b;&#x884c;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_line_information</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>line</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>up_mileage</name>
+        <rename>up_mileage</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>down_mileage</name>
+        <rename>down_mileage</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>up_travel_time</name>
+        <rename>up_travel_time</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>down_travel_time</name>
+        <rename>down_travel_time</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>early_start_time</name>
+        <rename>early_start_time</rename>
+        <default/>
+        <type>String</type>
+      </value>
+      <value>
+        <name>early_end_time</name>
+        <rename>early_end_time</rename>
+        <default/>
+        <type>String</type>
+      </value>
+      <value>
+        <name>early_up_time</name>
+        <rename>early_up_time</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>early_down_time</name>
+        <rename>early_down_time</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>late_start_time</name>
+        <rename>late_start_time</rename>
+        <default/>
+        <type>String</type>
+      </value>
+      <value>
+        <name>late_end_time</name>
+        <rename>late_end_time</rename>
+        <default/>
+        <type>String</type>
+      </value>
+      <value>
+        <name>late_up_time</name>
+        <rename>late_up_time</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>late_down_time</name>
+        <rename>late_down_time</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>149</xloc>
+      <yloc>581</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x65f6;&#x523b;&#x8868;&#x57fa;&#x7840;&#x4fe1;&#x606f;&#x5173;&#x8054;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_s_ttinfo</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>xl</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>ttinfoname_</name>
+        <field>name</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>iscanceled</name>
+        <field>is_cancel</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>id</name>
+        <rename>ttid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>1011</xloc>
+      <yloc>134</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x5173;&#x8054;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_line</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlname_</name>
+        <field>name</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>iscanceled</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>id</name>
+        <rename>xlid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>1007</xloc>
+      <yloc>43</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x51fa;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_line_information</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>line</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>up_out_timer</name>
+        <rename>up_out_timer</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>up_out_mileage</name>
+        <rename>up_out_mileage</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>down_out_timer</name>
+        <rename>down_out_timer</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>down_out_mileage</name>
+        <rename>down_out_mileage</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>335</xloc>
+      <yloc>763</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x8fdb;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_line_information</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>line</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>up_in_mileage</name>
+        <rename>up_in_mileage</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>up_in_timer</name>
+        <rename>up_in_timer</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>down_in_mileage</name>
+        <rename>down_in_mileage</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>down_in_timer</name>
+        <rename>down_in_timer</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>553</xloc>
+      <yloc>1004</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_ls_stationroute</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>line</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>version</name>
+        <field>versions</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>sxx</name>
+        <field>directions</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>endZdtype</name>
+        <field>station_mark</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>station_name</name>
+        <rename>zdzname</rename>
+        <default/>
+        <type>String</type>
+      </value>
+      <value>
+        <name>station</name>
+        <rename>zdzid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+      <value>
+        <name>station_code</name>
+        <rename>zdzcode</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>280</xloc>
+      <yloc>404</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_ls_stationroute</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>line</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>version</name>
+        <field>versions</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>qdzname</name>
+        <field>station_name</field>
+        <condition>LIKE</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>sendZdtype</name>
+        <field>station_mark</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>station</name>
+        <rename>qdzid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+      <value>
+        <name>directions</name>
+        <rename>sxx</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+      <value>
+        <name>station_code</name>
+        <rename>qdzcode</rename>
+        <default/>
+        <type>String</type>
+      </value>
+      <value>
+        <name>station_name</name>
+        <rename>qdzname_</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>430</xloc>
+      <yloc>403</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x8def;&#x724c;&#x5173;&#x8054;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_s_gbi</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>xl</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>lp</name>
+        <field>lp_name</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>iscanceled</name>
+        <field>is_cancel</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>id</name>
+        <rename>lpid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>1013</xloc>
+      <yloc>221</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ebf;&#x8def;&#x65b9;&#x5411;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_ls_stationroute</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>line</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>version</name>
+        <field>versions</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>startZdtype_calcu</name>
+        <field>station_mark</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>qdzname_calcu</name>
+        <field>station_name</field>
+        <condition>LIKE</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>directions</name>
+        <rename>sxx</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>548</xloc>
+      <yloc>610</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x5e76;&#x4f5c;&#x4e3a;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>Y</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_ls_stationroute</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>line</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>version</name>
+        <field>versions</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>endZdtype_calcu</name>
+        <field>station_mark</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>sxx</name>
+        <field>directions</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>station_name</name>
+        <rename>zdzname_calcu</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>550</xloc>
+      <yloc>701</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_ls_stationroute</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>line</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>version</name>
+        <field>versions</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>zdzname_calcu</name>
+        <field>station_name</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>startZdtype_calcu</name>
+        <field>station_mark</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>directions</name>
+        <rename>sxx2</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+      <value>
+        <name>station</name>
+        <rename>qdzid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+      <value>
+        <name>station_code</name>
+        <rename>qdzcode</rename>
+        <default/>
+        <type>String</type>
+      </value>
+      <value>
+        <name>station_name</name>
+        <rename>qname</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>551</xloc>
+      <yloc>782</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x6b63;&#x5e38;&#x73ed;&#x6b21;_&#x5904;&#x7406;&#x6570;&#x636e;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var sendZdtype &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;&#xa;&#xa;var destory &#x3d; 0&#x3b; &#x2f;&#x2f; &#x672a;&#x64a4;&#x9500;flag</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>sendZdtype</name>
+        <rename>sendZdtype</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>endZdtype</name>
+        <rename>endZdtype</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>destory</name>
+        <rename>destory</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>588</xloc>
+      <yloc>403</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x6570;&#x636e;</name>
+    <type>Dummy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>725</xloc>
+      <yloc>404</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x6dfb;&#x52a0;&#x53d1;&#x8f66;&#x987a;&#x5e8f;&#x53f7;</name>
+    <type>GroupBy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+      <all_rows>Y</all_rows>
+      <ignore_aggregate>N</ignore_aggregate>
+      <field_ignore/>
+      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
+      <prefix>grp</prefix>
+      <add_linenr>Y</add_linenr>
+      <linenr_fieldname>fcno</linenr_fieldname>
+      <give_back_row>N</give_back_row>
+      <group>
+        <field>
+          <name>lp</name>
+        </field>
+      </group>
+      <fields>
+      </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>442</xloc>
+      <yloc>44</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x6dfb;&#x52a0;&#x5bf9;&#x5e94;&#x73ed;&#x6b21;&#x6570;</name>
+    <type>GroupBy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+      <all_rows>Y</all_rows>
+      <ignore_aggregate>N</ignore_aggregate>
+      <field_ignore/>
+      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
+      <prefix>grp</prefix>
+      <add_linenr>Y</add_linenr>
+      <linenr_fieldname>bcs</linenr_fieldname>
+      <give_back_row>N</give_back_row>
+      <group>
+      </group>
+      <fields>
+      </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>553</xloc>
+      <yloc>44</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</name>
+    <type>Normaliser</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+   <typefield>&#x7ad9;&#x70b9;&#x540d;&#x79f0;</typefield>
+    <fields>      </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>248</xloc>
+      <yloc>44</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178;</name>
+    <type>ValueMapper</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <field_to_use>bctype</field_to_use>
+    <target_field>bctype_code</target_field>
+    <non_match_default>&#x672a;&#x77e5;&#x7c7b;&#x578b;</non_match_default>
+    <fields>
+      <field>
+        <source_value>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</source_value>
+        <target_value>normal</target_value>
+      </field>
+      <field>
+        <source_value>&#x51fa;&#x573a;</source_value>
+        <target_value>out</target_value>
+      </field>
+      <field>
+        <source_value>&#x8fdb;&#x573a;</source_value>
+        <target_value>in</target_value>
+      </field>
+      <field>
+        <source_value>&#x52a0;&#x6cb9;</source_value>
+        <target_value>oil</target_value>
+      </field>
+      <field>
+        <source_value>&#x4e34;&#x52a0;</source_value>
+        <target_value>temp</target_value>
+      </field>
+      <field>
+        <source_value>&#x533a;&#x95f4;</source_value>
+        <target_value>region</target_value>
+      </field>
+      <field>
+        <source_value>&#x653e;&#x7a7a;</source_value>
+        <target_value>venting</target_value>
+      </field>
+      <field>
+        <source_value>&#x653e;&#x5927;&#x7ad9;</source_value>
+        <target_value>major</target_value>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>149</xloc>
+      <yloc>491</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 2</name>
+    <type>ValueMapper</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <field_to_use>bctype</field_to_use>
+    <target_field>bctype_code</target_field>
+    <non_match_default>&#x672a;&#x77e5;&#x7c7b;&#x578b;</non_match_default>
+    <fields>
+      <field>
+        <source_value>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</source_value>
+        <target_value>normal</target_value>
+      </field>
+      <field>
+        <source_value>&#x51fa;&#x573a;</source_value>
+        <target_value>out</target_value>
+      </field>
+      <field>
+        <source_value>&#x8fdb;&#x573a;</source_value>
+        <target_value>in</target_value>
+      </field>
+      <field>
+        <source_value>&#x52a0;&#x6cb9;</source_value>
+        <target_value>oil</target_value>
+      </field>
+      <field>
+        <source_value>&#x4e34;&#x52a0;</source_value>
+        <target_value>temp</target_value>
+      </field>
+      <field>
+        <source_value>&#x533a;&#x95f4;</source_value>
+        <target_value>region</target_value>
+      </field>
+      <field>
+        <source_value>&#x653e;&#x7a7a;</source_value>
+        <target_value>venting</target_value>
+      </field>
+      <field>
+        <source_value>&#x653e;&#x5927;&#x7ad9;</source_value>
+        <target_value>major</target_value>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>333</xloc>
+      <yloc>681</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 3</name>
+    <type>ValueMapper</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <field_to_use>bctype</field_to_use>
+    <target_field>bctype_code</target_field>
+    <non_match_default>&#x672a;&#x77e5;&#x7c7b;&#x578b;</non_match_default>
+    <fields>
+      <field>
+        <source_value>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</source_value>
+        <target_value>normal</target_value>
+      </field>
+      <field>
+        <source_value>&#x51fa;&#x573a;</source_value>
+        <target_value>out</target_value>
+      </field>
+      <field>
+        <source_value>&#x8fdb;&#x573a;</source_value>
+        <target_value>in</target_value>
+      </field>
+      <field>
+        <source_value>&#x52a0;&#x6cb9;</source_value>
+        <target_value>oil</target_value>
+      </field>
+      <field>
+        <source_value>&#x4e34;&#x52a0;</source_value>
+        <target_value>temp</target_value>
+      </field>
+      <field>
+        <source_value>&#x533a;&#x95f4;</source_value>
+        <target_value>region</target_value>
+      </field>
+      <field>
+        <source_value>&#x653e;&#x7a7a;</source_value>
+        <target_value>venting</target_value>
+      </field>
+      <field>
+        <source_value>&#x653e;&#x5927;&#x7ad9;</source_value>
+        <target_value>major</target_value>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>551</xloc>
+      <yloc>928</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x7ad9;&#x70b9;&#x8def;&#x7531;&#x7248;&#x672c;&#x7c7b;&#x578b;</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>        <select_unspecified>Y</select_unspecified>
+      <meta>        <name>zdlyversion_</name>
+        <rename>version</rename>
+        <type>Integer</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>1016</xloc>
+      <yloc>305</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x7c7b;&#x578b;&#x4fee;&#x6b63;</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>        <select_unspecified>N</select_unspecified>
+      <meta>        <name>jhlc</name>
+        <rename>jhlc</rename>
+        <type>Number</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>      <meta>        <name>bcsj</name>
+        <rename>bcsj</rename>
+        <type>Integer</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>146</xloc>
+      <yloc>768</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 2</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>        <select_unspecified>N</select_unspecified>
+      <meta>        <name>out_mileage</name>
+        <rename>out_mileage</rename>
+        <type>Number</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>      <meta>        <name>out_time</name>
+        <rename>out_time</rename>
+        <type>Integer</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>      <meta>        <name>sxx</name>
+        <rename>sxx</rename>
+        <type>Integer</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>338</xloc>
+      <yloc>1008</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 3</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>        <select_unspecified>N</select_unspecified>
+      <meta>        <name>parade_mileage</name>
+        <rename>parade_mileage</rename>
+        <type>Number</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>      <meta>        <name>parade_time</name>
+        <rename>parade_time</rename>
+        <type>Integer</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>      <meta>        <name>sxx2</name>
+        <rename>sxx2</rename>
+        <type>Integer</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>847</xloc>
+      <yloc>1003</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8ba1;&#x7b97;&#x73ed;&#x6b21;&#x7c7b;&#x578b;</name>
+    <type>ValueMapper</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <field_to_use>qdzname</field_to_use>
+    <target_field>bctype</target_field>
+    <non_match_default>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</non_match_default>
+    <fields>
+      <field>
+        <source_value>&#x51fa;&#x573a;</source_value>
+        <target_value>&#x51fa;&#x573a;</target_value>
+      </field>
+      <field>
+        <source_value>&#x8fdb;&#x573a;</source_value>
+        <target_value>&#x8fdb;&#x573a;</target_value>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>1014</xloc>
+      <yloc>401</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8bb0;&#x5f55;&#x5173;&#x8054; &#x28;&#x7b1b;&#x5361;&#x5c14;&#x8f93;&#x51fa;&#x29;</name>
+    <type>JoinRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
+      <prefix>out</prefix>
+      <cache_size>500</cache_size>
+      <main/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <leftvalue/>
+ <function>&#x3d;</function>
+ <rightvalue/>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>310</xloc>
+      <yloc>133</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8fc7;&#x6ee4;&#x8bb0;&#x5f55;&#xff08;&#x53d1;&#x8f66;&#x65f6;&#x95f4;&#x4e3a;&#x7a7a;&#xff09;</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to/>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <leftvalue>sendtime_calcu</leftvalue>
+ <function>IS NOT NULL</function>
+ <rightvalue/>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>768</xloc>
+      <yloc>44</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8fdb;&#x573a;&#x73ed;&#x6b21;_&#x786e;&#x5b9a;&#x8d77;&#x70b9;&#x7ad9;&#x540d;&#x5b57;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var qdzname_calcu &#x3d; cc_groups&#x5b;gno - 2&#x5d;&#x3b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#x662f;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x8fd9;&#x91cc;&#x53ea;&#x6709;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#xff0c;&#x8fd8;&#x9700;&#x8981;&#x8ba1;&#x7b97;&#xa;var startZdtype_calcu &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype_calcu &#x3d; &#x27;E&#x27;&#x3b;&#xa;&#xa;var destory &#x3d; 0&#x3b; &#x2f;&#x2f; &#x672a;&#x64a4;&#x9500;flag</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname_calcu</name>
+        <rename>qdzname_calcu</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>startZdtype_calcu</name>
+        <rename>startZdtype_calcu</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>endZdtype_calcu</name>
+        <rename>endZdtype_calcu</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>destory</name>
+        <rename>destory</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>754</xloc>
+      <yloc>610</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</name>
+    <type>Dummy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>997</xloc>
+      <yloc>606</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step_error_handling>
+      <error>
+        <source_step>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail</source_step>
+        <target_step>Excel&#x8f93;&#x51fa;</target_step>
+        <is_enabled>Y</is_enabled>
+        <nr_valuename>c1</nr_valuename>
+        <descriptions_valuename>c2</descriptions_valuename>
+        <fields_valuename>c3</fields_valuename>
+        <codes_valuename>c4</codes_valuename>
+        <max_errors/>
+        <max_pct_errors/>
+        <min_pct_rows/>
+      </error>
+      <error>
+        <source_step>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 2</source_step>
+        <target_step>Excel&#x8f93;&#x51fa; 2</target_step>
+        <is_enabled>Y</is_enabled>
+        <nr_valuename/>
+        <descriptions_valuename/>
+        <fields_valuename/>
+        <codes_valuename/>
+        <max_errors/>
+        <max_pct_errors/>
+        <min_pct_rows/>
+      </error>
+      <error>
+        <source_step>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 3</source_step>
+        <target_step>Excel&#x8f93;&#x51fa; 3</target_step>
+        <is_enabled>Y</is_enabled>
+        <nr_valuename/>
+        <descriptions_valuename/>
+        <fields_valuename/>
+        <codes_valuename/>
+        <max_errors/>
+        <max_pct_errors/>
+        <min_pct_rows/>
+      </error>
+  </step_error_handling>
+   <slave-step-copy-partition-distribution>
+</slave-step-copy-partition-distribution>
+   <slave_transformation>N</slave_transformation>
+
+</transformation>
@@ -120,7 +120,21 @@
 				                    </div>
 				            	</div>
 		                		<!--  线路名称 (* 必填项) END -->
-	                 		</div>		
+
+	                 		</div>
+
+                            <div class="form-group">
+                                <!-- 线路版本 -->
+                                <div class="col-md-6">
+                                    <label class="control-label col-md-5">
+                                        <span class="required"> * </span> 站点路由版本&nbsp;：
+                                    </label>
+                                    <div class="col-md-6">
+                                        <select name="lineVersion" class="form-control input-medium"   id="lineVersionSelect"></select>
+                                    </div>
+                                </div>
+                            </div>
+
                  	 		<!-- 表单分组组件 form-group END -->
                         </div>
                         <!-- 获取参数 -->
@@ -132,10 +146,10 @@
 								<div class="col-md-9">
 									<div class="icheck-list">
 										<label >
-											<input type="radio" class="icheck" name="baseRes" value=1 checked> 班型/人次/车辆
+											<input type="radio" class="icheck" name="baseRes" value=1> 班型/人次/车辆
 										</label>
                                         <label>
-                                            <input type="radio" class="icheck" name="baseRes" value=2> 发车间隔分析
+                                            <input type="radio" class="icheck" name="baseRes" value=2 checked> 发车间隔分析
                                         </label>
 										<label>
 											<input type="radio" class="icheck" name="baseRes" value=0> 客流大数据分析
@@ -201,6 +201,25 @@
 			$get('/tic_ec/' + skbId ,null, function(d){
 				if(d.status=='SUCCESS') {
 					$("#lineSelect").select2("val", d.data.xl.id + '_' + d.data.xl.lineCode + '_' + d.data.xl.name);
+
+					// 获取线路版本信息
+                    $get('/tic_ec/stationroute/' + d.data.xl.id, null, function(rs){
+                        // 构造select2内容
+                        var iSelVersion = 0;
+                        var aOption = [];
+                        aOption.push('<option value="">请选择...</option><optgroup label="线路版本">');
+                        $.each(rs.data, function(i, g) {
+                            aOption.push('<option value="'+ g.version + '">' + g.desc + '</option>');
+                            if (i == 0) {
+                                iSelVersion = g.version;
+                            }
+                        });
+                        aOption.push('</optgroup>');
+                        $('#lineVersionSelect').html(aOption.join("")).select2();
+                        if (iSelVersion > 0) {
+                            $("#lineVersionSelect").select2("val", iSelVersion);
+                        }
+                    });
 				}
 			});
 		}
@@ -395,10 +395,26 @@ var SKBFormWizard = function() {
 				// 返回参数详情模版.
 				return cb && cb ({'forminput':template(tempName,{map:map}),'datadisplay': template(tempName +'config',{map:null})});
 			}else if (n==2) {
-                return cb && cb({
+                // 更具站点路由版本获取起点终点站
+                var iversion = $('#lineVersionSelect').val();
+                $get('/stationroute/all',{'line.id_eq':lineId,'destroy_eq':0, 'versions_eq': iversion},function(result) {
+                    $.each(result, function(i, d) {
+                        if (d.stationMark == 'B' && d.directions == 0) {
+                            // alert(d.stationName);
+                            map.line.startStationName = d.stationName;
+                        } else if (d.stationMark == 'E' && d.directions == 0) {
+                            // alert(d.stationName);
+                            map.line.endStationName = d.stationName;
+                        }
+                    });
+
+
+                    return cb && cb({
                         'forminput': template(tempName, {map: map}),
                         'datadisplay': template(tempName + '_config', {map: null})
                     });
+                });
+
             }
 		});
 	}
@@ -476,6 +492,7 @@ var SKBFormWizard = function() {
 				rules : {
 					'skbName' : {required : true,},// 时刻表名称,必填项.
 					'lineName' : {required : true,},// 线路名称,必填项.
+                    'lineVersion': {required: true}, // 站点路由版本，必填项，
 					// 'krl' : {isBaseRes : true,number : true,digits : true,},// 客容量,当选择为客流方式时必填项、整数
 					'startStationFirstTime' : {required : true}, // 起始站首班时间,必填项. 
 					'startStationEndTime' : {required : true}, // 起始站末班时间 ,必填项. 
@@ -598,20 +615,20 @@ var SKBFormWizard = function() {
 					var argus = form.serializeJSON();
 					console.log(argus);
 					// 获取站点路由.
-					$get('/stationroute/all',{'line.id_eq':argus.lineName.split('_')[0],'destroy_eq':0},function(result) {
+					$get('/stationroute/all',{'line.id_eq':argus.lineName.split('_')[0],'destroy_eq':0, 'versions_eq': argus.lineVersion},function(result) {
 						// 判断.
 						if(result) {
 							// 定义上行起点站,上行终点站,下行起点站,下行终点站.
 							var upB ='',upE='',downB='',downE='';
 							for(var r = 0 ; r<result.length;r++) {
 								if(result[r].directions==0 && result[r].stationMark =='B')
-									upB = result[r].station.id;
+									upB = result[r].id;
 								if(result[r].directions==0 && result[r].stationMark =='E')
-									upE = result[r].station.id;
+									upE = result[r].id;
 								if(result[r].directions==1 && result[r].stationMark =='B')
-									downB = result[r].station.id;
+									downB = result[r].id;
 								if(result[r].directions==1 && result[r].stationMark =='E')
-									downE = result[r].station.id;
+									downE = result[r].id;
 							}
 							argus.up_s = upB + '_' + upE;
 							argus.down_s = downB + '_' + downE;
@@ -628,7 +645,7 @@ var SKBFormWizard = function() {
 								$get('/tidc/all',{'ttinfo.id_eq':parseInt(argus.skbName)},function(data) {
 									if(data.status=='SUCCESS' && data.data.length>0) {
 										argus.istidc = 1;
-										layer.confirm('系统已存在该时刻表【'+ 
+										layer.confirm('系统已存在该时刻表【'+
 												  $("#skbNameSelect").select2("data")[0].text +
 												  '】明细,是否使用已有数据渲染模型？', {
 										  btn: ['确定并使用','取消并继续'] //按钮
@@ -648,7 +665,7 @@ var SKBFormWizard = function() {
 							layer.msg('系统不存在该线路的上、下行起终点站！');
 						}
 					});
-					
+
 					// 表单提交.
 					function submit(p,argus) {
                         var baseRes2 = $('#submit_argus_form input[name="baseRes"]:checked').val();// 获取参数方式值.
@@ -354,13 +354,18 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             alert("总配车数小于低谷最小配车");
             throw "总配车数小于低谷最小配车";
         }
+
         if (iDgminpc < 2) {
-            alert("连班路牌小于2，办不到啊");
-            throw "连班路牌小于2，办不到啊";
+            // alert("连班路牌小于2，办不到啊");
+            // throw "连班路牌小于2，办不到啊";
+            console.log("连班路牌小于2，则5休2之外的车辆数则为连班车辆数");
+            iDgminpc = iCls - i_5_2_lpes;
         }
         if (iCls - iDgminpc < i_5_2_lpes) {
-            alert("总分班路牌数小于加班路牌数");
-            throw "总分班路牌数小于加班路牌数";
+            // alert("总分班路牌数小于加班路牌数");
+            // throw "总分班路牌数小于加班路牌数";
+            console.log("总分班路牌数小于加班路牌数，则忽略其他分班路牌数");
+            iDgminpc = iCls - i_5_2_lpes;
         }
         //// 修正连班路牌数，班次间隔大于20的，加1，直至班次间隔小于20
@@ -929,11 +934,14 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                 // 处理中间
                 iQInternelCount = aEndBcIndex[1] - aStartBcIndex[1] - 1;
                 for (i = 1; i <= iQInternelCount; i++) {
-                    oLp = _internalLpArray[iQIndex + i];
-                    if (!oLp.getBc(iQIndex + i, iBcIndex)) {
-                        _fnGenerateBcAndSetBc(i, iQIndex + i, iBcIndex);
+                    for (j = 0; j < _internalLpArray.length; j++) {
+                        oLp = _internalLpArray[j];
+                        if (!oLp.getBc(iQIndex + i, iBcIndex)) {
+                            _fnGenerateBcAndSetBc(j, iQIndex + i, iBcIndex);
+                        }
                     }
+
                 }
                 // 处理尾部
@@ -1821,6 +1829,10 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                 }
             });
+            if (aBc.length == 0) {
+                return;
+            }
+
             var j;
             var iCount = aBc.length - 1;
             var iC1 = Math.floor(aBc[aBc.length - 1].getFcTimeObj().diff(aBc[0].getFcTimeObj(), "m") / iCount);
@@ -202,6 +202,7 @@ var Main_v2 = function() {
                     "zdzid": oTempBc._$_zdzid, // 终点站id
                     "isUp": oTempBc._$_isUp, // 是否上行
+                    "isFb": false, // 是否分班
                     "bcType": oTempBc._$_bcType, // 班次类型
                     "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
@@ -230,6 +231,7 @@ var Main_v2 = function() {
                     "zdzid": oTempBc._$_zdzid, // 终点站id
                     "isUp": oTempBc._$_isUp, // 是否上行
+                    "isFb": false, // 是否分班
                     "bcType": oTempBc._$_bcType, // 班次类型
                     "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
@@ -263,12 +265,15 @@ var Main_v2 = function() {
                     "zdzid": oTempBc._$_zdzid, // 终点站id
                     "isUp": oTempBc._$_isUp, // 是否上行
+                    "isFb": false, // 是否分班
                     "bcType": oTempBc._$_bcType, // 班次类型
                     "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
-                    "groupNo": -2, // 第几圈
-                    "groupBcNo": -3 // 圈里第几个班次
+                    "groupNo": oInternalLp.fnGetBcChainInfo(0)["e_b"] == 0 ?
+                        oInternalLp.fnGetBcChainInfo(0)["e_q"] :
+                        oInternalLp.fnGetBcChainInfo(0)["e_q"] + 1, // 第几圈
+                    "groupBcNo": oInternalLp.fnGetBcChainInfo(0)["e_b"] == 0 ? 1 : 0 // 圈里第几个班次
                 });
@@ -288,6 +293,7 @@ var Main_v2 = function() {
                     "zdzid": oTempBc._$_zdzid, // 终点站id
                     "isUp": oTempBc._$_isUp, // 是否上行
+                    "isFb": false, // 是否分班
                     "bcType": oTempBc._$_bcType, // 班次类型
                     "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
@@ -320,6 +326,7 @@ var Main_v2 = function() {
                     "zdzid": oTempBc._$_zdzid, // 终点站id
                     "isUp": oTempBc._$_isUp, // 是否上行
+                    "isFb": false, // 是否分班
                     "bcType": oTempBc._$_bcType, // 班次类型
                     "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
@@ -348,6 +355,7 @@ var Main_v2 = function() {
                     "zdzid": oTempBc._$_zdzid, // 终点站id
                     "isUp": oTempBc._$_isUp, // 是否上行
+                    "isFb": false, // 是否分班
                     "bcType": oTempBc._$_bcType, // 班次类型
                     "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
@@ -380,6 +388,7 @@ var Main_v2 = function() {
                     "zdzid": oTempBc._$_zdzid, // 终点站id
                     "isUp": oTempBc._$_isUp, // 是否上行
+                    "isFb": true, // 是否分班
                     "bcType": oTempBc._$_bcType, // 班次类型
                     "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
@@ -414,6 +423,7 @@ var Main_v2 = function() {
                     "zdzid": oTempBc._$_zdzid, // 终点站id
                     "isUp": oTempBc._$_isUp, // 是否上行
+                    "isFb": true, // 是否分班
                     "bcType": oTempBc._$_bcType, // 班次类型
                     "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
@@ -438,6 +448,7 @@ var Main_v2 = function() {
                     "zdzid": oTempBc._$_zdzid, // 终点站id
                     "isUp": oTempBc._$_isUp, // 是否上行
+                    "isFb": true, // 是否分班
                     "bcType": oTempBc._$_bcType, // 班次类型
                     "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
@@ -476,12 +487,15 @@ var Main_v2 = function() {
                     "zdzid": oTempBc._$_zdzid, // 终点站id
                     "isUp": oTempBc._$_isUp, // 是否上行
+                    "isFb": false, // 是否分班
                     "bcType": oTempBc._$_bcType, // 班次类型
                     "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
-                    "groupNo": -2, // 第几圈
-                    "groupBcNo": -3 // 圈里第几个班次
+                    "groupNo": oInternalLp.fnGetBcChainInfo(1)["e_b"] == 0 ?
+                        oInternalLp.fnGetBcChainInfo(1)["e_q"] :
+                        oInternalLp.fnGetBcChainInfo(1)["e_q"] + 1, // 第几圈
+                    "groupBcNo": oInternalLp.fnGetBcChainInfo(1)["e_b"] == 0 ? 1 : 0 // 圈里第几个班次
                 });
@@ -501,6 +515,7 @@ var Main_v2 = function() {
                     "zdzid": oTempBc._$_zdzid, // 终点站id
                     "isUp": oTempBc._$_isUp, // 是否上行
+                    "isFb": false, // 是否分班
                     "bcType": oTempBc._$_bcType, // 班次类型
                     "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
@@ -218,6 +218,7 @@
 			jsDoQuery(true);
 		});
+		var list;
 		var line = $("#line").val();
 		var startDate = $("#startDate").val();
 		var endDate = $("#endDate").val();
@@ -254,10 +255,8 @@
 			$(".hidden").removeClass("hidden");
 			var i = layer.load(2);
 			$get('/pcpc/scheduleAnaly', params, function(result){
-				// 把数据填充到模版中
-				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList});
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms tbody').html(tbodyHtml);
+				list = result.dataList;
+				dataPageChange(page, result.dataList);
 				layer.close(i);
 				if(result.dataList.length == 0)
@@ -277,6 +276,17 @@
 			});
 		}
+		function dataPageChange(page, list){
+			var tempList = [];
+			for(var f = page*10; f < list.length && f < (page+1)*10; f++){
+				tempList[tempList.length] = list[f];
+			}
+			// 把数据填充到模版中
+			var tbodyHtml = template('list_scheduleAnaly',{list:tempList});
+			// 把渲染好的模版html文本追加到表格中
+			$('#forms tbody').html(tbodyHtml);
+		}
+		
 		$("#export").on("click",function(){
 			var params = {};
 			params['page'] = page;
@@ -387,7 +397,8 @@
 			    		return;
 			    	}
 			    	page = num - 1;
-			    	jsDoQuery(false);
+// 			    	jsDoQuery(false);
+					dataPageChange(page, list);
 			    }
 			});
 		}
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+	   
+	   #forms > thead > tr> td >span{
+	    width: 5px; 
+		word-wrap: break-word; 
+		letter-spacing: 20px; 
+	  }
+	  
+	  #forms   > thead > tr> td >label{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>统计日报</h1>
+	</div>
+</div>
+
+<!-- <div class="row"> -->
+	<div  class="col-md-12 portlet light porttlet-fit bordered" style="height:calc(100% - 56px)">
+<!-- 		<div> -->
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+				<div style="display: inline-block; " id="gsdmDiv">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
+					</div>
+					<div style="margin-top: 2px"></div>
+					<div style="display: inline-block;">
+                        <span class="item-label" style="width: 80px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 180px;"></select>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
+                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="date2" style="width: 180px;"/>
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="查询"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                    </div>
+				</form>
+			</div>
+			<div class="portlet-body" id="tjrbBody" style="overflow:auto;height: calc(100% - 80px)">
+				<div class="table-container"   style="margin-top: 10px;min-width: 906px">
+					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th colspan="44"><label id="tjrq"></label> 线路统计日报</th>
+							</tr>
+							<tr>
+								<td rowspan="3"><span >路线名</span></td>
+								<td colspan="20">全日营运里程（公里）</td>
+								<td colspan="15">全日营运班次</td>
+								<td colspan="9">大间隔情况</td>
+							</tr>
+							<tr>
+								<td rowspan="2"><label>计划总</label>
+													<label>公里&nbsp;&nbsp;&nbsp;</label></td>
+								<td rowspan="2"><label>计划营</label><label>运公里</label></td>
+								<td rowspan="2"><label>计划空</label><label>驶公里</label></td>
+								<td rowspan="2"><label>实际</label><label>总公里</label></td>
+								<td rowspan="2"><label>实际营</label><label>运公里</label></td>
+								<td rowspan="2"><label>实际空</label><label>驶公里</label></td>
+								<td rowspan="2"><span>少驶公里</span></td>
+								<td rowspan="2"><span>少驶班次</span></td>
+								<td colspan="11">少驶原因（公里）</td>
+								<td rowspan="2"><span >临加公里</span></td>
+								<td colspan="3">计划班次</td>
+								<td colspan="3">实际班次</td>
+								<td colspan="3">临加班次</td>
+								<td colspan="3">放站班次</td>
+								<td colspan="3">调头班次</td>
+								<td colspan="3">发生次数</td>
+								<td rowspan="2">最大间隔时间（分）</td>
+								<td  rowspan="2">原因</td>
+							</tr>
+							<tr>
+								<td><span >路阻</span></td>
+								<td><span>吊慢</span></td>
+								<td><span >故障</span></td>
+								<td><span >纠纷</span></td>
+								<td><span >肇事</span></td>
+								<td><span>缺人</span></td>
+								<td><span>缺车</span></td>
+								<td><span >客稀</span></td>
+								<td><span>气候</span></td>
+								<td><span>援外</span></td>
+								<td><span>其他</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+							</tr>
+						</thead>
+						<tbody class="statisticsDailyCalc">
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		$('#export').attr('disabled', "true");
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+
+		var d = new Date();
+		d.setTime(d.getTime() - 1*1000*60*60*24);
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		var dateTime = year + "-" + month + "-" + day;
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#date2").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#date").val(dateTime);
+		$("#date2").val(dateTime);
+		
+		
+		var fage=false;
+		var obj = [];
+		var xlList;
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv').css('display','none');
+				}
+				$('#gsdm').html(options);
+				updateCompany();
+			});
+		})
+		$("#gsdm").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdm').val();
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdm').html(options);
+// 			initXl();
+		}
+		
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdm").attr("disabled", false);
+				$("#fgsdm").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#gsdm").val(temp[0]);
+				updateCompany();
+				$("#fgsdm").val(temp[1]);
+				$("#gsdm").attr("disabled", true);
+				$("#fgsdm").attr("disabled", true);
+			}
+		});
+		
+
+		var line ="";
+		var xlName ="";
+		var date = "";
+		var date2 ="";
+		var gsdm="";
+		var fgsdm="";
+		$("#query").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+			if($("#date2").val() == null || $("#date2").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+// 			$("#tjrbBody").height($(window).height()-100);
+			line = $("#line").val();
+			xlName = $("#select2-line-container").html();
+			date = $("#date").val();
+			date2 =$("#date2").val();
+			gsdm =$("#gsdm").val();
+			fgsdm=$("#fgsdm").val();
+			if(line=="请选择"){
+				line="";
+			}
+			if(date==null || date =="" ||date2==null || date2 ==""){
+				 layer.msg('请选择时间段.');
+			}else{
+				$("#tjrq").html(date+"至"+date2);
+				 var params = {};
+				 params['gsdm'] = gsdm;
+				 params['fgsdm'] =fgsdm ;
+				 params['line'] = line;
+				 params['date'] = date;
+				 params['date2'] = date2;
+				 params['xlName'] = xlName;
+				 params['type'] = "query";
+				var i = layer.load(2);
+// 				$get('/realSchedule/statisticsDailyTj',params,function(result){
+				$get('/calcWaybill/statisticsDailyTj',params,function(result){
+					// 把数据填充到模版中
+					var tbodyHtml = template('statisticsDailyCalc',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms .statisticsDailyCalc').html(tbodyHtml);
+					layer.close(i);
+					
+					if(result.length == 0)
+						$("#export").attr('disabled',"true");
+					else
+						$("#export").removeAttr("disabled");
+				});
+			}
+			
+		});
+// 		$("#tjrbBody").height($(window).height()-100);
+		$("#export").on("click",function(){
+			 var params = {};
+			 params['gsdm'] = gsdm;
+			 params['fgsdm'] =fgsdm ;
+			 params['line'] = line;
+			 params['date'] = date;
+			 params['date2'] = date2;
+			 params['xlName'] = xlName;
+			 params['type'] = "export";
+			$get('/realSchedule/statisticsDailyTj',params,function(result){
+				window.open("/downloadFile/download?fileName=统计日报"+moment(date).format("YYYYMMDD"));
+			});
+		});
+
+	});
+</script>
+<script type="text/html" id="statisticsDailyCalc">
+	{{each list as obj i}}
+		<tr {{if obj.zt==1}}style='color: red'{{/if}}>
+			<td>{{obj.xlName}}</td>
+			<td>{{obj.jhzlc}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.jcclc}}</td>
+			<td>{{obj.sjzgl}}</td>
+			<td>{{obj.sjgl}}</td>
+			<td>{{obj.sjksgl}}</td>
+			<td>{{obj.ssgl}}</td>
+			<td>{{obj.ssbc}}</td>
+			<td>{{obj.ssgl_lz}}</td>
+			<td>{{obj.ssgl_dm}}</td>
+			<td>{{obj.ssgl_gz}}</td>
+			<td>{{obj.ssgl_jf}}</td>
+			<td>{{obj.ssgl_zs}}</td>
+			<td>{{obj.ssgl_qr}}</td>
+			<td>{{obj.ssgl_qc}}</td>
+			<td>{{obj.ssgl_kx}}</td>
+			<td>{{obj.ssgl_qh}}</td>
+			<td>{{obj.ssgl_yw}}</td>
+			<td>{{obj.ssgl_other}}</td>
+			<td>{{obj.ljgl}}</td>
+			<td>{{obj.jhbc}}</td>
+			<td>{{obj.jhbc_m}}</td>
+			<td>{{obj.jhbc_a}}</td>
+			<td>{{obj.sjbc}}</td>
+			<td>{{obj.sjbc_m}}</td>
+			<td>{{obj.sjbc_a}}</td>
+			<td>{{obj.ljbc}}</td>
+			<td>{{obj.ljbc_m}}</td>
+			<td>{{obj.ljbc_a}}</td>
+			<td>{{obj.fzbc}}</td>
+			<td>{{obj.fzbc_m}}</td>
+			<td>{{obj.fzbc_a}}</td>
+			<td>{{obj.dtbc}}</td>
+			<td>{{obj.dtbc_m}}</td>
+			<td>{{obj.dtbc_a}}</td>
+			<td>{{obj.djg}}</td>
+			<td>{{obj.djg_m}}</td>
+			<td>{{obj.djg_a}}</td>
+			<td>{{obj.djg_time}}</td>
+			<td>&nbsp;</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 \ No newline at end of file
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+	   
+	   #forms > thead > tr> td >span{
+	    width: 5px; 
+		word-wrap: break-word; 
+		letter-spacing: 20px; 
+	  }
+	  
+	  #forms   > thead > tr> td >label{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>统计日报</h1>
+	</div>
+</div>
+
+<!-- <div class="row"> -->
+	<div  class="col-md-12 portlet light porttlet-fit bordered" style="height:calc(100% - 56px)">
+<!-- 		<div> -->
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+				<div style="display: inline-block; " id="gsdmDiv">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
+					</div>
+					<div style="margin-top: 2px"></div>
+					<div style="display: inline-block;">
+                        <span class="item-label" style="width: 80px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 180px;"></select>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
+                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="date2" style="width: 180px;"/>
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="查询"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                    </div>
+				</form>
+			</div>
+			<div class="portlet-body" id="tjrbBody" style="overflow:auto;height: calc(100% - 80px)">
+				<div class="table-container"   style="margin-top: 10px;min-width: 906px">
+					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th colspan="44"><label id="tjrq"></label> 线路统计日报</th>
+							</tr>
+							<tr>
+								<td rowspan="3"><span >路线名</span></td>
+								<td colspan="20">全日营运里程（公里）</td>
+								<td colspan="15">全日营运班次</td>
+								<td colspan="9">大间隔情况</td>
+							</tr>
+							<tr>
+								<td rowspan="2"><label>计划总</label>
+													<label>公里&nbsp;&nbsp;&nbsp;</label></td>
+								<td rowspan="2"><label>计划营</label><label>运公里</label></td>
+								<td rowspan="2"><label>计划空</label><label>驶公里</label></td>
+								<td rowspan="2"><label>实际</label><label>总公里</label></td>
+								<td rowspan="2"><label>实际营</label><label>运公里</label></td>
+								<td rowspan="2"><label>实际空</label><label>驶公里</label></td>
+								<td rowspan="2"><span>少驶公里</span></td>
+								<td rowspan="2"><span>少驶班次</span></td>
+								<td colspan="11">少驶原因（公里）</td>
+								<td rowspan="2"><span >临加公里</span></td>
+								<td colspan="3">计划班次</td>
+								<td colspan="3">实际班次</td>
+								<td colspan="3">临加班次</td>
+								<td colspan="3">放站班次</td>
+								<td colspan="3">调头班次</td>
+								<td colspan="3">发生次数</td>
+								<td rowspan="2">最大间隔时间（分）</td>
+								<td  rowspan="2">原因</td>
+							</tr>
+							<tr>
+								<td><span >路阻</span></td>
+								<td><span>吊慢</span></td>
+								<td><span >故障</span></td>
+								<td><span >纠纷</span></td>
+								<td><span >肇事</span></td>
+								<td><span>缺人</span></td>
+								<td><span>缺车</span></td>
+								<td><span >客稀</span></td>
+								<td><span>气候</span></td>
+								<td><span>援外</span></td>
+								<td><span>其他</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+							</tr>
+						</thead>
+						<tbody class="statisticsDailyCalc2">
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		$('#export').attr('disabled', "true");
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+
+		var d = new Date();
+		d.setTime(d.getTime() - 1*1000*60*60*24);
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		var dateTime = year + "-" + month + "-" + day;
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#date2").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#date").val(dateTime);
+		$("#date2").val(dateTime);
+		
+		
+		var fage=false;
+		var obj = [];
+		var xlList;
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv').css('display','none');
+				}
+				$('#gsdm').html(options);
+				updateCompany();
+			});
+		})
+		$("#gsdm").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdm').val();
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdm').html(options);
+// 			initXl();
+		}
+		
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdm").attr("disabled", false);
+				$("#fgsdm").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#gsdm").val(temp[0]);
+				updateCompany();
+				$("#fgsdm").val(temp[1]);
+				$("#gsdm").attr("disabled", true);
+				$("#fgsdm").attr("disabled", true);
+			}
+		});
+		
+
+		var line ="";
+		var xlName ="";
+		var date = "";
+		var date2 ="";
+		var gsdm="";
+		var fgsdm="";
+		$("#query").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+			if($("#date2").val() == null || $("#date2").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+// 			$("#tjrbBody").height($(window).height()-100);
+			line = $("#line").val();
+			xlName = $("#select2-line-container").html();
+			date = $("#date").val();
+			date2 =$("#date2").val();
+			gsdm =$("#gsdm").val();
+			fgsdm=$("#fgsdm").val();
+			if(line=="请选择"){
+				line="";
+			}
+			if(date==null || date =="" ||date2==null || date2 ==""){
+				 layer.msg('请选择时间段.');
+			}else{
+				$("#tjrq").html(date+"至"+date2);
+				 var params = {};
+				 params['gsdm'] = gsdm;
+				 params['fgsdm'] =fgsdm ;
+				 params['line'] = line;
+				 params['date'] = date;
+				 params['date2'] = date2;
+				 params['xlName'] = xlName;
+				 params['type'] = "query";
+				var i = layer.load(2);
+// 				$get('/realSchedule/statisticsDailyTj',params,function(result){
+				$get('/calcWaybill/calcStatisticsDaily',params,function(result){
+					// 把数据填充到模版中
+					var tbodyHtml = template('statisticsDailyCalc2',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms .statisticsDailyCalc2').html(tbodyHtml);
+					layer.close(i);
+					
+					if(result.length == 0)
+						$("#export").attr('disabled',"true");
+					else
+						$("#export").removeAttr("disabled");
+				});
+			}
+			
+		});
+// 		$("#tjrbBody").height($(window).height()-100);
+		$("#export").on("click",function(){
+			 var params = {};
+			 params['gsdm'] = gsdm;
+			 params['fgsdm'] =fgsdm ;
+			 params['line'] = line;
+			 params['date'] = date;
+			 params['date2'] = date2;
+			 params['xlName'] = xlName;
+			 params['type'] = "export";
+			$get('/realSchedule/statisticsDailyTj',params,function(result){
+				window.open("/downloadFile/download?fileName=统计日报"+moment(date).format("YYYYMMDD"));
+			});
+		});
+
+	});
+</script>
+<script type="text/html" id="statisticsDailyCalc2">
+	{{each list as obj i}}
+		<tr {{if obj.zt==1}}style='color: red'{{/if}}>
+			<td>{{obj.xlName}}</td>
+			<td>{{obj.jhzlc}}</td>
+			<td>{{obj.jhyylc}}</td>
+			<td>{{obj.jhkslc}}</td>
+			<td>{{obj.sjzlc}}</td>
+			<td>{{obj.sjyylc}}</td>
+			<td>{{obj.sjkslc}}</td>
+			<td>{{obj.sslc}}</td>
+			<td>{{obj.ssbc}}</td>
+			<td>{{obj.lzlc}}</td>
+			<td>{{obj.dmlc}}</td>
+			<td>{{obj.gzlc}}</td>
+			<td>{{obj.jflc}}</td>
+			<td>{{obj.zslc}}</td>
+			<td>{{obj.qrlc}}</td>
+			<td>{{obj.qclc}}</td>
+			<td>{{obj.kxlc}}</td>
+			<td>{{obj.qhlc}}</td>
+			<td>{{obj.ywlc}}</td>
+			<td>{{obj.qtlc}}</td>
+			<td>{{obj.ljlc}}</td>
+			<td>{{obj.jhbcq}}</td>
+			<td>{{obj.jhbcz}}</td>
+			<td>{{obj.jhbcw}}</td>
+			<td>{{obj.sjbcq}}</td>
+			<td>{{obj.sjbcz}}</td>
+			<td>{{obj.sjbcw}}</td>
+			<td>{{obj.ljbcq}}</td>
+			<td>{{obj.ljbcz}}</td>
+			<td>{{obj.ljbcw}}</td>
+			<td>{{obj.fzbcq}}</td>
+			<td>{{obj.fzbcz}}</td>
+			<td>{{obj.fzbcw}}</td>
+			<td>{{obj.dtbcq}}</td>
+			<td>{{obj.dtbcz}}</td>
+			<td>{{obj.dtbcw}}</td>
+			<td>{{obj.djgq}}</td>
+			<td>{{obj.djgz}}</td>
+			<td>{{obj.djgw}}</td>
+			<td>{{obj.djgsj}}</td>
+			<td>&nbsp;</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 \ No newline at end of file
@@ -103,6 +103,28 @@
         <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
             <div class="form-body">
                 <div class="form-group has-success has-feedback">
+                    <label class="col-md-2 control-label">ExcelSheet格式类型*：</label>
+                    <div class="col-md-4">
+                        <sa-Select5 name="timetabletype"
+                                    model="ctrl.ttInfoDetailManageForForm"
+                                    cmaps="{'excelFormatType': 'code'}"
+                                    dcname="excelFormatType"
+                                    icname="code"
+                                    dsparams="{{ {type: 'dic', param: 'timetabletype' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="格式类型..."
+                                    searchexp="this.name"
+                                    required >
+                        </sa-Select5>
+                    </div>
+                    <!-- 隐藏快，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.timetabletype.$error.required">
+                        格式类型必须选择
+                    </div>
+                </div>
+
+                <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">站点路由版本类型*：</label>
                     <div class="col-md-4">
                         <sa-Select5 name="zdlytype"
@@ -173,7 +195,8 @@
                                                     'sheetname': ctrl.ttInfoDetailManageForForm.sheetname,
                                                     'lineid' : ctrl.ttInfoDetailManageForForm.xlid,
                                                     'linename' : ctrl.ttInfoDetailManageForForm.xlname,
-                                                    'lineversion' : ctrl.ttInfoDetailManageForForm.lineversion
+                                                    'lineversion' : ctrl.ttInfoDetailManageForForm.lineversion,
+                                                    'excelFormatType': ctrl.ttInfoDetailManageForForm.excelFormatType
                                                     } | json}}"/>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -89,7 +89,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 sheetname: undefined, // sheet名字
                 sheetvaliddesc: undefined, // sheet验证描述返回
                 lineinfo: undefined, // 线路标准id
-                lineinfovaliddesc: undefined // 线路标准验证描述返回
+                lineinfovaliddesc: undefined, // 线路标准验证描述返回
+                excelFormatType: "normal" // 格式类型
             };
             self.sheetnames = [
                 //{name: '工作表1'}, {name: '工作表2'} // sheet名字列表
+#ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.url= jdbc:mysql://127.0.0.1/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#ms.mysql.username= root
+#ms.mysql.password= 123456
+
+ms.mysql.driver= com.mysql.jdbc.Driver
+ms.mysql.url= jdbc:mysql://10.10.150.21:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.username= root
+ms.mysql.password= root2jsp@JSP
+