Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into minhang

徐烜
2 parents 4b907705 a91199a8
Showing 38 changed files with 1208 additions and 267 deletions
src/main/java/com/bsth/controller/forecast/SampleController.java
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/data/match/Arrival2Schedule.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
src/main/java/com/bsth/data/schedule/thread/ScheduleLateThread.java
src/main/java/com/bsth/data/schedule/SchedulePstThread.java → src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/data/schedule/ScheduleRefreshThread.java → src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/entity/forecast/Sample.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/repository/forecast/SampleRepository.java
src/main/java/com/bsth/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/forecast/SampleService.java
src/main/java/com/bsth/service/forecast/SampleServiceImpl.java
src/main/java/com/bsth/service/realcontrol/LineConfigService.java
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
+package com.bsth.controller.forecast;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.forecast.Sample;
+
+@RestController
+@RequestMapping("sample")
+public class SampleController extends BaseController<Sample, Long>{
+
+}
@@ -34,4 +34,9 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	public Map<String, Object> editStartOptTime(@RequestParam String time,@RequestParam String lineCode){
 		return lineConfigService.editStartOptTime(time, lineCode);
 	}
+	
+	@RequestMapping(value = "/editOutTimeType", method = RequestMethod.POST)
+	public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type){
+		return lineConfigService.editOutTimeType(lineCode, type);
+	}
 }
