Merge branch 'master' of http://222.66.0.204:8090/panzhaov5/bsth_control

徐烜
2 parents 7c9a72d4 28d9bc72
Showing 49 changed files with 1234 additions and 268 deletions
pom.xml
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/StationRouteService.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
src/main/java/com/bsth/service/realcontrol/buffer/ScheduleBuffer.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/FTPClientUtils.java
@@ -5,7 +5,7 @@
 	<groupId>com.bsth</groupId>
 	<artifactId>bsth_control</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
+	<packaging>war</packaging>
  
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -19,11 +19,11 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
  
-		<!-- <dependency>
+		<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>provided</scope>
-        </dependency> -->
+        </dependency>
  
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -4,21 +4,28 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
  
 @SpringBootApplication
-public class Application{
+public class Application extends SpringBootServletInitializer {
  
-    @Bean
-    @Primary
-    public ObjectMapper objectMapper() {
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(Application.class);
+	}
+
+	@Bean
+	@Primary
+	public ObjectMapper objectMapper() {
+		ObjectMapper objectMapper = new ObjectMapper();
+		objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+
+		return objectMapper;
+	}
  
-        return objectMapper;
-    }
-	
 	public static void main(String[] args) throws Exception {
 		SpringApplication.run(Application.class, args);
 	}
@@ -93,7 +93,7 @@ public class StartCommand implements CommandLineRunner{
 			 * 每15秒从数据库抓取到离站信息和班次匹配
 			 * （网关生成的到离站数据也是延迟批量入库，所以缩短该线程执行周期并不会提高 “实际到离站” 的实时性）
 			 */
-			scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 35, 1200, TimeUnit.SECONDS);
+			//scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 35, 1200, TimeUnit.SECONDS);
  
 			/**
 			 * 首个调度指令下发（2分钟运行一次）
@@ -51,8 +51,11 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	@RequestMapping(method = RequestMethod.POST)
 	public Map<String, Object> save(Line t){
  
-		t.setId(Integer.valueOf(t.getLineCode()));
-		
+		if(t.getId()==null) {
+			
+			t.setId(Integer.valueOf(t.getLineCode()));
+			
+		}
 		return service.save(t);
 	} 
 }
@@ -92,11 +92,10 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	 * 
 	 * @param map <id:线路ID>
 	 * 
-	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 * @return Map<String, Object> <SUCCESS ; ERROR ; NOTDATA>
 	 */
 	@RequestMapping(value = "/usingSingle",method = RequestMethod.POST)
 	public Map<String, Object> usingSingle(@RequestParam Map<String, Object> map) {
-		
 		return service.usingSingle(map);
 	}
  
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
  
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -205,6 +206,18 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<Integer, Integer> trustStatus(@RequestParam String lineCodes) {
 		return scheduleRealInfoService.trustStatus(lineCodes);
 	}
+	
+	/**
+	 * 
+	 * @Title: outgoAdjustAll 
+	 * @Description: TODO(批量待发调整) 
+	 * @param @param list
+	 * @throws
+	 */
+	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
+	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
+		return scheduleRealInfoService.outgoAdjustAll(params);
+	}
  
 	/**
 	 * 
@@ -216,6 +229,29 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		ScheduleBuffer.trustMap.put(lineCode, status);
 		return 200;
 	}
+	
+	/**
+	 * 
+	 * @Title: findByLineAndUpDown 
+	 * @Description: TODO(根据线路和走向获取班次) 
+	 * @param @param line
+	 * @param @param upDown
+	 */
+	@RequestMapping(value = "/findByLineAndUpDown")
+	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam Integer line,@RequestParam Integer upDown){
+		return ScheduleBuffer.findByLineAndUpDown(line, upDown);
+	}
+
+	/**
+	 * 
+	 * @Title: findByLineCode 
+	 * @Description: TODO(根据线路获取班次信息) 
+	 * @param @param lineCode
+	 */
+	@RequestMapping(value = "/lineCode/{lineCode}")
+	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
+		return ScheduleBuffer.schedulListMap.get(lineCode);
+	}
  
 	@RequestMapping(value = "/queryUserInfo")
 	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line, @RequestParam String date) {
@@ -95,7 +95,7 @@ public class ChildTaskPlan {
 	/**
 	 * 主排班计划
 	 */
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne
 	private ScheduleRealInfo schedule;
  
 	private String remarks;
@@ -482,6 +482,17 @@ public class ScheduleRealInfo {
 		this.dfsj = sdfHHmm.format(new Date(this.dfsjT));
 	}
  
+	public void setDfsjAll(String dfsj) {
+		
+		try {
+			String dfsjFull = sdfyyyyMMdd.format(this.scheduleDate) + " " + dfsj;
+			this.dfsjT = sdfyyyyMMddHHmm.parse(dfsjFull).getTime();
+			this.dfsj = dfsj;
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+	}
+	
 	@Transient
 	static SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
 	@Transient
@@ -142,6 +142,13 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	@Query(value = " select  MAX(r.sectionroute_code) as sectionrouteCode   from bsth_c_sectionroute r  WHERE r.line=?1 and r.directions =?2 and r.sectionroute_code< ?3", nativeQuery=true)
 	List<Object[]> findUpSectionRouteCode(Integer lineId,Integer direction,Integer stationRouteCode);
  
+	/**
+	 * @Description :TODO(获取路段路由信息)
+	 * 
+	 * @param lineId：线路ID；directions：方向
+	 * 
+	 * @return List<Map<String, Object>> {[0]：directions（方向）；[1]：bsection_vector(路段坐标)；[2]：speed_limit(限速)；[3]：section_name(路段名称)}
+	 */
 	@Query(value =  "SELECT " +
 					"c.directions," +
 					"AsText(s.bsection_vector) as bsection_vector," +
@@ -149,5 +156,5 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 					"s.section_name " +
 					" FROM bsth_c_sectionroute c " +
 					" LEFT JOIN bsth_c_section s on c.section = s.id where c.line = ?1 and c.directions = ?2", nativeQuery=true)
-List<Object[]> sectionRouteVector(Integer lineId,Integer directions);
+	List<Object[]> sectionRouteVector(Integer lineId,Integer directions);
 }
@@ -7,6 +7,8 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
  
+import com.bsth.entity.Line;
+import com.bsth.entity.LineInformation;
 import com.bsth.entity.StationRoute;
  
 /**
@@ -124,7 +126,11 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	 * 
 	 * @param  lineId:线路ID 
 	 * 
-	 * @return List<Object[]>
+	 * @return List<Object[]>：{[0]：g_lonx（GPS经度）；[1]：g_laty（GPS纬度）；[2]：b_jwpoints（百度经纬度坐标）
+	 * 							
+	 * 							[3]：station_mark（站点类型）；[4]：station_route_code（站点序号）；[5]：station_cod（站点编码）；
+	 * 
+	 * 							[6]：distances（站点距离）；[7]：station_name（站点名称）；[8]：directions（方向）}
 	 */
 	@Query(value = "SELECT * FROM ("+
 				   "SELECT b.g_lonx," +
@@ -212,4 +218,6 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.id = ?1 ) a " +
 			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
 	List<Object[]> findStationRouteInfo(Integer id);
+	
+	List<StationRoute> findByLine(Line line);
 }
@@ -4,10 +4,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
  
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
  
@@ -20,9 +16,6 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query("select s from ScheduleRealInfo s where s.xlBm in ?1")
 	List<ScheduleRealInfo> findByLines(List<String> lines);
  
-	@EntityGraph(value = "scheduleRealInfo_childTasks", type = EntityGraph.EntityGraphType.FETCH)
-    @Override
-    Page<ScheduleRealInfo> findAll(Specification<ScheduleRealInfo> spec, Pageable pageable);
  
 	@Query(value="select s from ScheduleRealInfo s where s.xlName = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by jName,clZbh,lpName")
 	List<ScheduleRealInfo> queryUserInfo(String line,String date);
@@ -65,7 +65,7 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	  * 
 	  * @param map <id:线路ID>
 	  * 
-	  * @return Map<String, Object> <SUCCESS ; ERROR>
+	  * @return Map<String, Object> <SUCCESS ; ERROR ; NOTDATA>
 	  */
 	 Map<String, Object> usingSingle(Map<String, Object> map);
  
 package com.bsth.service.impl;
  
-import java.awt.Point;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -23,7 +23,7 @@ import com.bsth.repository.StationRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.StationRouteService;
 import com.bsth.util.FTPClientUtils;
-import com.bsth.util.Test;
+import com.bsth.util.PackTarGZUtils;
 import com.bsth.util.db.DBUtils_MS;
  
 /**
@@ -505,11 +505,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	 * 
 	 * @param map <lineId:线路ID>
 	 * 
-	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 * @return Map<String, Object> <SUCCESS ; ERROR ; NOTDATA>
 	 */
 	@Override
 	public Map<String, Object> usingSingle(Map<String, Object> map) {
  
+		// 返回值map
 		Map<String, Object> resultMap = new HashMap<String,Object>();
  
 		try {
@@ -517,63 +518,75 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			// 获取线路ID
 			Integer lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
  
-			/** 查询线路信息 */
+			/** 查询线路信息 @param：<lineId：线路ID> */
 			Line line = lineRepository.findOne(lineId);
  
+			/** 查询线路信息下的站点路由信息 @param：<lineId：线路ID> */
 			List<Object[]> objects = repository.usingSingle(lineId);
  
 			if (objects.size()>0) {
  
-				/** 获取配置文件里的ftp参数 */
+				/** 获取配置文件里的ftp登录参数 */
 				Map<String, Object> FTPParamMap = readPropertiesGetFTPParam();
  
 				// 压缩文件名
 				String odlGzFileName = line.getLineCode() + ".txt.gz";
  
-				// text文件名
+				// txt文件名
 				String textFileName  = line.getLineCode() + ".txt";
  
+				// 创建一个ftp上传实例
 				FTPClientUtils clientUtils = new FTPClientUtils();
  
+				// IP
 				String url = FTPParamMap.get("url").toString();
  
+				// 端口
 				int port = Integer.valueOf(FTPParamMap.get("port").toString());
  
+				// 用户名
 				String username = FTPParamMap.get("username").toString();
  
+				// 密码
 				String password = FTPParamMap.get("password").toString();
  
+				// 相对路径
 				String remotePath = FTPParamMap.get("remotePath").toString();
  
-				/** 如果行单文件已存在则删除 */
+				/** 如果已存在相同行单文件名则先删除 */
 				clientUtils.deleteFtpFile(url, port, username, password, remotePath, odlGzFileName);
  
 				clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName);
  
+				/** 行单文件内容 @param：<objects：站点路由；lineId：线路ID>*/
 				String textStr = newTextFileToFTP(objects,lineId);
  
-				/*textStr = line.getName() + "\t" + "2" + "\r\n" + textStr;*/
+				/*textStr = line.getName() + "\t" + "2" + "\r" + textStr;*/
  
-				textStr = line.getName() + "\t" + "2" + "\r" + textStr;
+				textStr = line.getName() + " " + "2" + "\r" + textStr;
  
 				InputStream input = new ByteArrayInputStream(textStr.getBytes("gbk"));
  
-				/** 生成text文件 */
+				/** 生成txt文件，上传ftp */
 				clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
  
-				Test test= new Test();
+				// 创建打包实例
+				PackTarGZUtils packTarGZUtils= new PackTarGZUtils();
  
+				/** 获取txt文件 */
 				File textFile = clientUtils.GetFtpFile(url, port, username, password, remotePath, textFileName);
  
+				/*File[] sources = new File[] {textFile};*/
 				File[] sources = new File[] {textFile};
  
 				File target = new File(odlGzFileName);
-				  
-				File targetFile = test.pack(sources, target);
+				 
+				// 将txt文件打包
+				File targetFile = packTarGZUtils.pack(sources, target);
  
 				/*clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
  
-				clientUtils.testUpLoadFromDisk(targetFile, targetFile.getName(), url, port, username, password, remotePath);
+				clientUtils.FTPUpLoadFromDisk(targetFile, targetFile.getName(), url, port, username, password, remotePath);
  
 				resultMap.put("status", ResponseCode.SUCCESS);
  
@@ -593,12 +606,28 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		return resultMap;
 	}
  
+	/**
+	 * @Description : TODO(形成行单文件内容)
+	 * 
+	 * @param objects ：站点路由信息
+	 * 	
+	 * 					{[0]：g_lonx（GPS经度）；[1]：g_laty（GPS纬度）；[2]：b_jwpoints（百度经纬度坐标）
+	 * 							
+	 * 					[3]：station_mark（站点类型）；[4]：station_route_code（站点序号）；[5]：station_cod（站点编码）；
+	 * 
+	 * 				    [6]：distances（站点距离）；[7]：station_name（站点名称）；[8]：directions（方向）}
+	 * 
+	 * @param lineId ：线路ID
+	 * 
+	 * @return String
+	 */ 
 	public String  newTextFileToFTP(List<Object[]> objects,Integer lineId) {
  
+		// 返回值String
 		String stationRStr = "";
  
 		// windows下的文本文件换行符
-		// String enterStr = "\r\n";
+		//String enterStr = "\r\n";
  
 		// linux/unix下的文本文件换行符
 		String enterStr = "\r";
@@ -616,15 +645,17 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				lat = "\t" +  lat;
  
 				// 站点类型
-				String stationMake =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
+				String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
+				
+				String stationMake = "";
  
-				if(stationMake.equals("E")) {
+				if(stationMakeStr.equals("E")) {
  
-					stationMake = "\t" + "2";
+					stationMake = "\t2";
  
 				}else {
  
-					stationMake ="\t" + "1";
+					stationMake ="\t1";
  
 				}
  
@@ -638,30 +669,35 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 				stationCode =  "\t" +stationCode;
  
-				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString());
+				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
  
-				double tempd = dis*1000;
+				String tempDistc = String.valueOf((int) dis);
  
 				// 站点距离
-				String staitondistance = "\t" + String.valueOf((int) tempd);
+				String staitondistance = "\t" + tempDistc;
  
 				// 站点名称
 				String stationName =  objects.get(i)[7].equals("") ? "" : objects.get(i)[7].toString();
  
+				stationName = "\t" +stationName;
+				
 				// 限速
 				// String sleepStr = " " + "60";
  
+				// 限速
 				String sleepStr = "";
  
+				// 方向
 				int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
  
+				/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 				List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
  
 				if(sobje.size()==1) {
  
-					sleepStr = sobje.get(0)[2] == null ? "" : sobje.get(0)[2].toString();
+					double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
  
-					sleepStr =  "\t" + sleepStr;
+					sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
  
 				}else if(sobje.size()>1){
  
@@ -674,9 +710,11 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 						if(stationName.equals(sectionNameA[0])){
  
-							sleepStr = sobje.get(j)[2].toString();
+							/*sleepStr = sobje.get(j)[2].toString();*/
+							
+							double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(j)[2].toString());
  
-							sleepStr =  "\t" + sleepStr;
+							sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
  
 						}
  
@@ -698,12 +736,6 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					sleepStr = sleepStr + GetFormPointOnPolylineSeleepLimit(pointsM,sobje);*/
 				}
  
-				if(sleepStr.equals(""))
-					sleepStr = "\t" + "60";
-					
-				
-				stationName = "\t" +stationName;
-				
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
  
 			}
@@ -798,8 +830,14 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		return success;
 	}
  
+	/**
+	 * @Description：TOOD(获取FTP登录参数) 这里暂时只做一个map值返回，以后可以作为ftp登录类提出来
+	 * 
+	 * @return ： Map<String, Object> <url：IP；port：端口；username：用户名；password：密码；remotePath：相对路径>
+	 */
 	public Map<String, Object> readPropertiesGetFTPParam(){
  
+		// 返回值map
 		Map<String, Object> resultMap = new HashMap<String, Object>();
  
 		Properties env = new Properties();
@@ -161,6 +161,11 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 更新里程
 			updateLineInfoUpOrDownMileage( resultLine , directions, sumUpOrDownMileage);
  
+			if(directions==0) {
+				
+				lineUpdateStationName(resultLine);
+				
+			}
 			resultMap.put("status", ResponseCode.SUCCESS);
  
 		} catch (Exception e) {
@@ -175,6 +180,53 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	}
  
  
+	public void lineUpdateStationName(Line resultLine) {
+		
+		List<StationRoute> stationRoutes = routeRepository.findByLine(resultLine);
+		
+		int sizeL = stationRoutes.size();
+		
+		if(sizeL<0) {
+			
+			return;
+			
+		}
+		
+		if(resultLine.getStartStationName()==null){
+			
+			for(int k =0;k<sizeL;k++) {
+				
+				StationRoute tempS = stationRoutes.get(k);
+				
+				if(tempS.getStationMark().equals("B") && tempS.getDirections()==0) {
+					
+					resultLine.setStartStationName(tempS.getStationName());
+					
+					lineRepository.save(resultLine);
+					
+				}
+			}
+
+		};
+		
+		if(resultLine.getEndStationName()==null) {
+			
+			for(int k =0;k<sizeL;k++) {
+				
+				StationRoute tempS = stationRoutes.get(k);
+				
+				if(tempS.getStationMark().equals("E") && tempS.getDirections()==0) {
+					
+					resultLine.setEndStationName(tempS.getStationName());
+					
+					lineRepository.save(resultLine);
+					
+				}
+			}
+			
+		}
+	}
+	
 	/**
 	 * @Description :保存站点和站点路由信息（系统规划）
 	 * 
@@ -877,7 +929,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
  
 				String stationRouteCodeArray [] = stationRouteCodeStr.split("_");
  
-				stationRouteCode = Integer.parseInt(stationRouteCodeArray[0]+1);
+				stationRouteCode = Integer.parseInt(stationRouteCodeArray[0].toString())+1;
  
  
 			}else {
@@ -1436,6 +1488,12 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 更新里程
 			updateLineInfoUpOrDownMileage( resultLine , directions, sumUpOrDownMileage);
  
+			if(directions==0) {
+				
+				lineUpdateStationName(resultLine);
+				
+			}
+			
 			resultMap.put("status", ResponseCode.SUCCESS);
  
 		} catch (Exception e) {
@@ -78,4 +78,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
  
 	Map<String, Object> schInfoFineTune(Map<String, String> map);
  
+	Map<String, Object>  outgoAdjustAll(String params);
+
 }
 package com.bsth.service.realcontrol.buffer;
  
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -16,7 +17,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.util.BatchSaveUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.bsth.vehicle.directive.buffer.DirectiveBuffer;
  
 /**
  * 
@@ -37,56 +38,65 @@ public class GetSchedulePlanThread  extends Thread{
 	@Autowired
 	ScheduleRealInfoRepository scheduleRealInfoRepository;
  
-	@Autowired
-	ObjectMapper objectMapper;
-	
 	SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
  
+	@Autowired
+	DirectiveBuffer directiveBuffer;
+	
 	@Override
 	public void run() {
 		try{
+			//清除缓存
 			ScheduleBuffer.clear();
+			//所有指令入库
+			directiveBuffer.saveAll();
+			DirectiveBuffer.clear();
  
-			List<ScheduleRealInfo>  realList = null;
-			String dateStr = sdfyyyyMMdd.format(new Date());
-			Date cDate = sdfyyyyMMdd.parse(dateStr);
-			//查询数据库是否有今日排班
-			int size = scheduleRealInfoRepository.countByDate(cDate);
-			if(size > 0){
-				//从数据库恢复当日排班
-				realList = scheduleRealInfoRepository.findByDate(cDate);
-				logger.info("从数据库恢复当日排班 " + realList.size());
-				//写入缓存
-				ScheduleBuffer.init(realList);
-			}
-			else{
-				List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(cDate);
-				
-				for(SchedulePlanInfo sp : list){
-					sp.setSchedulePlan(null);
-				}
-				
-				//实际排班计划
-				realList = JSONArray.parseArray(JSON.toJSONString(list), ScheduleRealInfo.class);
-				//查询数据库最大ID
-				Long id = scheduleRealInfoRepository.getMaxId();
-				if(null == id)
-					id = 0L;
-				id ++;
-				
-				for(ScheduleRealInfo item : realList){
-					item.setSpId(item.getId());
-					item.setId(id ++);//设置ID
-				}
-				
-				//写入缓存
-				ScheduleBuffer.init(realList);
-				//入库
-				new BatchSaveUtils<ScheduleRealInfo>().saveList(realList, ScheduleRealInfo.class);
-			}
-			logger.info("获取当天实际排班计划数量：" + realList.size());
+			//加载新的排班
+			loaSchedule();
 		}catch(Exception e){
 			logger.error("",e);
 		}
 	}
+	
+	public void loaSchedule() throws ParseException{
+		List<ScheduleRealInfo>  realList = null;
+		String dateStr = sdfyyyyMMdd.format(new Date());
+		Date cDate = sdfyyyyMMdd.parse(dateStr);
+		//查询数据库是否有今日排班
+		int size = scheduleRealInfoRepository.countByDate(cDate);
+		if(size > 0){
+			//从数据库恢复当日排班
+			realList = scheduleRealInfoRepository.findByDate(cDate);
+			logger.info("从数据库恢复当日排班 " + realList.size());
+			//写入缓存
+			ScheduleBuffer.init(realList);
+		}
+		else{
+			List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(cDate);
+			
+			for(SchedulePlanInfo sp : list){
+				sp.setSchedulePlan(null);
+			}
+			
+			//实际排班计划
+			realList = JSONArray.parseArray(JSON.toJSONString(list), ScheduleRealInfo.class);
+			//查询数据库最大ID
+			Long id = scheduleRealInfoRepository.getMaxId();
+			if(null == id)
+				id = 0L;
+			id ++;
+			
+			for(ScheduleRealInfo item : realList){
+				item.setSpId(item.getId());
+				item.setId(id ++);//设置ID
+			}
+			
+			//写入缓存
+			ScheduleBuffer.init(realList);
+			//入库
+			new BatchSaveUtils<ScheduleRealInfo>().saveList(realList, ScheduleRealInfo.class);
+		}
+		logger.info("获取当天实际排班计划数量：" + realList.size());
+	}
 }
@@ -36,13 +36,19 @@ public class ScheduleBuffer {
 	/**
 	 * K: 车辆自编号  V: 未完成班次链表
 	 */
-	public static Map<String, LinkedList<ScheduleRealInfo>> vehLinkedMap;
+	/*public static Map<String, LinkedList<ScheduleRealInfo>> vehLinkedMap;*/
+	
+	/**
+	 * K: 车辆自编号  V: 班次链表
+	 */
+	public static ArrayListMultimap<String, ScheduleRealInfo> vehSchListMap;
+	/*public static Map<String, LinkedList<ScheduleRealInfo>> vehSchLinkedMap;*/
  
  
 	/**
 	 * K: 车辆自编号  V: 已执行班次链表
 	 */
-	public static LinkedListMultimap<String, ScheduleRealInfo> finishLinkedMap;
+	/*public static LinkedListMultimap<String, ScheduleRealInfo> finishLinkedMap;*/
  
  
 	/**
@@ -73,8 +79,9 @@ public class ScheduleBuffer {
 		schedulListMap = ArrayListMultimap.create();
 		pkSchedulMap = new HashMap<>();
 		persistentList = new LinkedList<>();
-		vehLinkedMap = new HashMap<>();
-		finishLinkedMap = LinkedListMultimap.create();
+		/*vehLinkedMap = new HashMap<>();
+		finishLinkedMap = LinkedListMultimap.create();*/
+		vehSchListMap = ArrayListMultimap.create();
 		trustMap = new HashMap<>();
 	}
  
@@ -96,10 +103,11 @@ public class ScheduleBuffer {
  
 				//初始化车辆和班次列表对照
 				zbh = schedul.getClZbh();
-				if(!vehLinkedMap.containsKey(zbh))
+				vehSchListMap.put(zbh, schedul);
+				/*if(!vehLinkedMap.containsKey(zbh))
 					vehLinkedMap.put(zbh, new LinkedList<ScheduleRealInfo>());
  
-				vehLinkedMap.get(zbh).add(schedul);
+				vehLinkedMap.get(zbh).add(schedul);*/
 			}
  
 			//计算起点应到时间
@@ -152,18 +160,23 @@ public class ScheduleBuffer {
  
 	public static int put(ScheduleRealInfo sch){
 		schedulListMap.put(sch.getXlBm(), sch);
-		pkSchedulMap.put(sch.getId(), sch);
  
+		pkSchedulMap.put(sch.getId(), sch);
 		String zbh = sch.getClZbh();
-		if(!vehLinkedMap.containsKey(zbh))
+		vehSchListMap.put(zbh, sch);
+		
+		//List<ScheduleRealInfo> list = vehSchListMap.get(sch.getClZbh());
+		
+		/*if(!vehLinkedMap.containsKey(zbh))
 			vehLinkedMap.put(zbh, new LinkedList<ScheduleRealInfo>());
-		vehLinkedMap.get(zbh).add(sch);
+		vehLinkedMap.get(zbh).add(sch);*/
  
 		//重新排序
-		//Collections.sort(vehLinkedMap.get(zbh), scheduleComparator);
+		Collections.sort(schedulListMap.get(sch.getXlBm()), scheduleComparator);
  
 		//重新计算应到时间
-		calcArrDateQd(vehLinkedMap.get(zbh));
+		//calcArrDateQd(vehLinkedMap.get(zbh));
+		calcArrDateQd(vehSchListMap.get(zbh));
 		return 0;
 	}
  
@@ -184,12 +197,15 @@ public class ScheduleBuffer {
 	 * @throws
 	 */
 	public static ScheduleRealInfo finishSch(ScheduleRealInfo sch){
-		LinkedList<ScheduleRealInfo> list = vehLinkedMap.get(sch.getClZbh());
+		//LinkedList<ScheduleRealInfo> list = vehLinkedMap.get(sch.getClZbh());
 		//状态修改为已执行
 		sch.setStatus(2);
 		persistentList.add(sch);
  
-		ScheduleRealInfo temp;
+		//下一个班次
+		ScheduleRealInfo next = getNext(sch);
+		next.setQdzArrDateSJ(sch.getZdsjActual());
+		/*ScheduleRealInfo temp;
 		int len = list.size();
 		for(int i = 0; i < len; i ++){
 			temp = list.poll();
@@ -199,8 +215,41 @@ public class ScheduleBuffer {
 				break;
 			}
 		}
-		ScheduleRealInfo next = list.getFirst();
-		next.setQdzArrDateSJ(sch.getZdsjActual());
+		ScheduleRealInfo next = list.getFirst();*/
+		//next.setQdzArrDateSJ(sch.getZdsjActual());
+		return next;
+	}
+	
+	public static ScheduleRealInfo getNext(ScheduleRealInfo sch){
+		List<ScheduleRealInfo> list = vehSchListMap.get(sch.getClZbh());
+		
+		boolean flag = false;
+		ScheduleRealInfo next = null;
+		for(ScheduleRealInfo temp : list){
+			if(temp.getId() == sch.getId()){
+				flag = true;
+				continue;
+			}
+			//忽略烂班
+			if(temp.getStatus() == -1)
+				continue;
+			
+			if(flag){
+				next = temp;
+				break;
+			}
+		}
+		
+		
+		/*int size = list.size();
+		for(int i = 0; i < size; i ++){
+			current = list.get(i);
+			if(current.getId() == sch.getId()
+					&& i < (size - 1)){
+				next = list.get(i + 1);
+				break;
+			}
+		}*/
 		return next;
 	}
  
@@ -212,7 +261,56 @@ public class ScheduleBuffer {
 	 * @throws
 	 */
 	public static int getFinishSchNo(String nbbm){
-		return finishLinkedMap.get(nbbm) == null ? 0 : finishLinkedMap.get(nbbm).size();
+		List<ScheduleRealInfo> list = vehSchListMap.get(nbbm);
+		int no = 0;
+		for(ScheduleRealInfo sch : list){
+			if(sch.getStatus() == 2)
+				no ++;
+		}
+		return no;
+		//return finishLinkedMap.get(nbbm) == null ? 0 : finishLinkedMap.get(nbbm).size();
+	}
+	
+	/**
+	 * 
+	 * @Title: findCurrent 
+	 * @Description: TODO(获取车辆当前正在执行的班次) 
+	 * @param @param nbbm
+	 * @throws
+	 */
+	public static ScheduleRealInfo findCurrent(String nbbm){
+		List<ScheduleRealInfo> list = ScheduleBuffer.vehSchListMap.get(nbbm);
+		
+		int size = list.size();
+		ScheduleRealInfo sch;
+		//最后一个状态为 正在执行的班次
+		for(int i = size - 1; i > 0; i --){
+			sch = list.get(i);
+			if(sch.getStatus() == 1)
+				return sch;
+		}
+		return null;
+	}
+	
+	/**
+	 * 
+	 * @Title: findNextList 
+	 * @Description: TODO(获取后续班次) 
+	 * @param @param sch
+	 * @throws
+	 */
+	public static List<ScheduleRealInfo> findNextList(ScheduleRealInfo sch){
+		List<ScheduleRealInfo> list = vehSchListMap.get(sch.getClZbh()),
+					rs = null;
+		
+		for(ScheduleRealInfo temp : list){
+			if(temp.getId() == sch.getId())
+				rs = new ArrayList<>();
+			
+			if(rs != null)
+				rs.add(temp);
+		}
+		return rs == null?new ArrayList<ScheduleRealInfo>():rs;
 	}
  
 	public static void calcArrDateQd(List<ScheduleRealInfo> list){
@@ -256,4 +354,16 @@ public class ScheduleBuffer {
 	public static ScheduleRealInfo findOne(Long id){
 		return pkSchedulMap.get(id);
 	}
+	
+	public static List<ScheduleRealInfo> findByLineAndUpDown(Integer lineCode, Integer upDown){
+		List<ScheduleRealInfo> list = schedulListMap.get(String.valueOf(lineCode))
+				,subList = new ArrayList<>();
+		//按走向过滤
+		for(ScheduleRealInfo sch : list){
+			if(Integer.parseInt(sch.getXlDir()) == upDown){
+				subList.add(sch);
+			}
+		}
+		return subList;
+	}
 }
@@ -12,6 +12,7 @@ import com.bsth.vehicle.common.CommonMapped;
 @Service
 public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService{
  
+	
 	@Override
 	public Map<String, Object> save(ChildTaskPlan t) {
 		//保存起终点名称
@@ -19,6 +19,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
@@ -121,6 +123,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			ScheduleRealInfo schedule = null;
 			for (String id : idList) {
 				schedule = ScheduleBuffer.pkSchedulMap.get(Long.parseLong(id));
+				/*if(schedule.getStatus() == -1){
+					map.put("status", ResponseCode.ERROR);
+					map.put("msg", value)
+				}*/
 				if (null != schedule) {
 					schedule.setStatus(-1);
 					schedule.addRemarks(remarks);
@@ -264,7 +270,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		// 加入缓存
 		ScheduleBuffer.put(t);
 		//将该临加之后的班次作为更新返回页面
-		List<ScheduleRealInfo> list = ScheduleBuffer.vehLinkedMap.get(t.getClZbh())
+		List<ScheduleRealInfo> list = ScheduleBuffer.findNextList(t)
 				,rsList = null;
  
 		for(ScheduleRealInfo sch : list){
@@ -492,8 +498,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				rs.put("msg", "无实发时间，无法撤销！");
 			} else {
 				sch.setStatus(0);
-				sch.setFcsjActual("");
-				sch.setFcsjActualTime(0L);
+				sch.setFcsjActual(null);
+				sch.setFcsjActualTime(null);
 				rs.put("status", ResponseCode.SUCCESS);
 				rs.put("t", sch);
  
@@ -564,10 +570,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			String fcsj = map.get("fcsj");
 			//实际发车时间
 			String fcsjActual = map.get("fcsjActual");
-			//驾驶员
-			String[] jsy = map.get("jsy").split("/");
-			//售票员
-			String[] spy = map.get("spy").split("/");
+			
 			//实际终点时间
 			String zdsjActual = map.get("zdsjActual");
 			//备注
@@ -575,27 +578,47 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
 			ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
 			if(null != sch){
+				//驾驶员
+				if(StringUtils.isNotBlank(map.get("jsy"))){
+					String[] jsy = map.get("jsy").split("/");
+					sch.setjGh(jsy[0]);
+					sch.setjName(jsy[1]);
+				}
+				
+				//售票员
+				if(StringUtils.isNotBlank(map.get("spy"))){
+					String[] spy = map.get("spy").split("/");
+					sch.setsGh(spy[0]);
+					sch.setsName(spy[1]);
+				}
+				
 				sch.setBcType(bcType);
 				sch.setClZbh(clZbh);
 				sch.setFcsjAll(fcsj);
-				if(null == fcsjActual){
+				if(StringUtils.isNotBlank(fcsjActual)){
+					//调整实发
+					sch.setFcsjActualAll(fcsjActual);
+					sch.setStatus(1);
+				}
+				else{
 					sch.setFcsjActual(null);
 					sch.setFcsjActualTime(null);
 				}
-				else
-					sch.setFcsjActualAll(fcsjActual);
  
-				if(null == zdsjActual){
+				if(StringUtils.isNotBlank(zdsjActual)){
+					//调整实达
+					sch.setZdsjActualAll(zdsjActual);
+					sch.setStatus(2);
+					//下一班次起点到达
+					ScheduleRealInfo next = ScheduleBuffer.getNext(sch);
+					next.setQdzArrDateSJ(zdsjActual);
+					rs.put("nextSch", next);
+				}
+				else{
 					sch.setZdsjActual(null);
 					sch.setZdsjActualTime(null);
 				}
-				else
-					sch.setZdsjActualAll(zdsjActual);
  
-				sch.setjGh(jsy[0]);
-				sch.setjName(jsy[1]);
-				sch.setsGh(spy[0]);
-				sch.setsName(spy[1]);
 				sch.setRemarks(remarks);
 			}
  
@@ -609,4 +632,32 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		}
 		return rs;
 	}
+
+	@Override
+	public Map<String, Object> outgoAdjustAll(String params) {
+		Map<String, Object> rs = new HashMap<>();
+		try{
+			JSONArray jsonArray = JSONArray.parseArray(params);
+			
+			ScheduleRealInfo schedule = null;
+			JSONObject jsonObj;
+			String dfsj;
+			for(int i = 0; i < jsonArray.size(); i ++){
+				jsonObj = jsonArray.getJSONObject(i);
+				dfsj = jsonObj.getString("t");
+				schedule = ScheduleBuffer.findOne(jsonObj.getLong("id"));
+				//设置待发时间
+				schedule.setDfsjAll(dfsj);
+				ScheduleBuffer.persistentList.add(schedule);
+			}
+			
+			rs.put("status", ResponseCode.SUCCESS);
+			//将更新的最后一个班次返回
+			rs.put("t", schedule);
+		}catch(Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
+	}
 }
@@ -11,6 +11,7 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
  
 import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPReply;
 /**
  * @Description: 向FTP服务器上传文件
@@ -66,13 +67,16 @@ public class FTPClientUtils {
  
 			ftp.changeWorkingDirectory(path);
  
-			ftp.storeFile(filename, input);	
+			ftp.enterLocalPassiveMode();
+			
+			success = ftp.storeFile(new String(filename.getBytes("gbk"),"gbk"), input);
+			/*success = ftp.storeFile(filename, input);	*/
  
 			input.close();
  
 			ftp.logout();
  
-			success = true;
+			// success = true;
  
 		} catch (IOException e) {
  
@@ -97,8 +101,25 @@ public class FTPClientUtils {
 		return success;
 	}
  
-	// 将本地文件上传到FTP服务器上
-	public void testUpLoadFromDisk(File file,String name,String url, int port, String username, String password, String remotePath){
+	/**
+	 * @Description : TOOD(将本地文件上传到FTP服务器上)
+	 * 
+	 * @param file
+	 * 
+	 * @param name
+	 * 
+	 * @param url
+	 * 
+	 * @param port
+	 * 
+	 * @param username
+	 * 
+	 * @param password
+	 * 
+	 * @param remotePath
+	 * 
+	 */
+	public void FTPUpLoadFromDisk(File file,String name,String url, int port, String username, String password, String remotePath){
  
 		 try { 
 		        FileInputStream in=new FileInputStream(file); 
@@ -137,16 +158,21 @@ public class FTPClientUtils {
 	}
  
 	/** 
-     * <删除FTP上的文件> 
-     * <远程删除FTP服务器上的录音文件> 
+     * @Description (删除FTP上的文件)
+     * 
      * @param url FTP服务器IP地址 
+     * 
      * @param port FTP服务器端口 
+     * 
      * @param username FTP服务器登录名 
+     * 
      * @param password FTP服务器密码 
+     * 
      * @param remotePath 远程文件路径 
+     * 
      * @param fileName 待删除的文件名 
-     * @return 
-     * @see [类、类#方法、类#成员] 
+     * 
+     * @return boolean
      */  
     public static boolean deleteFtpFile(String url, int port, String username, String password, String remotePath, String fileName){  
  
@@ -170,8 +196,6 @@ public class FTPClientUtils {
             // 登录  
             ftp.login(username, password);  
  
-            
-            
             reply = ftp.getReplyCode(); 
  
             if (!FTPReply.isPositiveCompletion(reply)) {
@@ -185,7 +209,9 @@ public class FTPClientUtils {
  
             ftp.changeWorkingDirectory(remotePath);
  
-            success = ftp.deleteFile(fileName);
+            /*success = ftp.deleteFile(fileName);*/
+            
+            success = ftp.deleteFile(new String(fileName.getBytes("gbk"),"gbk"));
  
             ftp.logout(); 
  
@@ -217,6 +243,8 @@ public class FTPClientUtils {
     public static File GetFtpFile(String url, int port, String username, String password, String remotePath, String fileName){  
  
         FTPClient ftp = new FTPClient(); 
+       
+        /*File destFile = new File(fileName); */
  
         File destFile = new File(fileName); 
  
@@ -247,16 +275,42 @@ public class FTPClientUtils {
             	ftp.disconnect(); 
  
             }  
-              
+             
             // 转移到FTP服务器目录  
-            
+           
             ftp.changeWorkingDirectory(remotePath);
  
-            File srcFile = new File(fileName);  
+            ftp.enterLocalPassiveMode();
+            
+            FTPFile[] fs = ftp.listFiles();  
+            
+            System.out.println(fs.length);
+            
+          /*  for (FTPFile ff : fs) {  
+                //解决中文乱码问题，两次解码  
+                byte[] bytes=ff.getName().getBytes("gbk");  
+                String fn=new String(bytes,"gbk");  
+                if (fn.equals(fileName)) {  
+                    //6.写操作，将其写入到本地文件中  
+                    File localFile = new File(ff.getName());  
+                    
+                    
+                    OutputStream is = new FileOutputStream(localFile);  
+                    ftp.retrieveFile(ff.getName(), is);  
+                    is.close();  
+                }  
+            } */
+            
+           /* File srcFile = new File(fileName);  */
+            
+           /* File srcFile = new File(new String(fileName.getBytes("gbk"),"gbk"));*/
  
             int byteread = 0; // 读取的字节数
+           
+           /* in =  ftp.retrieveFileStream(remotePath + fileName);*/
  
-            in =  ftp.retrieveFileStream(fileName); 
+            in =  ftp.retrieveFileStream(new String(fileName.getBytes("gbk"),"gbk"));
+         
  
             out = new FileOutputStream(destFile);
  
 package com.bsth.vehicle.directive.buffer;
  
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
  
 import org.slf4j.Logger;
@@ -19,6 +22,7 @@ import com.bsth.vehicle.directive.entity.Directive80;
 import com.bsth.vehicle.directive.entity.DirectiveC0;
 import com.bsth.vehicle.directive.entity.DirectiveC0.DirectiveC0Data;
 import com.bsth.vehicle.directive.entity.LineChange;
+import com.bsth.vehicle.directive.repository.Directive60Repository;
 import com.bsth.vehicle.directive.repository.Directive80Repository;
 import com.bsth.vehicle.directive.repository.LineChangeRepository;
 import com.bsth.vehicle.directive.util.HttpUtils;
@@ -61,6 +65,9 @@ public class DirectiveBuffer {
 	 */
 	private static Map<Integer, Directive60> directiveMap;
  
+	@Autowired
+	Directive60Repository d60Repository;
+	
 	/**
 	 * 驾驶员上报数据
 	 * {K: 线路编码}
@@ -71,10 +78,7 @@ public class DirectiveBuffer {
 	RealControlSocketHandler socketHandler;
  
 	static{
-		transientList = new LinkedList<>();
-		directiveMap = new HashMap<>();
-		reportMultiMap = ArrayListMultimap.create();
-		changeMap = new HashMap<>();
+		clear();
 	}
  
 	public static void put(Directive60 directive){
@@ -205,4 +209,34 @@ public class DirectiveBuffer {
 		c0.setData(data);
 		return c0;
 	}
+	
+	/**
+	 * 
+	 * @Title: saveAll 
+	 * @Description: TODO(所有缓存里的指令全部入库) 
+	 */
+	public void saveAll(){
+		Iterator<Directive60> iterator = directiveMap.values().iterator();
+		List<Directive60> pList = new ArrayList<>();
+		Directive60 d60;
+		while(iterator.hasNext()){
+			d60 = iterator.next();
+			if(!d60.isPersistent())
+				pList.add(d60);
+		}
+		d60Repository.save(pList);
+	}
+	
+	/**
+	 * 
+	 * @Title: clear 
+	 * @Description: TODO(清理缓存) 
+	 * @throws
+	 */
+	public static void clear(){
+		transientList = new LinkedList<>();
+		directiveMap = new HashMap<>();
+		reportMultiMap = ArrayListMultimap.create();
+		changeMap = new HashMap<>();
+	}
 }
@@ -84,6 +84,9 @@ public class Directive60 {
 	@ManyToOne
 	private SysUser sender;
  
+	@Transient
+	private boolean persistent;
+	
 	@Embeddable
 	public static class DirectiveData {
 		// 公司代码
@@ -280,4 +283,12 @@ public class Directive60 {
 	public void setSender(SysUser sender) {
 		this.sender = sender;
 	}
+
+	public boolean isPersistent() {
+		return persistent;
+	}
+
+	public void setPersistent(boolean persistent) {
+		this.persistent = persistent;
+	}
 }
@@ -38,6 +38,7 @@ public class DirectivePersistenceThread extends Thread{
 			if(null == directive)
 				break;
  
+			directive.setPersistent(true);
 			directiveRepository.save(directive);
 		}
 	}
 package com.bsth.vehicle.directive.thread;
  
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
  
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +28,25 @@ public class FirstScheduleIssuedThread extends Thread{
 	@Override
 	public void run() {
  
-		Set<String> keys = ScheduleBuffer.vehLinkedMap.keySet();
+		Set<String> keys = ScheduleBuffer.vehSchListMap.keySet();
+		List<ScheduleRealInfo> list;
+		
+		Long t = System.currentTimeMillis();
+		ScheduleRealInfo sch;
+		for(String nbbm : keys){
+			list = ScheduleBuffer.vehSchListMap.get(nbbm);
+			
+			if(list.size() == 0)
+				continue;
+			
+			sch = list.get(0);
+			
+			if(sch.getStatus() == 0 && sch.getFcsjT() > t){
+				directiveService.send60Dispatch(sch, 0);
+			}
+		}
+		
+		/*Set<String> keys = ScheduleBuffer.vehLinkedMap.keySet();
 		LinkedList<ScheduleRealInfo> linkedList;
 		ScheduleRealInfo sch;
 		for(String nbbm : keys){
@@ -39,6 +58,6 @@ public class FirstScheduleIssuedThread extends Thread{
 			if(!ScheduleBuffer.finishLinkedMap.containsKey(nbbm) 
 					&& sch.getFcsjActual() == null)
 				directiveService.send60Dispatch(sch, 0);
-		}
+		}*/
 	}
 }
@@ -9,7 +9,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
  
@@ -68,18 +67,18 @@ public class GpsArrivalStationThread extends Thread{
 			set.add(CommonMapped.vehicDeviceBiMap.get(arr.getDeviceId()));
  
 		List<ArrivalInfo> rsList = null;
-		LinkedList<ScheduleRealInfo> linked = null;
+		List<ScheduleRealInfo> subList = null;
 		ArrivalInfo[] status;
 		for(String nbbm : set){
 			rsList = GpsArrivalDataBuffer.pops(nbbm);
-			//和该车辆未执行班次进行匹配
-			linked = ScheduleBuffer.vehLinkedMap.get(nbbm);
+			//和该车辆班次进行匹配
+			subList = ScheduleBuffer.vehSchListMap.get(nbbm);
  
-			if(null == linked || linked.size() == 0)
+			if(null == subList || subList.size() == 0)
 				continue;
  
 			try{
-				for(ScheduleRealInfo schedule : linked){
+				for(ScheduleRealInfo schedule : subList){
 					//匹配结果
 					status = match(rsList, schedule);
  
@@ -64,7 +64,7 @@ public class GpsArrivalStationThread_old extends Thread{
 		System.out.println("开始...");
 		List<ScheduleRealInfo> schList;
 		for(String key : keySet){
-			schList = extractSched(ScheduleBuffer.vehLinkedMap.get(key));
+			schList = extractSched(ScheduleBuffer.vehSchListMap.get(key));
 			if(null != schList)
 				match(GpsArrivalDataBuffer.allMap.get(key), schList);
 		}
@@ -221,8 +221,8 @@ public class GpsArrivalStationThread_old extends Thread{
 		try {
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
-			ps.setInt(1, /*weeks_year*/28);
-			ps.setLong(2, /*GpsArrivalDataBuffer.markTime*/1467853749000L);
+			ps.setInt(1, weeks_year);
+			ps.setLong(2, GpsArrivalDataBuffer.markTime);
  
 			Long t = System.currentTimeMillis();
 			rs = ps.executeQuery();
@@ -3,7 +3,6 @@ package com.bsth.vehicle.gpsdata.buffer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -136,15 +135,27 @@ public class GpsRealDataBuffer {
  
 		//写入车辆自编号
 		String nbbm;
-		LinkedList<ScheduleRealInfo> linkedList;
-		int size;
+		ScheduleRealInfo current, next;
 		for(GpsRealData gpsData : list){
 			nbbm = CommonMapped.vehicDeviceBiMap.get(gpsData.getDeviceId());
 			if(null != nbbm){
 				gpsData.setNbbm(nbbm);
 				gpsData.setStationName(CommonMapped.stationCodeMap.get(gpsData.getStopNo()));
  
-				linkedList = ScheduleBuffer.vehLinkedMap.get(nbbm);
+				current = ScheduleBuffer.findCurrent(nbbm);
+				next = ScheduleBuffer.getNext(current);
+				
+				if(current != null)
+					gpsData.setCurrSchId(current.getId());
+				if(next != null)
+					gpsData.setNextSchId(next.getId());
+				//gpsData.setCurrSchId(ScheduleBuffer.findCurrent(nbbm));
+				/*subList = ScheduleBuffer.vehSchListMap.get(nbbm);
+				if(subList.size() == 0)
+					continue;*/
+				
+				
+				/*linkedList = ScheduleBuffer.vehLinkedMap.get(nbbm);
 				if(null != linkedList){
 					//为GPS点附加班次信息
 					size = linkedList.size();
@@ -152,7 +163,7 @@ public class GpsRealDataBuffer {
 						gpsData.setCurrSchId(linkedList.peekFirst().getId());
 					if(size > 1)
 						gpsData.setNextSchId(linkedList.get(1).getId());
-				}
+				}*/
 				resList.add(gpsData);
 			}
 		}
@@ -26,6 +26,6 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
+http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.192:8080/transport_server/message/
+http.send.directive = http://192.168.168.171:8080/transport_server/message/
 spring.profiles: dev,prod
-spring.profiles.active: prod
+spring.profiles.active: dev
  
 spring.view.suffix=.html
 server.session-timeout=-1
@@ -37,8 +37,9 @@ fs.mkdir(dest, function(e){
 var cProcess;
  
 ep.tail('mvn-clean',function(){
+	ep.emit('copy-project');
 	//清理target
-	logInfo('mvn clean...');
+	/*logInfo('mvn clean...');
 	cProcess = child_process.exec("mvn clean",{cwd: workspace + '\\' + pName},function(error){
 		if(error)
 			logError(error);
@@ -46,7 +47,7 @@ ep.tail(&#39;mvn-clean&#39;,function(){
 		logSuccess('mvn clean success');
  
 		ep.emit('copy-project');
-	});
+	});*/
 	output(cProcess);
 });
  
@@ -2,7 +2,7 @@ ftp.url=222.66.0.205
 ftp.port=21
 ftp.username=transport
 ftp.password=transport123
-ftp.path= down/
+ftp.path=down/
  
 #ftp.url=192.168.168.101
 #ftp.port=21
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.192:3306/ms?useUnicode=true&characterEncoding=utf-8
+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
@@ -49,6 +49,8 @@ $(function(){
 	 // 填充公司下拉框选择值
 	 $get('/business/all', {upCode_eq: '77'}, function(array){
  
+		 console.log(array);
+		 
 		 // 公司下拉options属性值
 		 var options = '<option value="">-- 请选择公司 --</option>';
  
@@ -12,7 +12,7 @@
 		// 初始化公司下拉框
 		selectTemp(function(){
  
-			// 根据ID查询详细信息
+			/** 根据ID查询详细信息 */
 			$get('/line/' + lineId ,null, function(result){
  
 				// 如果不为空
@@ -24,7 +24,7 @@
 					// 设置日期
 					result.openDate = moment(result.openDate).format(fs);
  
-					// 填充修改线路表单元素值
+					/** 填充修改线路表单元素值 @param：<result：数据结果集；line_edit_form：表单元素> */
 					putFormData(result, '#line_edit_form');
  
 					// 设置公司值
@@ -60,7 +60,7 @@
 	// 输入线路名称，自动生成英文名称和线路简称
 	$('#nameInput').on('keyup', setPinYin);
  
-	// 根据线路名称值设置英文名称值和线路简称
+	/** 根据线路名称值设置英文名称值和线路简称 */
 	function setPinYin(){
  
 		// 获取线路名称值
@@ -74,7 +74,7 @@
 	 }
  
  
-	// 公司下拉框
+	/** 公司下拉框 @param：<callback：回调函数> */
 	function selectTemp(callback) {
  
 		// 填充公司下拉框选择值
@@ -453,7 +453,7 @@
 		}
 	});
  
-	// 联系电话(手机/电话皆可)验证 
+	/** 联系电话(手机/电话皆可)验证  */
 	$.validator.addMethod("isPhone", function(value,element) {
  
 		// 长度
 /**
  * 
- * @JSName : list.js(线路信息list.html页面js)
+ * @JSName : line-list-table.js(线路信息list.html页面js)
  * 
  * @Author : bsth@lq
  * 
@@ -27,14 +27,16 @@
  
 		 });
  
-		 // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
+		 // 填充公司下拉框options
 		 $('#companySelect').html(options)
+		 
+		 /** 闵行没下属公司，这里暂时注释公司值改变事件  */
 		 //$('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
  
 	 });
  
-	 /** 填充分公司下拉框 */ 
-	 setbrancheCompanySelectOptions();
+	 /** 填充分公司下拉框。--- 闵行没下属公司，这里暂时注释*/ 
+	/* setbrancheCompanySelectOptions();*/
  
 	 /** 填充分公司下拉框选择值 */ 
 	 function setbrancheCompanySelectOptions(){
@@ -53,7 +55,7 @@
  
 		  } else {
  
-			  // 查询出所属公司下的分公司名称和相应分公司代码
+			  /** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
 			  $get('/business/all', {upCode_eq: businessCode}, function(array){
  
 				  // 遍历array
@@ -75,7 +77,7 @@
 	// 选择框
 	var icheckOptions = {checkboxClass: 'icheckbox_flat-blue',increaseArea: '20%'};
  
-	// 表格数据分页加载
+	/** 表格数据分页加载 @param：<null：搜索参数；true：是否重新分页> */
 	loadTableDate(null,true);
  
 	/** 重置按钮事件 */
@@ -84,7 +86,7 @@
 		 // 清空搜索框值
 		 $('tr.filter input,select').val('').change();
  
-		 // 重新加载表格数据
+		 /** 表格数据分页加载 @param：<null：搜索参数；true：是否重新分页> */
 		 loadTableDate(null,true);
 	});
  
@@ -120,8 +122,10 @@
 				}
 			}
 		});
+		
 		page = 0;
  
+		/** 表格数据分页加载 @param：<params：搜索参数；true：是否重新分页> */
 		loadTableDate(params,true);
 	});
  
@@ -149,8 +153,6 @@
 		// 异步请求获取表格数据
 		$.get('/line',params,function(result){
  
-			console.log(result);
-			
 			// 添加序号
 			result.content.page =  page;
  
@@ -244,7 +246,7 @@
 		});
 	}
  
-	// 生成行单
+	/** 生成行单，这里暂时只做了单选生成。 */
 	$('#datatable_ajax_tools #createUsingSingle').on('click', function() {
  
 		// 获取选中行
@@ -275,11 +277,13 @@
  
     		lineName = arrChk.val();
  
+    		// 请求参数
     		var params = {lineId:id};
  
     		// 弹出正在加载层
     		var index = layer.load(0);
  
+    		/** 生成线路行单 @pararm：<params：请求参数> */
 			$post('/stationroute/usingSingle',params,function(data) {
  
 				 // 关闭弹出框
@@ -53,6 +53,7 @@
 								<th width="7%">线路编码</th>
 								<th width="8%">线路名称</th>
 								<th width="7%">所属公司</th>
+								<!-- 闵行没有下属公司，这里暂时注释掉 -->
 								<!-- <th width="8%">所属分公司</th> -->
 								<th width="6%">线路性质</th>
 								<th width="6%">线路等级</th>
@@ -72,12 +73,15 @@
 									<input type="text"  class="form-control form-filter input-sm" name="name_like">
 								</td>
 								<td>
+									 <!-- 公司这里没使用字典表，暂时查的公司表 -->
 									 <select name="company_eq" class="form-control" id="companySelect"></select>
 								</td>
+								<!-- 闵行没有下属公司，这里暂时注释掉 -->
 								<!-- <td>
 									 <select name="brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select>
 								</td> -->
 								<td>
+									<!-- 这里没使用字典表，暂时写在页面上 -->
 									<select name="nature_like" class="form-control" id="natureSelect">
 										<option value="">请选择...</option>
 										<option value="lj">路救</option>
@@ -93,6 +97,7 @@
 									</select>
 								</td>
 								<td>
+									<!-- 这里没使用字典表，暂时写在页面上 -->
 									<select name="level_eq" class="form-control" id="levelSelect">
 										<option value="">请选择...</option>
 										<option value="1">一级线路</option>
@@ -104,6 +109,7 @@
 									 <input type="text" class="form-control form-filter input-sm" name="shanghaiLinecode_eq">
 								</td>
 								<td>
+									<!-- 这里没使用字典表，暂时写在页面上 -->
 									<select class="form-control form-filter " name="destroy_eq">
                                          <option value="">请选择...</option>
                                          <option value="0">运营</option>
@@ -225,7 +231,6 @@
 					闵行公司
 				{{/if}}
 			</td>
-			
 			<td>
 				{{if obj.nature == 'lj'}}
 						路救
@@ -399,9 +399,7 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
  
 			console.log(params);
  
-			return;
-			
-			ajaxd.sectionUpdata(params,function(resuntDate) {
+			ajaxd.sectionUpdate(params,function(resuntDate) {
  
 				if(resuntDate.status=='SUCCESS') {
  
@@ -431,6 +431,9 @@ var PublicFunctions = function () {
  
 						 var Line = LineObj.getLineObj();
  
+						// 刷行左边树
+						 PublicFunctions.resjtreeDate(Line.id,stationRouteDirections);
+						 
 						 /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：上行路段数据 */
 						 GetAjaxData.getSectionRouteInfo(Line.id,stationRouteDirections,function(data) {
  
@@ -85,7 +85,7 @@
 	                            </div>
 	                            <!-- 树 -->
 	                            <div class="portlet-body">
-									<div id="station_Up_tree" style="height: 550px;overflow-y: auto;"></div>
+									<div id="station_Up_tree" style="height: auto;max-height: 500px;overflow-y: auto;"></div>
 								</div>
                              </div>
  
@@ -167,7 +167,7 @@
 	                            </div>
 	                            <!-- 树 -->
 	                            <div class="portlet-body">
-									<div id="station_Down_tree" style="height: 550px;overflow-y: auto;"></div>
+									<div id="station_Down_tree" style="height: auto;max-height: 500px;overflow-y: auto;"></div>
 								</div>
 	            		</div>
  
@@ -189,7 +189,7 @@ $(function(){
  
 		//显示班次详细
 		$.each(this.cells, function(i,cell){
-			$('#mainDetailPabel input[data-cell='+i+']').val($(cell).text());
+			$('#mainDetailPabel input[data-cell='+i+']').val($.trim($(cell).text()));
 		});
 		if(!changeHandlerPanel(this))
 			return;
@@ -284,7 +284,7 @@ $(function(){
 				var cont = $('.custom-table-panel');
 			  	cont.animate({
 					scrollTop: $tr.offset().top - cont.offset().top + $tr.scrollTop() - 36 * 4
-			  	}, 500);
+			  	}, 500); 
  
 			}, 100);
 		});
@@ -381,6 +381,18 @@ $(function(){
 		$(this).show();
 		$('input.no', schAddPanel).val($(tr.cells[0]).text());
 		$('select[name=xlDir]', schAddPanel).trigger('change');
+		//当前表格第一条数据 data-type="empty"
+		var $tr = $('.mainTable tr[data-id]', '#childTaskDiv').eq(0);
+		if($tr.length > 0){
+			var sch = _data.getSchedulById($tr.data('id'));
+			console.log(sch);
+			//默认车辆
+			$('select[name=clZbh]', schAddPanel).val(sch.clZbh).trigger('change');
+			//默认驾驶员
+			$('select[name=jGh]', schAddPanel).val(sch.jGh + '/' + sch.jName).trigger('change');
+			//默认售票员 
+			$('select[name=sGh]', schAddPanel).val(sch.sGh + '/' + sch.sName).trigger('change');
+		}
 	});
 	//切换上下行
 	$(schAddPanel).on('change', 'select[name=xlDir]', function(){
@@ -433,9 +445,12 @@ $(function(){
 		//拆分驾驶员工号和姓名
 		param.jName = param.jGh.split('/')[1];
 		param.jGh = param.jGh.split('/')[0];
-		//拆分售票员工号和姓名
-		param.sName = param.sGh.split('/')[1];
-		param.sGh = param.sGh.split('/')[0];
+		
+		if(param.sGh != null){
+			//拆分售票员工号和姓名
+			param.sName = param.sGh.split('/')[1];
+			param.sGh = param.sGh.split('/')[0];
+		}
 		//附加起终点名称
 		var route = stationRoute[param.xlDir];
 		param.qdzName = searchStationName(route, param.qdzCode);
@@ -445,10 +460,14 @@ $(function(){
 		$post('/realSchedule', param, function(rs){
 			var sch = rs.t;
 			//前端缓存更新
-			scheduleLineMap[param.xlBm][param.lpName].push(sch);
+			//scheduleLineMap[param.xlBm][param.lpName].push(sch);
+			/* var ups = rs.ups;
+			for(var i in ups){
+				_data.updateSchedule(ups[i]);
+			} */
 			//刷新表格
-			_alone.addScheduleToTable(sch);
-			_alone.refreshScheduleArray(rs.ups);
+			//_alone.updateTableBySch(sch);
+			_alone.update2Table(sch.xlBm, sch);
  
 			//关闭弹出层
 			layer.closeAll();
+<!-- 待发调整 -->
+<div id="outgoAdjustAllPanel">
+	<form action="#" class="form-horizontal form-custom">
+		<div class="form-body">
+			<div class="form-custom-row">
+				<div class="item" style="margin-top: 0">
+					<div class="input-icon right">
+						<span class="item-label" style="width: 40px;">线路: </span>
+						<select name="line" class="form-control lineSelect">
+						</select>
+                    </div>
+		   	 	</div>
+		   	 	&nbsp;&nbsp;
+		   	 	<div class="item" style="margin-top: 0">
+		   	 		<span class="item-label" style="width: 40px;">车辆: </span>
+			   	 	<select name="nbbm" class="form-control vehicSelect">
+					</select>
+		   	 	</div>
+			</div>
+			
+			<div class="form-custom-row">
+				<div class="item" style="min-width: calc(100% - 10px);">
+					<div class="custom-table-panel" style="display: inline-block;height: 420px;">
+						<div style="height: 36px; position: relative;">
+							<div class="custom-table-header">
+								<table class="table table-bordered table-advance sch-table">
+									<thead>
+										<tr>
+											<th width="12%">车辆</th>
+											<th width="7%">路牌</th>
+											<th width="10%">驾驶员</th>
+											<th width="18%">起点</th>
+											<th width="18%">终点</th>
+											<th width="13%">计发</th>
+											<th width="22%">待发</th>
+										</tr>
+									</thead>
+								</table>
+							</div>
+						</div>
+
+						<div class="custom-table-body" >
+							<table class="table table-bordered table-hover table-advance sch-table" >
+								<tbody></tbody>
+							</table>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<hr>
+			<div class="form-custom-footer" style="margin-top: 15px;">
+				<button type="button" class="btn blue-madison confirm">
+					<i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定
+				</button>
+				<button type="button" class="btn layui-layer-close">取消</button>
+			</div>
+			<br>
+		</div>
+	</form>
+
+<script id="outgo_adjust_all_item_temp" type="text/html">
+{{each list as item i}}
+<tr data-id={{item.id}}>
+	<td width="12%">
+		{{item.clZbh}}
+		{{if item.bcType == "out"}}
+			<span class="out-badge short"></span>
+		{{else if item.bcType == "in"}}
+			<span class="in-badge short"></span>
+		{{/if}}
+	</td>
+	<td width="7%">{{item.lpName}}</td>
+	<td width="10%">{{item.jName}}</td>
+	<td width="18%" title="{{item.qdzName}}">{{item.qdzName}}</td>
+	<td width="18%" title="{{item.zdzName}}">{{item.zdzName}}</td>
+	<td width="13%">{{item.fcsj}}</td>
+	<td width="22%"><input value="{{item.dfsj}}" data-old="{{item.dfsj}}" type="time" class="form-control df-input" style="width: 100%;"></td>
+</tr>
+{{/each}}
+
+{{if list.length == 0 }}
+<tr>
+	<td style="font-size: 12px;text-align: center;" colspan=7>该车辆今日无班次信息</td>
+</tr>
+{{/if}}
+</script>
+
+<script id="outgo_adjust_change_text_temp" type="text/html">
+<h5>B-89524（闵行11路）</h5>
+<hr>
+<div class="change-confirm-text">
+{{each list as item i}}
+<div>
+	<span>{{item.old}}</span><i class="fa fa-long-arrow-right"></i><span>{{item.t}}</span>
+</div>
+{{/each}}
+</div>
+</script>
+	
+<script type="text/javascript">
+!function(){
+	//滚动时固定表头
+	$('.custom-table-panel').on('scroll', function(){
+		var top = $(this).scrollTop()
+		,$header = $(this).find('.custom-table-header');
+		$header.css('top', top);
+	});
+	
+	var _data, _alone, lineCodeMaps;
+	
+	var lineSelect = $('#outgoAdjustAllPanel .lineSelect');
+	var vehicSelect = $('#outgoAdjustAllPanel .vehicSelect');
+	
+	var initStatus, schedul;
+	$('#outgoAdjustAllPanel').on('init', function(e, ops){
+		initStatus = true;
+		_data = ops._data;
+		_alone = ops._alone;
+		schedul = ops.selected;
+		
+		//线路下拉框
+		var data = [];
+		lineCodeMaps = _data.getLineIds();
+		for(var line in lineCodeMaps){
+			data.push({id: line, text: lineCodeMaps[line]});
+		}
+		
+		initPinYinSelect2(lineSelect, data, function(){
+			//默认选中线路
+			lineSelect.val(schedul.xlBm).trigger("change");
+			
+			
+		}).on('change', lineSelectChange); 
+		
+		
+		//线路切换事件
+		function lineSelectChange(){
+			var lineCode = $(this).val();
+			
+			var index = layer.msg('加载中', {icon: 16});
+			//查询线路配车
+			$get('/cci/all', {'xl.lineCode_eq': lineCode}, function(rs){
+				var data = [];
+				$.each(rs, function(){
+					data.push({id: this.cl.carCode, text: this.cl.carCode})
+				});
+				vehicSelect.html('').select2({data: data});
+				
+				layer.close(index);
+				
+				//初始选中车辆
+				if(initStatus)
+					vehicSelect.val(schedul.clZbh);
+				//触发change
+				vehicSelect.trigger("change")
+			});
+		}
+		
+		//车辆切换事件
+		vehicSelect.on('change', function(){
+			//根据车辆获取班次信息
+			var schArray = _data.getSchedulByVeh($(this).val());
+			
+			var htmlStr = template('outgo_adjust_all_item_temp', {list: schArray});
+			
+			var table = '#outgoAdjustAllPanel .sch-table ';
+			$('tbody', table).html(htmlStr);
+			
+			//初始选中班次
+			if(initStatus){
+				var $tr = $('tr[data-id='+schedul.id+']', table);
+				$tr.addClass('anim-delay animated flash');
+				//滚动条
+				var cont = $('#outgoAdjustAllPanel .custom-table-panel');
+			  	cont.animate({
+					scrollTop: $tr.offset().top - cont.offset().top + $tr.scrollTop() - 36 * 4
+			  	}, 500);
+				
+				initStatus = false;
+			}
+		});
+		
+		//确定
+		$('.confirm', '#outgoAdjustAllPanel').on('click', function(){
+			var es = $('#outgoAdjustAllPanel .df-input'),old, t;
+			var changes = [];
+			for(var i = 0, e;e = es[i++];){
+				t = $(e).val(), old = $(e).data('old');
+				if(t == ''){
+					layer.alert('待发时间不能为空！', {icon: 2, title: '提交失败'});
+					$(e).addClass('custom-val-error');
+					return false;
+				}
+				$(e).removeClass('custom-val-error');
+				
+				if(old != t)
+					changes.push({old: old, t: t, id: $(e).parents('tr').data('id')});
+			}
+			
+			var text = template('outgo_adjust_change_text_temp', {list: changes});
+			layer.confirm(text, {
+				  btn: ['确认调整','取消'],title:'待发调整确认'
+			}, function(){
+				 $.ajax({
+					url: '/realSchedule/outgoAdjustAll',
+					type: 'post',
+					data: {params: JSON.stringify(changes)},
+					success:function(rs){
+						if(rs.status == 'SUCCESS' && rs.t){
+							layer.closeAll();
+							layer.msg('调整成功！', {icon: 1});
+							//刷新表格
+							_alone.update2Table(rs.t.xlBm);
+						}
+					},
+					error: errorHandle
+				 });
+			});
+		});
+	});
+	
+	
+	function errorHandle(){
+		layer.alert('服务器出现异常！', {icon: 2, title: '操作失败'});
+	}
+}();
+</script>
+</div>
 \ No newline at end of file
@@ -2009,7 +2009,8 @@ span.log-item-handle a {
 .log-item.fache {
 }
  
-.in-badge, .out-badge {
+.in-badge, .out-badge,
+span.blue-badge {
     font-size: 13px;
     margin-left: 2px;
     padding: 2px 4px;
@@ -2017,6 +2018,16 @@ span.log-item-handle a {
     display: inline-block;
 }
  
+span.blue-badge{
+    background: #7cccaa;
+    color: white;
+}
+
+tr._active .blue-badge{
+	background: #ffffff;
+    color: #3c973c;
+}
+
 .out-badge{
 	background: #59d8e3;
     color: white;
@@ -2032,16 +2043,24 @@ span.log-item-handle a {
 }
  
 .out-badge:BEFORE{
-	content: '出场'
+	content: '出场';
+}
+
+.out-badge.short:BEFORE{
+	content: '出';
+}
+
+.in-badge.short:BEFORE{
+	content: '进';
 }
  
 @media ( max-width : 1780px) {
 	.in-badge:BEFORE{
-		content: '进'
+		content: '进';
 	}
  
 	.out-badge:BEFORE{
-		content: '出'
+		content: '出';
 	}
 }
  
@@ -2117,37 +2136,51 @@ span.log-item-handle a {
 	color: white;
 }
  
-.tab_line .panel-wrap ._panel ._body .pb-table tr._tr_active.active-line-no a{
-	color: #afafaf;
+.tab_line .panel-wrap ._panel ._body .pb-table tr._tr_active.active-line-no a,
+.pb-table tr.selected.dir_0 a,
+.pb-table tr.selected.dir_1 a{
+	color: #afafaf !important;
 }
  
 .tab_line .pb-table tr._tr_active.active-line-no a.remarks-popover{
 	color: #bebebe;
 }
  
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-qrlb{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-qrlb,
+.pb-table tr.selected.dir_0 td.tl-qrlb,
+.pb-table tr.selected.dir_1 td.tl-qrlb{
 	background: none;
     color: #ff796a;
 }
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-zzzx{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-zzzx,
+.pb-table tr.selected.dir_0 td.tl-zzzx,
+.pb-table tr.selected.dir_1 td.tl-zzzx{
 	background: none;
     color: #5ae35a;
 }
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-yzx{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-yzx,
+.pb-table tr.selected.dir_0 td.tl-yzx,
+.pb-table tr.selected.dir_1 td.tl-yzx{
 	background: none;
     color: #80c8fa;
 }
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxfc{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxfc,
+.pb-table tr.selected.dir_0 td.tl-xxfc,
+.pb-table tr.selected.dir_1 td.tl-xxfc{
 	background: none;
     color: #a16dff;
 }
  
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxsd{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxsd,
+.pb-table tr.selected.dir_0 td.tl-xxsd,
+.pb-table tr.selected.dir_1 td.tl-xxsd{
 	background: none;
     color: #ffb193;
 }
  
-.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxrd{
+.tab_line .pb-table tr._tr_active.active-line-no td.tl-xxrd,
+.pb-table tr.selected.dir_0 td.tl-xxrd,
+.pb-table tr.selected.dir_1 td.tl-xxrd{
 	background: none;
     color: #5cb0e9;
 }
@@ -2187,4 +2220,66 @@ tr._tr_active.active-line-no .out-badge{
     color: black;
 }
  
+.pb-table tr .anim-delay{
+	animation-delay:.5s;
+	-webkit-animation-delay:.5s;
+}
+
+.sch-table tr td:nth-of-type(1),
+.sch-table tr td:nth-of-type(2),
+.sch-table tr td:nth-of-type(3),
+.sch-table tr td:nth-of-type(4),
+.sch-table tr td:nth-of-type(5){
+	color: #646363;
+}
+
+.sch-table tr td:nth-of-type(6),
+.sch-table tr td:nth-of-type(7){
+    color: black;
+}
+
+
+.sch-table tr th:nth-of-type(1),
+.sch-table tr th:nth-of-type(2),
+.sch-table tr th:nth-of-type(3),
+.sch-table tr th:nth-of-type(4),
+.sch-table tr th:nth-of-type(5){
+	color: #646363;
+}
+
+.sch-table tr th:nth-of-type(6),
+.sch-table tr th:nth-of-type(7){
+    color: black;
+}
+
+.sch-table input{
+	color: black;
+}
+
+.sch-table td{
+	text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    vertical-align: middle !important;
+}
+
+.change-confirm-text span{
+	margin: 3px 8px 0 3px;
+	    font-family: arial;
+}
+
+.change-confirm-text div span:nth-of-type(1){
+	color: gray;
+}
+
+.change-confirm-text i{
+	    color: #46c146;
+}
+
+.pb-table tr.selected.dir_0{
+	background-color: #5d5da9 !important;
+}
  
+.pb-table tr.selected.dir_1{
+	background-color: #dc5a5a !important;
+}
 \ No newline at end of file
@@ -90,13 +90,28 @@
 	</div>
 <div id="tooltipShade" class="animated fadeIn"></div>
  
+<div id="menuWrap"></div>
 <!-- 线路调度右键菜单 -->
-<menu class="menu" id="rightMenu">
-    <li class="menu-item" >
+<menu class="menu" id="rightMenu" style="display: none;">
+    <li class="menu-item submenu">
         <button type="button" class="menu-btn" data-method="outgoAdjust">
             <span class="menu-text">待发调整</span>
         </button>
+        <menu class="menu">
+            <li class="menu-item">
+                <button type="button" class="menu-btn" data-method="outgoAdjust">
+                    <span class="menu-text">基于班次</span>
+                </button>
+            </li>
+            <li class="menu-item">
+                <button type="button" class="menu-btn" data-method="outgoAdjustAll">
+                    <span class="menu-text">基于车辆</span>
+                </button>
+            </li>
+        </menu>
     </li>
+    
+    
     <li class="menu-separator"></li>
     <li class="menu-item" >
         <button type="button" class="menu-btn"  data-method="planDestroy">
@@ -164,7 +179,7 @@
     </li>
 </menu>
 <!-- 主页右键菜单 -->
-<menu class="menu" id="homeMenu">
+<menu class="menu" id="homeMenu" style="display: none;">
 	<li class="menu-item disabled" id="menu-linename">
         <button type="button" class="menu-btn">
             <span class="menu-text">--- W2B-102 ---</span>
@@ -73,26 +73,64 @@ var _alone = (function(){
 			var table = $('tr[data-id='+array[0].id+']').parents('table')[0];
 			calculateLineNo(table);
 		},
-		//添加一个班次到表格
-		addScheduleToTable: function(schedule){
-			_data.pushSchedule(schedule);
-			
-			var upDown = schedule.xlDir==0?'up':'down';
-			var tab = $('#tab_line_' + schedule.xlBm);
-			//重新渲染表格
-			var table = tab.find('.pb-table[data-type='+upDown+']');
-			//获取班次信息
-			var schArray = _data.findSchByLine(schedule.xlBm, schedule.xlDir);
-			calculateLineNo(
-					table.find('tbody').html(template('alone_plan_table_temp', {list: schArray}))[0]
-			);
-			
-			//定位到新添加的班次
-			var currTr = table.find('tr[data-id='+schedule.id+']')
-				,top = parseInt(currTr.find('td[name=lineNo]').text()) * 37;
+		//将班次所在的表格做全量更新
+		updateTableBySch: function(schedule){
+			//将该线路走向班次 全部从服务器同步一次
+			var xlDir = schedule.xlDir, xlBm = schedule.xlBm;
+			$.get('/realSchedule/findByLineAndUpDown', {line: xlBm, upDown: xlDir}
+				,function(list){
+					$.each(list, function(){
+						_data.pushSchedule(this);
+					});
+					
+					var upDown = xlDir==0?'up':'down';
+					var tab = $('#tab_line_' + xlBm);
+					//重新渲染表格
+					var table = tab.find('.pb-table[data-type='+upDown+']');
+					var schArray = _data.findSchByLine(xlBm, xlDir);
+					calculateLineNo(
+							table.find('tbody').html(template('alone_plan_table_temp', {list: schArray}))[0]
+					);
+					
+					var half = tab.find('._body').height() / 2;
+					
+					//定位到新添加的班次
+					var currTr = table.find('tr[data-id='+schedule.id+']')
+						,top = parseInt(currTr.find('td[name=lineNo]').text()) * 37 - half;
+					
+					top = top>0?top:0;
+					currTr.addClass('anim-delay animated flash');
+					currTr.parents('._body').slimScroll({ scrollTo: top + 'px' });
+			});
+		},
+		update2Table: function(xlBm, schedule){
+			//上行
+			$.get('/realSchedule/lineCode/' + xlBm, function(array){
+				//加入_data缓存
+				$.each(array, function(){
+					_data.pushSchedule(this);
+				});
+				
+				var rs = splitDir(array)
+					,tab = $('#tab_line_' + xlBm)
+					,half = tab.find('._body').height() / 2;
+				//填充表格数据
+				calculateLineNo(
+						//上行
+						tab.find('table[data-type=up] tbody').html(template('alone_plan_table_temp', {list: rs.up}))[0]
+				);
+				calculateLineNo(
+						//下行
+						tab.find('table[data-type=down] tbody').html(template('alone_plan_table_temp', {list: rs.down}))[0]
+				);
+				//定位到指定的班次
+				var currTr = tab.find('tr[data-id='+schedule.id+']')
+					,top = parseInt(currTr.find('td[name=lineNo]').text()) * 37 - half;
  
-			currTr.addClass('animated flash');
-			currTr.parents('._body').slimScroll({ scrollTo: top + 'px' });
+				top = top>0?top:0;
+				currTr.addClass('anim-delay animated flash');
+				currTr.parents('._body').slimScroll({ scrollTo: top + 'px' });
+			});
 		},
 		//重新计算行号
 		calculateLineNo: calculateLineNo
@@ -13,8 +13,7 @@ var _data = (function(){
  
 	var dateStr = moment().format('YYYY-MM-DD');
 	//实际排班
-	var schedules = {}
-		,scheduleList = [];
+	var schedules = {};
  
 	//站点路由缓存
 	var stationRoute = {};
@@ -24,38 +23,69 @@ var _data = (function(){
 	//线路标准信息
 	var lineInformations = {};
 	//车辆和班次数组映射
-	var clSchMap = {};
+	//var clSchMap = {};
  
 	//车辆自编号和设备号对照
 	var carDeviceIdMapp = {};
  
+	var fcsjSort = function(a, b){
+		return a.fcsjT - b.fcsjT;
+	}
+	
 	var dataObject = {
 		/*//班次发车
 		setFcsj: function(schId, fcsj, fcsjT){
 			schedules[schId].fcsjActual = fcsj;
 			schedules[schId].fcsjActualTime = fcsjT;
 		},*/
+		//根据线路编码获取上行和下行班次
+		/*findByLineAll: function(xlbm){
+			var array = [],sch;
+			for(var id in schedules){
+				sch = schedules[id];
+				if(sch.xlBm == xlbm)
+					array.push(e);
+			}
+			//排序
+			array.sort(function(a, b){
+				return a.fcsjT - b.fcsjT;
+			});
+			
+			return array;
+		},*/
 		//根据线路和上下行获取计划排班
 		findSchByLine: function(xlbm, upDown){
 			var array = [];
-			$.each(scheduleList, function(){
-				if(this.xlBm == xlbm
-						&& this.xlDir == upDown)
-					array.push(this);
-			});
+			var sch;
+			for(var id in schedules){
+				sch = schedules[id];
+				if(sch.xlBm == xlbm
+						&& sch.xlDir == upDown){
+					array.push(sch);
+				}
+			}
+			//排序
+			array.sort(fcsjSort);
  
 			return array;
 		},
 		//根据车辆获取班次数组
 		findByCl: function(nbbm){
-			return clSchMap[nbbm];
+			var array = [];
+			for(var id in schedules){
+				sch = schedules[id];
+				if(sch.clZbh == nbbm)
+					array.push(sch);
+			}
+			
+			//排序
+			array.sort(fcsjSort);
+			return array;
 		},
 		//添加一个班次
 		pushSchedule: function(sch){
 			//附加信息
 			attachInfo(sch);
-			//加入缓存
-			scheduleList.push(sch);
 			schedules[sch.id] = sch;
 			lineLpMap[sch.xlBm][sch.lpName].push(sch);
 		},
@@ -124,15 +154,14 @@ var _data = (function(){
 						attachInfo(this);
 						//缓存排班计划
 						schedules[this.id] = this;
-						scheduleList.push(this);
 						//构造 线路 ——> 路牌 ——> 班次 3层映射
 						if(!lineLpMap[lineCode][this.lpName])
 							lineLpMap[lineCode][this.lpName] = [];
 						lineLpMap[lineCode][this.lpName].push(this);
 						//车辆 ——> 班次数组
-						if(!clSchMap[this.clZbh])
+						/*if(!clSchMap[this.clZbh])
 							clSchMap[this.clZbh] = [];
-						clSchMap[this.clZbh].push(this);
+						clSchMap[this.clZbh].push(this);*/
 					});
  
 					//按发车时间排序
@@ -150,10 +179,15 @@ var _data = (function(){
 		//根据车辆内部编码获取排班数组
 		getSchedulByVeh: function(nbbm){
 			var array = [];
-			$.each(scheduleList, function(){
-				if(this.clZbh == nbbm)
-					array.push(this);
-			});
+			var sch;
+			for(var id in schedules){
+				sch = schedules[id];
+				if(sch.clZbh == nbbm)
+					array.push(sch);
+			}
+			
+			//排序
+			array.sort(fcsjSort);
 			return array;
 		},
 		//根据设备号获取GPS
@@ -83,6 +83,7 @@
 		 		setTimeout(function(){
 		 			//去掉loading
 			 		$('.load-anim').fadeOut();
+			 		$('menu.menu').show();
 		 		}, 500);
 		 	}, 400);
  
@@ -31,7 +31,7 @@ var _menu = (function() {
  
 	// 表格右键呼出菜单
 	var ac = 'active-menu'
-		,items = '.pb-table.data tr td[name!=lineNo]';
+		,items = '.pb-table.data tr td[name!=lineNo][data-name!=lpName]';
 	$('.portlet-fullscreen').on('contextmenu', items, 
 			function(e) {
 				e.preventDefault();
@@ -83,6 +83,20 @@ var _menu = (function() {
  
 	});
  
+	//点击路牌
+	var lps = '.pb-table.data tr td[data-name=lpName]';
+	$('.portlet-fullscreen').on('click', lps, function(e){
+		var lp = $(this).text();
+		layer.msg('高亮路牌：' + lp + '',{offset: 'ct', shift : 5});
+		var lineCode = $(this).parents('.tab-pane').data('id');
+		var schArray = _data.getLineLpMap()[lineCode][lp];
+		
+		resetAllState();
+		$.each(schArray, function(){
+			$('.pb-table tr[data-id='+this.id+']').addClass('selected dir_' + this.xlDir);
+		});
+	});
+	
 	function selectOneRow(firstCell){
 		return $(firstCell).addClass('selected').parent().addClass('_tr_active active-line-no');
 	}
@@ -97,11 +111,11 @@ var _menu = (function() {
 			  tips: [2, '#709d94'],shift:5, time: 5000
 		});
 	});
-	
+/*	
 	$('.portlet-fullscreen').on('dbclick', 'table.pb-table .sfsj-item', function(){
 		alert(11);
 	});
-	
+*/	
 	//选中关联班次
 	function selCognateSch($ctr){
 		//选中关联班次
@@ -110,6 +124,7 @@ var _menu = (function() {
 			,sch = _data.getSchedulById(schId);
  
 		var scroll = false;
+		console.log(_data.findByCl(clnbbm));
 		$.each(_data.findByCl(clnbbm), function(){
 			if(scroll){
 				var nextTr = $('tr[data-id='+this.id+']');
@@ -122,8 +137,11 @@ var _menu = (function() {
 				}
 				scroll = false;
 				nextTr.addClass('next-sch');
+				
+				$('.pb-table tr[data-id='+this.id+']').addClass('selected');
+				return false;
 			}
-			$('.pb-table tr[data-id='+this.id+']').addClass('selected');
+			//$('.pb-table tr[data-id='+this.id+']').addClass('selected');
 			if(this.id == schId)
 				scroll = true;
 		});
@@ -134,6 +152,8 @@ var _menu = (function() {
 		$('.pb-table tr td.' + ac).removeClass(ac);
 		$('.pb-table tr.selected').removeClass('selected');
 		$('.pb-table tr.next-sch').removeClass('next-sch');
+		$('.pb-table tr.dir_0').removeClass('dir_0');
+		$('.pb-table tr.dir_1').removeClass('dir_1');
 		if(layerTip){
 			layer.close(layerTip);
 			layerTip = null;
@@ -142,6 +162,8 @@ var _menu = (function() {
 	function resetAllState(){
 		$('.pb-table tr td.' + ac).removeClass(ac);
 		$('.pb-table tr.selected').removeClass('selected');
+		$('.pb-table tr.dir_0').removeClass('dir_0');
+		$('.pb-table tr.dir_1').removeClass('dir_1');
 		$('.pb-table tr._tr_active').removeClass('_tr_active active-line-no');
 		$('.pb-table tr.next-sch').removeClass('next-sch');
 		$('.pb-table.data tr td.selected[name=lineNo]').removeClass('selected');
@@ -223,7 +245,18 @@ var _menu = (function() {
 		},
 		//计划烂班
 		planDestroy: function(schedul){
-			var data = {item: schedul, array : _data.getSchedulByVeh(schedul.clZbh)}
+			/*if(schedul.status == -1){
+				layer.alert('不能重复烂班！', {icon: 2, title: '提示', shift: 5}); 
+				return;
+			}*/
+			var array = [];
+			//获取未烂班的班次
+			$.each(_data.getSchedulByVeh(schedul.clZbh),function(){
+				if(this.status != -1)
+					array.push(this);
+			});
+			
+			var data = {item: schedul, array : array}
 			var index = layer.open({
 			  type: 1,
 			  area: ['370px', '645px'],
@@ -507,10 +540,33 @@ var _menu = (function() {
 							layer.close(index);
 							if(rs.t)
 								_alone.refreshSchedule(rs.t);
+							
+							if(rs.nextSch)
+								_alone.refreshSchedule(rs.nextSch);
 						});
 					});
 			  }
 			});
+		},
+		//基于车辆的待发调整
+		outgoAdjustAll: function(schedul){
+			$.get('/pages/control/line/child_pages/outgo_adjust_all.html', function(content){
+				layer.open({
+				  type: 1,
+				  area: '830px',
+				  maxmin: true,
+				  content: content,
+				  shift: 5,
+				  title: '待发调整（车辆）',
+				  success: function(){
+					  $('#outgoAdjustAllPanel').trigger('init', {
+						  selected: schedul, 
+						  _data: _data,
+						  _alone: _alone
+					  });
+				  }
+				});
+			});
 		}
 	}
  
@@ -293,7 +293,7 @@
 {{each array as obj i}}
     				<label>
 						<div class="checker">
-						<span><input type="checkbox" value={{obj.id}} name="ids[]" class="icheck" {{if obj.dfsj==item.dfsj}}checked{{/if}}></span></div> {{obj.dfsj}}
+						<span><input type="checkbox" value={{obj.id}} name="ids[]" class="icheck" {{if obj.id==item.id}}checked{{/if}}></span></div> {{obj.dfsj}}
 					</label>
 {{/each}}
 					</div>
@@ -486,7 +486,7 @@
    	 <div class="form-custom-row">
    	 	<div class="item full" >
    	 		<p style="margin: 10px 0;">调整说明: <span class="font-red">（不超过20个字符）</span></p>
-	   	 	<textarea class="form-control" name="remarks" rows="4" placeholder="说明，必填"></textarea>
+	   	 	<textarea class="form-control" name="remarks" rows="4" placeholder="调整说明"></textarea>
    	 	</div>
    	 </div>
 	<hr>
@@ -3,7 +3,7 @@
 <script id="child_task_main_table_temp" type="text/html">
 {{each list as item i}}
 {{if item == null}}
-	<tr class="empty">
+	<tr class="empty" data-type="empty">
 		<td width="5%" >{{i + 1}}</td>
 		<td width="9%" ></td>
 		<td width="9%" ></td>
@@ -17,7 +17,10 @@
 {{else}}
 <tr data-id="{{item.id}}" >
 	<td width="5%" >{{i + 1}}</td>
-	<td width="9%" >{{item.fcsj}}</td>
+	<td width="9%" >
+		{{if item.fcsjActual != null}}{{item.fcsjActual}}<span class="blue-badge">实</span>{{else}}{{item.dfsj}}
+		{{/if}}
+	</td>
 	<td width="9%" >{{item.zdsj}}</td>
 	<td width="14%" >{{item.qdzName}}</td>
 	<td width="14%" >{{item.zdzName}}</td>