@@ -158,7 +158,6 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				//漂移判定
 				if(driftCheck(mr, arr)){
-					
 					mr.sch.setFcsjActualAll(mr.ts);
 					//通知客户端
 					sendUtils.sendFcsj(mr.sch);
@@ -283,7 +283,7 @@ public class PilotReport {
 	public void clear(String lineCode){
 		logger.info("清除 80数据 before: " + d80MultiMap.size());
-		d80MultiMap.removeAll(lineCode);
+		d80MultiMap.removeAll(Integer.parseInt(lineCode));
 		logger.info("清除 80数据 after: " + d80MultiMap.size());
 	}
@@ -25,6 +25,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.FirstScheduleCheckThread;
+import com.bsth.data.schedule.thread.ScheduleLateThread;
+import com.bsth.data.schedule.thread.SchedulePstThread;
+import com.bsth.data.schedule.thread.ScheduleRefreshThread;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -62,15 +65,11 @@ public class DayOfSchedule implements CommandLineRunner {
 	public static LinkedList<ScheduleRealInfo> pstBuffer;
 	// 排序器
-	private static ScheduleComparator.FCNO schNoComparator;
-	//private static ScheduleComparator.FCSJ schFcsjComparator;
+	private static ScheduleComparator.FCSJ schFCSJComparator;
 	@Autowired
 	LineConfigData lineConfigData;
-	/*@Autowired
-	ScheduleRealInfoService scheduleRealService;*/
-	
 	@Autowired
 	ScheduleRealInfoRepository schRepository;
@@ -90,7 +89,7 @@ public class DayOfSchedule implements CommandLineRunner {
 		nbbmScheduleMap = ArrayListMultimap.create();
 		id2SchedulMap = new HashMap<>();
 		pstBuffer = new LinkedList<>();
-		schNoComparator = new ScheduleComparator.FCNO();
+		schFCSJComparator = new ScheduleComparator.FCSJ();
 		currSchDateMap = new HashMap<>();
 		nbbm2SEStationMap = TreeMultimap.create();
 	}
@@ -103,6 +102,9 @@ public class DayOfSchedule implements CommandLineRunner {
 	@Autowired
 	FirstScheduleCheckThread firstScheduleCheckThread;
+	
+	@Autowired
+	ScheduleLateThread scheduleLateThread;
 	@Override
 	public void run(String... arg0) throws Exception {
@@ -112,6 +114,8 @@ public class DayOfSchedule implements CommandLineRunner {
 		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
 		//首班出场指令补发器
 		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 60, 60, TimeUnit.SECONDS);
+		//班次误点扫描
+		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
 	}
 	public Map<String, String> getCurrSchDate() {
@@ -167,11 +171,18 @@ public class DayOfSchedule implements CommandLineRunner {
 			//添加到缓存
 			putAll(list);
-			//计算“起点站应到”时间
 			Set<String> cars = searchAllCars(list);
+			//计算“起点站应到”时间
 			for(String nbbm : cars)
 				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
+			//是否是出站即出场
+			LineConfig conf = lineConfigData.get(lineCode);
+			if(conf.getOutConfig() == 2){
+				for(String nbbm : cars)
+					schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
+			}
+			
 			// 页面 翻班通知
 			sendUtils.shiftSchedule(lineCode);
 		} catch (Exception e) {
@@ -265,6 +276,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	 * @Description: TODO(从计划排班表加载数据)
 	 */
 	public List<ScheduleRealInfo> loadPlanSch(String lineCode, String schDate) {
+		logger.info("从计划排班表恢复排班，lineCode: " + lineCode + ", schDate: " + schDate);
 		List<ScheduleRealInfo> realList = new ArrayList<>();
 		try {
@@ -290,6 +302,9 @@ public class DayOfSchedule implements CommandLineRunner {
 						logger.error("loadPlanSch... 计算终点时间失败...");
 					}
 				}
+				//计划里程为0，直接清空
+				if(sch.getJhlc() != null && sch.getJhlc() == 0)
+					sch.setJhlc(null);
 			}
 		} catch (Exception e) {
 			logger.error("", e);
@@ -418,28 +433,6 @@ public class DayOfSchedule implements CommandLineRunner {
 		return next;
 	}
-	/**
-	 * 
-	 * @Title: prveRealSch
-	 * @Description: TODO(获取上一个已实际发出的班次)
-	 */
-/*	public ScheduleRealInfo prveSjfc(ScheduleRealInfo sch) {
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		// 排序
-		Collections.sort(list, schNoComparator);
-
-		ScheduleRealInfo prve = null;
-
-		int i = list.indexOf(sch);
-		for (; i >= 0; i--){
-			if (list.get(i).getFcsjActual() != null){
-				prve = list.get(i);
-				break;
-			}
-		}
-		return prve;
-	}*/
-
 	public void put(ScheduleRealInfo sch) {
 		schAttrCalculator
 			.calcRealDate(sch)
@@ -466,7 +459,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
 		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
 		// 排序
-		Collections.sort(list, schNoComparator);
+		Collections.sort(list, schFCSJComparator);
 		List<ScheduleRealInfo> rs = new ArrayList<>();
 		ScheduleRealInfo temp;
@@ -554,33 +547,6 @@ public class DayOfSchedule implements CommandLineRunner {
 		pstBuffer.add(sch);
 	}
-	/**
-	 * 
-	 * @Title: outSch 
-	 * @Description: TODO(出场班次) 
-	 */
-/*	public List<ScheduleRealInfo> outSch(String nbbm){
-		List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm)
-					,outList = new ArrayList<>();
-		
-		for(ScheduleRealInfo sch : all){
-			if(sch.getBcType().equals("out"))
-				outList.add(sch);
-		}
-		return outList;
-	}
-	
-	public ScheduleRealInfo nextOut(String nbbm){
-		List<ScheduleRealInfo> list = outSch(nbbm);
-		Collections.sort(list, schNoComparator);
-		ScheduleRealInfo sch = null;
-		for(ScheduleRealInfo temp : list){
-			if(temp.getFcsjActual() == null)
-				sch = temp;
-		}
-		
-		return sch;
-	}*/
 	/**
 	 * 
@@ -590,7 +556,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	public ScheduleRealInfo nextByBcType(String nbbm, String bcType){
 		List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
-		Collections.sort(list, schNoComparator);
+		Collections.sort(list, schFCSJComparator);
 		ScheduleRealInfo sch = null;
 		for(ScheduleRealInfo temp : list){
 			if(temp.getFcsjActual() == null)
@@ -623,4 +589,8 @@ public class DayOfSchedule implements CommandLineRunner {
 	public Set<String> allCar(){
 		return nbbmScheduleMap.keySet();
 	}
+	
+	public Collection<ScheduleRealInfo> findAll(){
+		return nbbmScheduleMap.values();
+	}
 }
@@ -87,7 +87,7 @@ public class SchAttrCalculator {
 	 * @Description: TODO(计算班次的起点应到时间，list 必须是同一辆车的班次) 
 	 */
 	public void calcQdzTimePlan(List<ScheduleRealInfo> list){
-		Collections.sort(list, new ScheduleComparator.FCNO());
+		Collections.sort(list, new ScheduleComparator.FCSJ());
 		int len = list.size();
 		if(len == 0)
@@ -102,6 +102,34 @@ public class SchAttrCalculator {
 			prve = curr;
 		}
 	}
+	
+	/**
+	 * 
+	 * @Title: connectOutSchedule 
+	 * @Description: TODO(关联出场班次) 
+	 */
+	public void connectOutSchedule(List<ScheduleRealInfo> list){
+		Collections.sort(list, new ScheduleComparator.FCSJ());
+		
+		int len = list.size();
+		if(len == 0)
+			return;
+		
+		ScheduleRealInfo prve = list.get(0), curr;
+		for(int i = 1; i < len; i ++){
+			curr = list.get(i);
+			
+			//出站即出场关联
+			if(prve.getBcType().equals("out") && prve.getJhlc() == null)
+				curr.setTwinsSch(prve);
+			
+			//进站即进场关联
+			if(curr.getBcType().equals("in") && curr.getJhlc() == null)
+				prve.setTwinsSch(curr);
+			
+			prve = curr;
+		}
+	}
 	public SchAttrCalculator calcFcsjTime(ScheduleRealInfo sch) throws ParseException {
 		sch.setFcsjT(DateUtils.sdfyyyyMMddHHmm.parse(sch.getRealExecDate() + sch.getFcsj()).getTime());
@@ -14,18 +14,18 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
  */
 public class ScheduleComparator {
-	public static class FCNO implements Comparator<ScheduleRealInfo>{
+/*	public static class FCNO implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
 			return s1.getFcno() - s2.getFcno();
 		}
-	}
+	}*/
 	public static class FCSJ  implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			return (int) (s1.getFcsjT() - s2.getFcsjT());
+			return (int) (s1.getDfsjT() - s2.getDfsjT());
 		}
 	}
 }
+package com.bsth.data.schedule.thread;
+
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+
+/**
+ * 
+ * @ClassName: ScheduleLateThread 
+ * @Description: TODO(班次误点扫描线程) 
+ * @author PanZhao 
+ * @date 2016年8月31日 下午3:09:02 
+ *
+ */
+@Component
+public class ScheduleLateThread extends Thread{
+
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+	
+	@Autowired
+	SendUtils sendUtils;
+	
+	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.FCSJ();
+	
+	@Override
+	public void run() {
+		List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+		Collections.sort(all, cpm);
+		
+		long t = System.currentTimeMillis();
+		int size = all.size();
+		
+		ScheduleRealInfo sch;
+		for(int i = 0; i < size; i ++){
+			sch = all.get(i);
+			if(sch.getDfsjT() > t)
+				break;
+			
+			if(sch.getStatus() == 0 && sch.getFcsjActual() == null){
+				//应发未发
+				sch.setLate(true);
+				//通知客户端
+				sendUtils.refreshSch(sch);
+			}
+		}
+	}
+}
-package com.bsth.data.schedule;
+package com.bsth.data.schedule.thread;
 import java.util.LinkedList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-package com.bsth.data.schedule;
+package com.bsth.data.schedule.thread;
 import java.util.Collection;
 import java.util.Set;
@@ -13,6 +13,7 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.arrival.ArrivalData_GPS;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.pilot80.PilotReport;
+import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.LineConfig;
 /**
+package com.bsth.entity.forecast;
+
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * 
+ * @ClassName: Sample
+ * @Description: TODO(站点耗时预测样本)
+ * @author PanZhao
+ * @date 2016年8月31日 上午9:50:49
+ *
+ */
+@Entity
+@Table(name = "bsth_forecast_sample")
+public class Sample {
+
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	private Integer lineCode;
+	
+	// 开始时间
+	private String sDate;
+	@Transient
+	private Long sTime;
+
+	// 结束时间
+	private String eDate;
+	@Transient
+	private Long eTime;
+
+	// 开始站点
+	private String sStation;
+
+	// 结束站点
+	private String eStation;
+
+	// 0：gps分析生成， 1：人工录入
+	private int type;
+	
+	private String tag;
+	
+	//行驶时间
+	private Float runTime;
+	
+	private int updown;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getsDate() {
+		return sDate;
+	}
+
+	public void setsDate(String sDate) {
+		this.sDate = sDate;
+	}
+
+	public Long getsTime() {
+		return sTime;
+	}
+
+	public void setsTime(Long sTime) {
+		this.sTime = sTime;
+	}
+
+	public String geteDate() {
+		return eDate;
+	}
+
+	public void seteDate(String eDate) {
+		this.eDate = eDate;
+	}
+
+	public Long geteTime() {
+		return eTime;
+	}
+
+	public void seteTime(Long eTime) {
+		this.eTime = eTime;
+	}
+
+	public String getsStation() {
+		return sStation;
+	}
+
+	public void setsStation(String sStation) {
+		this.sStation = sStation;
+	}
+
+	public String geteStation() {
+		return eStation;
+	}
+
+	public void seteStation(String eStation) {
+		this.eStation = eStation;
+	}
+
+	public int getType() {
+		return type;
+	}
+
+	public void setType(int type) {
+		this.type = type;
+	}
+
+	public String getTag() {
+		return tag;
+	}
+
+	public void setTag(String tag) {
+		this.tag = tag;
+	}
+
+	public Float getRunTime() {
+		return runTime;
+	}
+
+	public void setRunTime(Float runTime) {
+		this.runTime = runTime;
+	}
+
+	public Integer getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(Integer lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public int getUpdown() {
+		return updown;
+	}
+
+	public void setUpdown(int updown) {
+		this.updown = updown;
+	}
+}
@@ -55,10 +55,10 @@ public class LineConfig {
 	/** 托管状态 */
 	private boolean trust;
-	/** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 */
+	/** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 2：出站即出场 */
 	private int outConfig;
-	/** 进场时间设置 0：真实进场（设备进入缓冲区时间） 1：请求进场时间 */
+	/** 进场时间设置 0：真实进场（设备进入缓冲区时间） 1：请求进场时间  2：出站即出场*/
 	private int inConfig;
 	/** 短语模板 , 号分隔多个 */
@@ -102,19 +102,10 @@ public class ScheduleRealInfo {
 	 */
 	private String bcType;
-	/** 设备请求出场或进场时间（班次为 出场或进场 时，该字段可能有值） 
-	private Long devRequestTime;*/
-	
-	/** 停车场既首发站  */
-	@Transient
-	private boolean parkIsFirstStation;
-	/** 首发站既停车场  */
-	@Transient
-	private boolean firstStationIsPark;
-	/** 与其共享发车时间的进出场班次  */
+	/** 出站即出场 ， 关联的进出场班次  */
 	@JsonIgnore
 	@Transient
-	private ScheduleRealInfo twins;
+	private ScheduleRealInfo twinsSch;
 	/** 创建人 */
 	@JsonIgnore
@@ -149,7 +140,7 @@ public class ScheduleRealInfo {
 	private boolean sflj;
 	/** 是否误点*/
-	private boolean isLate;
+	private boolean late;
 	/**实际里程*/
 	private Float realMileage;
@@ -468,14 +459,6 @@ public class ScheduleRealInfo {
 		this.status = status;
 	}
-	public boolean isLate() {
-		return isLate;
-	}
-
-	public void setLate(boolean isLate) {
-		this.isLate = isLate;
-	}
-
 	public Float getRealMileage() {
 		return realMileage;
 	}
@@ -539,35 +522,6 @@ public class ScheduleRealInfo {
 		}
 	}
-	/**
-	 * @throws ParseException 
-	 * 
-	 * @Title: syncTime 
-	 * @Description: TODO(根据计发时间，计算待发时间和终点时间) 
-	 * @param     设定文件 
-	 * @return void    返回类型 
-	 * @throws
-	
-	public void syncTime(){
-		try{
-			this.setDfsj(this.getFcsj());
-			//发车时间戳
-			this.setFcsjT(sdfyyyyMMddHHmm.parse(this.realExecDate + " " + this.getFcsj()).getTime());
-			//待发时间戳
-			this.setDfsjT(this.getFcsjT());
-			//计算终点时间
-			calcEndTime();
-			
-			if(this.fcsjActual != null)
-				this.setFcsjActualAll(this.fcsjActual);
-			
-			if(this.zdsjActual != null)
-				this.setZdsjActualAll(this.zdsjActual);
-		}catch(Exception e){
-			e.printStackTrace();
-		}
-	} */
-	
 	public void calcEndTime(){
 		//计划终点时间
 		if(this.getBcsj() != null){
@@ -671,21 +625,6 @@ public class ScheduleRealInfo {
 		calcStatus();
 	}
-	//和依赖班次同步发车时间
-/*	public void synchroFcsj(){
-		if(this.isFirstStationIsPark() || this.isParkIsFirstStation()){
-			ScheduleRealInfo twinsSch = this.twins;
-			if(null != twinsSch){
-				//有关联的出场班次
-				twinsSch.setFcsjActual(this.fcsjActual);
-				twinsSch.setFcsjActualTime(this.fcsjActualTime);
-				if(null != twinsSch.getSjfcModel())
-					twinsSch.getSjfcModel().setPersonTime(this.fcsjActualTime);
-				twinsSch.calcStatus();
-			}
-		}
-	}*/
-	
 	/**
 	 * 
 	 * @Title: setFcsjActualAll 
@@ -718,19 +657,6 @@ public class ScheduleRealInfo {
 		}
 	}
-	//和依赖的进场班次同步终点时间
-/*	public void synchroZdsj(){
-		if(this.isFirstStationIsPark()){
-			ScheduleRealInfo twinsSch = this.twins;
-			if(null != twinsSch && twinsSch.getBcType().equals("in")){
-				//有关联的进场班次
-				twinsSch.setFcsjActual(this.zdsjActual);
-				twinsSch.setFcsjActualTime(this.zdsjActualTime);
-				twinsSch.calcStatus();
-			}
-		}
-	}*/
-
 	public Long getSpId() {
 		return spId;
 	}
@@ -755,9 +681,9 @@ public class ScheduleRealInfo {
 		if(StringUtils.isNotBlank(this.fcsjActual)){
 			this.status = 1;
-			//进出场班次并且没有终点时间的
+			//进出场班次并且没有计划里程的
 			if((this.bcType.equals("out") || this.bcType.equals("in"))
-					&& this.zdsj == null){
+					&& this.jhlc == null){
 				this.status = 2;
 			}
 		}
@@ -792,60 +718,12 @@ public class ScheduleRealInfo {
 	public void setScheduleDateStr(String scheduleDateStr) {
 		this.scheduleDateStr = scheduleDateStr;
 	}
-
-	public boolean isParkIsFirstStation() {
-		return parkIsFirstStation;
-	}
-
-	public void setParkIsFirstStation(boolean parkIsFirstStation) {
-		this.parkIsFirstStation = parkIsFirstStation;
-	}
-
-/*	public ScheduleRealInfo getTwins() {
-		return twins;
-	}
-
-	public void setTwins(ScheduleRealInfo twins) {
-		this.twins = twins;
-	}
-
-	public boolean isFirstStationIsPark() {
-		return firstStationIsPark;
-	}
-
-	public void setFirstStationIsPark(boolean firstStationIsPark) {
-		this.firstStationIsPark = firstStationIsPark;
-	}*/
-	
-	
-	/*public boolean statusTostart(){
-		return this.getFcsjActual() == null
-				&& this.getSjfcModel().getTime() != null;
-	}
-	
-	public boolean statusToEnd(){
-		return this.getZdsjActual() == null
-				&& this.getSjddModel().getTime() != null;
-	}
-
-	public void revokeRealOutgo() {
-		//this.setStatus(0);
-		this.setFcsjActual(null);
-		this.setFcsjActualTime(null);
-		if(null != this.getSjfcModel())
-			this.getSjfcModel().resetNull();
-		this.calcStatus();
-	}*/
 	public void clearFcsjActual(){
 		this.setFcsjActual(null);
 		this.setFcsjActualTime(null);
 		this.calcStatus();
 	}
-
-/*	public boolean existDependent() {
-		return this.isFirstStationIsPark() || this.parkIsFirstStation;
-	}*/
 	//清除实际终点时间
 	public void clearZdsjActual(){
@@ -862,4 +740,20 @@ public class ScheduleRealInfo {
 	public void setOpDirectiveState(Integer opDirectiveState) {
 		this.opDirectiveState = opDirectiveState;
 	}
+
+	public ScheduleRealInfo getTwinsSch() {
+		return twinsSch;
+	}
+
+	public void setTwinsSch(ScheduleRealInfo twinsSch) {
+		this.twinsSch = twinsSch;
+	}
+
+	public boolean isLate() {
+		return late;
+	}
+
+	public void setLate(boolean late) {
+		this.late = late;
+	}
 }
+package com.bsth.repository.forecast;
+
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.forecast.Sample;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface SampleRepository extends BaseRepository<Sample, Long>{
+
+}
@@ -4,9 +4,6 @@ package com.bsth.service.directive;
 import java.util.List;
 import java.util.Map;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.D80;
@@ -40,6 +40,8 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.util.DateUtils;
 import com.bsth.websocket.handler.RealControlSocketHandler;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Splitter;
 @Service
@@ -165,10 +167,17 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	 */
 	@Override
 	public void sendD60ToPage(ScheduleRealInfo sch) {
-		JSONObject json = new JSONObject();
-		json.put("fn", "directive");
-		json.put("t", sch);
-		socketHandler.sendMessageToLine(sch.getXlBm(), json.toJSONString());
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", sch);
+		map.put("t", sch);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		
+		try {
+			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
+		} catch (JsonProcessingException e) {
+			logger.error("", e);
+		}
 	}
 	@Override
@@ -244,7 +253,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 			logger.error("没有设备号对照的车辆：" + nbbm);
 			return null;
 		}
-		// 根据当前确定 上下行和营运状态
+		// 根据当前GPS确定 上下行和营运状态
 		Integer upDown = null, state = null;
 		if (null == sch) {
 			GpsEntity gpsData = gpsRealDataBuffer.findByDeviceId(deviceId);
+package com.bsth.service.forecast;
+
+import com.bsth.entity.forecast.Sample;
+import com.bsth.service.BaseService;
+
+public interface SampleService extends BaseService<Sample, Long>{
+
+}
+package com.bsth.service.forecast;
+
+import org.springframework.stereotype.Service;
+
+import com.bsth.entity.forecast.Sample;
+import com.bsth.service.impl.BaseServiceImpl;
+
+@Service
+public class SampleServiceImpl extends BaseServiceImpl<Sample, Long>{
+
+}
@@ -13,4 +13,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
 	Map<String, Object> editStartOptTime(String time, String lineCode);
+	Map<String, Object> editOutTimeType(String lineCode, int type);
+
 }
@@ -64,4 +64,18 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
 		rs.put("time", time);
 		return rs;
 	}
+
+	@Override
+	public Map<String, Object> editOutTimeType(String lineCode, int type) {
+		Map<String, Object> rs = new HashMap<>();
+		LineConfig conf = lineConfigData.get(lineCode);
+		
+		conf.setOutConfig(type);
+		conf.setInConfig(type);
+		lineConfigData.set(conf);
+		
+		rs.put("status", ResponseCode.SUCCESS);
+		rs.put("type", type);
+		return rs;
+	}
 }
@@ -712,7 +712,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			}
 			else{
 				// 按发车时间排序
-				Collections.sort(list, new ScheduleComparator.FCNO());
+				Collections.sort(list, new ScheduleComparator.FCSJ());
 				// 以第一个实际发车/待发时间为起点，调整间隔
 				sch = list.get(0);
 package com.bsth.service.sys.impl;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -8,6 +10,8 @@ import java.util.Map;
 import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
 import com.bsth.common.ResponseCode;
@@ -60,7 +64,7 @@ public class ModuleServiceImpl extends BaseServiceImpl&lt;Module, Integer&gt; implemen
 		SysUser user = SecurityUtils.getCurrentUser();
 		Set<Role> roles = user.getRoles();
-		List<Module> all = (List<Module>) moduleRepository.findAll()
+		List<Module> all = (List<Module>) moduleRepository.findAll(new Sort(Direction.ASC, "id"))
 					,results = new ArrayList<>();
 		Map<Integer, Module> map = new HashMap<>();
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
+import com.bsth.data.LineConfigData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -24,6 +25,9 @@ public class SendUtils{
 	@Autowired
 	private RealControlSocketHandler socketHandler;
+	
+	@Autowired
+	LineConfigData lineConfigData;
 	private static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
@@ -33,17 +37,19 @@ public class SendUtils{
 	 * @throws JsonProcessingException
 	 *             TODO(推送发车信息)
 	 */
-	public void sendFcsj(ScheduleRealInfo schedule) {
-
+	public void sendFcsj(ScheduleRealInfo sch) {
+		//处理出站即出场的班次
+		connectOutSchTime(sch);
+		
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "faChe");
-		map.put("t", schedule);
+		map.put("t", sch);
 		map.put("dataStr", sdf.format(new Date()));
 		ObjectMapper mapper = new ObjectMapper();
 		try {
-			socketHandler.sendMessageToLine(schedule.getXlBm(), mapper.writeValueAsString(map));
+			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -77,11 +83,13 @@ public class SendUtils{
 	 * 			@throws NumberFormatException @Title: sendFcsj @Description:
 	 *             TODO(推送到达终点时间) @param @param schedule 班次 @throws
 	 */
-	public void sendZdsj(ScheduleRealInfo schedule, ScheduleRealInfo nextSch, int finish) {
+	public void sendZdsj(ScheduleRealInfo sch, ScheduleRealInfo nextSch, int finish) {
+		//处理进站即进场的班次
+		connectInSchTime(sch);
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "zhongDian");
-		map.put("t", schedule);
+		map.put("t", sch);
 		map.put("nt", nextSch);
 		map.put("finish", finish);
 		map.put("dataStr", sdf.format(new Date()));
@@ -89,7 +97,7 @@ public class SendUtils{
 		ObjectMapper mapper = new ObjectMapper();
 		try {
-			socketHandler.sendMessageToLine(schedule.getXlBm(), mapper.writeValueAsString(map));
+			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -141,5 +149,38 @@ public class SendUtils{
 		refreshSch(list);
 	}
-	//public void sendReportOutTime(ScheduleRealInfo sch)
+	
+	//出站即出场
+	public void connectOutSchTime(ScheduleRealInfo sch){
+		try{
+			ScheduleRealInfo twins = sch.getTwinsSch();
+			if(twins != null
+					&& lineConfigData.get(sch.getXlBm()).getOutConfig() == 2
+					&& twins.getBcType().equals("out")){
+				
+				twins.setFcsjActualAll(sch.getFcsjActualTime());
+				//刷新关联的出场班次
+				refreshSch(twins);
+			}
+		}catch(Exception e){
+			logger.error("", e);
+		}
+	}
+	
+	//进站即出场
+	public void connectInSchTime(ScheduleRealInfo sch){
+		try{
+			ScheduleRealInfo twins = sch.getTwinsSch();
+			if(twins != null
+					&& lineConfigData.get(sch.getXlBm()).getOutConfig() == 2
+					&& twins.getBcType().equals("in")){
+				
+				twins.setZdsjActualAll(sch.getZdsjActualTime());
+				//刷新关联的出场班次
+				refreshSch(twins);
+			}
+		}catch(Exception e){
+			logger.error("", e);
+		}
+	}
 }
 spring.profiles: dev,prod
-spring.profiles.active: prod
+spring.profiles.active: dev
 spring.view.suffix=.html
 server.session-timeout=-1
@@ -4,13 +4,13 @@
 datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
 #数据库ip地址
-datatools.kvars_dbip=127.0.0.1
+datatools.kvars_dbip=192.168.168.201
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
-datatools.kvars_dbpwd=
+datatools.kvars_dbpwd=123456
 #数据库库名
-datatools.kvars_dbdname=control
+datatools.kvars_dbdname=mh_control
 # 3、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
-#ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
-#ms.mysql.username= root
-#ms.mysql.password= panzhao
-
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.password= panzhao
+
+#ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+#ms.mysql.username= root
+#ms.mysql.password= root2jsp
 \ No newline at end of file
@@ -2554,6 +2554,8 @@ span.nt-coord:before{
 	margin: 8px 0;
 }
+
+
 tr.linjia td:nth-child(1):AFTER {
     content: "\f173";
     font: normal normal normal 14px/1 FontAwesome;
@@ -2565,6 +2567,21 @@ tr.linjia td:nth-child(1):AFTER {
     padding: 1px 3px 1px 3px;
     background: #e7505a;
     border-radius: 15px;
+    box-shadow: 0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12);
+}
+
+tr.child_task td:nth-child(1):AFTER{
+    content: "Z";
+    font: normal normal normal 14px/1 FontAwesome;
+    position: absolute;
+    right: 1px;
+    bottom: 2px;
+    color: #ffffff;
+    padding: 1px 3px 1px 3px;
+    background: #3598dc;
+    border-radius: 15px;
+    font-weight: bold;
+    box-shadow: 0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12);
 }
 .device_event_str{
@@ -197,10 +197,6 @@ var _data = (function(){
 						if(!lineLpMap[lineCode][this.lpName])
 							lineLpMap[lineCode][this.lpName] = [];
 						lineLpMap[lineCode][this.lpName].push(this);
-						//车辆 ——> 班次数组
-						/*if(!clSchMap[this.clZbh])
-							clSchMap[this.clZbh] = [];
-						clSchMap[this.clZbh].push(this);*/
 					});
 					//按发车时间排序
@@ -571,14 +571,15 @@ var _menu = (function() {
 						var params = $('form#schinfoFineTune').serializeJSON();
 						 if(!customFormValidate('form#schinfoFineTune'))return;
-						 
+						
+						var loadIndex = layer.msg('操作中...', {icon: 16});
 						$post('/realSchedule/schInfoFineTune', params, function(rs){
 							layer.close(index);
+							layer.close(loadIndex);
+							
 							if(rs.ts)
 								_alone.refreshScheduleArray(rs.ts);
-							/*if(rs.nextSch)
-								_alone.refreshSchedule(rs.nextSch);*/
 						});
 					});
 			  }
@@ -104,7 +104,7 @@
 <!-- 班次table -->
 <script id="alone_plan_table_temp" type="text/html">
 {{each list as item i}}
-<tr data-id={{item.id}} class="{{if item.sflj}}linjia{{/if}}">
+<tr data-id={{item.id}} class="{{if item.sflj}}linjia{{/if}} {{if item.cTasks.length > 0}} child_task {{/if}}">
 	<td name="lineNo"></td>
 	<td data-name="lpName"><a href="javascript:;">{{item.lpName}}</a></td>
@@ -138,7 +138,8 @@
 {{else if item.status == 1}}
 	<td data-name="sjfcsj" class="tl-zzzx sfsj-item">{{item.fcsjActual}}<span class="fcsj-diff">{{item.fcsj_diff}}</span></td>
-
+{{else if item.status == 0 && item.late}}
+	<td data-name="sjfcsj" class="tl-wd sfsj-item">{{item.fcsjActual}}<span class="fcsj-diff">{{item.fcsj_diff}}</span></td>
 {{else }}
 	<td data-name="sjfcsj" class="sfsj-item">{{item.fcsjActual}}<span class="fcsj-diff">{{item.fcsj_diff}}</span></td>
 {{/if}}
@@ -211,23 +211,14 @@ butto.line-config-btn:active{
 	  </div>
 	</section>
-	<!--<section>
-	  <h3>出场时间</h3>
-	
-	  <div class="settings-row" >
-	    <p > 使用 <a href="javascript:;" data-type="select" id="outTimeType"></a> 作为出场班次的实际时间。</p>
-	  </div>
-	</section>
--->
-<!--
 	<section>
-	  <h3>进场时间</h3>
+	  <h3>班次进出场时间</h3>
 	  <div class="settings-row" >
-	    <p > 使用 <a href="javascript:;" data-type="select" id="inTimeType"></a> 作为进场班次的实际时间。</p>
+	    <p > 使用 <a href="javascript:;" data-type="select" id="outTimeType"></a> 时间作为出场班次的实际时间。</p>
 	  </div>
 	</section>
--->
+
 </form>
 </script>
@@ -305,7 +296,6 @@ butto.line-config-btn:active{
 		//运营开始时间
 		$('#startOptTimeLink').editable({
 			 type: 'time',
-			 title:'修改线路运营开始时间',
 			 placement: 'right',
 			 display: false,
 			 validate: function(value){
@@ -316,42 +306,41 @@ butto.line-config-btn:active{
 		})
 		.on('save', function(e, params) {
 			var index = showLoad('提交数据...');
-		    var lineCode = $('.line_config_tree li.selected').data('code');
-		    $post('/lineConfig/editTime', {lineCode: lineCode, time: params.newValue}
+		    $post('/lineConfig/editTime', {lineCode: getLineCode(), time: params.newValue}
 		    	,function(rs){
 		    		layer.close(index);
 		    		$('#startOptTimeLink').text(rs.time);
 		    	});
 		});
-/* 		//出场时间类型
+		//进出场时间类型
         $('#outTimeType').editable({
         	value: conf.outConfig,
             inputclass: 'form-control',
             placement: 'right',
             source: [{
                 value: 0,
-                text: '离开缓冲区时间'
+                text: 'gps出场'
             }, {
                 value: 1,
-                text: '请求出场时间'
-            }]
-        });
-		
-		//进场时间类型
-        $('#inTimeType').editable({
-        	value: conf.inConfig,
-            inputclass: 'form-control',
-            placement: 'right',
-            source: [{
-                value: 0,
-                text: '离开缓冲区时间'
+                text: '请求出场'
             }, {
-                value: 1,
-                text: '请求进场时间'
+            	value: 2,
+            	text: '出站即出场'
             }]
-        }); */
-        
+        })
+        .on('save', function(e, params) {
+			var index = showLoad('提交数据...');
+		   $post('/lineConfig/editOutTimeType', {lineCode: lineCode, type: params.newValue}
+		    	,function(rs){
+		    		layer.close(index);
+		    		$('#outTimeType').val(rs.type);
+		    });
+		});
+	}
+	
+	function getLineCode(){
+		return $('.line_config_tree li.selected').data('code');
 	}
 }();
 </script>
 \ No newline at end of file
+暂未开放
 \ No newline at end of file
+暂未开放
 \ No newline at end of file
+#lineConfigPanel{
+    background: #fff;
+    overflow: hidden;
+    font-family: 'Segoe UI',Arial,'Microsoft Yahei',sans-serif !important;
+    min-width: 1392px;
+}
+
+#lineConfigPanel h1{
+	-webkit-margin-start: 23px;
+    color: rgb(92, 97, 102);
+    margin-bottom: 1em;
+    margin-top: 21px;
+    font-size: 1.5em;
+}
+
+#lineConfigPanel .line_config_tree ul {
+	list-style-type: none;
+    padding: 0;
+    height: 100% !important;
+}
+
+#lineConfigPanel .line_config_tree ul li{
+	 -webkit-border-start: 6px solid transparent;
+    -webkit-padding-start: 18px;
+    -webkit-user-select: none;
+    cursor: pointer;
+}
+
+#lineConfigPanel .line_config_tree ul li.selected{
+	-webkit-border-start-color: #1bbc9b;
+    cursor: default;
+    pointer-events: none;
+}
+
+#lineConfigPanel .line_config_tree ul li button{
+	background-color: white;
+    border: 0;
+    color: #999;
+    cursor: pointer;
+    font: inherit;
+    line-height: 1.417em;
+    margin: 6px 0;
+    padding: 0;
+}
+
+#lineConfigPanel .line_config_tree ul li.selected button{
+	color: #1bbc9b;
+}
+
+#lineConfigPanel #trafficChart{
+	display: inline-block;
+    width: calc(100% - 152px);
+    vertical-align: top;
+    height: 100%;
+}
+
+#lineConfigPanel #trafficChart .sample_tags{
+    width: 100%;
+    height: 65px;
+    text-align: right;
+    padding: 20px 40px 0;
+}
+
+#lineConfigPanel #trafficChart .sample_tags a.tag{
+    display: inline-block;
+    line-height: 1;
+    vertical-align: baseline;
+    background-color: #E8E8E8;
+    padding: .5833em .833em;
+    color: rgba(0,0,0,.6);
+    text-transform: none;
+    font-weight: 700;
+    border: 0 solid transparent;
+    border-radius: .28571429rem !important;
+    -webkit-transition: background .1s ease;
+    transition: background .1s ease;
+    font-size: .85714286rem;
+    margin: .8em .5em .5em 0;
+       font-weight: 400;
+}
+
+#lineConfigPanel #trafficChart svg{
+	width: 100%;
+    height: calc(100% - 65px);
+}
+
+#lineConfigPanel #trafficChart svg circle{
+    fill: #b9b7b7;
+    r: 6;
+    stroke: rgb(253, 253, 253);
+    stroke-width: 3;
+}
+
+#lineConfigPanel #trafficChart svg path{
+	stroke-width: 6.4px;
+    opacity: 0.9;
+    stroke: #b2afaf;
+    cursor: pointer;
+}
+
+#lineConfigPanel #trafficChart svg path.active{
+	stroke: #1bbc9b;
+}
+
+#lineConfigPanel #trafficChart svg text{
+    font-size: 85%;
+    fill: #6b6666;
+    font-weight: bold;
+}
+
+#lineConfigPanel #trafficChart .sample_tags a.tag.active{
+	background-color: #1bbc9b;
+    color: white;
+}
+
+.line_config_tree{
+	width: 155px;
+	float: left;
+	height: 100%;
+}
+
+#lineConfigPanel .slimScrollBar{
+	border-radius: 7px !important;
+	background: rgb(176, 173, 173) !important;
+    width: 4px !important;
+}
+
+.line_config_content{
+    width: calc(100% - 155px);
+    float: left;
+    height: 100%;
+}
+
+.line_config_content .body{
+	height: 100% !important;
+    overflow: auto;
+    color: rgb(48, 57, 66);
+    overflow: hidden;
+}
+
+.left_station_route{
+    height: 100%;
+    width: 147px;
+    display: inline-block;
+    padding-top: 7px;
+}
+
+ .left_station_route ul{
+	list-style-type: none;
+	padding-left: 0;
+}
+
+.left_station_route ul li{
+    -webkit-user-select: none;
+    margin: 8px 0;
+}
+
+.left_station_route ul.list li:FIRST-CHILD {
+    margin-top: 0px;
+}
+
+.left_station_route .tabbable-line ul li div{
+	padding-left: 10px;
+	display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.left_station_route .tabbable-line ul li div a{
+	color: #605f5f;
+	text-decoration: none;
+}
+
+.left_station_route ul.list li:FIRST-CHILD div a{
+	cursor: default;
+    color: #bbbaba;
+}
+
+.left_station_route .tabbable-line .tab-content{
+	height: 100% !important;
+	padding: 20px 0 0;
+}
+
+rect.station_rect{
+    fill: #949595;
+    height: 24px;
+    rx: 3px;
+}
+
+rect.f_rect{
+    height: 20px;
+    fill: #32c2a5;
+    rx: 3px;
+}
+
+#lineConfigPanel #trafficChart svg text.f_text{
+	fill: #ffffff;
+}
+
+.select2-container--open{
+	z-index: 100000000;
+}
 \ No newline at end of file
+var sampleSvg = (function(){
+	
+	var rowNum = 5
+		,itemWidth = 240
+		, rowHeight = 130
+		, _count
+		, margin
+		, _opt
+		, svg
+		, _data;
+	
+	var stationMapp = {};
+	//路由
+	var routes;
+	//X比例尺
+	var scaleX = function(d, i){
+		var r = parseInt(i / rowNum)
+			,x = (i % rowNum) * itemWidth;
+		
+		if(r % 2 != 0)
+			x = itemWidth * (rowNum - 1) - x ;
+		return x + margin;
+	}
+	//Y 比例尺
+	var scaleY = function(d, i){
+		return (parseInt(i / rowNum)) * rowHeight + 60;
+	};
+	
+	var dx = function(d){return d.cx;};
+	var dy = function(d){return d.cy;};
+	var text = function(d){return d.stationName;}
+	var transform = function(d, i){
+		var size = d.stationName.length
+			,dx = size / 2 * 12
+			,dy = -15;
+		
+		if((i + 1) % rowNum == 1 && i != 0)
+			dy += 40;
+		return 'translate(-'+dx+', '+dy+')';
+	}
+	
+	var line = d3.svg.line().x(function(d) {
+		return d.cx;
+	}).y(function(d) {
+		return d.cy;
+	});
+	
+	var dataId = function(d, i){
+		if(i >= _count - 1)
+			return null; 
+		else 
+			return _opt.rts[i + 1].stationCode;
+	}
+	
+	function draw(opt){
+		$('#trafficChart svg').remove();
+		svg = d3.select('#trafficChart').append('svg');
+		//容器宽度
+		var width = $('#trafficChart svg').width();
+		margin = (width - (rowNum - 1) * itemWidth) / 2;
+		var rts = opt.rts
+		_count = rts.length;
+		_opt = opt;
+		routes = rts;
+		//附加坐标
+		$.each(rts , function(i, obj){
+			obj.cx = scaleX(obj, i);
+			obj.cy = scaleY(obj, i);
+			stationMapp[obj.stationCode] = obj.stationName;
+		});
+		
+		//画线
+		svg.selectAll('path').data(rts)
+			.enter().append('path')
+			.attr('d', function(d, i){
+				if(i == _count - 1)
+					return;
+				return line([d, rts[i + 1]]);
+			})
+			.attr('data-id', dataId)
+			.attr('data-group', function(d, i){return dataId(d, i - 1) + '_' + dataId(null, i)})
+			.on('click', function(){popAddModal($(this).data('id'))});
+		
+		//画点
+		svg.selectAll('circle').data(rts)
+			.enter().append('circle')
+			.attr('cx', dx)
+			.attr('cy', dy)
+		
+		//站点名
+		drawText(rts);
+		//显示tags
+		showTags();
+	}
+	
+	$('#trafficChart').on('click', '.sample_tags a.tag', function(){
+		$('.sample_tags a.tag.active').removeClass('active');
+		$(this).addClass('active');
+		var tag = $(this).text();
+		clearRunTimeE();
+		//show
+		showRunTimeE(_data[tag])
+		
+	});
+	
+	function showRunTimeE(rs){
+		//改变path颜色
+		$.each(rs, function(){
+			var group = this.sStation + '_' + this.eStation
+				,path = $('#trafficChart path[data-group='+group+']')
+				,d = path.attr('d');
+			this.cp = analysePath(d);
+			path.attr('class', 'active')
+				.attr('data-sid', this.id);
+		});
+		
+		//背景
+		svg.selectAll('.f_rect')
+			.data(rs).enter().append('rect')
+			.attr('x', function(d){return d.cp[0]})
+			.attr('y', function(d){return d.cp[1]})
+			.attr('transform', 'translate(-4, -14)')
+			.attr('width', function(d){
+				return (d.runTime + '').length * 7 + 20;
+			})
+			.classed('f_rect', true);
+		
+		//时间text
+		svg.selectAll('.f_text')
+			.data(rs).enter().append('text')
+			.attr('x', function(d){return d.cp[0]})
+			.attr('y', function(d){return d.cp[1]})
+			.attr('class', 'f_text')
+			.text(function(d){return d.runTime + 'm'});
+	}
+	
+	
+	function clearRunTimeE(){
+		$('#trafficChart path.active').removeAttr('class');
+		$('.f_rect,.f_text').remove();
+	}
+	
+	function showTags(){
+		//查询 耗时信息
+		$.get('/sample/all', {'lineCode_eq': _opt.lineCode, 'updown_eq': _opt.updown}, function(rs){
+			//按tag分组数据
+			_data = {};
+			var tags = '';//
+			$.each(rs, function(i, d){
+				if(!_data[d.tag]){
+					_data[d.tag] = [];
+					tags += '<a class="tag">'+d.tag+'</a>';
+				}
+				_data[d.tag].push(d);
+			});
+			$('#trafficChart .sample_tags').html(tags);
+			//选中第一个tag
+			$('#trafficChart .sample_tags a.tag:eq(0)').click();
+		});
+	}
+	
+	function drawText(rts){
+		svg.selectAll('text').data(rts)
+			.enter().append('text')
+			.attr('x', dx)
+			.attr('y', dy)
+			.attr('transform', transform)
+			.text(text)
+	}
+	
+	var tagRange = {'早高峰': {s: '06:31', e: '08:30'}, '平峰': {s: '08:31', e: '16:00'}, '晚高峰': {s: '16:01', e: '18:00'}};
+	function popAddModal(id){
+		//var eid = id ,sid =  prve(id);
+		//if(!sid)return;
+		
+		//var opts = {sid: sid, eid: eid, sName: stationMapp[sid], eName: stationMapp[eid]};
+		$.get('/pages/forecast/sample/modal.html', function(rs){
+			var index = layer.open({
+				  type: 1,
+				  area: '550px',
+				  content: rs,
+				  shift: 5,
+				 // title: '...',
+				  success: function(){
+					 $('#forecast_sample_modal').trigger('init', {_opt: _opt, _data: _data, id: id});
+					/*$("#addSampleForm select[name=tag]").select2({
+						  maximumSelectionLength: 1,
+						  tags: true
+					})
+					.on('change', function(){
+						var t = $(this).val();
+						if(tagRange[t]){
+							$("#addSampleForm input[name=sDate]").val(tagRange[t].s);
+							$("#addSampleForm input[name=eDate]").val(tagRange[t].e);
+						}
+					});
+					
+					//提交
+					$('#addSampleForm .confirm').on('click', function(){
+						if(customFormValidate('#addSampleForm')){
+							console.log(_opt);
+							var param = $('#addSampleForm').serializeJSON();
+							param.lineCode = _opt.lineCode;
+							param.updown = _opt.updown;
+							$post('/sample', param, function(){layer.close(index);});
+						}
+					});*/
+				  }
+			});
+		});
+	}
+	
+	
+	var drawObject = {
+		draw: draw ,
+		popAddModal: popAddModal
+	}
+	
+	//分析path d 路径中间点
+	function analysePath(d){
+		d = d.replace('M', '');
+		var sp = d.split('L')[0].split(',')
+			,ep = d.split('L')[1].split(',')
+			,cp = [];
+		sp[0] = parseInt(sp[0]);
+		sp[1] = parseInt(sp[1]);
+		ep[0] = parseInt(ep[0]);
+		ep[1] = parseInt(ep[1]);
+		
+		cp = sp;
+		var diff;
+		if(sp[0] != ep[0]){
+			diff = Math.abs(sp[0] - ep[0]) / 2 - 16;
+			cp[0] = sp[0] > ep[0]?ep[0]+diff:sp[0]+diff;
+			cp[1] -= 10;
+		}
+		else if(sp[1] != ep[1]){
+			diff = Math.abs(sp[1] - ep[1]) / 2;
+			cp[1] = sp[1] > ep[1]?ep[1]+diff:sp[1]+diff;
+			
+			cp[0] += 10;
+		}
+		return cp;
+	}
+	
+	/**
+	 * 自定义表单校验
+	 */
+	function customFormValidate(f){
+		var rs = true;
+		//所有可见的项
+		var es = $('input,select', f);
+		
+		for(var i = 0, e; e = es[i++];){
+			if($(e).attr('required') && ( $(e).val() == null || $(e).val() == '')){
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').addClass('custom-val-error');
+				else
+					$(e).addClass('custom-val-error');
+				rs = false;
+			}
+			else{
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').removeClass('custom-val-error');
+				else
+					$(e).removeClass('custom-val-error');
+			}
+		}
+		
+		if(!rs){
+			layer.alert('数据完整性校验失败，请检查输入项', {icon: 2, title: '操作失败',  shift: 5});    
+		}
+		return rs;
+	}
+	return drawObject;
+})();
 \ No newline at end of file
+<link href="/pages/forecast/sample/css/main.css" rel="stylesheet" type="text/css" />
+<div id="lineConfigPanel">
+	<div class="line_config_tree" >
+		<h1 >线路</h1>
+		<ul></ul>
+	</div>
+	
+	<div class="line_config_content">
+		<div class="body ">
+			<div class="left_station_route">
+				<div class="tabbable-line" style="height: 100%;">
+					<ul class="nav nav-tabs ">
+						<li class="active"><a href="#tab_up" data-toggle="tab"
+							aria-expanded="true"> 上&nbsp;行 </a></li>
+						<li class=""><a href="#tab_down" data-toggle="tab"
+							aria-expanded="false"> 下&nbsp;行 </a></li>
+					</ul>
+					<div class="tab-content" >
+						<div class="tab-pane active" id="tab_up">
+							<ul class="list">
+							</ul>
+						</div>
+						<div class="tab-pane" id="tab_down">
+							<ul class="list">
+							</ul>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<div id="trafficChart" >
+				<div class="sample_tags"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script id="forecast_sample_tree_item_temp" type="text/html">
+{{each array as line }}
+<li data-code={{line.lineCode}}>
+	<button>{{line.name}}</button>
+</li>
+{{/each}}
+</script>
+
+<script id="forecast_sample_route_temp" type="text/html">
+{{each list as route i}}
+<li>
+		<div> <a class="sample_route_item" data-id="{{route.stationCode}}">{{route.stationName}}</a><div>
+</li>
+{{/each}}
+</script>
+
+<script src="/pages/forecast/sample/js/svg.js"></script>
+<script>
+!function(){
+	//站点路由信息
+	var routes = {};
+	
+	var $panel = $('#lineConfigPanel')
+		,$body = $('.line_config_content .body');
+	var h = $('.page-container>.page-sidebar-wrapper>.page-sidebar').height();
+	$panel.css('height', h - 18);
+	
+	//线路滚动条
+	$('.line_config_tree ul').slimscroll({
+		height : 'calc(100% - 68px)',
+		alwaysVisible : true,
+		opacity : .8
+	});
+	
+	//路由
+	$('.left_station_route .tab-content').slimscroll({
+		height : 'calc(100% - 46px)',
+		opacity : .8
+	});
+	
+	//上下行切换事件 
+	$('.left_station_route .tabbable-line ul li').on('click', function(){setTimeout(drawSvg, 300);});
+	
+	$get('/line/all', {destroy_eq:0}, function(rs){
+		var itemsHtml = template('forecast_sample_tree_item_temp', {array: rs});
+		$('.line_config_tree ul').html(itemsHtml)
+			.find('li:eq(0)').click();
+	});
+	
+	$panel.on('click', '.line_config_tree li', function(){
+		$('.line_config_tree li.selected').removeClass('selected');
+		$(this).addClass('selected');
+		
+		//显示路由信息
+		showRouteInfo();
+	});
+	
+	function showRouteInfo(){
+		$.get('/stationroute/all', {'line.lineCode_eq': getLineCode(), 'destroy_eq': 0}
+		,function(rs){
+			rs.sort(function(a, b){
+				return a.stationRouteCode - b.stationRouteCode;
+			});
+			var temp = 'forecast_sample_route_temp';
+			//上下行分组
+			var ups = [],downs = [];
+			$.each(rs, function(){
+				if(this.directions == 0)
+					ups.push(this);
+				else
+					downs.push(this);
+			});
+			
+			$('#tab_up ul').html(template(temp, {list: ups}));
+			$('#tab_down ul').html(template(temp, {list: downs}));
+			
+			routes.ups = ups;
+			routes.downs = downs;
+			
+			drawSvg();
+		});
+	}
+	
+	function showLoad(text){
+		return layer.msg(text, {icon: 16, time: 0, shade: 0.3});
+	}
+	
+	function getUpdown(){
+		var activePanel = $('.left_station_route .tab-content .tab-pane.active')
+			,updown = -1
+			,id = activePanel.attr('id');
+		
+		if(id == 'tab_up')
+			updown = 0;
+		else if(id == 'tab_down')
+			updown = 1;
+		
+		return updown;
+	}
+	
+	function getLineCode(){
+		return $('.line_config_tree li.selected').data('code');
+	}
+	
+	function drawSvg(){
+		//绘制svg
+		var rts = [], updown = getUpdown();
+		if(updown === 0)
+			rts = routes.ups;
+		else if(updown === 1)
+			rts = routes.downs;
+		sampleSvg.draw({lineCode: getLineCode(), rts: rts, updown: getUpdown()});
+	}
+	
+	$('#lineConfigPanel').on('click', '.sample_route_item', function(){
+		sampleSvg.popAddModal($(this).data('id'));
+	})
+}();
+</script>
 \ No newline at end of file
+<div id="forecast_sample_modal">
+</div>
+
+<script id="forecast_addSample_temp" type="text/html">
+<form class="form-horizontal" role="form" style="padding: 35px 25px;" id="addSampleForm">
+	<input type="hidden" name="sStation" value="{{sid}}"/>
+	<input type="hidden" name="eStation" value="{{eid}}"/>
+    <div class="form-body">
+        <div class="form-group">
+            <label class="col-md-3 control-label">开始站：</label>
+            <div class="col-md-9">
+                <input type="text" class="form-control " value="{{sName}}" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-3 control-label">截止站：</label>
+            <div class="col-md-9">
+                        <input type="text" class="form-control" value="{{eName}}" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-3 control-label">标签：</label>
+            <div class="col-md-9">
+				<select class="form-control" name="tag" multiple required>
+					<option value="早高峰">早高峰</option>
+					<option value="平峰">平峰</option>
+					<option value="晚高峰">晚高峰</option>
+				</select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-3 control-label">时段：</label>
+            <div class="col-md-4" style="padding-right: 0;">
+                 <input type="time" class="form-control" name="sDate" required> 
+            </div>
+			<div class="col-md-1" style="margin-top: 10px;font-size: 85%;color: gray;">至</div>
+			<div class="col-md-4" style="padding-left: 0;">
+                 <input type="time" class="form-control" name="eDate" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-3 control-label">耗时(分)：</label>
+            <div class="col-md-9">
+                    <input type="number" class="form-control" name="runTime" required>
+            </div>
+        </div>
+    </div>
+<br>
+    <div class="form-actions">
+        <div class="row">
+            <div class="col-md-offset-4 col-md-8">
+                <button type="button" class="btn green confirm"><i class="fa fa-check"></i> 提交</button>&nbsp;&nbsp;
+                <button type="button" class="btn layui-layer-close">取消</button>
+            </div>
+        </div>
+    </div>
+</form>
+</script>
+
+<script>
+!function(){
+	var _data,_opt,id;
+	
+	
+	$('#forecast_sample_modal').on('init', function(e, rs){
+		_data = rs._data;
+		_opt = rs._opt;
+		id = rs.id;
+		//console.log(rs);
+	});
+	
+	
+	function prve(that){
+		for(var i = 0; i < _opt.rts.length; i ++){
+			if(routes[i].stationCode == that){
+				if(i == 0)
+					return null;
+				return routes[i - 1].stationCode;
+			}
+		}
+		
+		return null;
+	}
+}();
+</script>
 \ No newline at end of file
@@ -133,7 +133,7 @@
 		{{obj.lastLoginDate}}
 	</td>
 	<td>
-		<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}"><i class="fa fa-edit"></i> 编辑</a>
+		<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
 	</td>
 </tr>
 {{/each}}