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

minhang

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into
minhang
廖磊
2 parents 3556aca1 bb7d840d
Showing 167 changed files with 5655 additions and 2360 deletions
pom.xml
src/main/java/com/bsth/controller/DownloadController.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/SignalStateController.java
src/main/java/com/bsth/controller/schedule/BController.java
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/controller/schedule/basicinfo/CarDeviceController.java
src/main/java/com/bsth/controller/schedule/basicinfo/CarsController.java
src/main/java/com/bsth/controller/schedule/basicinfo/EmployeeController.java
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/EmployeeConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
src/main/java/com/bsth/controller/sys/DutyEmployeeController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/LineConfigData.java
@@ -155,6 +155,12 @@
 			<version>2.1.8</version>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>1.7</version>
+        </dependency>
+
         <!-- pentaho kettle 依赖 -->
         <dependency>
             <groupId>com.pentaho.kettle</groupId>
@@ -2,6 +2,7 @@ package com.bsth.controller;
 import java.io.File;  
 import java.io.IOException;  
+import java.net.URLDecoder;
 import org.apache.commons.io.FileUtils;
 import org.springframework.context.annotation.Scope;  
@@ -35,7 +36,7 @@ public class DownloadController
         File file=new File(moudelPath);  
         HttpHeaders headers = new HttpHeaders();    
         String realFileName=new String(fileName.getBytes("UTF-8"),"iso-8859-1");//为了解决中文名称乱码问题  
-        headers.setContentDispositionFormData("attachment", realFileName);   
+        headers.setContentDispositionFormData("attachment", URLDecoder.decode(realFileName,"utf-8"));   
         headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);   
         return new ResponseEntity<byte[]>(FileUtils.readFileToByteArray(file),    
                                           headers, HttpStatus.CREATED);    
@@ -13,8 +13,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.bsth.data.BasicData;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Executionrate;
 import com.bsth.entity.mcy_forms.Linepasswengerflow;
 import com.bsth.entity.mcy_forms.Operationservice;
@@ -319,8 +321,34 @@ public class ExportController {
 		List<Turnoutrate> turnoutrate = formsService.turnoutrate(map);
 		Map<String, Object> map1 = new HashMap<String, Object>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		String xlts="";
+		String zsgs="";
+		String jh="";
+		Float j=0f;
+		Float sj=0f;
+		Float qz=0f;
+		Float ccl=0f;
+		Float bcjh=0f;
+		String bcsj="";
+		Float bczxl=0f;
+		String gs="";
+		String zhgs="";
+		
 		for (Turnoutrate l : turnoutrate) {
 			Map<String, Object> m = new HashMap<String, Object>();
+			
+			xlts +=l.getGsgs()==""?0:String.valueOf(l.getGsgs());
+			zsgs +=l.getFgsgs()==""?0:String.valueOf(l.getFgsgs());
+			jh +=l.getXl()==""?0:String.valueOf(l.getXl());
+			sj +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
+			ccl +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
+			bcjh +=l.getCchqz()==""?0f:Float.valueOf(l.getCchqz());
+			bcsj +=l.getChl()==""?0:String.valueOf(l.getChl());
+			bczxl +=l.getBcjh()==""?0f:Float.valueOf(l.getBcjh());
+			gs +=l.getBcsj()==""?0:String.valueOf(l.getBcsj());
+			zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());
+			
+			
 			m.put("rq", l.getRq());
 			m.put("gs", l.getGs());
 			m.put("zhgs", l.getZhgs());
@@ -330,10 +358,27 @@ public class ExportController {
 			m.put("cchqz", l.getCchqz());
 			m.put("chl", l.getChl());
 			m.put("bcjh", l.getBcjh());
-			m.put("bcsj", l.getBbzxl());
+			m.put("bcsj", l.getBcsj());
 			m.put("bbzxl", l.getBbzxl());
 			m.put("sm", l.getSm());
 			resList.add(m);
+			
+			
+			
+			m=new HashMap<String,Object>();
+			m.put("total_xlts", xlts);
+			m.put("total_zhgs", zsgs);
+			m.put("total_jh", jh);
+			m.put("total_sj", sj);
+			m.put("total_qz", ccl);
+			m.put("total_ccl", bcjh);
+			m.put("total_bcjh",bcsj);
+			m.put("total_bcsj", bczxl);
+			m.put("total_bczxl", bczxl);
+			m.put("total_gs", zhgs);
+			
+
+			map1 = m;
 		}
 		try {
@@ -347,7 +392,7 @@ public class ExportController {
 		return resList;
 	}
-	//营运线路出车率统计表
+	//班次执行率统计表
 	@RequestMapping(value = "/executionrateExport", method = RequestMethod.POST)
 	public List<Map<String, Object>> executionrateExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
@@ -356,8 +401,33 @@ public class ExportController {
 		List<Executionrate> executionrate = formsService.executionrate(map);
 		Map<String, Object> map1 = new HashMap<String, Object>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		String xlts="";
+		String zsgs="";
+		String jh="";
+		Float sj=0f;
+		Float ccl=0f;
+		Float bcjh=0f;
+		String bcsj="";
+		Float bczxl=0f;
+		String gs="";
+		String zhgs="";
+		
+		Map<String, Object> m = new HashMap<String, Object>();
+
 		for (Executionrate l : executionrate) {
-			Map<String, Object> m = new HashMap<String, Object>();
+			
+			xlts +=l.getGsgs()==""?0:String.valueOf(l.getGsgs());
+			zsgs +=l.getFgsgs()==""?0:String.valueOf(l.getFgsgs());
+			jh +=l.getXl()==""?0:String.valueOf(l.getXl());
+			sj +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
+			ccl +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
+			bcsj +=l.getChl()==""?0:String.valueOf(l.getChl());
+			bczxl +=l.getBcjh()==""?0f:Float.valueOf(l.getBcjh());
+			gs +=l.getBcsj()==""?0:String.valueOf(l.getBcsj());
+			zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());
+			
+			
+			
 			m.put("rq", l.getRq());
 			m.put("gs", l.getGs());
 			m.put("zhgs", l.getZhgs());
@@ -366,10 +436,24 @@ public class ExportController {
 			m.put("cchsj", l.getCchsj());
 			m.put("chl", l.getChl());
 			m.put("bcjh", l.getBcjh());
-			m.put("bcsj", l.getBbzxl());
+			m.put("bcsj", l.getBcsj());
 			m.put("bbzxl", l.getBbzxl());
 			m.put("sm", l.getSm());
 			resList.add(m);
+			
+			
+		    m=new HashMap<String,Object>();
+			m.put("total_gs", xlts);
+			m.put("total_zhgs", zsgs);
+			m.put("total_xlts", jh);
+			m.put("total_jh", sj);
+			m.put("total_sj", ccl);
+			m.put("total_ccl",bcsj);
+			m.put("total_bcjh", bczxl);
+			m.put("total_bcsj", gs);
+			m.put("total_bczxl", zhgs);
+			
+			map1 = m;
 		}
 		try {
@@ -393,8 +477,28 @@ public class ExportController {
 		List<Allline> allline = formsService.allline(map);
 		Map<String, Object> map1 = new HashMap<String, Object>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Integer jh=0;
+		Integer  sj=0;
+		Integer  ccl=0;
+		Double bcjh=0.0;
+		String bcsj="";
+		Integer bczxl=0;
+		String  gs="";
+		String zhgs="";
+		Map<String, Object> m ;
 		for (Allline l : allline) {
-			Map<String, Object> m = new HashMap<String, Object>();
+			m = new HashMap<String, Object>();
+			
+			jh +=l.getGsgs()=="" ? 0: Integer.valueOf(l.getGsgs());
+			sj +=l.getFgsgs()==""?0: Integer.valueOf(l.getFgsgs());
+			ccl +=l.getCchjh()==""?0: Integer.valueOf(l.getCchjh());
+			bcjh +=l.getCchsj()==""?0: Double.valueOf(l.getCchsj());
+			
+			bcsj +=l.getChl()==""? 0:String.valueOf(l.getChl());
+			bczxl +=l.getBcjh()==""?0: Integer.valueOf(l.getBcjh());
+			gs +=l.getBcsj()==""?0: String.valueOf(l.getBcsj());
+			zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());
+			
 			m.put("rq", l.getRq());
 			m.put("gs", l.getGs());
 			m.put("zhgs", l.getZhgs());
@@ -403,10 +507,22 @@ public class ExportController {
 			m.put("cchsj", l.getCchsj());
 			m.put("chl", l.getChl());
 			m.put("bcjh", l.getBcjh());
-			m.put("bcsj", l.getBbzxl());
+			m.put("bcsj", l.getBcsj());
 			m.put("bbzxl", l.getBbzxl());
 			m.put("sm", l.getSm());
 			resList.add(m);
+			
+			m=new HashMap<String,Object>();
+			m.put("total_jh", jh);
+			m.put("total_sj", sj);
+			m.put("total_ccl", ccl);
+			m.put("total_bcjh", bcjh);
+			m.put("total_bcsj", bcsj);
+			m.put("total_bczxl", bczxl);
+			m.put("total_gs", gs);
+			m.put("total_zhgs", zhgs);
+			map1 = m;
+			
 		}
 		try {
@@ -422,6 +538,56 @@ public class ExportController {
+	//班次日报表
+	@RequestMapping(value = "/dailyExport", method = RequestMethod.POST)
+		public List<Map<String, Object>> dailyExport(@RequestParam Map<String, Object> map) {
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Daily> allline = formsService.daily(map);
+		
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Float zgl=0f;
+		Float ks=0f;
+		Float yh=0f;
+		Float bc=0f;
+		Map<String, Object> m ;
+		for (Daily d : allline) {
+			m = new HashMap<String, Object>();
+			zgl +=d.getZlc()==""?0f:Float.valueOf(d.getZlc());
+			ks +=d.getJzl1()==""?0f:Float.valueOf(d.getJzl1());
+			yh +=d.getYh()==""?0f:Float.valueOf(d.getYh());
+			bc +=d.getBc()==""?0f:Float.valueOf(d.getBc());
+			m.put("zbh", d.getZbh());
+			m.put("jgh",d.getJgh());
+			m.put("jName", d.getjName());
+			m.put("zlc", d.getZlc());
+			m.put("jzl1", d.getJzl1());
+			m.put("yh", d.getYh());
+			m.put("bc", d.getBc());
+			
+			resList.add(m);
+			}
+			
+		m=new HashMap<String,Object>();
+		m.put("total_zgl", zgl);
+		m.put("total_ks", ks);
+		m.put("total_yh", yh);
+		m.put("total_bc", bc);
+		
+		m.put("line", BasicData.lineCode2NameMap.get(map.get("line").toString()));
+		m.put("date", map.get("date").toString());
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { m }, path + "mould\\daily.xls", path + "export\\班次日报表"
+					+ sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return resList;
+	}
+	
 }
@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Executionrate;
 import com.bsth.entity.mcy_forms.Linepasswengerflow;
 import com.bsth.entity.mcy_forms.Operationservice;
@@ -112,4 +113,12 @@ public class MCY_FormsController {
 		return formsService.allline(map);
 	}
+	
+	// 营运线路名称统计表
+		@RequestMapping(value = "/daily", method = RequestMethod.POST)
+	public List<Daily> daily(@RequestParam Map<String, Object> map) {
+
+		return formsService.daily(map);
+		}
+	
 }
@@ -59,4 +59,14 @@ public class RealMapController {
     public Map<String, Object> findRouteAndStationByLine(@RequestParam String lineCode){
         return realMapService.findRouteAndStationByLine(lineCode);
     }
+
+    /**
+     * 获取多个线路的路段信息（为前端越界计算提供数据）
+     * @param codeIdx
+     * @return
+     */
+    @RequestMapping(value = "/multiSectionRoute")
+    public Map<String, Object> multiSectionRoute(@RequestParam String codeIdx){
+        return realMapService.multiSectionRoute(codeIdx);
+    }
 }
@@ -310,8 +310,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/historyMessage")
 	public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
-			@RequestParam String code) {
-		return scheduleRealInfoService.historyMessage(line, date, code);
+			@RequestParam String code, @RequestParam String type) {
+		return scheduleRealInfoService.historyMessage(line, date, code, type);
 	}
 	@RequestMapping(value="/findLine")
@@ -332,14 +332,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/account")
 	public List<Map<String,Object>> account(@RequestParam String line, @RequestParam String date,
-			@RequestParam String code,@RequestParam String xlName) {
-		return scheduleRealInfoService.account(line, date, code,xlName);
+			@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
+		return scheduleRealInfoService.account(line, date, code, xlName, type);
 	}
 	@RequestMapping(value = "/correctForm")
 	public List<ScheduleRealInfo> correctForm(@RequestParam String line, @RequestParam String startDate,
-			@RequestParam String endDate,@RequestParam String lpName,@RequestParam String code) {
-		return scheduleRealInfoService.correctForm(line, startDate, endDate, lpName, code);
+			@RequestParam String endDate, @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
+		return scheduleRealInfoService.correctForm(line, startDate, endDate, lpName, code, type);
 	}
 	/**
 	 * @Title queryListWaybill
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.gpsdata.SignalStateData;
+import com.bsth.data.gpsdata.arrival.entity.SignalState;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2016/12/30.
+ */
+@RestController
+@RequestMapping("signalState")
+public class SignalStateController {
+
+    @Autowired
+    SignalStateData signalStateData;
+
+    @RequestMapping("/multi")
+    public List<SignalState> findByMultiLine(@RequestParam String idx){
+        return signalStateData.get(idx);
+    }
+}
@@ -5,16 +5,21 @@ import com.bsth.common.ResponseCode;
 import com.bsth.entity.schedule.BEntity;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.BService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.sys.SysUserService;
 import com.google.common.base.Splitter;
+import jxl.Sheet;
+import jxl.Workbook;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import java.io.Serializable;
+import java.io.*;
 import java.util.*;
 /**
@@ -26,7 +31,7 @@ public class BController&lt;T, ID extends Serializable&gt; {
     @Autowired
     private SysUserService sysUserService;
-    // CRUD 操作
+    //---------------- CRUD 操作 ----------------//
     // Create操作
     @RequestMapping(method = RequestMethod.POST)
     public Map<String, Object> save(@RequestBody T t, HttpSession httpSession) {
@@ -73,6 +78,7 @@ public class BController&lt;T, ID extends Serializable&gt; {
         rtn.put("data", t);
         return rtn;
     }
+    // 查询所有操作
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     public Map<String, Object> list(@RequestParam Map<String, Object> param) {
         List<T> tList = bService.list(param);
@@ -81,6 +87,7 @@ public class BController&lt;T, ID extends Serializable&gt; {
         rtn.put("data", tList);
         return rtn;
     }
+    // 分页查询操作
     @RequestMapping(method = RequestMethod.GET)
     public Map<String, Object> list(
             @RequestParam Map<String, Object> map,
@@ -138,4 +145,99 @@ public class BController&lt;T, ID extends Serializable&gt; {
         return rtn;
     }
+    //---------------- 数据服务操作 ----------------//
+    // 上传excel文件
+    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+    public Map<String, Object> uploadFile(MultipartFile file) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            File file1 = bService.uploadFile(file.getOriginalFilename(), file.getBytes());
+            // excel文件名
+            String fileName = file1.getAbsolutePath();
+            // excel文件sheet
+            List<String> sheetnames = new ArrayList<>();
+            Workbook book = Workbook.getWorkbook(file1);
+            for (Sheet sheet : book.getSheets()) {
+                sheetnames.add(sheet.getName());
+            }
+
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("filename", fileName);
+            rtn.put("sheetnames", StringUtils.join(sheetnames, ","));
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    // 导入excel文件
+    @RequestMapping(value = "/importFile", method = RequestMethod.POST)
+    public Map<String, Object> importFile(@RequestParam Map<String, Object> params) {
+        Map<String, Object> rtn = new HashMap<>();
+
+        try {
+            File file = new File(String.valueOf(params.get("filename")));
+            if (!file.exists()) {
+                throw new Exception("导入文件不存在！");
+            }
+            bService.importData(file, params);
+
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("msg", "导入文件成功");
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    // 上传并导入excel文件
+    @RequestMapping(value = "/uploadAndImportFile", method = RequestMethod.POST)
+    public Map<String, Object> uploadAndImportFile(MultipartFile file) {
+        Map<String, Object> rtn = new HashMap<>();
+
+        try {
+            File file1 = bService.uploadFile(file.getOriginalFilename(), file.getBytes());
+            Map<String, Object> params = new HashMap<>();
+            bService.importData(file1, params);
+
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("msg", "上传&导入文件成功");
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    // 导出数据到xls文件
+    @RequestMapping(value = "/exportFile", method = RequestMethod.GET)
+    public void exportFile(HttpServletResponse response,
+                           @RequestParam Map<String, Object> params) throws Exception {
+        File file = bService.exportData(params);
+        // 流输出导出文件
+        response.setHeader("content-type", "application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment; filename=" + file.getName());
+        response.setContentType("application/octet-stream");
+
+        OutputStream os = response.getOutputStream();
+        BufferedOutputStream bos = new BufferedOutputStream(os);
+
+        InputStream is = new FileInputStream(file);
+        BufferedInputStream bis = new BufferedInputStream(is);
+
+        int length = 0;
+        byte[] temp = new byte[1 * 1024 * 10];
+        while ((length = bis.read(temp)) != -1) {
+            bos.write(temp, 0, length);
+        }
+        bos.flush();
+        bis.close();
+        bos.close();
+        is.close();
+    }
+
 }
-package com.bsth.controller.schedule;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.BaseController2;
-import com.bsth.entity.CarPark;
-import com.bsth.entity.LineInformation;
-import com.bsth.entity.StationRoute;
-import com.bsth.entity.schedule.GuideboardInfo;
-import com.bsth.entity.schedule.TTInfoDetail;
-import com.bsth.repository.schedule.TTInfoDetailRepository;
-import com.bsth.service.CarParkService;
-import com.bsth.service.LineInformationService;
-import com.bsth.service.StationRouteService;
-import com.bsth.service.schedule.GuideboardInfoService;
-import com.bsth.service.schedule.TTInfoDetailService;
-import com.bsth.service.schedule.utils.DataImportExportService;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import jxl.Cell;
-import jxl.Sheet;
-import jxl.Workbook;
-import jxl.write.Label;
-import jxl.write.WritableSheet;
-import jxl.write.WritableWorkbook;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by xu on 16/7/2.
- */
-@RestController
-@RequestMapping("tidc")
-public class TTInfoDetailController extends BaseController2<TTInfoDetail, Long> {
-    @Autowired
-    private TTInfoDetailService ttInfoDetailService;
-    @Autowired
-    private CarParkService carParkService;
-    @Autowired
-    private LineInformationService lineInformationService;
-    @Autowired
-    private TTInfoDetailRepository ttInfoDetailRepository;
-    @Autowired
-    private DataImportExportService dataImportExportService;
-    @Autowired
-    private StationRouteService stationRouteService;
-    @Autowired
-    private GuideboardInfoService guideboardInfoService;
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-
-    /**
-     * 1、上传Excel文件，返回文件全路径名，工作区名称列表。
-     * @param file
-     * @return
-     * @throws Exception
-     */
-
-
-    /**
-     * 2、验证sheet（以后放到规则引擎里去做）。
-     * @param filename excel文件全路径名
-     * @param sheetname sheet名字
-     * @param lineid 线路id
-     * @param linename 线路名称
-     * @return
-     */
-    @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST)
-    public Map<String, Object> validateSheet(String filename, String sheetname, Integer lineid, String linename) throws Exception {
-        Map<String, Object> rtn = new HashMap<>();
-        Workbook book = Workbook.getWorkbook(new File(filename));
-        Sheet sheet = book.getSheet(sheetname);
-        if (sheet.getRows() == 0 || sheet.getColumns() == 0) { // 工作区是否为空
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", String.format("%s 工作区没有数据！", sheetname));
-            return rtn;
-        } else {
-            if (sheet.getRows() <= 1 || sheet.getColumns() <= 1) {
-                rtn.put("status", ResponseCode.ERROR);
-                rtn.put("msg", String.format("工作区至少包含2行2列的数据"));
-                return rtn;
-            } else {
-                Cell[] cells = sheet.getRow(0); // 获取第一行数据列
-                for (int i = 0; i < cells.length; i++) {
-                    String cell_con = cells[i].getContents();
-
-                    if (StringUtils.isEmpty(cell_con)) {
-                        rtn.put("status", ResponseCode.ERROR);
-                        rtn.put("msg", String.format("第1行，第%d列数据不能为空", i + 1));
-                        return rtn;
-                    } else {
-                        // 正则表达式去除数字
-                        cell_con = cell_con.replaceAll("[\\d+]", "");
-
-                        if (i == 0) { // 第一列必须是路牌2个字
-                            if (!"路牌".equals(cell_con.trim())) {
-                                rtn.put("status", ResponseCode.ERROR);
-                                rtn.put("msg", "第1行，第1列数据必须是路牌2个字");
-                                return rtn;
-                            }
-                        } else { // 排除出场，进场，其余内容到站点路由里查询，以各个方向的起点站为查询依据
-                            if ((!"出场".equals(cell_con.trim())) &&
-                                    (!"进场".equals(cell_con.trim()))) {
-                                Map<String, Object> p1 = new HashMap<>();
-                                p1.put("line.id_eq", lineid);
-                                p1.put("stationName_eq", cell_con.trim());
-                                p1.put("stationMark_eq", "B");
-
-
-                                // TODO：这里要修改（起点站有启用撤销的标志的）
-
-                                List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
-                                if (CollectionUtils.isEmpty(stationRouteList)) {
-                                    rtn.put("status", ResponseCode.ERROR);
-                                    rtn.put("msg", String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename));
-                                    return rtn;
-                                } else if (stationRouteList.size() > 1) {
-                                    rtn.put("status", ResponseCode.ERROR);
-                                    rtn.put("msg", String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename));
-                                    return rtn;
-                                }
-                            }
-
-                        }
-                    }
-                }
-
-                // 验证路牌内容
-                Map<String, Integer> gbindexmap = new HashMap<>(); // 记录每个路牌在第几行
-                for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
-                    Cell bcell = sheet.getRow(i)[0]; // 获取第1列
-                    String bcell_con = bcell.getContents();
-                    if (StringUtils.isEmpty(bcell_con)) {
-                        rtn.put("status", ResponseCode.ERROR);
-                        rtn.put("msg", String.format("第%d行，第1列路牌无数据", i + 1));
-                        return rtn;
-                    } else if (gbindexmap.get(bcell_con.trim()) != null) {
-                        rtn.put("status", ResponseCode.ERROR);
-                        rtn.put("msg", String.format("第%d行，第1列的路牌数据与第%d行，第1列数据重复",
-                                i + 1,
-                                gbindexmap.get(bcell_con.trim())));
-                        return rtn;
-                    } else {
-                        Map<String, Object> p2 = new HashMap<>();
-                        p2.put("xl.id_eq", lineid);
-                        p2.put("lpName_eq", bcell_con.trim());
-                        List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2);
-                        if (CollectionUtils.isEmpty(guideboardInfoList)) {
-                            rtn.put("status", ResponseCode.ERROR);
-                            rtn.put("msg", String.format("第%d行，第1列的路牌在%s中不存在", i + 1, linename));
-                            return rtn;
-                        } else if (guideboardInfoList.size() > 1) {
-                            rtn.put("status", ResponseCode.ERROR);
-                            rtn.put("msg", String.format("第%d行，第1列的路牌在%s中重复", i + 1, linename));
-                            return rtn;
-                        } else {
-                            gbindexmap.put(bcell_con.trim(), i + 1);
-                        }
-                    }
-                }
-
-                // 班次时间验证，正则表达式，格式hh:mm或者hhmm
-                String el = "^(([0-1]\\d)|(2[0-4])):[0-5]\\d$"; // hh:mm格式
-                String el2 = "^(([0-1]\\d)|(2[0-4]))[0-5]\\d$"; // hhmm格式
-                Pattern p = Pattern.compile(el);
-                Pattern p2 = Pattern.compile(el2);
-
-                for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
-                    Cell[] bcells = sheet.getRow(i);
-                    for (int j = 1; j < bcells.length; j++) { // 从第2列开始
-                        String bcell_con = bcells[j].getContents();
-                        if (StringUtils.isNotEmpty(bcell_con)) {
-                            Matcher m = p.matcher(bcell_con.trim());
-                            Matcher m2 = p2.matcher(bcell_con.trim());
-                            if ((!m.matches()) && (!m2.matches())) {
-                                rtn.put("status", ResponseCode.ERROR);
-                                rtn.put("msg", String.format("第%d行，第%d列的发车时间格式不正确，格式应为hh:mm或hhmm", i + 1, j + 1));
-                                return rtn;
-                            }
-                        }
-                    }
-                }
-            }
-
-        }
-
-        rtn.put("status", ResponseCode.SUCCESS);
-        return rtn;
-    }
-
-    /**
-     * 3、验证关联的线路标准信息（以后放到规则引擎里去做）。
-     * @param lineinfoid
-     * @return
-     */
-    @RequestMapping(value = "/validate/lineinfo", method = RequestMethod.GET)
-    public Map<String, Object> validateAssoLineInfo(Integer lineinfoid) {
-        Map<String, Object> rtn = new HashMap<>();
-        LineInformation lineInformation = lineInformationService.findById(lineinfoid);
-        if (lineInformation.getUpInMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行进场里程为空");
-            return rtn;
-        } else if (lineInformation.getUpInTimer() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行进场时间为空");
-            return rtn;
-        } else if (lineInformation.getUpOutMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行出场里程为空");
-            return rtn;
-        } else if (lineInformation.getUpOutTimer() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行出场时间为空");
-            return rtn;
-        } else if (lineInformation.getUpMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行班次里程为空");
-            return rtn;
-        } else if (lineInformation.getUpTravelTime() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行班次时间为空");
-            return rtn;
-        } else if (lineInformation.getDownInMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行进场里程为空");
-            return rtn;
-        } else if (lineInformation.getDownInTimer() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行进场时间为空");
-            return rtn;
-        } else if (lineInformation.getDownOutMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行出场里程为空");
-            return rtn;
-        } else if (lineInformation.getDownOutTimer() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行出场时间为空");
-            return rtn;
-        } else if (lineInformation.getDownMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行班次里程为空");
-            return rtn;
-        } else if (lineInformation.getDownTravelTime() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行班次时间为空");
-            return rtn;
-        } else if (StringUtils.isEmpty(lineInformation.getCarPark())) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "停车场必须选择");
-            return rtn;
-        }
-
-        // 单独验证停车场信息
-        String tcccode = lineInformation.getCarPark();
-        Map<String, Object> p1 = new HashMap<>();
-        p1.put("parkCode_eq", tcccode);
-        List<CarPark> carParkList = (List<CarPark>) carParkService.list(p1);
-        if (CollectionUtils.isEmpty(carParkList)) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", String.format("线路标准里的停车场code=%s，在停车场信息中未找到", tcccode));
-            return rtn;
-        } else if (carParkList.size() > 1) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", String.format("线路标准里的停车场code=%s，在停车场信息中有重复数据", tcccode));
-            return rtn;
-        } else {
-            CarPark carPark = carParkList.get(0);
-            if (StringUtils.isEmpty(carPark.getParkName())) {
-                rtn.put("status", ResponseCode.ERROR);
-                rtn.put("msg", String.format("线路标准里的停车场code=%s，在停车场信息中没有停车场名字", tcccode));
-                return rtn;
-            }
-        }
-
-        rtn.put("status", ResponseCode.SUCCESS);
-        return rtn;
-    }
-
-    /**
-     * 4、导入时刻表明细数据。
-     * @param form
-     * @return
-     */
-    @RequestMapping(value = "/importfile", method = RequestMethod.POST)
-    public Map<String, Object> importTTinfo(@RequestParam Map<String, Object> form) throws Exception {
-        Map<String, Object> rtn = new HashMap<>();
-
-        // 1、修改已经上传的excel文件，在每个起点站后标示数字，表示第几个班次
-        // 2、由于格式问题，需要把内容都转换成字符串
-        String filename = (String) form.get("filename");
-        List<String> colList = new ArrayList<>();
-        Workbook workbook = Workbook.getWorkbook(new File(filename));
-        Sheet sheet = workbook.getSheet((String) form.get("sheetname"));
-        Cell[] cells = sheet.getRow(0);
-        for (int i = 0; i < cells.length; i++) {
-            if (i == 0) {
-                colList.add(cells[i].getContents().trim());
-            } else {
-                colList.add(cells[i].getContents() + i);
-            }
-        }
-
-        WritableWorkbook writableWorkbook = Workbook.createWorkbook(new File(filename + "_temp.xls"), workbook);
-        WritableSheet sheet1 = writableWorkbook.getSheet((String) form.get("sheetname"));
-        for (int i = 0; i < sheet1.getColumns(); i++) { // 第一行数据
-            sheet1.addCell(new Label(i, 0, colList.get(i)));
-        }
-        for (int i = 1; i < sheet1.getRows(); i++) { // 第二行开始
-            Cell[] cells1 = sheet.getRow(i);
-            for (int j = 0; j < cells1.length; j++) {
-                sheet1.addCell(new Label(j, i, cells1[j].getContents()));
-            }
-        }
-        writableWorkbook.write();
-        writableWorkbook.close();
-
-        // 2、删除原有数据
-        ttInfoDetailService.deleteByTtinfo(Long.valueOf(form.get("ttid").toString()));
-
-        // 3、导入时刻表
-        // 获取停车场名字
-        LineInformation lineInformation = lineInformationService.findById(Integer.valueOf(form.get("lineinfo").toString()));
-        Map<String, Object> p1 = new HashMap<>();
-        p1.put("parkCode_eq", lineInformation.getCarPark());
-        List<CarPark> carParkList = (List<CarPark>) carParkService.list(p1);
-        String tccname = carParkList.get(0).getParkName();
-
-        ttInfoDetailService.fileDataImport(
-                new File(filename + "_temp.xls"),
-                (String) form.get("sheetname"),
-                (String) form.get("xlname"),
-                (String) form.get("ttname"),
-                tccname
-        );
-
-        return rtn;
-    }
-
-    //------------- 旧版本 --------------//
-    @RequestMapping(value = "/dataImportExtend", method = RequestMethod.POST)
-    public Map<String, Object> uploadDataAndImport(
-            MultipartFile file, String xlmc, String ttinfoname) throws Exception {
-        Map<String, Object> resultMap = new HashMap<>();
-
-        try {
-            // 查找lineinformation对象，没有报错
-            Map<String, Object> param = new HashMap<>();
-            param.put("line.name_eq", xlmc);
-            Iterator<LineInformation> lineInformationIterator = lineInformationService.list(param).iterator();
-            if (!lineInformationIterator.hasNext()) {
-                // 没有lineinformation，报错
-                resultMap.put("status", ResponseCode.ERROR);
-                resultMap.put("msg", "没有lineinfomation，线路名称=" + xlmc);
-            } else {
-                String tcccode = lineInformationIterator.next().getCarPark();
-                if (StringUtils.isEmpty(tcccode)) {
-                    // 没有停车场code，报错
-                    resultMap.put("status", ResponseCode.ERROR);
-                    resultMap.put("msg", "线路lineinfomation没有停车场code信息，线路名称=" + xlmc);
-                } else {
-                    // 使用停车场code查找停车场
-                    param.clear();;
-                    param.put("parkCode_eq", tcccode);
-                    Iterator<CarPark> carParkIterator = carParkService.list(param).iterator();
-                    if (!carParkIterator.hasNext()) {
-                        // 指定的停车场code没有找到停车场信息，报错
-                        resultMap.put("status", ResponseCode.ERROR);
-                        resultMap.put("msg", "没有找到停车场信息，停车场code=" + tcccode);
-                    } else {
-                        String tccname = carParkIterator.next().getParkName();
-                        if (StringUtils.isEmpty(tccname)) {
-                            // 没有停车场名字，报错
-                            resultMap.put("status", ResponseCode.ERROR);
-                            resultMap.put("msg", "停车场信息没有停车场名字，停车场code=" + tcccode);
-                        } else {
-                            ttInfoDetailService.fileDataImport(file, xlmc, ttinfoname, tccname);
-                            resultMap.put("status", ResponseCode.SUCCESS);
-                            resultMap.put("msg", "导入成功");
-                        }
-                    }
-                }
-            }
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            throw exp;
-        }
-
-        return resultMap;
-    }
-
-    @RequestMapping(value = "/edit/{xlid}/{ttid}", method = RequestMethod.GET)
-    public Object getEditInfo(
-            @PathVariable("xlid") Integer xlid,
-            @PathVariable("ttid") Long ttid) throws Exception {
-        // TODO：返回类型需要修正
-        return ttInfoDetailService.getEditInfo(xlid, ttid);
-    }
-
-    @Override
-    public TTInfoDetail findById(@PathVariable("id") Long aLong) {
-        return ttInfoDetailRepository.findOneExtend(aLong);
-    }
-
-    @RequestMapping(value = "/bcdetail", method = RequestMethod.GET)
-    public List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId) {
-        return ttInfoDetailRepository.findBcdetails(xlId, ttinfoId, lpId);
-    }
-
-    @Override
-    public void dataExport(HttpServletResponse response, @RequestParam Map<String, Object> param) throws Exception {
-        // 获取injectktr
-        File ktrFile2 = new File(this.getClass().getResource(
-                dataToolsProperties.getTtinfodetailOutput()).toURI());
-        param.put("injectktrfile", ktrFile2.getAbsolutePath());
-        param.put("ttinfoid", param.get("ttinfoid"));
-
-        super.dataExport(response, param);
-    }
-
-    @Override
-    protected String getDataExportKtrClasspath() {
-        return dataToolsProperties.getTtinfodetailMetaoutput();
-    }
-
-    @Override
-    protected String getDataExportFilename() {
-        return "时刻表";
-    }
-}
@@ -4,7 +4,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.CarDevice;
 import com.bsth.service.schedule.CarDeviceService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -4,7 +4,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.Cars;
 import com.bsth.service.schedule.CarsService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -4,7 +4,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.Personnel;
 import com.bsth.service.schedule.EmployeeService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -5,7 +5,7 @@ import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.service.schedule.CarConfigInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -5,7 +5,7 @@ import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -5,7 +5,7 @@ import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.repository.schedule.GuideboardInfoRepository;
 import com.bsth.service.schedule.GuideboardInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -3,7 +3,7 @@ package com.bsth.controller.schedule.core;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.TTInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+package com.bsth.controller.schedule.core;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.service.schedule.TTInfoDetailService;
+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.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by xu on 17/1/4.
+ */
+@RestController
+@RequestMapping("tidc")
+public class TTInfoDetailController extends BController<TTInfoDetail, Long> {
+    @Autowired
+    private TTInfoDetailService ttInfoDetailService;
+
+    @RequestMapping(value = "/bcdetail", method = RequestMethod.GET)
+    public List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId) {
+        return ttInfoDetailService.findBcdetails(xlId, ttinfoId, lpId);
+    }
+
+    /**
+     * 验证sheet（以后放到规则引擎里去做）。
+     * @param filename excel文件全路径名
+     * @param sheetname sheet名字
+     * @param lineid 线路id
+     * @param linename 线路名称
+     * @return
+     */
+    @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST)
+    public Map<String, Object> validate_sheet(String filename, String sheetname, Integer lineid, String linename) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    /**
+     * 验证关联的线路标准信息（以后放到规则引擎里去做）。
+     * @param lineinfoid
+     * @return
+     */
+    @RequestMapping(value = "/validate/lineinfo", method = RequestMethod.GET)
+    public Map<String, Object> validate_lineInfo(Integer lineinfoid) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            ttInfoDetailService.validateAssoLineInfo(lineinfoid);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    /**
+     * 获取时刻表明细编辑信息。
+     * @param xlid 线路id
+     * @param ttid 时刻表id
+     * @return
+     */
+    @RequestMapping(value = "/edit/{xlid}/{ttid}", method = RequestMethod.GET)
+    public Map<String, Object> getEditInfo(@PathVariable("xlid") Integer xlid,
+                                           @PathVariable("ttid") Long ttid) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            TTInfoDetailService.EditInfo editInfo = ttInfoDetailService.getEditInfo(xlid, ttid);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", editInfo);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+}
+package com.bsth.controller.sys;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.sys.DutyEmployee;
+import com.bsth.service.sys.DutyEmployeeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/1/5.
+ */
+@RestController
+@RequestMapping("dutyEmployee")
+public class DutyEmployeeController extends BaseController<DutyEmployee, Long> {
+
+    @Autowired
+    DutyEmployeeService dutyEmployeeService;
+
+    @RequestMapping(value = "queryByLineAndTime")
+    public List<DutyEmployee> getDutyEmployee(@RequestParam String lineCode, @RequestParam String startTime, @RequestParam String endTime) {
+        return dutyEmployeeService.getDutyEmployee(lineCode, startTime, endTime);
+    }
+}
@@ -26,12 +26,12 @@ import java.util.concurrent.TimeUnit;
  */
 @Component
 public class BasicData implements CommandLineRunner {
-	
-	//公司代码和公司名对照(K: 公司编码，V:公司名)
-	public static Map<String, String> businessCodeNameMap;
-	
-	//分公司公司代码和分公司公司名对照(K: 公司编码+分公司编码，V:分公司公司名)
-	public static Map<String, String> businessFgsCodeNameMap;
+
+    //公司代码和公司名对照(K: 公司编码，V:公司名)
+    public static Map<String, String> businessCodeNameMap;
+
+    //分公司公司代码和分公司公司名对照(K: 公司编码+分公司编码，V:分公司公司名)
+    public static Map<String, String> businessFgsCodeNameMap;
     //设备号和车辆自编号 （K: 设备编码 ，V：车辆自编号）
     public static BiMap<String, String> deviceId2NbbmMap;
@@ -39,27 +39,21 @@ public class BasicData implements CommandLineRunner {
     //车辆自编号和公司代码对照 （K: 车辆自编号 ，V：公司代码）
     public static Map<String, String> nbbm2CompanyCodeMap;
-    //站点编码和名称对照，包括停车场 （K: 站点编码 ，V：站点名称）
+    //站点编码和名称对照，包括停车场 （K: lineCode_updown_stationCode ，V：站点名称）
     public static Map<String, String> stationCode2NameMap;
     //线路起终点对照（线路编码_上下行_起终点）  1024_0_B (1024上行起点)
-    public static Map<String, String> lineSEPointMap;
+    //public static Map<String, String> lineSEPointMap;
     //车辆和线路对照
     public static Map<String, Line> nbbm2LineMap;
-    //线路和用户对照 用于webSocket定向推送消息（用户进入线调时写入数据）
-    //public static TreeMultimap<String, String> lineCode2SocketUserMap = TreeMultimap.create();
-
     //线路ID和code 对照
     public static BiMap<Integer, String> lineId2CodeMap;
     //线路编码和名称对照
     public static Map<String, String> lineCode2NameMap;
-    //线路编码_站点编码 == 0|1  上下行
-    //public static Map<String, Integer> lineStationUpDownMap;
-
     //停车场
     public static List<String> parkCodeList;
@@ -77,7 +71,7 @@ public class BasicData implements CommandLineRunner {
     public static Map<String, String> allPerson;
     //站点名和运管处编号 对照
-    public static Map<String,Integer> stationName2YgcNumber;
+    public static Map<String, Integer> stationName2YgcNumber;
     static Logger logger = LoggerFactory.getLogger(BasicData.class);
@@ -90,6 +84,10 @@ public class BasicData implements CommandLineRunner {
         Application.mainServices.scheduleWithFixedDelay(dataLoader, 2, 2, TimeUnit.HOURS);
     }
+    public static String getStationNameByCode(String code, String prefix){
+        String name = stationCode2NameMap.get(code);
+        return name != null? name: stationCode2NameMap.get(prefix + code);
+    }
     @Component
     public static class BasicDataLoader extends Thread {
@@ -114,7 +112,7 @@ public class BasicData implements CommandLineRunner {
         @Autowired
         PersonnelRepository personnelRepository;
-        
+
         @Autowired
         BusinessRepository businessRepository;
@@ -156,47 +154,24 @@ public class BasicData implements CommandLineRunner {
             return 0;
         }
-
-/*        private void loadStationRouteInfo() {
-            Iterator<StationRoute> iterator = stationRouteRepository.findAllEffective().iterator();
-
-            Map<String, String> sePointMap = new HashMap<>();
-            //lineSEPointMap
-            Map<String, Integer> map = new HashMap<>();
-
-            StationRoute route;
-            while (iterator.hasNext()) {
-                route = iterator.next();
-                map.put(route.getLineCode() + "_" + route.getStationCode(), route.getDirections());
-
-                if (route.getStationMark() != null &&
-                        (route.getStationMark().equals("B") || route.getStationMark().equals("E"))) {
-                    sePointMap.put(route.getLineCode() + "_"
-                            + route.getDirections()
-                            + "_" + route.getStationMark(), route.getStationCode());
-                }
-            }
-            lineStationUpDownMap = map;
-            lineSEPointMap = sePointMap;
-        }*/
-
         /**
          * loadBusinessInfo
          * (公司代码公司名对照)
          */
-        public void loadBusinessInfo(){
-        	Map<String, String> businessMap=new HashMap<String,String>();
-        	Map<String, String> businessFgsMap=new HashMap<String,String>();
-        	Iterator<Business> busIter=businessRepository.findAll().iterator();
-        	Business t;
-        	while(busIter.hasNext()){
-        		t=busIter.next();
-        		businessMap.put(t.getBusinessCode(), t.getBusinessName());
-        		businessFgsMap.put(t.getBusinessCode()+"_"+t.getUpCode(), t.getBusinessName());
-        	}
-        	businessCodeNameMap=businessMap;
-        	businessFgsCodeNameMap=businessFgsMap;
+        public void loadBusinessInfo() {
+            Map<String, String> businessMap = new HashMap<String, String>();
+            Map<String, String> businessFgsMap = new HashMap<String, String>();
+            Iterator<Business> busIter = businessRepository.findAll().iterator();
+            Business t;
+            while (busIter.hasNext()) {
+                t = busIter.next();
+                businessMap.put(t.getBusinessCode(), t.getBusinessName());
+                businessFgsMap.put(t.getBusinessCode() + "_" + t.getUpCode(), t.getBusinessName());
+            }
+            businessCodeNameMap = businessMap;
+            businessFgsCodeNameMap = businessFgsMap;
         }
+
         /**
          * @Title: loadDeviceInfo
          * @Description: TODO(加载设备相关信息)
@@ -223,13 +198,13 @@ public class BasicData implements CommandLineRunner {
          */
         public void loadStationInfo() {
             Map<String, String> stationCode2Name = new HashMap<>();
-            Iterator<Station> iterator = stationRepository.findAll().iterator();
-            //站点
-            Station station;
+            Iterator<StationRoute> iterator = stationRouteRepository.findAll().iterator();
+            StationRoute sroute;
             while (iterator.hasNext()) {
-                station = iterator.next();
-                stationCode2Name.put(station.getStationCod(), station.getStationName());
+                sroute = iterator.next();
+                stationCode2Name.put(sroute.getLineCode() + "_" + sroute.getDirections() + "_" + sroute.getStationCode(), sroute.getStationName());
             }
+
             //停车场
             Iterator<CarPark> iterator2 = carParkRepository.findAll().iterator();
@@ -266,7 +241,7 @@ public class BasicData implements CommandLineRunner {
          * @Title: loadLineInfo
          * @Description: TODO(加载线路相关信息)
          */
-        public void loadLineInfo(){
+        public void loadLineInfo() {
             Iterator<Line> iterator = lineRepository.findAll().iterator();
             Line line;
@@ -276,36 +251,36 @@ public class BasicData implements CommandLineRunner {
             Map<String, String> code2SHcode = new HashMap<String, String>();
             Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 line = iterator.next();
                 biMap.put(line.getId(), line.getLineCode());
                 code2name.put(line.getLineCode(), line.getName());
-                id2SHcode.put(line.getId(),line.getShanghaiLinecode());
+                id2SHcode.put(line.getId(), line.getShanghaiLinecode());
                 code2SHcode.put(line.getLineCode(), line.getShanghaiLinecode());
                 /**
                  * 加载运管处的站点及序号
                  * 上行从1开始，下行顺序续编
-                List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
-                if(ygcLines != null && ygcLines.size() > 0){
-                    int size = ygcLines.size();
-                    Object[] tempArray ;
-                    int num = 1;
-                    String key;
-                    String lineCode = "";
-                    for (int i = 0; i < size; i ++){
-                        tempArray = ygcLines.get(i);
-                        if(lineCode.equals("")){
-                            lineCode = tempArray[0]+"";
-                        }else if(!lineCode.equals(tempArray[0]+"")){
-                            num = 1;
-                            lineCode = tempArray[0]+"";
-                        }
-                        key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
-                        tempStationName2YgcNumber.put(key,num++);
-                    }
-                }*/
+                 List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
+                 if(ygcLines != null && ygcLines.size() > 0){
+                 int size = ygcLines.size();
+                 Object[] tempArray ;
+                 int num = 1;
+                 String key;
+                 String lineCode = "";
+                 for (int i = 0; i < size; i ++){
+                 tempArray = ygcLines.get(i);
+                 if(lineCode.equals("")){
+                 lineCode = tempArray[0]+"";
+                 }else if(!lineCode.equals(tempArray[0]+"")){
+                 num = 1;
+                 lineCode = tempArray[0]+"";
+                 }
+                 key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
+                 tempStationName2YgcNumber.put(key,num++);
+                 }
+                 }*/
             }
             lineId2CodeMap = biMap;
@@ -10,6 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import java.util.*;
@@ -23,6 +24,7 @@ import java.util.*;
  *
  */
 @Component
+@Order(value = 2)
 public class LineConfigData implements CommandLineRunner {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 package com.bsth.data.arrival;
-import com.bsth.data.match.Arrival2Schedule;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
@@ -59,7 +58,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 		@Override
 		public void run() {
-			try{
+			/*try{
 				logger.info("开始加载到离站数据, " + System.currentTimeMillis());
 				List<ArrivalEntity> arrSets = dataLoader.load();
 				if(null == arrSets || arrSets.size() == 0)
@@ -86,7 +85,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 				Arrival2Schedule.start(carSet);
 			}catch(Exception e){
 				logger.error("", e);
-			}
+			}*/
 		}
 	}
 package com.bsth.data.forecast;
+import com.bsth.Application;
 import com.bsth.data.forecast.entity.ForecastResult;
 import com.bsth.data.forecast.entity.ForecastResult.ForecastResultItem;
 import com.bsth.data.forecast.entity.SimpleRoute;
@@ -20,6 +21,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 /**
  * 
@@ -58,7 +60,7 @@ public class ForecastRealServer implements CommandLineRunner {
 	@Override
 	public void run(String... arg0) throws Exception {
 		//2小时更新一次站点间耗时数据
-		//Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS);
 	}
 	/**
@@ -86,7 +88,7 @@ public class ForecastRealServer implements CommandLineRunner {
 			//终点站
 			String eStation = null;
 			//当前执行班次
-			ScheduleRealInfo sch = dayOfSchedule.execPlanMap().get(nbbm);
+			ScheduleRealInfo sch = dayOfSchedule.executeCurr(nbbm);
 			if(null != sch)
 				eStation = sch.getZdzCode();
@@ -86,7 +86,7 @@ public class GpsEntity {
 	private StationRoute station;
 	/** 状态 */
-	private String signalState;
+	private String signalState = "normal";
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -2,7 +2,6 @@ package com.bsth.data.gpsdata;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
 import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
@@ -26,7 +25,6 @@ import org.springframework.stereotype.Component;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 /**
  * @author PanZhao
@@ -67,12 +65,42 @@ public class GpsRealData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
-        logger.info("gpsDataLoader,40,6");
-        Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 40, 6, TimeUnit.SECONDS);
+        logger.info("gpsDataLoader,20,5");
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
     }
     public void put(GpsEntity gps) {
-        gpsMap.put(gps.getDeviceId(), gps);
+        String device = gps.getDeviceId();
+        GpsEntity old = gpsMap.get(device);
+
+        try {
+            if (!StringUtils.isEmpty(gps.getStopNo())) {
+                //站点编码改变
+                if (null == old || !gps.getStopNo().equals(old.getStopNo())) {
+                    gps.setArrTime(gps.getTimestamp());
+                    //预测到达终点时间
+                    forecastRealServer.forecast(gps.getNbbm(), gps);
+                } else {
+                    gps.setArrTime(old.getArrTime());
+                    //不预测， 重新计算终点时间
+                    gps.setExpectStopTime(forecastRealServer.expectStopTime(gps.getNbbm()));
+                }
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+
+        //刷新对照
+        gpsMap.put(device, gps);
+        if (StringUtils.isNotBlank(gps.getLineId())) {
+            //站点名称
+            gps.setStationName(getStationName(gps));
+            lineCode2Devices.put(gps.getLineId(), device);
+        }
+    }
+
+    public String getStationName(GpsEntity gps) {
+        return BasicData.getStationNameByCode(gps.getStopNo(), gps.getLineId() + "_" + gps.getUpDown() + "_");
     }
     /**
@@ -94,7 +122,7 @@ public class GpsRealData implements CommandLineRunner {
         for (String device : set) {
             gps = gpsMap.get(device);
             //过滤异常GPS数据
-            if (gps.isAbnormal())
+            if (gps == null || gps.isAbnormal())
                 continue;
             sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
+package com.bsth.data.gpsdata;
+
+import com.bsth.data.gpsdata.arrival.entity.SignalState;
+import com.bsth.websocket.handler.SendUtils;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 信号状态数据
+ * Created by panzhao on 2016/12/30.
+ */
+@Component
+public class SignalStateData {
+
+    @Autowired
+    SendUtils sendUtils;
+
+    private static ArrayListMultimap<String, SignalState> listMultimap = ArrayListMultimap.create();
+
+    public void put(SignalState state){
+        listMultimap.put(state.getLineCode(), state);
+        //推送到客户端
+        sendUtils.sendSignalState(state);
+    }
+
+    public List<SignalState> get(String idx){
+        List<SignalState> rs = new ArrayList<>();
+        List<String> ids = Splitter.on(",").splitToList(idx);
+
+        for(String lineCode : ids){
+            rs.addAll(listMultimap.get(lineCode));
+        }
+        return rs;
+    }
+}
@@ -29,8 +29,8 @@ public class GeoCacheData {
     static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
-    //每辆车缓存最后500条gps
-    private static final int CACHE_SIZE = 500;
+    //每辆车缓存最后1000条gps
+    private static final int CACHE_SIZE = 1000;
     private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
     //线路路段走向
@@ -75,7 +75,7 @@ public class GeoCacheData {
         }
     }
-    public static StationRoute getRouteCode(GpsEntity gps){
+    public static StationRoute getRouteCode(GpsEntity gps) {
         return routeCodeMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo());
     }
@@ -94,6 +94,21 @@ public class GeoCacheData {
         return null;
     }
+    public static List<StationRoute> midwayStation(String lineCode, int directions, String sCode, String eCode) {
+        List<StationRoute> list = getStationRoute(lineCode, directions), rs = new ArrayList<>();
+
+        boolean flag = false;
+        for (StationRoute sr : list) {
+            if (flag)
+                rs.add(sr);
+            if (sr.getCode().equals(sCode))
+                flag = true;
+            else if (sr.getCode().equals(eCode))
+                break;
+        }
+        return rs;
+    }
+
     public static Polygon getTccPolygon(String code) {
         return tccMap.get(code);
     }
@@ -191,4 +206,16 @@ public class GeoCacheData {
         }
         return cds;
     }
+
+    /**
+     * 是不是终点站
+     * @param lineId
+     * @param upDown
+     * @param stationCode
+     * @return
+     */
+    public static boolean isEndStation(String lineId, Integer upDown, String stationCode) {
+        StationRoute station = routeCodeMap.get(lineId + "_" + upDown + "_" + stationCode);
+        return station != null && station.getMark().equals("E");
+    }
 }
 \ No newline at end of file
 package com.bsth.data.gpsdata.arrival;
 import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.arrival.handlers.*;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import org.slf4j.Logger;
@@ -33,6 +34,9 @@ public class GpsRealAnalyse {
     @Autowired
     ReverseSignalHandle reverseSignalHandle;
+    @Autowired
+    GpsRealData gpsRealData;
+
     //50个线程
     static ExecutorService threadPool = Executors.newFixedThreadPool(50);
@@ -45,6 +49,10 @@ public class GpsRealAnalyse {
         try {
             //等待子线程结束
             count.await();
+
+            //加入实时gps对照
+            for(GpsEntity gps: list)
+                gpsRealData.put(gps);
         } catch (InterruptedException e) {
             logger.error("", e);
         }
 package com.bsth.data.gpsdata.arrival;
 import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+import java.util.List;
 /**
  * Created by panzhao on 2016/12/27.
@@ -14,64 +19,71 @@ public abstract class SignalHandle {
         return prevs != null && prevs.size() > 0 && prevs.getTail() != null;
     }
+    protected boolean isDriftSignal(GpsEntity gps) {
+        return gps.getLat() == 0 || gps.getLon() == 0;
+    }
+
     /**
      * 是不是异常信号
      *
      * @param gps
-     * @return
-     */
-    protected boolean isAbnormal(GpsEntity gps) {
-        return gps.getLat() == 0 || gps.getLon() == 0;
-    }
+     * @return protected boolean isAbnormal(GpsEntity gps) {
+    return gps.getLat() == 0 || gps.getLon() == 0;
+    }*/
     /**
      * 连续异常信号个数统计
      *
      * @param prevs
-     * @return
+     * @return protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
+     * int count = 0;
+     * <p>
+     * if (!isNotEmpty(prevs))
+     * return count;
+     * <p>
+     * GpsEntity[] array = (GpsEntity[]) prevs.getQueue();
+     * GpsEntity gps;
+     * for (int i = array.length - 1; i > 0; i--) {
+     * gps = array[i];
+     * <p>
+     * if (isAbnormal(gps))
+     * count++;
+     * else
+     * break;
+     * }
+     * <p>
+     * return count;
+     * }
      */
-    protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
-        int count = 0;
-        if (!isNotEmpty(prevs))
-            return count;
-
-        GpsEntity[] array = (GpsEntity[]) prevs.getQueue();
-        GpsEntity gps;
-        for (int i = array.length - 1; i > 0; i--) {
-            gps = array[i];
-
-            if (isAbnormal(gps))
-                count++;
-            else
-                break;
+    protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
+        int updown = Integer.parseInt(sch.getXlDir());
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), updown);
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+        if (station != null) {
+            gps.setUpDown(updown);
+            gps.setStopNo(station.getCode());
         }
-
-        return count;
     }
     /**
-     * 车辆运行轨迹（最近20分钟）
-     * 0：上行 1：下行 -1：未知
+     * 是否是从异常状态恢复的第一个信号
      *
      * @param gps
+     * @param prevs
      * @return
      */
-    protected int runTrack(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        int rs = -1, count = 0;
-
-        long et = gps.getTimestamp() - (1000 * 60 * 20);
-        Object[] array = prevs.getQueue();
-        GpsEntity prev;
-        for(Object obj : array){
-            prev = (GpsEntity) obj;
-            if(prev.getTimestamp() < et)
-                break;
-
+    protected boolean abnormalRecovery(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        if (prevs == null || prevs.size() == 0)
+            return false;
+        GpsEntity prev = prevs.getTail();
+        //从漂移状态恢复
+        if (isDriftSignal(prev)
+                && !isDriftSignal(gps)) {
+            return true;
         }
-        //for()
-        return 0;
-    }
-}
+        return false;
+    }
+}
 \ No newline at end of file
@@ -5,6 +5,7 @@ package com.bsth.data.gpsdata.arrival.entity;
  */
 public class RouteReverse {
+    private String nbbm;
     //反转个数
     private int count;
@@ -14,18 +15,18 @@ public class RouteReverse {
     //掉头站点
     private String turned;
-    //开始时间
-    private long st;
-
     //掉头时间
     private long zt;
-    //结束时间
-    private long et;
+    //检测时间
+    private long ct;
     //是否闭合
     private boolean close;
+    //信号不明确
+    private boolean vague;
+
     public int getCount() {
         return count;
     }
@@ -50,22 +51,6 @@ public class RouteReverse {
         this.turned = turned;
     }
-    public long getSt() {
-        return st;
-    }
-
-    public void setSt(long st) {
-        this.st = st;
-    }
-
-    public long getEt() {
-        return et;
-    }
-
-    public void setEt(long et) {
-        this.et = et;
-    }
-
     public boolean isClose() {
         return close;
     }
@@ -81,4 +66,28 @@ public class RouteReverse {
     public void setZt(long zt) {
         this.zt = zt;
     }
-}
+
+    public long getCt() {
+        return ct;
+    }
+
+    public void setCt(long ct) {
+        this.ct = ct;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public boolean isVague() {
+        return vague;
+    }
+
+    public void setVague(boolean vague) {
+        this.vague = vague;
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.arrival.entity;
+
+/**
+ * 班次信号异常（漂移 或 断线）
+ * Created by panzhao on 2016/12/31.
+ */
+public class SignalAbnormal {
+
+    private Long et;
+
+    /** drift or reconnection */
+    private String abnormalType;
+
+    private Long st;
+
+    private String nearPoint;
+
+    private String destCode;
+
+    private Long ct;
+
+    //0: 发车  1：到站
+    private int outOrIn;
+
+    public Long getEt() {
+        return et;
+    }
+
+    public void setEt(Long et) {
+        this.et = et;
+    }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
+
+    public Long getSt() {
+        return st;
+    }
+
+    public void setSt(Long st) {
+        this.st = st;
+    }
+
+    public String getNearPoint() {
+        return nearPoint;
+    }
+
+    public void setNearPoint(String nearPoint) {
+        this.nearPoint = nearPoint;
+    }
+
+    public Long getCt() {
+        return ct;
+    }
+
+    public void setCt(Long ct) {
+        this.ct = ct;
+    }
+
+    public int getOutOrIn() {
+        return outOrIn;
+    }
+
+    public void setOutOrIn(int outOrIn) {
+        this.outOrIn = outOrIn;
+    }
+
+    public String getDestCode() {
+        return destCode;
+    }
+
+    public void setDestCode(String destCode) {
+        this.destCode = destCode;
+    }
+}
+package com.bsth.data.gpsdata.arrival.entity;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+/**
+ * 信号状态
+ * Created by panzhao on 2016/12/30.
+ */
+public class SignalState {
+
+    private String type;
+
+    private Long st;
+
+    //private Long checkTime;
+
+    private Long schId;
+
+    private String lineCode;
+
+    private String text;
+
+    private RouteReverse reverse;
+
+    private SignalAbnormal signalAbnormal;
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    /**
+     * 记录区间调头
+     *
+     * @param sch
+     * @param reverse
+     * @return
+     */
+    public static SignalState reverseSignalSTate(ScheduleRealInfo sch, RouteReverse reverse) {
+        /*if(reverse.isVague())
+            return null;*/
+
+        SignalState state = new SignalState();
+        state.setSchId(sch.getId());
+        state.setType("route_reverse");
+        //state.setCheckTime(System.currentTimeMillis());
+
+        String stationName = BasicData.stationCode2NameMap.get(sch.getXlBm() + "_" + sch.getXlDir() + "_" + reverse.getTurned());
+        state.setText(fmtHHmm.print(reverse.getZt()) + " 从 " + stationName + " 站掉头");
+        state.setSt(sch.getFcsjActualTime());
+        state.setLineCode(sch.getXlBm());
+        state.setReverse(reverse);
+        return state;
+    }
+
+    public static SignalState abnormalSignalSTate(ScheduleRealInfo sch, SignalAbnormal signalAbnormal) {
+        SignalState state = new SignalState();
+        state.setSchId(sch.getId());
+        state.setType("abnormal_signal");
+        //state.setCheckTime(signalAbnormal.getCt());
+        state.setLineCode(sch.getXlBm());
+
+        String text = (fmtHHmm.print(signalAbnormal.getSt()) + " ~ " + fmtHHmm.print(signalAbnormal.getEt()));
+        String abnormType = signalAbnormal.getAbnormalType();
+        if (abnormType.equals("drift"))
+            text += "（GPS无效）";
+        else if (abnormType.equals("reconnection"))
+            text += "（信号丢失）";
+
+        state.setText(text);
+        state.setSignalAbnormal(signalAbnormal);
+        return state;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public long getSchId() {
+        return schId;
+    }
+
+    public void setSchId(long schId) {
+        this.schId = schId;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getSt() {
+        return st;
+    }
+
+    public void setSt(Long st) {
+        this.st = st;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public RouteReverse getReverse() {
+        return reverse;
+    }
+
+    public void setReverse(RouteReverse reverse) {
+        this.reverse = reverse;
+    }
+
+    public SignalAbnormal getSignalAbnormal() {
+        return signalAbnormal;
+    }
+
+    public void setSignalAbnormal(SignalAbnormal signalAbnormal) {
+        this.signalAbnormal = signalAbnormal;
+    }
+}
@@ -2,23 +2,21 @@ package com.bsth.data.gpsdata.arrival.handlers;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.SignalHandle;
-import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
+import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import java.util.List;
-
 /**
  * 进出站动作处理
  * Created by panzhao on 2016/12/27.
@@ -40,8 +38,25 @@ public class InOutStationSignalHandle extends SignalHandle{
     @Autowired
     DirectiveService directiveService;
+    @Autowired
+    ScheduleSignalState scheduleSignalState;
+
+    @Autowired
+    SignalSchPlanMatcher signalSchPlanMatcher;
+
+    private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
+
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //忽略漂移信号
+        if(isDriftSignal(gps))
+            return false;
+
+        //从异常状态恢复的第一个信号
+        if(abnormalRecovery(gps, prevs)){
+            //回溯一下之前的轨迹
+            scheduleSignalState.signalRetrospect(gps);
+        }
         if(isNotEmpty(prevs)){
             GpsEntity prev = prevs.getTail();
@@ -91,13 +106,23 @@ public class InOutStationSignalHandle extends SignalHandle{
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         String qdzCode = sch.getQdzCode();
-
-        //if(sch.getFcsjActual() != )
+        //首班出场最多提前1.2小时
+        if(dayOfSchedule.isFirstOut(sch) && sch.getDfsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+            return;
         //起点发车
         if(qdzCode != null && prev.getStopNo().equals(qdzCode)
                 && !willDepart(gps, prev, sch)){
+            //发车班次匹配
+            signalSchPlanMatcher.outMatch(gps, sch);
+            sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+            //实发时间不覆盖
+            if(StringUtils.isNotEmpty(sch.getFcsjActual()))
+                return;
+
+            //实发时间
             sch.setFcsjActualAll(gps.getTimestamp());
             //通知客户端
             sendUtils.sendFcsj(sch);
@@ -108,16 +133,28 @@ public class InOutStationSignalHandle extends SignalHandle{
             outStationAndOutPark(sch);
             logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
         }
+        else if(sch.getBcType().equals("out")){
+            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            if(prev.getStopNo().equals(next.getQdzCode())){
+                //发下一个班次
+                dayOfSchedule.addExecPlan(next);
+                outStation(gps, prev);
+            }
+        }
     }
+
     private void outStationAndOutPark(ScheduleRealInfo sch){
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (config != null && config.getOutConfig() == 2) {
             //出站既出场
             ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
             if (schPrev != null && schPrev.getBcType().equals("out")) {
-                schPrev.setFcsjActualAll(sch.getFcsjActual());
-                schPrev.setZdsjActualAll(sch.getFcsjActual());
+                schPrev.setFcsjActualAll(sch.getFcsjActualTime());
+                schPrev.setZdsjActualAll(sch.getFcsjActualTime());
+
+                sendUtils.refreshSch(schPrev);
+                dayOfSchedule.save(schPrev);
             }
         }
     }
@@ -129,9 +166,12 @@ public class InOutStationSignalHandle extends SignalHandle{
      */
     private void inStation(GpsEntity gps, GpsEntity prev){
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-        String zdzCode = sch.getZdzCode();
-        if(zdzCode != null && gps.getStopNo().equals(zdzCode)){
+        if(gps.getStopNo().equals(sch.getZdzCode())){
+
+            //实达时间不覆盖
+            if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+                return;
             sch.setZdsjActualAll(gps.getTimestamp());
             //已完成班次数
@@ -142,33 +182,22 @@ public class InOutStationSignalHandle extends SignalHandle{
             //持久化
             dayOfSchedule.save(sch);
             //下发调度指令
-            //directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            directiveService.send60Dispatch(next, doneSum, "到站@系统");
             //准备执行下一个班次
             if (next != null) {
                 next.setQdzArrDatesj(sch.getZdsjActual());
                 dayOfSchedule.addExecPlan(next);
-
                 //进站既进场
                 inStationAndInPark(sch, next);
-
                 //将gps转换为下一个班次走向的站内信号
-                int updown = Integer.parseInt(next.getXlDir());
-                List<StationRoute> srs = GeoCacheData.getStationRoute(next.getXlBm(), updown);
-                StationRoute station = GeoUtils.gpsInStation(gps, srs);
-                if (station != null) {
-                    gps.setUpDown(updown);
-                    gps.setStopNo(station.getCode());
-                }
+                transformUpdown(gps, sch);
             }
         }
-       /* //如果出场班次计划终点时间5分钟后还未完成，检查一下车辆轨迹，是否已经在执行线路上班次
-        else if(sch.getBcType().equals("out")
-                && sch.getZdsj() != null
-                && gps.getTimestamp() - sch.getZdsjT() >= 1000 * 60 * 5){
-            logger.info("出场班次计划终点时间5分钟后还未完成");
-
-        }*/
+        else if(sch.getFcsjActual() == null){
+            //有进站，但班次没有实发，向前追溯一下信号
+            scheduleSignalState.signalRetrospect(gps, sch);
+        }
     }
     /**
@@ -179,8 +208,11 @@ public class InOutStationSignalHandle extends SignalHandle{
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (next.getBcType().equals("in") &&
                 config != null && config.getOutConfig() == 2) {
-            next.setFcsjActualAll(sch.getZdsjActual());
-            next.setZdsjActualAll(sch.getZdsjActual());
+            next.setFcsjActualAll(sch.getZdsjActualTime());
+            next.setZdsjActualAll(sch.getZdsjActualTime());
+
+            sendUtils.refreshSch(next);
+            dayOfSchedule.save(next);
         }
     }
@@ -193,7 +225,7 @@ public class InOutStationSignalHandle extends SignalHandle{
      */
     private boolean willDepart(GpsEntity gps, GpsEntity prev, Object task){
-/*        ScheduleRealInfo sch = (ScheduleRealInfo) task;
+        /*ScheduleRealInfo sch = (ScheduleRealInfo) task;
         ScheduleRealInfo prevTask = dayOfSchedule.prev(sch);
         if(prevTask == null || prevTask.getBcType().equals("out"))
             return false;
@@ -216,4 +248,4 @@ public class InOutStationSignalHandle extends SignalHandle{
         }*/
         return false;
     }
-}
+}
 \ No newline at end of file
@@ -13,16 +13,17 @@ import org.springframework.stereotype.Component;
 @Component
 public class OfflineSignalHandle extends SignalHandle{
-    //断开3分钟，标记为重连信号
-    private final static int OFFLINE_TIME = 1000 * 60 * 3;
+    //断开2分钟，标记为重连信号
+    private final static int OFFLINE_TIME = 1000 * 60 * 2;
     //断开70分钟，之前的信号不再有参考价值
     private final static int CLEAR_TIME = 1000 * 60 * 70;
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //异常信号不管
-        if(isAbnormal(gps)){
+        //漂移信号不管
+        if(isDriftSignal(gps)){
+            gps.setSignalState("drift");
             return true;
         }
@@ -39,4 +40,4 @@ public class OfflineSignalHandle extends SignalHandle{
         }
         return true;
     }
-}
+}
 \ No newline at end of file
 package com.bsth.data.gpsdata.arrival.handlers;
-import com.alibaba.fastjson.JSON;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.entity.RouteReverse;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
 import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +25,9 @@ public class ReverseSignalHandle extends SignalHandle {
     @Autowired
     DayOfSchedule dayOfSchedule;
+    @Autowired
+    ScheduleSignalState scheduleSignalState;
+
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
         if (!isNotEmpty(prevs))
@@ -36,17 +38,10 @@ public class ReverseSignalHandle extends SignalHandle {
         if (isReverse(gps, prev)) {
             RouteReverse reverse = reverseSearch(prevs, gps);
-            if (reverse.getCount() >= 2) {
-                //切换到下一个班次
-                ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-                if (sch.getBcType().equals("out") && sch.getZdsjT() != null && sch.getZdsjT() > gps.getTimestamp()) {
-                    return false;
-                }
-                dayOfSchedule.addExecPlan(dayOfSchedule.next(sch));
-
-                if (reverse.isClose()) {
-                    logger.info("区间掉头，车辆：" + gps.getNbbm() + " -" + JSON.toJSONString(reverse));
-                }
+            if (reverse.getCount() >= 3
+                    && reverse.isClose()
+                    && !GeoCacheData.isEndStation(gps.getLineId(), gps.getUpDown(), reverse.getTurned())) {
+                scheduleSignalState.reverseAnalyse(reverse);
             }
         }
         return false;
@@ -63,7 +58,8 @@ public class ReverseSignalHandle extends SignalHandle {
         RouteReverse routeReverse = new RouteReverse();
         int count = 0;
         String path = "";
-        String turned = null;
+        long zt = 0L;
+        boolean half = false;
         //当前站点
         StationRoute curr = GeoCacheData.getRouteCode(gps), sr;
@@ -72,22 +68,29 @@ public class ReverseSignalHandle extends SignalHandle {
         for (int i = array.length - 1; i > 0; i--) {
             prev = (GpsEntity) array[i];
-            if(!prev.getUpDown().equals(gps.getUpDown()))
+            if (!prev.getUpDown().equals(gps.getUpDown())
+                    || prev.getSignalState().equals("reconnection"))
                 break;
             if (prev.getInstation() == 1) {
                 sr = GeoCacheData.getRouteCode(prev);
                 if (sr.getRouteSort() > curr.getRouteSort()) {
+                    if(half){
+                        routeReverse.setVague(true);
+                    }
+
                     path += (curr.getCode() + ",");
                     count++;
+                    zt = prev.getTimestamp();
                 } else if (sr.getRouteSort() < curr.getRouteSort()) {
-                    path += (curr.getCode() + ",");
-                    //掉头点
-                    if (turned == null)
-                        turned = prev.getStopNo();
+                    if (routeReverse.getTurned() == null) {
+                        routeReverse.setTurned(curr.getCode());
+                        half = true;
+                    }
-                    //路径闭合
+                    path += (curr.getCode() + ",");
+                    //掉头前当前站
                     if (sr.getCode().equals(gps.getStopNo())) {
                         routeReverse.setClose(true);
                         path += sr.getCode();
@@ -99,9 +102,11 @@ public class ReverseSignalHandle extends SignalHandle {
             }
         }
+        routeReverse.setZt(zt);
         routeReverse.setCount(count);
         routeReverse.setDetail(path);
-        routeReverse.setTurned(turned);
+        routeReverse.setCt(gps.getTimestamp());
+        routeReverse.setNbbm(gps.getNbbm());
         return routeReverse;
     }
@@ -129,4 +134,4 @@ public class ReverseSignalHandle extends SignalHandle {
         }
         return false;
     }
-}
+}
 \ No newline at end of file
@@ -105,8 +105,8 @@ public class CircleQueue&lt;T&gt; {
                 }
             }
         } else {
-            elementDataSort = new Object[tail];
-            for (int i = 0; i < tail; i++) {
+            elementDataSort = new Object[tail + 1];
+            for (int i = 0; i <= tail; i++) {
                 elementDataSort[i] = elementDataCopy[i];
             }
         }
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.SignalStateData;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.entity.RouteReverse;
+import com.bsth.data.gpsdata.arrival.entity.SignalAbnormal;
+import com.bsth.data.gpsdata.arrival.entity.SignalState;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 班次信号状态分析
+ * Created by panzhao on 2016/12/29.
+ */
+@Component
+public class ScheduleSignalState {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    LineConfigData lineConfigData;
+
+    @Autowired
+    SignalStateData signalStateData;
+
+    /**
+     * 路由反向分析
+     */
+    public void reverseAnalyse(RouteReverse reverse) {
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(reverse.getNbbm());
+
+        String bcType = sch.getBcType();
+
+        switch (bcType) {
+            case "out":
+                outReverseAnalyse(sch, reverse);
+                break;
+            case "normal":
+                normalReverseAnalyse(sch, reverse);
+                break;
+        }
+    }
+
+    /**
+     * 出场班次路由反向分析
+     *
+     * @param sch
+     */
+    private void outReverseAnalyse(ScheduleRealInfo sch, RouteReverse reverse) {
+        long t = reverse.getCt();
+        //出场班次终点时间前，允许反向轨迹
+        if (sch.getZdsjT() != null && sch.getZdsjT() > t) {
+            return;
+        }
+
+        int rt;
+        //从实发 到 当前时间 < 计划运送时间 * 0.9
+        if (sch.getFcsjActual() != null && sch.getBcsj() != null) {
+            rt = (int) (t - sch.getFcsjActualTime());
+            if (rt < sch.getBcsj() * 0.9)
+                return;
+        }
+
+        ScheduleRealInfo next = dayOfSchedule.next(sch);
+        if (next.getXlDir().equals(sch.getXlDir()))
+            return;
+
+        //时间足够下一个班次待发时间运行到当前站
+        int runTime = reverse.getCount() * 1500 * 60;
+        if (next.getDfsjT() + runTime < t) {
+            //跳到下一个班次
+            dayOfSchedule.addExecPlan(next);
+        }
+    }
+
+    /**
+     * 正常班次路由反向分析
+     *
+     * @param sch
+     * @param reverse
+     */
+    private void normalReverseAnalyse(ScheduleRealInfo sch, RouteReverse reverse) {
+        LineConfig conf = lineConfigData.get(sch.getXlBm());
+
+        if (conf.isReadReverse()) {
+            //跳下一个班次
+            ScheduleRealInfo next = dayOfSchedule.next(sch);
+            if (next != null)
+                dayOfSchedule.addExecPlan(next);
+
+            //记录信号状态
+            SignalState signalState = SignalState.reverseSignalSTate(sch, reverse);
+            if(signalState != null)
+                signalStateData.put(signalState);
+        }
+    }
+
+    public void signalRetrospect(GpsEntity gps) {
+        signalRetrospect(gps, dayOfSchedule.executeCurr(gps.getNbbm()));
+    }
+
+    /**
+     * 信号追溯
+     *
+     * @param gps
+     * @param sch
+     */
+    public void signalRetrospect(GpsEntity gps, ScheduleRealInfo sch) {
+        //回放数据，是否有掉线或者漂移
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        if (queue == null || queue.size() == 0 /*|| gps.getInstation() == 0*/)
+            return;
+
+        //起始时间点
+        long st = 0;
+        ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+
+        if (prev != null) {
+            if (prev.getZdsjActual() != null)
+                st = prev.getZdsjActualTime();
+            else
+                st = (GeoCacheData.midwayStation(gps.getLineId(), gps.getUpDown(), sch.getQdzCode(), gps.getStopNo()).size() + 1) * (1000 * 60 * 5);
+        }
+
+        Object[] tempArray = queue.getQueue();
+        int len = tempArray.length;
+
+        Object[] array = new Object[len + 1];
+        System.arraycopy(tempArray, 0, array, 0, len);
+        array[len] = gps;
+
+        String gpsState = "";
+        GpsEntity tempGps, nearGps = null;
+        int i = len - 1;
+        for (; i >= 0; i--) {
+            tempGps = (GpsEntity) array[i];
+
+            gpsState = tempGps.getSignalState();
+            if (gpsState.equals("truncation"))
+                break;
+            else if (gpsState.equals("drift")) {
+                nearGps = (GpsEntity) array[i + 1];
+                break;
+            } else if (gpsState.equals("reconnection")) {
+                nearGps = tempGps;
+                break;
+            }
+
+            if (tempGps.getTimestamp() < st)
+                break;
+        }
+
+        if (nearGps != null && i > 0) {
+            createSignalAbnormal(gpsState, nearGps, i, array, sch);
+        }
+    }
+
+    private void createSignalAbnormal(String gpsState, GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
+        switch (gpsState) {
+            case "drift":
+                driftSignalAbnormal(nearGps, i, array, sch);
+                break;
+            case "reconnection":
+                offlineSignalAbnormal(nearGps, ((GpsEntity) array[i - 1]), sch);
+                break;
+        }
+    }
+
+    /**
+     * 掉线异常状态记录
+     *
+     * @param e
+     * @param s
+     */
+    private void offlineSignalAbnormal(GpsEntity e, GpsEntity s, ScheduleRealInfo sch) {
+        long st = s.getTimestamp(), et = e.getTimestamp();
+
+        //掉线超过10分钟才记录
+        if (et - st < (1000 * 60 * 10))
+            return;
+
+        SignalAbnormal signalAbnormal = new SignalAbnormal();
+        signalAbnormal.setSt(st);
+        signalAbnormal.setEt(et);
+        signalAbnormal.setAbnormalType("reconnection");
+        signalAbnormal.setDestCode(sch.getQdzCode());
+        signalAbnormal.setOutOrIn(0);
+
+        //截断GPS
+        e.setSignalState("truncation");
+
+        //记录信号状态
+        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
+        signalStateData.put(signalState);
+    }
+
+    /**
+     * 漂移异常状态记录
+     *
+     * @param nearGps
+     * @param i
+     * @param array
+     */
+    private void driftSignalAbnormal(GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
+        GpsEntity gps, s = null;
+        //找到漂移开始时间
+        for (; i >= 0; i--) {
+            gps = (GpsEntity) array[i];
+
+            if (!gps.getSignalState().equals("drift") || i == 0
+                    || gps.getSignalState().equals("truncation")) {
+                s = gps;
+                break;
+            }
+        }
+
+        long st = s.getTimestamp(), et = nearGps.getTimestamp();
+        if (et - st < (1000 * 60 * 3))
+            return;
+        /*if (s != null){
+            st = s.getTimestamp();
+            //漂移小于3分钟
+            if(et - st < (1000 * 60 * 3))
+                return;
+        }*/
+
+
+        SignalAbnormal signalAbnormal = new SignalAbnormal();
+        signalAbnormal.setSt(st);
+        signalAbnormal.setEt(et);
+        signalAbnormal.setAbnormalType("drift");
+        signalAbnormal.setDestCode(sch.getQdzCode());
+        signalAbnormal.setOutOrIn(0);
+
+        //截断GPS
+        nearGps.setSignalState("truncation");
+
+        //记录信号状态
+        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
+        signalStateData.put(signalState);
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 班次匹配器
+ * Created by panzhao on 2016/12/31.
+ */
+@Component
+public class SignalSchPlanMatcher {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    /**
+     * 发车信号匹配
+     * @param outSigal
+     * @param sch
+     * @return
+     */
+    public void outMatch(GpsEntity outSigal, ScheduleRealInfo sch){
+        long t = outSigal.getTimestamp();
+        if(t < sch.getDfsjT())
+            return;
+
+        //下一个相同走向的班次
+        ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+        if(next == null || !next.getQdzCode().equals(sch.getQdzCode()))
+            return;
+
+        //晚于班次间隔百分之70，跳下一个班次
+        double s = (int) (next.getDfsjT() - sch.getDfsjT());
+        double r = (int) (t - sch.getDfsjT());
+        if(r / s > 0.7){
+            dayOfSchedule.addExecPlan(next);
+            outMatch(outSigal, next);
+        }
+    }
+}
@@ -28,7 +28,7 @@ import java.util.concurrent.Executors;
  * Created by panzhao on 2016/12/24.
  */
 @Component
-public class GpsDataRecovery implements ApplicationContextAware{
+public class GpsDataRecovery implements ApplicationContextAware {
     static Logger logger = LoggerFactory.getLogger(GpsDataRecovery.class);
@@ -48,7 +48,7 @@ public class GpsDataRecovery implements ApplicationContextAware{
         //按车辆分组数据
         ArrayListMultimap<String, GpsEntity> listMap = ArrayListMultimap.create();
         for (GpsEntity gps : list) {
-            if(gps.getNbbm() != null)
+            if (gps.getNbbm() != null)
                 listMap.put(gps.getNbbm(), gps);
         }
@@ -60,6 +60,8 @@ public class GpsDataRecovery implements ApplicationContextAware{
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
+            /*if(nbbm.equals("W9H-003"))
+                new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
         try {
@@ -124,7 +126,7 @@ public class GpsDataRecovery implements ApplicationContextAware{
         reverseSignalHandle = applicationContext.getBean(ReverseSignalHandle.class);
     }
-    public static class GpsComp implements Comparator<GpsEntity>{
+    public static class GpsComp implements Comparator<GpsEntity> {
         @Override
         public int compare(GpsEntity g1, GpsEntity g2) {
@@ -132,26 +134,28 @@ public class GpsDataRecovery implements ApplicationContextAware{
         }
     }
-    public static class RecoveryThread implements Runnable{
+    public static class RecoveryThread implements Runnable {
         List<GpsEntity> list;
         CountDownLatch count;
-        RecoveryThread(List<GpsEntity> list, CountDownLatch count){
+        RecoveryThread(List<GpsEntity> list, CountDownLatch count) {
             this.list = list;
             this.count = count;
         }
+
         @Override
         public void run() {
             try {
                 //循环gps恢复数据
                 CircleQueue<GpsEntity> prevs;
-                for(GpsEntity gps : list){
+                for (GpsEntity gps : list) {
+
                     prevs = GeoCacheData.getGps(gps.getNbbm());
                     //掉线处理
                     offlineSignalHandle.handle(gps, prevs);
                     //状态处理
-                    if(!correctSignalHandle.handle(gps, prevs))
+                    if (!correctSignalHandle.handle(gps, prevs))
                         continue;
                     //场，站内外判断
                     stationInsideHandle.handle(gps, prevs);
@@ -160,11 +164,12 @@ public class GpsDataRecovery implements ApplicationContextAware{
                     //进出站动作处理
                     inOutStationSignalHandle.handle(gps, prevs);
                     GeoCacheData.putGps(gps);
+
+                    //Thread.sleep(50);
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 logger.error("", e);
-            }
-            finally {
+            } finally {
                 count.countDown();
             }
         }
@@ -84,6 +84,8 @@ public class PilotReport {
 				//下发调度指令
 				directiveService.send60Dispatch(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
+				//下发线路切换指令
+				directiveService.lineChange(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
 /*				d80.setRemarks("计划出场时间：" + outSch.getDfsj());
 				//当前GPS位置
 				GpsEntity gps = gpsRealData.get(d80.getDeviceId());
@@ -29,6 +29,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import java.text.ParseException;
@@ -43,6 +44,7 @@ import java.util.concurrent.TimeUnit;
  * @date 2016年8月15日 上午10:16:12
  */
 @Component
+@Order(value = 3)
 public class DayOfSchedule implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -83,6 +85,9 @@ public class DayOfSchedule implements CommandLineRunner {
     @Autowired
     GpsRealData gpsRealData;
+    @Autowired
+    BasicData.BasicDataLoader basicDataLoader;
+
     /**
      * 线路当前使用的排班的日期
      */
@@ -117,28 +122,24 @@ public class DayOfSchedule implements CommandLineRunner {
     LineConfigData lineConfigs;
     @Autowired
-    BasicData.BasicDataLoader dataLoader;
-
-    @Autowired
     GpsDataRecovery gpsDataRecovery;
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd"), fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     @Override
     public void run(String... arg0) throws Exception {
-        //加载基础数据
-        dataLoader.loadAllData();
+        basicDataLoader.loadAllData();
         //从数据库恢复排班
-        dataRecovery();
+        //dataRecovery();
         //翻班线程
-//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
 //        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
         //首班出场指令补发器
 //		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
         //班次误点扫描
-        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
         //每天凌晨2点20提交数据到运管处
         long diff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
@@ -224,15 +225,8 @@ public class DayOfSchedule implements CommandLineRunner {
                 reCalcExecPlan(nbbm);
             }
-            //是否是出站即出场
-            LineConfig conf = lineConfigData.get(lineCode);
-            if (conf.getOutConfig() == 2) {
-                for (String nbbm : cars)
-                    schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
-            }
-
             // 页面 翻班通知
-            sendUtils.shiftSchedule(lineCode);
+            //sendUtils.shiftSchedule(lineCode);
         } catch (Exception e) {
             logger.error("", e);
             return -1;
@@ -503,6 +497,41 @@ public class DayOfSchedule implements CommandLineRunner {
     }
     /**
+     * 下一个相同走向的班次
+     * @param sch
+     * @return
+     */
+    public ScheduleRealInfo nextSame(ScheduleRealInfo sch){
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        int outConfig = -1;
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (config != null)
+            outConfig = config.getOutConfig();
+
+        boolean flag = false;
+        ScheduleRealInfo next = null;
+        for (ScheduleRealInfo temp : list) {
+            if (temp.getId() == sch.getId()) {
+                flag = true;
+                continue;
+            }
+            //忽略烂班
+            if (temp.isDestroy())
+                continue;
+
+            //出站既出场，忽略出场班次
+            if (outConfig == 2 && temp.getBcType().equals("out"))
+                continue;
+
+            if (flag && temp.getXlDir().equals(sch.getXlDir())) {
+                next = temp;
+                break;
+            }
+        }
+        return next;
+    }
+
+    /**
      * 上一个班次
      *
      * @param sch
@@ -527,6 +556,18 @@ public class DayOfSchedule implements CommandLineRunner {
         return prev;
     }
+    /**
+     * 是否是首班出场
+     * @param sch
+     * @return
+     */
+    public boolean isFirstOut(ScheduleRealInfo sch){
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        if(list.get(0) == sch && sch.getBcType().equals("out"))
+            return true;
+        return false;
+    }
+
     public void put(ScheduleRealInfo sch) {
         schAttrCalculator
                 .calcRealDate(sch)
@@ -62,13 +62,13 @@ public class SchAttrCalculator {
 				sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()));
 			//實發時間
-			if(sch.getFcsjActual() != null &&
+			if(StringUtils.isNotEmpty(sch.getFcsjActual()) &&
 					sch.getFcsjActual().compareTo(conf.getStartOpt()) < 0){
 				sch.setFcsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsjActual()) + DAY_TIME);
 			}
 			//實際終點時間
-			if(sch.getZdsjActual() != null &&
+			if(StringUtils.isNotEmpty(sch.getZdsjActual()) &&
 					sch.getZdsjActual().compareTo(conf.getStartOpt()) < 0){
 				sch.setZdsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getZdsjActual()) + DAY_TIME);
 			}
@@ -162,34 +162,6 @@ public class SchAttrCalculator {
 		return updateList;
 	}
-	
-	/**
-	 * 
-	 * @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(fmtyyyyMMddHHmm.parseMillis(sch.getRealExecDate() + sch.getFcsj()));
 package com.bsth.entity;
-import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
+import java.util.Date;
 /**
@@ -25,6 +22,7 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "bsth_c_car_park")
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class CarPark {
 	@Id
@@ -23,7 +23,7 @@ import java.util.Date;
 @Entity
 @Table(name = "bsth_c_cars")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class Cars extends BEntity implements Serializable {
 	/** 主键Id */
@@ -24,7 +24,7 @@ import java.util.Date;
 @Entity
 @Table(name = "bsth_c_line")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class Line implements Serializable {
 	@Id
@@ -21,7 +21,7 @@ import javax.persistence.*;
 @Entity
 @Table(name = "bsth_c_personnel")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class Personnel extends BEntity {
     /** 主键Id */
 package com.bsth.entity;
-import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import java.util.Date;
 /**
@@ -26,6 +25,7 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "bsth_c_station")
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class Station {
 	@Id
+package com.bsth.entity.mcy_forms;
+
+public class Daily {
+
+	private String rq;//日期
+	
+    public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	private String zbh;//车牌号
+	
+	private String jgh;//员工号
+	
+	private String jName;//驾驶员
+	
+	private String zlc;//里程
+	
+	private String jzl1;//空驶公里
+	
+	private String yh;//油耗
+	
+	private String bc;//班次
+
+	public String getZbh() {
+		return zbh;
+	}
+
+	public void setZbh(String zbh) {
+		this.zbh = zbh;
+	}
+
+	public String getJgh() {
+		return jgh;
+	}
+
+	public void setJgh(String jgh) {
+		this.jgh = jgh;
+	}
+
+	public String getjName() {
+		return jName;
+	}
+
+	public void setjName(String jName) {
+		this.jName = jName;
+	}
+
+	public String getZlc() {
+		return zlc;
+	}
+
+	public void setZlc(String zlc) {
+		this.zlc = zlc;
+	}
+
+	public String getJzl1() {
+		return jzl1;
+	}
+
+	public void setJzl1(String jzl1) {
+		this.jzl1 = jzl1;
+	}
+
+	public String getYh() {
+		return yh;
+	}
+
+	public void setYh(String yh) {
+		this.yh = yh;
+	}
+
+	public String getBc() {
+		return bc;
+	}
+
+	public void setBc(String bc) {
+		this.bc = bc;
+	}
+	
+	
+	
+
+	
+}
@@ -53,6 +53,9 @@ public class LineConfig {
 	/** 调度指令模板 */
 	private String schDirectiveTemp;
+	/** 识别区间调头 */
+	private boolean readReverse;
+
 	@OneToMany(cascade = CascadeType.ALL)
 	private Set<D80ReplyTemp> d80Temps = new HashSet<>();
@@ -140,4 +143,12 @@ public class LineConfig {
 	public void setD80Temps(Set<D80ReplyTemp> d80Temps) {
 		this.d80Temps = d80Temps;
 	}
+
+	public boolean isReadReverse() {
+		return readReverse;
+	}
+
+	public void setReadReverse(boolean readReverse) {
+		this.readReverse = readReverse;
+	}
 }
@@ -94,11 +94,6 @@ public class ScheduleRealInfo {
 	 * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
 	 */
 	private String bcType;
-	
-	/** 出站即出场 ， 关联的进出场班次  */
-	@JsonIgnore
-	@Transient
-	private ScheduleRealInfo twinsSch;
 	/** 创建人 */
 	@JsonIgnore
@@ -258,21 +253,6 @@ public class ScheduleRealInfo {
 		this.ccno = ccno;
 	}
-	public static DateTimeFormatter getFmtHHmm() {
-		return fmtHHmm;
-	}
-
-	public static void setFmtHHmm(DateTimeFormatter fmtHHmm) {
-		ScheduleRealInfo.fmtHHmm = fmtHHmm;
-	}
-
-	public static DateTimeFormatter getFmtyyyyMMddHHmm() {
-		return fmtyyyyMMddHHmm;
-	}
-
-	public static void setFmtyyyyMMddHHmm(DateTimeFormatter fmtyyyyMMddHHmm) {
-		ScheduleRealInfo.fmtyyyyMMddHHmm = fmtyyyyMMddHHmm;
-	}
 	/** ----------------
 	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@@ -804,13 +784,13 @@ public class ScheduleRealInfo {
 		this.opDirectiveState = opDirectiveState;
 	}
-	public ScheduleRealInfo getTwinsSch() {
+/*	public ScheduleRealInfo getTwinsSch() {
 		return twinsSch;
 	}
 	public void setTwinsSch(ScheduleRealInfo twinsSch) {
 		this.twinsSch = twinsSch;
-	}
+	}*/
 	public boolean isLate() {
 		return late;
@@ -19,7 +19,7 @@ import java.util.Date;
                 @NamedAttributeNode("cl")
         })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class CarConfigInfo extends BEntity implements Serializable {
     /** 主健Id */
@@ -22,7 +22,7 @@ import java.io.Serializable;
             @NamedAttributeNode("xl")
     })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class EmployeeConfigInfo extends BEntity implements Serializable {
     /** 主键Id */
@@ -15,7 +15,7 @@ import javax.persistence.*;
                 @NamedAttributeNode("xl")
         })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class GuideboardInfo extends BEntity {
     /** 主键Id */
 package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
 import java.util.Date;
@@ -17,6 +18,7 @@ import java.util.Date;
                 @NamedAttributeNode("updateBy")
         })
 })
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class TTInfo extends BEntity {
     /** 主键Id */
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
@@ -21,6 +22,7 @@ import javax.persistence.*;
                 @NamedAttributeNode("tcc")
         })
 })
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class TTInfoDetail extends BEntity {
     /** 主健Id */
+package com.bsth.entity.sys;
+
+import javax.persistence.*;
+
+/**
+ * 当班调度员
+ * Created by panzhao on 2017/1/5.
+ */
+@Entity
+@Table(name = "bsth_c_sys_duty_employee")
+public class DutyEmployee {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /**
+     * 员工ID
+     */
+    private Integer uId;
+
+    /**
+     * 员工姓名
+     */
+    private String uName;
+
+    /**
+     * 线路编码 ,号分割多个
+     */
+    private String codeIdx;
+
+    /**
+     * 登入线调时间
+     */
+    private Long ts;
+
+    /**
+     * 是否主调模式进入
+     */
+    private boolean main;
+
+    public Integer getuId() {
+        return uId;
+    }
+
+    public void setuId(Integer uId) {
+        this.uId = uId;
+    }
+
+    public String getuName() {
+        return uName;
+    }
+
+    public void setuName(String uName) {
+        this.uName = uName;
+    }
+
+    public String getCodeIdx() {
+        return codeIdx;
+    }
+
+    public void setCodeIdx(String codeIdx) {
+        this.codeIdx = codeIdx;
+    }
+
+    public Long getTs() {
+        return ts;
+    }
+
+    public void setTs(Long ts) {
+        this.ts = ts;
+    }
+
+    public boolean isMain() {
+        return main;
+    }
+
+    public void setMain(boolean main) {
+        this.main = main;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}
-package com.bsth.entity.sys;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-/**
- * 
- * @ClassName: SessionLog
- * @Description: TODO(session日志)
- * @author PanZhao
- * @date 2016年7月20日 下午4:46:27
- *
- */
-@Entity
-@Table(name = "bsth_c_sys_sessionlog")
-public class SessionLog {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-
-	@ManyToOne
-	private SysUser user;
-
-	/** 登录时间 */
-	private Date loginDate;
-
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-
-	/** 登出时间 */
-	private Date logoutDate;
-
-	/** 登出方式 0：主动登出， -1：其他 */
-	private int logoutType;
-	
-	/** 登录IP  */
-	private String ip;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public SysUser getUser() {
-		return user;
-	}
-
-	public void setUser(SysUser user) {
-		this.user = user;
-	}
-
-	public Date getLoginDate() {
-		return loginDate;
-	}
-
-	public void setLoginDate(Date loginDate) {
-		this.loginDate = loginDate;
-	}
-
-	public Date getCreateDate() {
-		return createDate;
-	}
-
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-
-	public Date getLogoutDate() {
-		return logoutDate;
-	}
-
-	public void setLogoutDate(Date logoutDate) {
-		this.logoutDate = logoutDate;
-	}
-
-	public int getLogoutType() {
-		return logoutType;
-	}
-
-	public void setLogoutType(int logoutType) {
-		this.logoutType = logoutType;
-	}
-
-	public String getIp() {
-		return ip;
-	}
-
-	public void setIp(String ip) {
-		this.ip = ip;
-	}
-}
-package com.bsth.entity.sys;
-
-import java.util.Date;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-/**
- * 
- * @ClassName: SignControl
- * @Description: TODO(进出线调记录)
- * @author PanZhao
- * @date 2016年7月20日 下午4:50:50
- *
- */
-@Entity
-@Table(name = "bsth_c_sys_sign")
-public class SignControl {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-
-	@ManyToOne
-	private SessionLog session;
-
-	/** 登出线调时间 */
-	private Date outDate;
-
-	/** 在线时长 */
-	private Long onLineTimel;
-
-	/** 0: 主调模式， 1：监控模式 */
-	private int signType;
-	
-	/** 用户名 */
-	private String userName;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public SessionLog getSession() {
-		return session;
-	}
-
-	public void setSession(SessionLog session) {
-		this.session = session;
-	}
-
-	public Date getOutDate() {
-		return outDate;
-	}
-
-	public void setOutDate(Date outDate) {
-		this.outDate = outDate;
-	}
-
-	public Long getOnLineTimel() {
-		return onLineTimel;
-	}
-
-	public void setOnLineTimel(Long onLineTimel) {
-		this.onLineTimel = onLineTimel;
-	}
-
-	public int getSignType() {
-		return signType;
-	}
-
-	public void setSignType(int signType) {
-		this.signType = signType;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-}
@@ -9,7 +9,8 @@ import java.util.Set;
 @Entity
 @Table(name = "bsth_c_sys_user")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+//@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class SysUser {
 	@Id
@@ -32,7 +32,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//把sum(addMileage) 替换为0   数据表去掉了 add_mileage 字段
 	@Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,"
-			+ " 0 as ksgl,count(jName) as bcs) from ScheduleRealInfo s where"
+			+ "0 as ksgl,count(jName) as bcs) from ScheduleRealInfo s where"
 			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
@@ -71,7 +71,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and sflj != 0")
 	int findLjbc(String jName,String clZbh,String lpName);
-	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id like %?1% and c.inside_code like %?3%",nativeQuery=true)
+	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code = ?3",nativeQuery=true)
 	List<Object[]> account(String line,String date,String code);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') "
@@ -34,7 +34,10 @@ public interface TTInfoDetailRepository extends BaseRepository&lt;TTInfoDetail, Lon
     @Query("select cc from TTInfoDetail cc where cc.id=?1")
     TTInfoDetail findOneExtend(Long aLong);
-    void deleteByTtinfoId(Long ttid);
+//    TODO：在findOne中  @EntityGraph 无效
+//    @EntityGraph(value = "tTInfoDetail_xl_lp_qdz_zdz_tcc", type = EntityGraph.EntityGraphType.FETCH)
+//    @Override
+//    TTInfoDetail findOne(Long aLong);
     @Query(value = "select max(tt.fcno) as mx from bsth_c_s_ttinfo_detail tt where tt.xl =?1 and tt.ttinfo =?2", nativeQuery = true)
     Long findMaxFcno(Integer xlid, Long ttinfoid);
@@ -44,6 +47,6 @@ public interface TTInfoDetailRepository extends BaseRepository&lt;TTInfoDetail, Lon
     @Modifying
     @Query(value = "delete from TTInfoDetail t where t.ttinfo.id = ?1")
-    void deleteByTtinfo(Long ttinfoid);
+    void deleteByTtinfoIdWithModify(Long ttinfoid);
 }
+package com.bsth.repository.sys;
+
+import com.bsth.entity.sys.DutyEmployee;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/1/5.
+ */
+@Repository
+public interface DutyEmployeeRepository extends BaseRepository<DutyEmployee, Long>{
+
+    @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
+    List<DutyEmployee> findByLineAndTime(String lineCode, long st, long et);
+}
-package com.bsth.repository.sys;
-
-import org.springframework.stereotype.Repository;
-
-import com.bsth.entity.sys.SessionLog;
-import com.bsth.repository.BaseRepository;
-
-@Repository
-public interface SessionLogRepository extends BaseRepository<SessionLog, Integer>{
-
-}
@@ -2,6 +2,7 @@ package com.bsth.service.forms;
 import java.util.List;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Linepasswengerflow;
 import com.bsth.entity.mcy_forms.Operationservice;
 import com.bsth.entity.mcy_forms.Shifday;
@@ -28,6 +29,6 @@ public interface ExportService {
 	public void operationservice(String startDate, String endDate, String lpName,
 			List<Operationservice> resList);
-	
+
 }
@@ -5,6 +5,7 @@ import java.util.Map;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Executionrate;
 import com.bsth.entity.mcy_forms.Linepasswengerflow;
 import com.bsth.entity.mcy_forms.Operationservice;
@@ -39,4 +40,6 @@ public interface FormsService {
 	public List<Executionrate> executionrate(Map<String, Object> map);
 	public List<Allline> allline(Map<String, Object> map);
+	
+	public List<Daily> daily(Map<String, Object> map);
 }
@@ -25,6 +25,7 @@ import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Executionrate;
 import com.bsth.service.forms.CommonService;
 import com.bsth.service.forms.FormsService;
@@ -615,8 +616,8 @@ public class FormsServiceImpl implements FormsService {
 				tu.setRq(rq);
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
-				//tu.setXl(arg0.getString("xlgs"));这个是根据公司判断线路有几条
-				tu.setXl(arg0.getString("sxl"));
+				tu.setXl(arg0.getString("xlgs"));//这个是根据公司判断线路有几条
+				//tu.setXl(arg0.getString("sxl"));
 				tu.setXlmc(arg0.getString("sxl"));
 				tu.setCchjh(arg0.getString("jcl").toString());
 				tu.setCchsj(arg0.getString("scl").toString());
@@ -708,4 +709,46 @@ public class FormsServiceImpl implements FormsService {
 		return list;
 	}
+
+	@Override
+	public List<Daily> daily(Map<String, Object> map) {
+
+		String sql ="select  r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
+				+ " from 	bsth_c_s_sp_info_real r  LEFT JOIN bsth_c_ylb y ON r.cl_zbh = y.nbbm "
+				+ " WHERE 1 = 1"
+		        + "  and r.xl_bm='" + map.get("line").toString() + "'"
+		        + "  and to_days(r.schedule_date)=to_days('"+map.get("date").toString()+"')"
+		        + "  AND r.gs_bm is not null";
+		  
+	if(map.get("gsdmDaily").toString()!=""){
+		sql+=" and r.gs_bm='"+map.get("gsdmDaily").toString()+"'";
+	}
+	if(map.get("fgsdmDaily").toString()!=""){
+		sql+=" and r.fgs_bm='"+map.get("fgsdmDaily").toString()+"'";
+	}
+		 sql += "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
+
+		List<Daily> list = jdbcTemplate.query(sql, new RowMapper<Daily>() {
+			@Override
+			public Daily mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Daily daily = new Daily();
+				daily.setRq(arg0.getString("schedule_date_str"));
+				daily.setZbh(arg0.getString("cl_zbh"));
+				daily.setJgh(arg0.getString("j_gh"));
+				daily.setjName(arg0.getString("j_name"));
+				daily.setYh(arg0.getString("YH"));
+				return daily;
+			}
+		});
+		
+		for(int i=0;i<list.size();i++){
+			Daily d=list.get(i);
+			Map<String, Object> maps = new HashMap<>();
+			maps = commonService.findKMBC2(d.getJgh(),d.getZbh(),d.getRq());
+			d.setJzl1(maps.get("ksgl").toString());
+			d.setZlc(maps.get("realMileage").toString());
+			d.setBc(maps.get("sjbc").toString());
+		}
+		return list;
+	}
 }
@@ -58,7 +58,7 @@ public class GpsServiceImpl implements GpsService {
         int dayOfYear = sCal.get(Calendar.DAY_OF_YEAR);
         /*
-		 * if(dayOfYear != eCal.get(Calendar.DAY_OF_YEAR)){
+         * if(dayOfYear != eCal.get(Calendar.DAY_OF_YEAR)){
 		 * System.out.println("暂时不支持跨天查询..."); return null; }
 		 */
@@ -195,7 +195,7 @@ public class GpsServiceImpl implements GpsService {
         inv = inv.substring(0, inv.length() - 1);
         // 查询到离站数据
-        //Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, st, et, inv);
+        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, st, et, inv);
         String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO,DIRECTION,LINE_ID,SPEED_GPS from bsth_c_gps_info where days_year=? and device_id in ("
                 + inv + ") and ts > ? and ts < ?";
@@ -239,11 +239,12 @@ public class GpsServiceImpl implements GpsService {
                 inOutStop = rs.getInt("INOUT_STOP");
                 map.put("inout_stop", inOutStop);
-                /*analyse = arrivalMap.get(rs.getString("DEVICE_ID") + "_" + rs.getLong("TS"));
-                if (analyse != null) {
-                    map.put("inout_stop_info", analyse);
-                    map.put("inout_stop", analyse.getInOut());
-                }*/
+                arrival = arrivalMap.get(rs.getString("DEVICE_ID") + "_" + rs.getLong("TS"));
+                if (arrival != null) {
+                    map.put("inout_stop_info", arrival);
+                    map.put("inout_stop", arrival.getInOut());
+                }
+
                 map.put("nbbm", BasicData.deviceId2NbbmMap.get(rs.getString("DEVICE_ID")));
                 map.put("state", 0);
                 // 上下行
@@ -272,11 +273,17 @@ public class GpsServiceImpl implements GpsService {
             rs = ps.executeQuery();
             ArrivalEntity arr;
-            int inOut;
+            int inOut, updown;
+            String prefix, stationName, lineId;
             while (rs.next()) {
-                arr = new ArrivalEntity(rs.getString("DEVICE_ID"), rs.getLong("TS"), rs.getString("LINE_ID"),
-                        rs.getInt("UP_DOWN"), rs.getString("STOP_NO"), rs.getInt("IN_OUT"), rs.getLong("CREATE_DATE"),
-                        rs.getInt("WEEKS_YEAR"), BasicData.stationCode2NameMap.get(rs.getString("STOP_NO")));
+                lineId = rs.getString("LINE_ID");
+                updown = rs.getInt("UP_DOWN");
+                prefix = lineId + "_" + updown + "_";
+                stationName = BasicData.getStationNameByCode(rs.getString("STOP_NO"), prefix);
+
+                arr = new ArrivalEntity(rs.getString("DEVICE_ID"), rs.getLong("TS"), lineId,
+                        updown, rs.getString("STOP_NO"), rs.getInt("IN_OUT"), rs.getLong("CREATE_DATE"),
+                        rs.getInt("WEEKS_YEAR"), stationName);
                 // 设备号_时间戳_进出状态 为key
                 // 反转进出状态
@@ -382,7 +389,7 @@ public class GpsServiceImpl implements GpsService {
             gpsRealData.remove(device);
             rs.put("status", ResponseCode.SUCCESS);
-        }catch (Exception e){
+        } catch (Exception e) {
             rs.put("status", ResponseCode.ERROR);
         }
         return rs;
@@ -14,7 +14,6 @@ import com.bsth.repository.schedule.*;
 import com.bsth.service.TrafficManageService;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
-import com.bsth.webService.trafficManage.geotool.services.Internal;
 import com.bsth.webService.trafficManage.geotool.services.InternalPortType;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap;
@@ -105,7 +104,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	// 运管处接口
-	private InternalPortType portType = new Internal().getInternalHttpSoap11Endpoint();
+	private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint();
 	private WebServiceSoap ssop ;
 	{
 		try {
@@ -13,4 +13,6 @@ public interface RealMapService {
     Map<String,Object> findRouteByLine(String lineCode);
     Map<String,Object> findRouteAndStationByLine(String lineCode);
+
+    Map<String,Object> multiSectionRoute(String codeIdx);
 }
@@ -65,7 +65,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> dailyInfo(String line,String date,String type);
-	List<Object[]> historyMessage(String line,String date,String code);
+	List<Object[]> historyMessage(String line,String date,String code, String type);
 	Map<Integer, Integer> trustStatus(String lineCodes);
@@ -93,9 +93,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,String>> findLpName(String lpName);
-	List<Map<String,Object>> account(String line,String date,String code,String xlName);
+	List<Map<String,Object>> account(String line,String date,String code,String xlName, String type);
-	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
+	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code, String type);
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String type);
@@ -17,65 +17,65 @@ import javax.transaction.Transactional;
 import java.util.Map;
 @Service
-public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService{
+public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService {
 	/*@Autowired
-	ScheduleRealInfoServiceImpl scheduleRealInfoService;*/
-
-	@Autowired
-	ScheduleRealInfoRepository scheduleRealInfoRepository;
-	
-	@Autowired
-	ChildTaskPlanRepository childTaskPlanRepository;
-	
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-	
-	@Autowired
-	Arrival2Schedule arrival2Schedule;
-
-	@Autowired
-	JdbcTemplate jdbcTemplate;
-	
-	@Transactional
-	@Override
-	public Map<String, Object> save(ChildTaskPlan t) {
-		Map<String, Object> rs;
-		//保存起终点名称
-		Map<String, String> map = BasicData.stationCode2NameMap;
-		
-		t.setStartStationName(map.get(t.getStartStation()));
-		t.setEndStationName(map.get(t.getEndStation()));
-		//先持久化子任务
-		rs = super.save(t);
-		//再关联主任务
-		ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
-		sch.getcTasks().add(t);
-		dayOfSchedule.save(sch);
-		
-		rs.put("t", sch);
-		
-		if(sch.getZdsjActual() == null)
-			arrival2Schedule.removeExpect(sch.getClZbh());
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> delete(Long id) {
-		Map<String, Object> rs;
-		
-		ChildTaskPlan cPlan = childTaskPlanRepository.findOne(id);
-		//解除和主任务关联
-		ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
-		sch.getcTasks().remove(cPlan);
-		//删除关联表数据
-		jdbcTemplate.execute("delete from bsth_c_s_sp_info_real_c_tasks where bsth_c_s_sp_info_real="+sch.getId()+" and c_tasks="+cPlan.getId());
-
-		//删除子任务
-		rs = super.delete(id);
-		dayOfSchedule.save(sch);
-
-		rs.put("t", sch);
-		return rs;
-	}
+    ScheduleRealInfoServiceImpl scheduleRealInfoService;*/
+
+    @Autowired
+    ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+    @Autowired
+    ChildTaskPlanRepository childTaskPlanRepository;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    Arrival2Schedule arrival2Schedule;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Transactional
+    @Override
+    public Map<String, Object> save(ChildTaskPlan t) {
+        ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
+        Map<String, Object> rs;
+        //保存起终点名称
+        String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+
+        t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
+        t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
+        //先持久化子任务
+        rs = super.save(t);
+        //再关联主任务
+        sch.getcTasks().add(t);
+        dayOfSchedule.save(sch);
+
+        rs.put("t", sch);
+
+        if (sch.getZdsjActual() == null)
+            arrival2Schedule.removeExpect(sch.getClZbh());
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> delete(Long id) {
+        Map<String, Object> rs;
+
+        ChildTaskPlan cPlan = childTaskPlanRepository.findOne(id);
+        //解除和主任务关联
+        ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
+        sch.getcTasks().remove(cPlan);
+        //删除关联表数据
+        jdbcTemplate.execute("delete from bsth_c_s_sp_info_real_c_tasks where bsth_c_s_sp_info_real=" + sch.getId() + " and c_tasks=" + cPlan.getId());
+
+        //删除子任务
+        rs = super.delete(id);
+        dayOfSchedule.save(sch);
+
+        rs.put("t", sch);
+        return rs;
+    }
 }
@@ -122,7 +122,7 @@ public class RealMapServiceImpl implements RealMapService {
             rs.put("section", secList);
             //查询站点信息
-            sql="select r.STATION_NAME,r.STATION_ROUTE_CODE,r.LINE_CODE,r.STATION_CODE,r.STATION_MARK,s.G_LONX,s.G_LATY, r.DIRECTIONS from bsth_c_stationroute r INNER JOIN bsth_c_station s on r.station=s.id and r.line_code=? and r.destroy=0";
+            sql = "select r.STATION_NAME,r.STATION_ROUTE_CODE,r.LINE_CODE,r.STATION_CODE,r.STATION_MARK,s.G_LONX,s.G_LATY, r.DIRECTIONS from bsth_c_stationroute r INNER JOIN bsth_c_station s on r.station=s.id and r.line_code=? and r.destroy=0";
             List<Map<String, Object>> stationList = jdbcTemplate.queryForList(sql, lineCode);
             rs.put("station", stationList);
@@ -134,6 +134,31 @@ public class RealMapServiceImpl implements RealMapService {
         return rs;
     }
+    @Override
+    public Map<String, Object> multiSectionRoute(String codeIdx) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            List<String> idArray = Splitter.on(",").splitToList(codeIdx);
+            //拼接in语句
+            String inStr = "";
+            for (String code : idArray) {
+                inStr += (",'" + code + "'");
+            }
+            inStr = " (" + inStr.substring(1) + ")";
+
+            String sql = "SELECT r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,s.SECTION_NAME,ST_AsText (s.GSECTION_VECTOR) AS GSECTION_VECTOR,r.DIRECTIONS FROM bsth_c_sectionroute r INNER JOIN bsth_c_section s ON r.section = s.id WHERE r.line_code in " + inStr + " AND r.destroy = 0 order by r.line_code, r.directions,r.sectionroute_code";
+
+            List<Map<String, Object>> secList = jdbcTemplate.queryForList(sql);
+            rs.put("section", secList);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (DataAccessException e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+
+        return rs;
+    }
+
     /**
      * wgs 坐标数组转 百度
      *
@@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -286,6 +287,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			t.setCreateBy(user);
 			t.setSflj(true);
 			t.setLate(false);
+			t.setDfsj(t.getFcsj());
 			t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
@@ -293,8 +295,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			t.setBcsj(DateUtils.calcHHmmDiff(t.getFcsj(), t.getZdsj()) / 1000 / 60);
 			//起终点名称
-			t.setQdzName(BasicData.stationCode2NameMap.get(t.getQdzCode()));
-			t.setZdzName(BasicData.stationCode2NameMap.get(t.getZdzCode()));
+			String prefix = t.getXlBm() + "_" + t.getXlDir() + "_";
+			t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix));
+			t.setZdzName(BasicData.getStationNameByCode(t.getZdzCode(), prefix));
 			//计算班次实际时间
 			schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
@@ -617,7 +620,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	}
 	@Override
-	public List<Object[]> historyMessage(String line, String date, String code) {
+	public List<Object[]> historyMessage(String line, String date, String code, String type) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		long d= 0;
 		long t=0;
@@ -639,6 +642,36 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				obj[4] = BasicData.lineCode2NameMap.get(line);
 			}
 		}
+		
+		if(type != null && type.length() != 0 && type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>();
+			for(int i = 0; i < list.size(); i++){
+				Map<String, Object> map = new HashMap<String, Object>();
+				Object[] obj = list.get(i);
+				map.put("num", i + 1);
+				map.put("line", obj[4]);
+				map.put("clZbh", obj[0]);
+				map.put("sender", obj[1]);
+				map.put("date", obj[3]);
+				map.put("text", obj[2]);
+				newList.add(map);
+			}
+			try {
+				listI.add(newList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould\\historyMessage.xls",
+						path+"export\\调度历史消息" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
 		return list;
 	}
@@ -1218,13 +1251,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<Map<String, Object>> account(String line, String date,
-			String code,String xlName) {
+			String code,String xlName, String type) {
 		List<Object[]> lsitObj = scheduleRealInfoRepository.account(line,date,code);
 		List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
 		Map<String,Object> map;
+		int i = 1;
 		for(Object[] obj : lsitObj){
 			if(obj != null){
 				map = new HashMap<String,Object>();
+				map.put("num", i++);
 				map.put("xlName", xlName);
 				map.put("clZbh", obj[3]);
 				map.put("company", obj[0]);
@@ -1233,13 +1268,65 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				listMap.add(map);
 			}
 		}
+		
+		if(type != null && type.length() != 0 && type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			Map<String, Object> typeMap = new HashMap<String, Object>();
+			typeMap.put("0xA1", "请求恢复运营");
+			typeMap.put("0xA2", "申请调档");
+			typeMap.put("0xA3", "出场请求");
+			typeMap.put("0xA5", "进场请求");
+			typeMap.put("0xA7", "加油请求");
+			typeMap.put("0x50", "车辆故障");
+			typeMap.put("0x70", "路阻报告");
+			typeMap.put("0x60", "事故报告");
+			typeMap.put("0x11", "扣证纠纷");
+			typeMap.put("0x12", "报警");
+			for(Map<String, Object> map1 : listMap){
+				map1.put("requestText", typeMap.get(map1.get("requestType")));
+			}
+			try {
+				listI.add(listMap.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould\\account.xls",
+						path+"export\\驾驶员请求台账" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
 		return listMap;
 	}
 	@Override
 	public List<ScheduleRealInfo> correctForm(String line, String startDate,
-			String endDate, String lpName, String code) {
+			String endDate, String lpName, String code, String type) {
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line,startDate,endDate,lpName,code);
+		
+		if(type != null && type.length() != 0 && type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			m.put("startDate", startDate);
+			m.put("endDate", endDate);
+			try {
+				listI.add(list.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould\\correctForm.xls",
+						path+"export\\" + URLEncoder.encode("修正报表", "UTF-8") + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
 		return list;
 	}
 package com.bsth.service.schedule;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -10,8 +12,8 @@ import java.util.Map;
 /**
  * 基础service接口。
  */
-public interface BService<T, ID extends Serializable> {
-    // CRUD 操作
+public interface BService<T, ID extends Serializable> extends DataToolsService {
+    //---------------- CRUD 操作 ----------------//
     // Create，Update操作
     T save(T t);
     <S extends T> List<S> bulkSave(List<S> entities); // 批量保存（TODO：待测试）
@@ -22,4 +24,5 @@ public interface BService&lt;T, ID extends Serializable&gt; {
     List<T> list(Map<String, Object> param);
     // Delete操作
     void delete(ID id) throws ScheduleException;
+
 }
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.service.schedule.exception.ScheduleException;
 /**
  * Created by xu on 16/5/9.
 package com.bsth.service.schedule;
 import com.bsth.entity.CarDevice;
+import com.bsth.service.schedule.exception.ScheduleException;
 /**
  * Created by xu on 16/12/15.
 package com.bsth.service.schedule;
 import com.bsth.entity.Cars;
+import com.bsth.service.schedule.exception.ScheduleException;
 /**
  * Created by xu on 16/12/8.
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.service.schedule.exception.ScheduleException;
 /**
  * Created by xu on 16/5/10.
 package com.bsth.service.schedule;
 import com.bsth.entity.Personnel;
+import com.bsth.service.schedule.exception.ScheduleException;
 /**
  * Created by xu on 16/12/15.
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.service.schedule.exception.ScheduleException;
 /**
  * Created by xu on 16/5/11.
 package com.bsth.service.schedule;
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -463,7 +464,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				listI.add(resList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
 				ee.excelReplace(listI, new Object[] { m }, path+"mould\\workDaily.xls",
-						path+"export\\营运服务日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+						path+"export\\营运服务日报表"+ sdfSimple.format(sdfMonth.parse(date))+".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -937,7 +938,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				tempMap.put("sjfcFirst0", "/");
 				tempMap.put("delayFirst0", "/");
 			}
-			if(moban0.getZdsjActual() != null){
+			if(moban0.getFcsjActual() != null){
 				String[] split = moban0.getFcsjActual().split(":");
 				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 				long delay = moban0.getFcsjT() - min;
@@ -963,7 +964,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				tempMap.put("sjfcFirst1", "/");
 				tempMap.put("delayFirst1", "/");
 			}
-			if(moban1.getZdsjActual() != null){
+			if(moban1.getFcsjActual() != null){
 				String[] split = moban1.getFcsjActual().split(":");
 				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 				long delay = moban1.getFcsjT() - min;
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.TTInfoDetail;
-import com.bsth.service.BaseService;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 /**
  * Created by xu on 16/7/2.
  */
-public interface TTInfoDetailService extends BaseService<TTInfoDetail, Long> {
-
-    void deleteByTtinfo(Long ttinfoid);
+public interface TTInfoDetailService extends BService<TTInfoDetail, Long> {
     /**
      * 发车信息内部类。
@@ -34,7 +30,12 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
         public FcInfo() {
         }
-        public FcInfo(String ttdid_str, String bc_type, String fcsj, String xldir, String isfb) {
+        public FcInfo(
+                String ttdid_str,
+                String bc_type,
+                String fcsj,
+                String xldir,
+                String isfb) {
             this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
             this.bc_type = bc_type;
             this.fcsj = fcsj;
@@ -98,6 +99,9 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
         /** 内容数据 */
         private List<List<FcInfo>> contents = new ArrayList<>();
+        /** 营运描述 */
+        private String yy_desc;
+
         public List<String> getHeader() {
             return header;
         }
@@ -113,6 +117,14 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
         public void setContents(List<List<FcInfo>> contents) {
             this.contents = contents;
         }
+
+        public String getYy_desc() {
+            return yy_desc;
+        }
+
+        public void setYy_desc(String yy_desc) {
+            this.yy_desc = yy_desc;
+        }
     }
     /**
@@ -121,22 +133,28 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
      * @param ttid 时刻表id
      * @return
      */
-    EditInfo getEditInfo(Integer xlid, Long ttid) throws Exception;
+    EditInfo getEditInfo(Integer xlid, Long ttid) throws ScheduleException;
+
+    /**
+     * 验证sheet（以后放到规则引擎里去做）。
+     * @param filename excel文件全路径名
+     * @param sheetname sheet名字
+     * @param lineid 线路id
+     */
+    void validateExcelSheet(
+            String filename,
+            String sheetname,
+            Integer lineid,
+            String linename) throws ScheduleException;
     /**
-     * 上传并导入数据，和DataImportExportService的同名方法有差别。
-     * @param datafile form上传文件
-     * @param xlmc 线路名称
-     * @param ttinfoname 时刻表名字
-     * @param tccname 停车场名字
-     * @throws Exception
+     * 验证关联的线路标准信息（以后放到规则引擎里去做）。
+     * @param lineinfoid 线路id
      */
-    void fileDataImport(MultipartFile datafile,
-                               String xlmc,
-                               String ttinfoname,
-                               String tccname) throws Exception;
+    void validateAssoLineInfo(Integer lineinfoid) throws ScheduleException;
-    void fileDataImport(File file, String sheetname, String xlmc, String ttinfoname, String tccname) throws Exception;
+    // TODO：这个方法可以用通用方法解决，以后改
+    List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId);
 }
-package com.bsth.service.schedule;
-
-import com.bsth.entity.schedule.TTInfoDetail;
-import com.bsth.repository.schedule.TTInfoDetailRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.service.schedule.utils.DataImportExportService;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import jxl.Sheet;
-import jxl.Workbook;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.pentaho.di.trans.Trans;
-import org.pentaho.di.trans.TransMeta;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by xu on 16/7/2.
- */
-@Service
-@EnableConfigurationProperties(DataToolsProperties.class)
-public class TTInfoDetailServiceImpl extends BaseServiceImpl<TTInfoDetail, Long> implements TTInfoDetailService {
-    @Autowired
-    private DataImportExportService dataImportExportService;
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-    @Autowired
-    private TTInfoDetailRepository ttInfoDetailRepository;
-
-    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
-    @Override
-    public void deleteByTtinfo(Long ttinfoid) {
-        ttInfoDetailRepository.deleteByTtinfo(ttinfoid);
-    }
-
-    /**
-     * 获取待编辑的数据。
-     * @param xlid 线路id
-     * @param ttid 时刻表id
-     * @return
-     */
-    @Override
-    public EditInfo getEditInfo(Integer xlid, Long ttid) throws Exception {
-        // 1、使用ktr转换获取输出文件
-        // 1.1、获取转换用ktr
-        File ktrFile = new File(this.getClass().getResource(
-                dataToolsProperties.getTtinfodetailForeditktr()).toURI());
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-//        trans.setLogLevel(LogLevel.DEBUG);
-        // 1.2、设定命名参数，TODO：之后还要添加其他命名参数
-        String outputFilePath = "ttinfodetail_" + new DateTime().toString("yyyy-MM-dd_HH-mm-ss");
-        trans.setParameterValue("tempfilepath", dataToolsProperties.getTransTempdir() + File.separator + outputFilePath); // 数据输出文件路径
-        trans.setParameterValue("xlid", String.valueOf(xlid));
-        trans.setParameterValue("ttid", String.valueOf(ttid));
-        // 1.3、执行转换
-        trans.execute(null);
-        // 1.4、等待转换结束
-        trans.waitUntilFinished();
-
-        // 1.5、判定ktr错误数，注意这种错误代表部分数据错误，不会终止转换执行，一般设计ktr的时候，会有错误输出文件，TODO：以后考虑使用日志实时输出
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-
-        // 1.6、获取最大的发车数，用于输出数据的数量
-        Long maxfcno = ttInfoDetailRepository.findMaxFcno(xlid, ttid);
-        if (maxfcno == null)
-            return new EditInfo();
-
-        // 2、读取ktr生成的excel数据，组织编辑用数据返回
-        // 2-1、读取Excel文件
-        Workbook book = Workbook.getWorkbook(new File(dataToolsProperties.getTransTempdir() +
-                File.separator + outputFilePath + ".xls"));
-        Sheet sheet = book.getSheet(0);
-        EditInfo editInfo = new EditInfo();
-        // 2-2、处理数据
-        String[] headarrays = new String[maxfcno.intValue() + 1];
-        headarrays[0] = "路牌";
-        for (int r = 1; r < sheet.getRows(); r++) {
-            List<FcInfo> fcInfos = new ArrayList<>();
-            // 每行第一列都是路牌
-            fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null)); // 用fcsj放置路牌显示
-            for (int c = 1; c <= maxfcno * 6; ) {
-                String ttdid_str = sheet.getCell(c, r).getContents(); // 时刻表明细id
-                String fcsj = sheet.getCell(c + 1, r).getContents(); // 发车时间
-                String fzdname = sheet.getCell(c + 2, r).getContents(); // 发车站点名称
-                String bctype = sheet.getCell(c + 3, r).getContents(); // 班次类型
-                String xldir = sheet.getCell(c + 4, r).getContents(); // 线路上下行
-                String isfb = sheet.getCell(c + 5, r).getContents(); // 是否分班
-
-                FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb);
-
-                if (StringUtils.isNotEmpty(fzdname))
-                    headarrays[(int)(c / 6) + 1] = fzdname;
-                fcInfos.add(fcInfo);
-
-                c += 6;
-            }
-            editInfo.getContents().add(fcInfos);
-        }
-        editInfo.getHeader().addAll(Arrays.asList(headarrays));
-
-        return editInfo;
-    }
-
-    @Override
-    /**
-     * 上传并导入数据，和DataImportExportService的同名方法有差别。
-     * @param datafile form上传文件
-     * @param xlmc 线路名称
-     * @param ttinfoname 时刻表名字
-     * @param tccname 停车场名字
-     * @throws Exception
-     */
-    public void fileDataImport(MultipartFile datafile,
-                               String xlmc,
-                               String ttinfoname,
-                               String tccname) throws Exception {
-        // 上传数据文件
-        File uploadFile = dataImportExportService.uploadFile(datafile);
-        fileDataImport(uploadFile, "工作表1", xlmc, ttinfoname, tccname);
-
-    }
-
-    @Override
-    public void fileDataImport(File uploadFile, String sheetname, String xlmc, String ttinfoname, String tccname) throws Exception {
-        // 1、上传数据文件
-        System.out.println("线路名称：" + xlmc);
-        System.out.println("时刻表名称：" + ttinfoname);
-        System.out.println("停车场名字：" + tccname);
-        System.out.println("时刻表明细上传文件：" + uploadFile);
-
-        // 2、jexcelapi读取excel文件
-        Workbook book = Workbook.getWorkbook(uploadFile);
-        Sheet sheet = book.getSheet(0);
-        List<String> columnames = new ArrayList<>();
-        for (int i = 0; i < sheet.getColumns(); i++) { // 获取第一行，数据，作为列名
-            columnames.add(sheet.getCell(i, 0).getContents());
-        }
-
-        System.out.println("表头1：" + StringUtils.join(columnames.toArray(), ","));
-
-        // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
-        // 2.1、初始化kettle（组件初始化已经做了）
-        // 2.2、创建转换元数据，转换
-        File ktrFile = new File(this.getClass().getResource(
-                dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI());
-        File ktrFile2 = new File(this.getClass().getResource(
-                dataToolsProperties.getTtinfodetailDatainputktr()).toURI());
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-        // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
-        trans.setParameterValue("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
-        trans.setParameterValue("filepath", uploadFile.getAbsolutePath()); // 指定导入数据文件的位置
-        trans.setParameterValue("sheetname", sheetname); // sheet工作区的名字
-        trans.setParameterValue("erroroutputdir", dataToolsProperties.getTransErrordir()); // ktr转换错误输出目录
-        trans.setParameterValue("xlname", xlmc); // 线路名称
-        trans.setParameterValue("ttinfoname", ttinfoname); // 时刻表名称
-        trans.setParameterValue("tccname", tccname); // 停车场名字
-        trans.setParameterValue("excelfieldnames", StringUtils.join(columnames.toArray(), ",")); // 时刻表excel输入字段名，以逗号连接
-        columnames.remove(0);
-        trans.setParameterValue("normalizefieldnames", StringUtils.join(columnames.toArray(), ",")); // 数据范式化字段名，以逗号连接
-
-        // TODO：可以考虑设定日志输出
-        // 2.4、执行转换
-        trans.execute(null);
-        // 2.5、等待转换结束
-        trans.waitUntilFinished();
-
-        // 3、判定ktr错误数，注意这种错误代表部分数据错误，不会终止转换执行，一般设计ktr的时候，会有错误输出文件，TODO：以后考虑使用日志实时输出
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-    }
-}
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.TTInfo;
+import com.bsth.service.schedule.exception.ScheduleException;
 /**
  * Created by xu on 16/5/12.
-package com.bsth.service.schedule;
+package com.bsth.service.schedule.exception;
 /**
  * Created by xu on 16/12/5.
@@ -3,16 +3,19 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.BaseRepository;
 import com.bsth.service.schedule.BService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import javax.persistence.EntityManager;
+import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -29,6 +32,10 @@ public class BServiceImpl&lt;T, ID extends Serializable&gt; implements BService&lt;T, ID&gt;
     @Value("${hibernate.jdbc.batch_size}")
     private int batchSize;
+    @Autowired
+    @Qualifier(value = "dataToolsServiceImpl")
+    private DataToolsService dataToolsService;
+
     /** 日志记录器 */
     protected Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -108,4 +115,19 @@ public class BServiceImpl&lt;T, ID extends Serializable&gt; implements BService&lt;T, ID&gt;
         baseRepository.delete(id);
     }
+
+    @Override
+    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+        return dataToolsService.uploadFile(filename, filedata);
+    }
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        dataToolsService.importData(file, params);
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        return dataToolsService.exportData(params);
+    }
 }
@@ -3,7 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.service.schedule.CarConfigInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.ScheduleRule1FlatService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -4,7 +4,7 @@ import com.bsth.entity.CarDevice;
 import com.bsth.entity.Cars;
 import com.bsth.service.CarsService;
 import com.bsth.service.schedule.CarDeviceService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -2,19 +2,91 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.Cars;
 import com.bsth.service.schedule.CarsService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 /**
  * Created by xu on 16/12/8.
  */
+@EnableConfigurationProperties(DataToolsProperties.class)
 @Service(value = "carsServiceImpl_sc")
 public class CarsServiceImpl extends BServiceImpl<Cars, Integer> implements CarsService {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(CarsServiceImpl.class);
+
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导入车辆基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getCarsDatainputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filepath", file.getAbsolutePath());
+            ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            super.importData(file, ktrParms);
+
+            LOGGER.info("//---------------- 导入车辆基础信息 success... ----------------//");
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导入车辆基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导出车辆基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getCarsDataoutputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", "车辆基础信息_download-");
+
+            File file = super.exportData(ktrParms);
+
+            LOGGER.info("//---------------- 导出车辆基础信息 success... ----------------//");
+
+            return file;
+
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导出车辆基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
     @Override
     @Transactional
@@ -3,7 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.ScheduleRule1FlatService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -2,19 +2,92 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.Personnel;
 import com.bsth.service.schedule.EmployeeService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 /**
  * Created by xu on 16/12/15.
  */
+@EnableConfigurationProperties(DataToolsProperties.class)
 @Service
 public class EmployeeServiceImpl extends BServiceImpl<Personnel, Integer> implements EmployeeService {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(EmployeeServiceImpl.class);
+
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导入人员基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getEmployeesDatainputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filepath", file.getAbsolutePath());
+            ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            super.importData(file, ktrParms);
+
+            LOGGER.info("//---------------- 导入人员基础信息 success... ----------------//");
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导入人员基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导出人员基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getEmployeesDataoutputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", "人员基础信息_download-");
+
+            File file = super.exportData(ktrParms);
+
+            LOGGER.info("//---------------- 导出人员基础信息 success... ----------------//");
+
+            return file;
+
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导出人员基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
     @Override
     @Transactional
     public void validate_gh(Personnel personnel) throws ScheduleException {
@@ -3,7 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.GuideboardInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.TTInfoDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -2,7 +2,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.rule.RerunRule;
 import com.bsth.service.schedule.RerunService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.CarPark;
+import com.bsth.entity.LineInformation;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.repository.schedule.TTInfoDetailRepository;
+import com.bsth.service.CarParkService;
+import com.bsth.service.LineInformationService;
+import com.bsth.service.StationRouteService;
+import com.bsth.service.schedule.GuideboardInfoService;
+import com.bsth.service.schedule.TTInfoDetailService;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsProperties;
+import jxl.Cell;
+import jxl.Sheet;
+import jxl.Workbook;
+import jxl.write.Label;
+import jxl.write.WritableSheet;
+import jxl.write.WritableWorkbook;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by xu on 17/1/3.
+ */
+@Service
+@EnableConfigurationProperties(DataToolsProperties.class)
+public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> implements TTInfoDetailService {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(TTInfoDetailServiceImpl.class);
+
+    @Autowired
+    private GuideboardInfoService guideboardInfoService;
+    @Autowired
+    private StationRouteService stationRouteService;
+    @Autowired
+    private LineInformationService lineInformationService;
+    @Autowired
+    private CarParkService carParkService;
+    @Autowired
+    private TTInfoDetailRepository ttInfoDetailRepository;
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    @Override
+    public TTInfoDetail findById(Long aLong) {
+        return ttInfoDetailRepository.findOneExtend(aLong);
+    }
+
+    @Override
+    public void importData(
+            File file,
+            Map<String, Object> params) throws ScheduleException {
+
+        try {
+            LOGGER.info("//---------------- 导入时刻表明细 start... ----------------//");
+
+            String filename = file.getAbsolutePath(); // xls文件名
+            String sheetname = String.valueOf(params.get("sheetname")); // sheet名字
+            Long ttid = Long.valueOf(String.valueOf(params.get("ttid"))); // 时刻表id
+            Long xlid = Long.valueOf(String.valueOf(params.get("xlid"))); // 线路id
+            Integer lineid = Integer.valueOf(String.valueOf(params.get("lineinfo"))); // 线路标准id
+            String xlname = String.valueOf(params.get("xlname")); // 线路名字
+            String ttname = String.valueOf(params.get("ttname")); // 时刻表名字
+
+            LOGGER.info("参数1, xls文件名={},sheet名字={}", filename, sheetname);
+            LOGGER.info("参数2, 线路id={},线路名字={}", xlid, xlname);
+            LOGGER.info("参数3, 时刻表id={},时刻表名字={}", ttid, ttname);
+
+            LOGGER.info("转换xls文件格式成文本格式...");
+            // 1、修改已经上传的excel文件，在每个起点站后标示数字，表示第几个班次
+            // 2、由于格式问题，需要把内容都转换成字符串
+            List<String> colList = new ArrayList<>();
+            Workbook workbook = Workbook.getWorkbook(new File(filename));
+            Sheet sheet = workbook.getSheet(sheetname);
+            Cell[] cells = sheet.getRow(0);
+            for (int i = 0; i < cells.length; i++) {
+                if (i == 0) {
+                    colList.add(cells[i].getContents().trim());
+                } else {
+                    colList.add(cells[i].getContents() + i);
+                }
+            }
+
+            File fileCal = new File(filename + "_stringType.xls");
+            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal, workbook);
+            WritableSheet sheet1 = writableWorkbook.getSheet(sheetname);
+            for (int i = 0; i < sheet1.getColumns(); i++) { // 第一行数据
+                sheet1.addCell(new Label(i, 0, colList.get(i)));
+            }
+            for (int i = 1; i < sheet1.getRows(); i++) { // 第二行开始
+                Cell[] cells1 = sheet.getRow(i);
+                for (int j = 0; j < cells1.length; j++) {
+                    sheet1.addCell(new Label(j, i, cells1[j].getContents()));
+                }
+            }
+            writableWorkbook.write();
+            writableWorkbook.close();
+
+            // 2、删除原有数据
+            // 操作在ktr内部执行
+
+            // 3、导入时刻表
+            // 获取停车场名字
+            LOGGER.info("获取停车场名字...");
+            LineInformation lineInformation = lineInformationService.findById(lineid);
+            Map<String, Object> p1 = new HashMap<>();
+            p1.put("parkCode_eq", lineInformation.getCarPark());
+            List<CarPark> carParkList = (List<CarPark>) carParkService.list(p1);
+            String tccname = carParkList.get(0).getParkName();
+            LOGGER.info("停车场名字={}", tccname);
+
+
+            // 计算表头参数
+            Workbook book = Workbook.getWorkbook(fileCal);
+            Sheet sheet_exp = book.getSheet(sheetname);
+            List<String> columnames = new ArrayList<>();
+            for (int i = 0; i < sheet_exp.getColumns(); i++) { // 获取第一行，数据，作为列名
+                columnames.add(sheet_exp.getCell(i, 0).getContents());
+            }
+            LOGGER.info("表头={}", StringUtils.join(columnames.toArray(), ","));
+
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI());
+            File ktrFile2 = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailDatainputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filepath", fileCal.getAbsolutePath());
+            ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            // 附加参数
+            ktrParms.put("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
+            ktrParms.put("sheetname", sheetname); // sheet工作区的名字
+            ktrParms.put("xlname", xlname); // 线路名称
+            ktrParms.put("ttinfoname", ttname); // 时刻表名称
+            ktrParms.put("ttid", ttid.intValue()); // 时刻表id
+            ktrParms.put("tccname", tccname); // 停车场名字
+            ktrParms.put("excelfieldnames", StringUtils.join(columnames.toArray(), ",")); // 时刻表excel输入字段名，以逗号连接
+            columnames.remove(0);
+            ktrParms.put("normalizefieldnames", StringUtils.join(columnames.toArray(), ",")); // 数据范式化字段名，以逗号连接
+
+            super.importData(fileCal, ktrParms);
+
+            LOGGER.info("//---------------- 导入时刻表明细 success... ----------------//");
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导入时刻表明细 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导出时刻表明细 start... ----------------//");
+
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailMetaoutput()).toURI());
+            File ktrFile2 = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailOutput()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", String.format("时刻表_(id=%s)_download-", String.valueOf(params.get("ttinfoid"))));
+
+            // 附加参数
+            ktrParms.put("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
+            ktrParms.put("ttinfoid", String.valueOf(params.get("ttinfoid")));
+
+            File file = super.exportData(ktrParms);
+
+            LOGGER.info("//---------------- 导出时刻表明细 success... ----------------//");
+
+            return file;
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导出时刻表明细 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public EditInfo getEditInfo(Integer xlid, Long ttid) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 start... ----------------//");
+
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailForeditktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", "todo");
+
+            // 附加参数
+            String outputFilePath = String.format("ttinfodetail_(id=%s)_foredit-%s",
+                    String.valueOf(ttid), new DateTime().toString("yyyyMMddHHmmss"));
+
+            ktrParms.put("tempfilepath", dataToolsProperties.getTransTempdir() + File.separator + outputFilePath); // 数据输出文件路径
+            ktrParms.put("xlid", String.valueOf(xlid));
+            ktrParms.put("ttid", String.valueOf(ttid));
+
+            super.exportData(ktrParms);
+
+            // 1.6、获取最大的发车数，用于输出数据的数量
+            Long maxfcno = ttInfoDetailRepository.findMaxFcno(xlid, ttid);
+            if (maxfcno == null)
+                return new EditInfo();
+
+            // 2、读取ktr生成的excel数据，组织编辑用数据返回
+            // 2-1、读取Excel文件
+            Workbook book = Workbook.getWorkbook(new File(dataToolsProperties.getTransTempdir() +
+                    File.separator + outputFilePath + ".xls"));
+            Sheet sheet = book.getSheet(0);
+            EditInfo editInfo = new EditInfo();
+            // 2-2、处理数据
+            int all_bc = 0; // 总班次
+            double all_lc_ks = 0; // 总空驶里程
+            double all_lc_yy = 0; // 总营运里程
+
+            String[] headarrays = new String[maxfcno.intValue() + 3];
+            headarrays[0] = "路牌";
+            headarrays[maxfcno.intValue() + 1] = "空驶班次/空驶里程";
+            headarrays[maxfcno.intValue() + 2] = "运营班次/运营里程";
+
+            for (int r = 1; r < sheet.getRows(); r++) {
+                List<FcInfo> fcInfos = new ArrayList<>();
+                // 每行第一列都是路牌
+                fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null)); // 用fcsj放置路牌显示
+
+                int bc_ks = 0; // 空驶班次
+                int bc_yy = 0; // 营运班次
+                double lc_ks = 0; // 空驶里程
+                double lc_yy = 0; // 营运里程
+
+                for (int c = 1; c <= maxfcno * 7; ) {
+                    String ttdid_str = sheet.getCell(c, r).getContents(); // 时刻表明细id
+                    String fcsj = sheet.getCell(c + 1, r).getContents(); // 发车时间
+                    String jhlc = sheet.getCell(c + 2, r).getContents(); // 计划里程
+                    String fzdname = sheet.getCell(c + 3, r).getContents(); // 发车站点名称
+                    String bctype = sheet.getCell(c + 4, r).getContents(); // 班次类型
+                    String xldir = sheet.getCell(c + 5, r).getContents(); // 线路上下行
+                    String isfb = sheet.getCell(c + 6, r).getContents(); // 是否分班
+
+                    FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb);
+
+                    if (StringUtils.isNotEmpty(fzdname))
+                        headarrays[(int)(c / 7) + 1] = fzdname;
+                    fcInfos.add(fcInfo);
+
+                    c += 7;
+
+                    // 计算班次里程
+                    if (StringUtils.isNotEmpty(jhlc)) {
+                        if ("in".equals(bctype) || "out".equals(bctype)) {
+                            bc_ks += 1;
+                            lc_ks += Double.valueOf(jhlc);
+
+                            all_bc += 1;
+                            all_lc_ks += Double.valueOf(jhlc);
+
+                        } else {
+                            bc_yy += 1;
+                            lc_yy += Double.valueOf(jhlc);
+
+                            all_bc += 1;
+                            all_lc_yy += Double.valueOf(jhlc);
+                        }
+                    }
+
+                }
+
+                // 添加一列 空驶班次/空驶里程，fcsj放置数据
+                fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_ks, lc_ks), null, null));
+
+                // 添加一列 营运班次/营运里程，fcsj放置数据
+                fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_yy, lc_yy), null, null));
+
+                editInfo.getContents().add(fcInfos);
+            }
+            editInfo.getHeader().addAll(Arrays.asList(headarrays));
+
+            editInfo.setYy_desc(String.format("班次=%d,空驶里程=%.2f,营运里程=%.2f", all_bc, all_lc_ks, all_lc_yy));
+
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 success... ----------------//");
+
+            return editInfo;
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+
+
+    @Override
+    public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename) throws ScheduleException {
+        try {
+            Workbook book = Workbook.getWorkbook(new File(filename));
+            Sheet sheet = book.getSheet(sheetname);
+            if (sheet.getRows() == 0 || sheet.getColumns() == 0) { // 工作区是否为空
+                throw new Exception(String.format("%s 工作区没有数据！", sheetname));
+            } else {
+                if (sheet.getRows() <= 1 || sheet.getColumns() <= 1) {
+                    throw new Exception(String.format("工作区至少包含2行2列的数据"));
+                } else {
+                    Cell[] cells = sheet.getRow(0); // 获取第一行数据列
+                    for (int i = 0; i < cells.length; i++) {
+                        String cell_con = cells[i].getContents();
+
+                        if (StringUtils.isEmpty(cell_con)) {
+                            throw new Exception(String.format("第1行，第%d列数据不能为空", i + 1));
+                        } else {
+                            // 正则表达式去除数字
+                            cell_con = cell_con.replaceAll("[\\d+]", "");
+
+                            if (i == 0) { // 第一列必须是路牌2个字
+                                if (!"路牌".equals(cell_con.trim())) {
+                                    throw new Exception("第1行，第1列数据必须是路牌2个字");
+                                }
+                            } else { // 排除出场，进场，其余内容到站点路由里查询，以各个方向的起点站为查询依据
+                                if ((!"出场".equals(cell_con.trim())) &&
+                                        (!"进场".equals(cell_con.trim()))) {
+                                    Map<String, Object> p1 = new HashMap<>();
+                                    p1.put("line.id_eq", lineid);
+                                    p1.put("stationName_eq", cell_con.trim());
+                                    p1.put("stationMark_eq", "B");
+
+
+                                    // TODO：这里要修改（起点站有启用撤销的标志的）
+
+                                    List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
+                                    if (CollectionUtils.isEmpty(stationRouteList)) {
+                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename));
+                                    } else if (stationRouteList.size() > 1) {
+                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename));
+                                    }
+                                }
+
+                            }
+                        }
+                    }
+
+                    // 验证路牌内容
+                    Map<String, Integer> gbindexmap = new HashMap<>(); // 记录每个路牌在第几行
+                    for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
+                        Cell bcell = sheet.getRow(i)[0]; // 获取第1列
+                        String bcell_con = bcell.getContents();
+                        if (StringUtils.isEmpty(bcell_con)) {
+                            throw new Exception(String.format("第%d行，第1列路牌无数据", i + 1));
+                        } else if (gbindexmap.get(bcell_con.trim()) != null) {
+                            throw new Exception(String.format("第%d行，第1列的路牌数据与第%d行，第1列数据重复",
+                                    i + 1,
+                                    gbindexmap.get(bcell_con.trim())));
+                        } else {
+                            Map<String, Object> p2 = new HashMap<>();
+                            p2.put("xl.id_eq", lineid);
+                            p2.put("lpName_eq", bcell_con.trim());
+                            List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2);
+                            if (CollectionUtils.isEmpty(guideboardInfoList)) {
+                                throw new Exception(String.format("第%d行，第1列的路牌在%s中不存在", i + 1, linename));
+                            } else if (guideboardInfoList.size() > 1) {
+                                throw new Exception(String.format("第%d行，第1列的路牌在%s中重复", i + 1, linename));
+                            } else {
+                                gbindexmap.put(bcell_con.trim(), i + 1);
+                            }
+                        }
+                    }
+
+                    // 班次时间验证，正则表达式，格式hh:mm或者hhmm
+                    String el = "^(([0-1]\\d)|(2[0-4])):[0-5]\\d$"; // hh:mm格式
+                    String el2 = "^(([0-1]\\d)|(2[0-4]))[0-5]\\d$"; // hhmm格式
+                    Pattern p = Pattern.compile(el);
+                    Pattern p2 = Pattern.compile(el2);
+
+                    for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
+                        Cell[] bcells = sheet.getRow(i);
+                        for (int j = 1; j < bcells.length; j++) { // 从第2列开始
+                            String bcell_con = bcells[j].getContents();
+                            if (StringUtils.isNotEmpty(bcell_con)) {
+                                Matcher m = p.matcher(bcell_con.trim());
+                                Matcher m2 = p2.matcher(bcell_con.trim());
+                                if ((!m.matches()) && (!m2.matches())) {
+                                    throw new Exception(String.format("第%d行，第%d列的发车时间格式不正确，格式应为hh:mm或hhmm", i + 1, j + 1));
+                                }
+                            }
+                        }
+                    }
+                }
+
+            }
+        } catch (Exception exp) {
+            throw new ScheduleException(exp.getMessage());
+        }
+
+    }
+
+    @Override
+    public void validateAssoLineInfo(Integer lineinfoid) throws ScheduleException {
+        LineInformation lineInformation = lineInformationService.findById(lineinfoid);
+        if (lineInformation.getUpInMileage() == null) {
+            throw new ScheduleException("上行进场里程为空");
+        } else if (lineInformation.getUpInTimer() == null) {
+            throw new ScheduleException("上行进场时间为空");
+        } else if (lineInformation.getUpOutMileage() == null) {
+            throw new ScheduleException("上行出场里程为空");
+        } else if (lineInformation.getUpOutTimer() == null) {
+            throw new ScheduleException("上行出场时间为空");
+        } else if (lineInformation.getUpMileage() == null) {
+            throw new ScheduleException("上行班次里程为空");
+        } else if (lineInformation.getUpTravelTime() == null) {
+            throw new ScheduleException("上行班次时间为空");
+        } else if (lineInformation.getDownInMileage() == null) {
+            throw new ScheduleException("下行进场里程为空");
+        } else if (lineInformation.getDownInTimer() == null) {
+            throw new ScheduleException("下行进场时间为空");
+        } else if (lineInformation.getDownOutMileage() == null) {
+            throw new ScheduleException("下行出场里程为空");
+        } else if (lineInformation.getDownOutTimer() == null) {
+            throw new ScheduleException("下行出场时间为空");
+        } else if (lineInformation.getDownMileage() == null) {
+            throw new ScheduleException("下行班次里程为空");
+        } else if (lineInformation.getDownTravelTime() == null) {
+            throw new ScheduleException("下行班次时间为空");
+        } else if (StringUtils.isEmpty(lineInformation.getCarPark())) {
+            throw new ScheduleException("停车场必须选择");
+        }
+
+        // 单独验证停车场信息
+        String tcccode = lineInformation.getCarPark();
+        Map<String, Object> p1 = new HashMap<>();
+        p1.put("parkCode_eq", tcccode);
+        List<CarPark> carParkList = (List<CarPark>) carParkService.list(p1);
+        if (CollectionUtils.isEmpty(carParkList)) {
+            throw new ScheduleException(String.format("线路标准里的停车场code=%s，在停车场信息中未找到", tcccode));
+        } else if (carParkList.size() > 1) {
+            throw new ScheduleException(String.format("线路标准里的停车场code=%s，在停车场信息中有重复数据", tcccode));
+        } else {
+            CarPark carPark = carParkList.get(0);
+            if (StringUtils.isEmpty(carPark.getParkName())) {
+                throw new ScheduleException(String.format("线路标准里的停车场code=%s，在停车场信息中没有停车场名字", tcccode));
+            }
+        }
+
+    }
+
+    @Override
+    public List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId) {
+        return ttInfoDetailRepository.findBcdetails(xlId, ttinfoId, lpId);
+    }
+}
 package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.TTInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+package com.bsth.service.schedule.utils;
+
+import com.bsth.service.schedule.exception.ScheduleException;
+
+import java.io.File;
+import java.util.Map;
+
+/**
+ * 数据服务接口。
+ */
+public interface DataToolsService {
+    //----------------- 数据服务操作 --------------//
+    // 上传文件
+    File uploadFile(String filename, byte[] filedata) throws ScheduleException;
+    // 导入数据
+    void importData(File file, Map<String, Object> params) throws ScheduleException;
+    // 导出数据
+    File exportData(Map<String, Object> params) throws ScheduleException;
+}
+package com.bsth.service.schedule.utils;
+
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.google.common.io.Files;
+import org.apache.tika.Tika;
+import org.joda.time.DateTime;
+import org.pentaho.di.core.KettleEnvironment;
+import org.pentaho.di.core.logging.KettleLogStore;
+import org.pentaho.di.core.logging.LoggingBuffer;
+import org.pentaho.di.core.logging.LoggingRegistry;
+import org.pentaho.di.core.util.EnvUtil;
+import org.pentaho.di.trans.Trans;
+import org.pentaho.di.trans.TransMeta;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Created by xu on 17/1/3.
+ */
+@Service
+@EnableConfigurationProperties(DataToolsProperties.class)
+public class DataToolsServiceImpl implements DataToolsService, InitializingBean {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(DataToolsServiceImpl.class);
+
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    /**
+     * 自定义kettle环境初始化定义。
+     */
+    private void ktrEnvironmentInit() throws Exception {
+        // 由于kettle.properties可能没有（没有安装过kettle），
+        // 导致 EnvUtil.environmentInit() 报找不到kettle.properties文件
+        // 所以这里重写 EnvUtil.environmentInit() 方法
+
+        if (Thread.currentThread().getContextClassLoader() == null) {
+            Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
+        }
+
+        // 获取配置文件
+        File file = new File(getClass().getResource(dataToolsProperties.getKettleProperties()).toURI());
+        Properties kettleProperties = EnvUtil.readProperties(file.getAbsolutePath());
+        EnvUtil.applyKettleProperties(kettleProperties);
+        System.getProperties().put("Internal.Cluster.Size", "1");
+        System.getProperties().put("Internal.Slave.Transformation.Number", "0");
+        System.getProperties().put("Internal.Slave.Server.Name", "slave-trans-name");
+        System.getProperties().put("Internal.Step.CopyNr", "0");
+        System.getProperties().put("Internal.Step.Name", "step-name");
+        System.getProperties().put("Internal.Step.Partition.ID", "partition-id");
+        System.getProperties().put("Internal.Step.Partition.Number", "0");
+        System.getProperties().put("Internal.Step.Unique.Count", "1");
+        System.getProperties().put("Internal.Step.Unique.Number", "0");
+        if (!kettleProperties.containsKey("vfs.sftp.org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder.USER_DIR_IS_ROOT")) {
+            System.getProperties().put("vfs.sftp.org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder.USER_DIR_IS_ROOT", "false");
+        }
+
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        // 初始化kettle环境（自定义）
+        ktrEnvironmentInit();
+
+        // 添加全局ktr变量，并覆盖原来的设置
+        Map<String, String> kvars = new HashMap<>();
+        kvars.put("v_db_ip", dataToolsProperties.getKvarsDbip());
+        kvars.put("v_db_uname", dataToolsProperties.getKvarsDbuname());
+        kvars.put("v_db_pwd", dataToolsProperties.getKvarsDbpwd());
+        kvars.put("v_db_dname", dataToolsProperties.getKvarsDbdname());
+        EnvUtil.applyKettleProperties(kvars, true);
+        KettleEnvironment.init();
+    }
+
+    @Override
+    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+        // 上传文件
+        try {
+            LOGGER.info("start uploadFile...originalFilename={}", filename);
+            File newFile = new File(dataToolsProperties.getFileuploadDir() + File.separator +
+                    filename + "-upload-" + new DateTime().toString("yyyyMMddHHmmss") + ".xls");
+            // TODO：判定是否excel数据
+            Tika tika = new Tika();
+            String type = tika.detect(filedata);
+            // application/x-tika-msoffice
+            LOGGER.info("文件格式={}", type);
+            if ("application/vnd.ms-excel".equals(type) || "application/x-tika-msoffice".equals(type)) {
+                // .xls 2007的格式
+                Files.write(filedata, newFile);
+            } else if ("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equals(type)) {
+                // .xlsx 2007之后的格式
+                throw new Exception("暂时不支持.xlsx格式文件！");
+            } else {
+                // 非excel文件
+                throw new Exception("非.xls格式文件！");
+            }
+
+            LOGGER.info("uploadFile success...newFilename={}", newFile.getAbsolutePath());
+
+            return newFile;
+        } catch (Exception exp) {
+            LOGGER.info("uploadFile failed...stackTrace...");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException("上传文件错误！");
+        }
+    }
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        // 导入数据
+        String transLogId = "";
+        String transMetaLogId = "";
+        try {
+            LOGGER.info("start importData...originalFilename={}", file.getAbsolutePath());
+            // 检查参数
+            String transpath = String.valueOf(params.get("transpath"));
+            if ("null".equals(transpath)) {
+                throw new Exception(
+                        "没有指定transpath参数值，无法确定ktr转换文件！");
+            }
+            File ktrFile = new File(transpath);
+            // 设置文件路径，错误输出文件路径参数
+            params.put("filepath", file.getAbsolutePath());
+            params.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
+            // 2.1、初始化kettle（组件初始化已经做了）
+            // 2.2、创建转换元数据，转换
+            TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
+            Trans trans = new Trans(transMeta);
+            // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
+            for (String key : params.keySet()) {
+                trans.setParameterValue(key, String.valueOf(params.get(key)));
+            }
+            // 2.4、执行转换
+            trans.execute(null);
+            // 2.5、等待转换结束
+            trans.waitUntilFinished();
+
+            // 获取日志
+            transLogId = trans.getLogChannelId();
+            transMetaLogId = transMeta.getLogChannelId();
+
+            LoggingBuffer loggingBuffer = KettleLogStore.getAppender();
+            StringBuffer stringBuffer = loggingBuffer.getBuffer(
+                    trans.getLogChannelId(), false
+            );
+            if (trans.getErrors() > 0) {
+                throw new Exception(stringBuffer.toString());
+            }
+            LOGGER.info(stringBuffer.toString());
+            LOGGER.info("importData success...");
+
+        } catch (Exception exp) {
+            LOGGER.info("importData failed...statckTrace...");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException("导入数据错误！");
+        } finally {
+            // 清除日志操作
+            KettleLogStore.discardLines(transLogId, true);
+            KettleLogStore.discardLines(transMetaLogId, true);
+            LoggingRegistry.getInstance().removeIncludingChildren(transLogId);
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        // 导出数据
+        String transLogId = "";
+        String transMetaLogId = "";
+        try {
+            LOGGER.info("start exportData...");
+            // 检查参数
+            String filename = String.valueOf(params.get("filename"));
+            if ("null".equals(filename)) {
+                filename = "temp";
+            }
+            String transpath = String.valueOf(params.get("transpath"));
+            if ("null".equals(transpath)) {
+                throw new Exception(
+                        "没有指定transpath参数值，无法确定ktr转换文件！");
+            }
+            File ktrFile = new File(transpath);
+            // 设置文件路径参数
+            String filepath = dataToolsProperties.getFileoutputDir() +
+                    File.separator +
+                    filename +
+                    new DateTime().toString("yyyyMMddHHmmss") + ".xls";
+            params.put("filepath", filepath);
+
+            // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
+            // 2.1、初始化kettle（组件初始化已经做了）
+            // 2.2、创建转换元数据，转换
+            TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
+            Trans trans = new Trans(transMeta);
+            // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
+            for (String key : params.keySet()) {
+                trans.setParameterValue(key, String.valueOf(params.get(key)));
+            }
+            // 2.4、执行转换
+            trans.execute(null);
+            // 2.5、等待转换结束
+            trans.waitUntilFinished();
+
+            // 获取日志
+            transLogId = trans.getLogChannelId();
+            transMetaLogId = transMeta.getLogChannelId();
+
+            LoggingBuffer loggingBuffer = KettleLogStore.getAppender();
+            StringBuffer stringBuffer = loggingBuffer.getBuffer(
+                    trans.getLogChannelId(), false
+            );
+            if (trans.getErrors() > 0) {
+                throw new Exception(stringBuffer.toString());
+            }
+            LOGGER.info(stringBuffer.toString());
+            LOGGER.info("exportData success...");
+
+            return new File(filepath);
+        } catch (Exception exp) {
+            LOGGER.info("exportData failed...statckTrace...");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException("导出数据错误！");
+        } finally {
+            // 清除日志操作
+            KettleLogStore.discardLines(transLogId, true);
+            KettleLogStore.discardLines(transMetaLogId, true);
+            LoggingRegistry.getInstance().removeIncludingChildren(transLogId);
+        }
+    }
+}
+package com.bsth.service.sys;
+
+import com.bsth.entity.sys.DutyEmployee;
+import com.bsth.service.BaseService;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/1/5.
+ */
+public interface DutyEmployeeService extends BaseService<DutyEmployee, Long> {
+
+    List<DutyEmployee> getDutyEmployee(String lineCode, String startTime, String endTime);
+}
+package com.bsth.service.sys.impl;
+
+import com.bsth.entity.sys.DutyEmployee;
+import com.bsth.repository.sys.DutyEmployeeRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.DutyEmployeeService;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/1/5.
+ */
+@Service
+public class DutyEmployeeServiceImpl extends BaseServiceImpl<DutyEmployee, Long> implements DutyEmployeeService {
+
+    @Autowired
+    DutyEmployeeRepository dutyEmployeeRepository;
+
+    @Override
+    public Map<String, Object> save(DutyEmployee dutyEmployee) {
+        //登入时间，当前时间 - 10分钟
+        dutyEmployee.setTs(System.currentTimeMillis() - (1000 * 60 * 10));
+        return super.save(dutyEmployee);
+    }
+
+
+    /**
+     * 获取当班调度
+     *
+     * @param lineCode  线路编码
+     * @param startTime 开始时间 yyyy-MM-ddHH:mm
+     * @param endTime   结束时间 yyyy-MM-ddHH:mm
+     * @return
+     */
+    public List<DutyEmployee> getDutyEmployee(String lineCode, String startTime, String endTime) {
+        DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+        return dutyEmployeeRepository.findByLineAndTime(lineCode + ",", fmtyyyyMMddHHmm.parseMillis(startTime), fmtyyyyMMddHHmm.parseMillis(endTime));
+    }
+}
 package com.bsth.websocket.handler;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-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.data.gpsdata.arrival.entity.SignalState;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
 @Component
 public class SendUtils{
@@ -40,7 +35,7 @@ public class SendUtils{
 	 */
 	public void sendFcsj(ScheduleRealInfo sch) {
 		//处理出站即出场的班次
-		connectOutSchTime(sch);
+		//connectOutSchTime(sch);
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "faChe");
@@ -86,7 +81,7 @@ public class SendUtils{
 	 */
 	public void sendZdsj(ScheduleRealInfo sch, ScheduleRealInfo nextSch, int finish) {
 		//处理进站即进场的班次
-		connectInSchTime(sch);
+		//connectInSchTime(sch);
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "zhongDian");
@@ -103,12 +98,30 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
+
+	/**
+	 * 推送班次信号状态
+	 * @param state
+	 */
+	public void sendSignalState(SignalState state){
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "signal_state");
+		map.put("data", state);
+
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessageToLine(state.getLineCode(), mapper.writeValueAsString(map));
+		} catch (Exception e) {
+			logger.error("", e);
+		}
+	}
 	/**
 	 * 
 	 * @Title: shiftSchedule 
 	 * @Description: TODO(线路翻班通知) 
-	 */
+
 	public void shiftSchedule(String lineCode){
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "systemNotice");
@@ -124,7 +137,7 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
-	
+	 */
 	/**
 	 * 
 	 * @Title: sendDirectiveToPage 
@@ -157,39 +170,4 @@ public class SendUtils{
 		list.add(sch);
 		refreshSch(list);
 	}
-	
-	
-	//出站即出场
-	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);
-		}
-	}
 }
@@ -15,11 +15,11 @@ datatools.kvars_dbdname=control
 # 3、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
-datatools.fileupload_dir=/opt/bsth_control_u_d_files
+datatools.fileupload_dir=/home/bsth_control_u_d_files
 # ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正）
-datatools.trans_errordir=/opt/bsth_control_u_d_files/erroroutput
+datatools.trans_errordir=/home/bsth_control_u_d_files/erroroutput
 # 临时输出文件目录
-datatools.trans_tempdir=/opt/bsth_control_u_d_files/temp
+datatools.trans_tempdir=/home/bsth_control_u_d_files/temp
 ##---------------------------- 导入数据ktr ----------------------------##
 # 测试temp的ktr转换文件
@@ -49,7 +49,7 @@ datatools.employeesconfig_datainputktr=/datatools/ktrs/employeesConfigDataInput.
 # 4、数据导出配置信息
 # 导出数据文件目录配置（根据不同的环境需要修正）
-datatools.fileoutput_dir=/opt/bsth_control_u_d_files
+datatools.fileoutput_dir=/home/bsth_control_u_d_files
 ##---------------------------- 导出数据ktr -----------------------------##
 # 车辆信息导出ktr转换
@@ -1182,7 +1182,7 @@
     <name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</name>
     <type>ExcelInput</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
          <partitioning>
@@ -1837,6 +1837,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>iscanceled</name>
+        <field>is_cancel</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>id</name>
         <rename>lpid</rename>
@@ -2662,6 +2668,18 @@
     </step>
   <step_error_handling>
+      <error>
+        <source_step>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail</source_step>
+        <target_step>Excel&#x8f93;&#x51fa;</target_step>
+        <is_enabled>Y</is_enabled>
+        <nr_valuename>c1</nr_valuename>
+        <descriptions_valuename>c2</descriptions_valuename>
+        <fields_valuename>c3</fields_valuename>
+        <codes_valuename>c4</codes_valuename>
+        <max_errors/>
+        <max_pct_errors/>
+        <min_pct_rows/>
+      </error>
   </step_error_handling>
    <slave-step-copy-partition-distribution>
 </slave-step-copy-partition-distribution>
@@ -37,7 +37,7 @@
         <parameter>
             <name>sheetname</name>
             <default_value>&#x5de5;&#x4f5c;&#x8868;1</default_value>
-            <description/>
+            <description>xls sheet&#x540d;&#x5b57;</description>
         </parameter>
         <parameter>
             <name>tccname</name>
@@ -45,6 +45,11 @@
             <description>&#x505c;&#x8f66;&#x573a;&#x540d;&#x5b57;</description>
         </parameter>
         <parameter>
+            <name>ttid</name>
+            <default_value>1</default_value>
+            <description>&#x65f6;&#x523b;&#x8868;id</description>
+        </parameter>
+        <parameter>
             <name>ttinfoname</name>
             <default_value>&#x8868;2</default_value>
             <description>&#x65f6;&#x523b;&#x8868;&#x540d;&#x79f0;</description>
@@ -133,6 +138,7 @@
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
       <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
@@ -294,13 +300,14 @@
   <hop> <from>&#x83b7;&#x53d6;&#x505c;&#x8f66;&#x573a;&#x540d;&#x79f0;</from><to>&#x589e;&#x52a0;&#x505c;&#x8f66;&#x573a;&#x540d;&#x79f0;metadata</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x589e;&#x52a0;&#x505c;&#x8f66;&#x573a;&#x540d;&#x79f0;metadata</from><to>&#x66ff;&#x6362;&#x505c;&#x8f66;&#x5382;&#x540d;&#x5b57; </to><enabled>Y</enabled> </hop>
   <hop> <from>&#x66ff;&#x6362;&#x505c;&#x8f66;&#x5382;&#x540d;&#x5b57; </from><to>&#x505c;&#x8f66;&#x573a;&#x540d;&#x79f0;metadata&#x5b57;&#x6bb5;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x83b7;&#x53d6;&#x65f6;&#x523b;&#x8868;&#x540d;&#x79f0;&#x540d;&#x79f0;</from><to>&#x589e;&#x52a0;&#x65f6;&#x523b;&#x8868;&#x540d;&#x79f0;metadata</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x83b7;&#x53d6;&#x65f6;&#x523b;&#x8868;&#x540d;&#x79f0;</from><to>&#x589e;&#x52a0;&#x65f6;&#x523b;&#x8868;&#x540d;&#x79f0;metadata</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x589e;&#x52a0;&#x65f6;&#x523b;&#x8868;&#x540d;&#x79f0;metadata</from><to>&#x66ff;&#x6362;&#x65f6;&#x523b;&#x8868;&#x540d;&#x5b57;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x66ff;&#x6362;&#x65f6;&#x523b;&#x8868;&#x540d;&#x5b57;</from><to>&#x65f6;&#x523b;&#x8868;&#x540d;&#x79f0;metadata&#x5b57;&#x6bb5;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x7ebf;&#x8def;&#x540d;&#x79f0;metadata&#x5b57;&#x6bb5;</from><to>&#x5408;&#x5e76;&#x589e;&#x52a0;&#x5e38;&#x91cf;&#x6570;&#x636e;metadata</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x505c;&#x8f66;&#x573a;&#x540d;&#x79f0;metadata&#x5b57;&#x6bb5;</from><to>&#x5408;&#x5e76;&#x589e;&#x52a0;&#x5e38;&#x91cf;&#x6570;&#x636e;metadata</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x65f6;&#x523b;&#x8868;&#x540d;&#x79f0;metadata&#x5b57;&#x6bb5;</from><to>&#x5408;&#x5e76;&#x589e;&#x52a0;&#x5e38;&#x91cf;&#x6570;&#x636e;metadata</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x5408;&#x5e76;&#x589e;&#x52a0;&#x5e38;&#x91cf;&#x6570;&#x636e;metadata</from><to>ETL&#x5143;&#x6570;&#x636e;&#x6ce8;&#x5165;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x83b7;&#x53d6;&#x65f6;&#x523b;&#x8868;id</from><to>&#x5220;&#x9664;&#x4e4b;&#x524d;&#x7684;&#x660e;&#x7ec6;&#x4fe1;&#x606f;</to><enabled>Y</enabled> </hop>
   </order>
   <step>
     <name>ETL&#x5143;&#x6570;&#x636e;&#x6ce8;&#x5165;</name>
@@ -343,56 +350,6 @@
         <target_detail>Y</target_detail>
         <source_step>&#x83b7;&#x53d6;excel&#x6587;&#x4ef6;&#x540d;</source_step>
         <source_field>filepath_</source_field>
-      </mapping>      <mapping>        <target_step_name>&#x884c;&#x8f6c;&#x5217;</target_step_name>
-        <target_attribute_key>NAME</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c; 2</source_step>
-        <source_field>fieldName</source_field>
-      </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
-        <target_attribute_key>NAME</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
-        <source_field>fieldname</source_field>
-      </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
-        <target_attribute_key>SHEET_NAME</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x83b7;&#x53d6;excel&#x6587;&#x4ef6;&#x540d;</source_step>
-        <source_field>sheetname_</source_field>
-      </mapping>      <mapping>        <target_step_name>&#x589e;&#x52a0;&#x65f6;&#x523b;&#x8868;&#x540d;&#x5b57;&#xff0c;&#x7ebf;&#x8def;&#x540d;&#x5b57;&#xff0c;&#x505c;&#x8f66;&#x573a;&#x540d;&#x5b57;</target_step_name>
-        <target_attribute_key>NAME</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x5408;&#x5e76;&#x589e;&#x52a0;&#x5e38;&#x91cf;&#x6570;&#x636e;metadata</source_step>
-        <source_field>col_name</source_field>
-      </mapping>      <mapping>        <target_step_name>Excel&#x8f93;&#x5165;</target_step_name>
-        <target_attribute_key>NAME</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c;</source_step>
-        <source_field>fieldName</source_field>
-      </mapping>      <mapping>        <target_step_name>Excel&#x8f93;&#x5165;</target_step_name>
-        <target_attribute_key>TRIM_TYPE</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c;</source_step>
-        <source_field>trim_type</source_field>
-      </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
-        <target_attribute_key>REPEAT</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
-        <source_field>repeat</source_field>
-      </mapping>      <mapping>        <target_step_name>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</target_step_name>
-        <target_attribute_key>NORMALISED</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x589e;&#x52a0;normalize&#x5143;&#x6570;&#x636e;</source_step>
-        <source_field>valuefield</source_field>
-      </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
-        <target_attribute_key>FORMAT</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
-        <source_field>format</source_field>
-      </mapping>      <mapping>        <target_step_name>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</target_step_name>
-        <target_attribute_key>VALUE</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x589e;&#x52a0;normalize&#x5143;&#x6570;&#x636e;</source_step>
-        <source_field>nfieldname</source_field>
       </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
         <target_attribute_key>PRECISION</target_attribute_key>
         <target_detail>Y</target_detail>
@@ -418,6 +375,16 @@
         <target_detail>Y</target_detail>
         <source_step>&#x5408;&#x5e76;&#x589e;&#x52a0;&#x5e38;&#x91cf;&#x6570;&#x636e;metadata</source_step>
         <source_field>col_type</source_field>
+      </mapping>      <mapping>        <target_step_name>&#x884c;&#x8f6c;&#x5217;</target_step_name>
+        <target_attribute_key>NAME</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c; 2</source_step>
+        <source_field>fieldName</source_field>
+      </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
+        <target_attribute_key>NAME</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
+        <source_field>fieldname</source_field>
       </mapping>      <mapping>        <target_step_name>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</target_step_name>
         <target_attribute_key>NAME</target_attribute_key>
         <target_detail>Y</target_detail>
@@ -429,20 +396,60 @@
         <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
         <source_field>length</source_field>
       </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
+        <target_attribute_key>SHEET_NAME</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x83b7;&#x53d6;excel&#x6587;&#x4ef6;&#x540d;</source_step>
+        <source_field>sheetname_</source_field>
+      </mapping>      <mapping>        <target_step_name>&#x589e;&#x52a0;&#x65f6;&#x523b;&#x8868;&#x540d;&#x5b57;&#xff0c;&#x7ebf;&#x8def;&#x540d;&#x5b57;&#xff0c;&#x505c;&#x8f66;&#x573a;&#x540d;&#x5b57;</target_step_name>
+        <target_attribute_key>NAME</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x5408;&#x5e76;&#x589e;&#x52a0;&#x5e38;&#x91cf;&#x6570;&#x636e;metadata</source_step>
+        <source_field>col_name</source_field>
+      </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
         <target_attribute_key>TYPE</target_attribute_key>
         <target_detail>Y</target_detail>
         <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
         <source_field>fieldtype</source_field>
+      </mapping>      <mapping>        <target_step_name>Excel&#x8f93;&#x5165;</target_step_name>
+        <target_attribute_key>NAME</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c;</source_step>
+        <source_field>fieldName</source_field>
       </mapping>      <mapping>        <target_step_name>&#x884c;&#x8f6c;&#x5217;</target_step_name>
         <target_attribute_key>VALUE</target_attribute_key>
         <target_detail>Y</target_detail>
         <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c; 2</source_step>
         <source_field>fieldName</source_field>
+      </mapping>      <mapping>        <target_step_name>Excel&#x8f93;&#x5165;</target_step_name>
+        <target_attribute_key>TRIM_TYPE</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c;</source_step>
+        <source_field>trim_type</source_field>
       </mapping>      <mapping>        <target_step_name>&#x884c;&#x8f6c;&#x5217;</target_step_name>
         <target_attribute_key>NORMALISED</target_attribute_key>
         <target_detail>Y</target_detail>
         <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c; 2</source_step>
         <source_field>value</source_field>
+      </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
+        <target_attribute_key>REPEAT</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
+        <source_field>repeat</source_field>
+      </mapping>      <mapping>        <target_step_name>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</target_step_name>
+        <target_attribute_key>NORMALISED</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x589e;&#x52a0;normalize&#x5143;&#x6570;&#x636e;</source_step>
+        <source_field>valuefield</source_field>
+      </mapping>      <mapping>        <target_step_name>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</target_step_name>
+        <target_attribute_key>VALUE</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x589e;&#x52a0;normalize&#x5143;&#x6570;&#x636e;</source_step>
+        <source_field>nfieldname</source_field>
+      </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
+        <target_attribute_key>FORMAT</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
+        <source_field>format</source_field>
       </mapping>      <mapping>        <target_step_name>Excel&#x8f93;&#x5165;</target_step_name>
         <target_attribute_key>PRECISION</target_attribute_key>
         <target_detail>Y</target_detail>
@@ -1100,7 +1107,7 @@
     </step>
   <step>
-    <name>&#x83b7;&#x53d6;&#x65f6;&#x523b;&#x8868;&#x540d;&#x79f0;&#x540d;&#x79f0;</name>
+    <name>&#x83b7;&#x53d6;&#x65f6;&#x523b;&#x8868;&#x540d;&#x79f0;</name>
     <type>GetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -1217,6 +1224,72 @@
       </GUI>
     </step>
+  <step>
+    <name>&#x83b7;&#x53d6;&#x65f6;&#x523b;&#x8868;id</name>
+    <type>GetVariable</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>
+      <field>
+        <name>ttid_</name>
+        <variable>&#x24;&#x7b;ttid&#x7d;</variable>
+        <type>Integer</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>427</xloc>
+      <yloc>26</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5220;&#x9664;&#x4e4b;&#x524d;&#x7684;&#x660e;&#x7ec6;&#x4fe1;&#x606f;</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <execute_each_row>Y</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>N</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>delete from bsth_c_s_ttinfo_detail where ttinfo &#x3d; &#x3f;</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+       <argument><name>ttid_</name></argument>
+    </arguments>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>627</xloc>
+      <yloc>26</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
   <step_error_handling>
   </step_error_handling>
    <slave-step-copy-partition-distribution>
@@ -345,6 +345,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno1_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno1_zdname</name>
         <type>String</type>
         <format/>
@@ -375,6 +380,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno2_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno2_zdname</name>
         <type>String</type>
         <format/>
@@ -405,6 +415,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno3_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno3_zdname</name>
         <type>String</type>
         <format/>
@@ -435,6 +450,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno5_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno4_zdname</name>
         <type>String</type>
         <format/>
@@ -465,6 +485,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno5_jhlc_1</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno5_zdname</name>
         <type>String</type>
         <format/>
@@ -495,6 +520,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno6_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno6_zdname</name>
         <type>String</type>
         <format/>
@@ -525,6 +555,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno7_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno7_zdname</name>
         <type>String</type>
         <format/>
@@ -555,6 +590,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno8_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno8_zdname</name>
         <type>String</type>
         <format/>
@@ -585,6 +625,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno9_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno9_zdname</name>
         <type>String</type>
         <format/>
@@ -615,6 +660,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno10_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno10_zdname</name>
         <type>String</type>
         <format/>
@@ -645,6 +695,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno11_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno11_zdname</name>
         <type>String</type>
         <format/>
@@ -675,6 +730,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno12_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno12_zdname</name>
         <type>String</type>
         <format/>
@@ -705,6 +765,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno13_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno13_zdname</name>
         <type>String</type>
         <format/>
@@ -735,6 +800,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno14_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno14_zdname</name>
         <type>String</type>
         <format/>
@@ -765,6 +835,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno15_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno15_zdname</name>
         <type>String</type>
         <format/>
@@ -795,6 +870,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno16_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno16_zdname</name>
         <type>String</type>
         <format/>
@@ -825,6 +905,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno17_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno17_zdname</name>
         <type>String</type>
         <format/>
@@ -855,6 +940,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno18_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno18_zdname</name>
         <type>String</type>
         <format/>
@@ -885,6 +975,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno19_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno19_zdname</name>
         <type>String</type>
         <format/>
@@ -915,6 +1010,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno20_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno20_zdname</name>
         <type>String</type>
         <format/>
@@ -945,6 +1045,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno21_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno21_zdname</name>
         <type>String</type>
         <format/>
@@ -975,6 +1080,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno22_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno22_zdname</name>
         <type>String</type>
         <format/>
@@ -1005,6 +1115,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno23_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno23_zdname</name>
         <type>String</type>
         <format/>
@@ -1035,6 +1150,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno24_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno24_zdname</name>
         <type>String</type>
         <format/>
@@ -1065,6 +1185,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno25_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno25_zdname</name>
         <type>String</type>
         <format/>
@@ -1095,6 +1220,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno26_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno26_zdname</name>
         <type>String</type>
         <format/>
@@ -1125,6 +1255,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno27_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno27_zdname</name>
         <type>String</type>
         <format/>
@@ -1155,6 +1290,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno28_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno28_zdname</name>
         <type>String</type>
         <format/>
@@ -1185,6 +1325,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno29_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno29_zdname</name>
         <type>String</type>
         <format/>
@@ -1215,6 +1360,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno30_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno30_zdname</name>
         <type>String</type>
         <format/>
@@ -1245,6 +1395,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno31_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno31_zdname</name>
         <type>String</type>
         <format/>
@@ -1275,6 +1430,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno32_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno32_zdname</name>
         <type>String</type>
         <format/>
@@ -1305,6 +1465,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno33_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno33_zdname</name>
         <type>String</type>
         <format/>
@@ -1335,6 +1500,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno34_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno34_zdname</name>
         <type>String</type>
         <format/>
@@ -1365,6 +1535,11 @@
         <format/>
       </field>
       <field>
+        <name>fcno35_jhlc</name>
+        <type>None</type>
+        <format/>
+      </field>
+      <field>
         <name>fcno35_zdname</name>
         <type>String</type>
         <format/>
@@ -1457,6 +1632,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>1</key_value>
+          <target_name>fcno1_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>1</key_value>
           <target_name>fcno1_zdname</target_name>
@@ -1541,6 +1730,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>2</key_value>
+          <target_name>fcno2_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>2</key_value>
           <target_name>fcno2_zdname</target_name>
@@ -1625,6 +1828,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>3</key_value>
+          <target_name>fcno3_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>3</key_value>
           <target_name>fcno3_zdname</target_name>
@@ -1709,6 +1926,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>4</key_value>
+          <target_name>fcno5_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>4</key_value>
           <target_name>fcno4_zdname</target_name>
@@ -1793,6 +2024,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>5</key_value>
+          <target_name>fcno5_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>5</key_value>
           <target_name>fcno5_zdname</target_name>
@@ -1877,6 +2122,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>6</key_value>
+          <target_name>fcno6_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>6</key_value>
           <target_name>fcno6_zdname</target_name>
@@ -1961,6 +2220,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>7</key_value>
+          <target_name>fcno7_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>7</key_value>
           <target_name>fcno7_zdname</target_name>
@@ -2045,6 +2318,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>8</key_value>
+          <target_name>fcno8_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>8</key_value>
           <target_name>fcno8_zdname</target_name>
@@ -2129,6 +2416,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>9</key_value>
+          <target_name>fcno9_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>9</key_value>
           <target_name>fcno9_zdname</target_name>
@@ -2213,6 +2514,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>10</key_value>
+          <target_name>fcno10_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>10</key_value>
           <target_name>fcno10_zdname</target_name>
@@ -2297,6 +2612,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>11</key_value>
+          <target_name>fcno11_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>11</key_value>
           <target_name>fcno11_zdname</target_name>
@@ -2381,6 +2710,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>12</key_value>
+          <target_name>fcno12_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>12</key_value>
           <target_name>fcno12_zdname</target_name>
@@ -2465,9 +2808,9 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
-          <field_name>fczdName</field_name>
+          <field_name>jhlc</field_name>
           <key_value>13</key_value>
-          <target_name>fcno13_zdname</target_name>
+          <target_name>fcno13_jhlc</target_name>
           <target_type>String</target_type>
           <target_format/>
           <target_length>-1</target_length>
@@ -2479,9 +2822,9 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
-          <field_name>bc_type</field_name>
+          <field_name>fczdName</field_name>
           <key_value>13</key_value>
-          <target_name>fcno13_bctype</target_name>
+          <target_name>fcno13_zdname</target_name>
           <target_type>String</target_type>
           <target_format/>
           <target_length>-1</target_length>
@@ -2493,7 +2836,21 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
-          <field_name>xl_dir</field_name>
+          <field_name>bc_type</field_name>
+          <key_value>13</key_value>
+          <target_name>fcno13_bctype</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>xl_dir</field_name>
           <key_value>13</key_value>
           <target_name>fcno13_xldir</target_name>
           <target_type>String</target_type>
@@ -2549,6 +2906,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>14</key_value>
+          <target_name>fcno14_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>14</key_value>
           <target_name>fcno14_zdname</target_name>
@@ -2633,6 +3004,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>15</key_value>
+          <target_name>fcno15_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>15</key_value>
           <target_name>fcno15_zdname</target_name>
@@ -2717,6 +3102,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>16</key_value>
+          <target_name>fcno16_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>16</key_value>
           <target_name>fcno16_zdname</target_name>
@@ -2801,6 +3200,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>17</key_value>
+          <target_name>fcno17_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>17</key_value>
           <target_name>fcno17_zdname</target_name>
@@ -2885,6 +3298,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>18</key_value>
+          <target_name>fcno18_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>18</key_value>
           <target_name>fcno18_zdname</target_name>
@@ -2969,6 +3396,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>19</key_value>
+          <target_name>fcno19_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>19</key_value>
           <target_name>fcno19_zdname</target_name>
@@ -3053,6 +3494,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>20</key_value>
+          <target_name>fcno20_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>20</key_value>
           <target_name>fcno20_zdname</target_name>
@@ -3137,6 +3592,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>21</key_value>
+          <target_name>fcno21_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>21</key_value>
           <target_name>fcno21_zdname</target_name>
@@ -3221,6 +3690,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>22</key_value>
+          <target_name>fcno22_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>22</key_value>
           <target_name>fcno22_zdname</target_name>
@@ -3305,6 +3788,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>23</key_value>
+          <target_name>fcno23_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>23</key_value>
           <target_name>fcno23_zdname</target_name>
@@ -3389,6 +3886,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>24</key_value>
+          <target_name>fcno24_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>24</key_value>
           <target_name>fcno24_zdname</target_name>
@@ -3473,6 +3984,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>25</key_value>
+          <target_name>fcno25_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>25</key_value>
           <target_name>fcno25_zdname</target_name>
@@ -3557,6 +4082,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>26</key_value>
+          <target_name>fcno26_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>26</key_value>
           <target_name>fcno26_zdname</target_name>
@@ -3641,6 +4180,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>27</key_value>
+          <target_name>fcno27_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>27</key_value>
           <target_name>fcno27_zdname</target_name>
@@ -3725,6 +4278,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>28</key_value>
+          <target_name>fcno28_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>28</key_value>
           <target_name>fcno28_zdname</target_name>
@@ -3809,6 +4376,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>29</key_value>
+          <target_name>fcno29_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>29</key_value>
           <target_name>fcno29_zdname</target_name>
@@ -3893,6 +4474,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>30</key_value>
+          <target_name>fcno30_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>30</key_value>
           <target_name>fcno30_zdname</target_name>
@@ -3977,6 +4572,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>31</key_value>
+          <target_name>fcno31_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>31</key_value>
           <target_name>fcno31_zdname</target_name>
@@ -4061,6 +4670,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>32</key_value>
+          <target_name>fcno32_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>32</key_value>
           <target_name>fcno32_zdname</target_name>
@@ -4145,6 +4768,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>33</key_value>
+          <target_name>fcno33_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>33</key_value>
           <target_name>fcno33_zdname</target_name>
@@ -4229,6 +4866,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>34</key_value>
+          <target_name>fcno34_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>34</key_value>
           <target_name>fcno34_zdname</target_name>
@@ -4313,6 +4964,20 @@
           <target_aggregation_type>-</target_aggregation_type>
           </field>
         <field>
+          <field_name>jhlc</field_name>
+          <key_value>35</key_value>
+          <target_name>fcno35_jhlc</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
           <field_name>fczdName</field_name>
           <key_value>35</key_value>
           <target_name>fcno35_zdname</target_name>
@@ -4451,6 +5116,10 @@
         <rename/>
         <length>-2</length>
         <precision>-2</precision>
+      </field>      <field>        <name>jhlc</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
       </field>        <select_unspecified>N</select_unspecified>
     </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -4511,6 +5180,10 @@
         <rename/>
         <length>-2</length>
         <precision>-2</precision>
+      </field>      <field>        <name>jhlc</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
       </field>        <select_unspecified>N</select_unspecified>
     </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -4755,7 +5428,7 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <sql>select &#xa;t.id as id&#xa;, g.lp_name as lp&#xa;, g.xl as xl&#xa;, qdz&#xa;, zdz&#xa;, tcc&#xa;, fcsj&#xa;, bc_type &#xa;, bcs&#xa;, fcno&#xa;, xl_dir&#xa;, isfb&#xa;from bsth_c_s_ttinfo_detail t left join &#xa;bsth_c_s_gbi g on t.lp &#x3d; g.id &#xa;where &#xa;g.xl &#x3d; &#x3f; and&#xa;t.ttinfo &#x3d; &#x3f; &#xa;order by t.bcs asc</sql>
+    <sql>select &#xa;t.id as id&#xa;, g.lp_name as lp&#xa;, g.xl as xl&#xa;, qdz&#xa;, zdz&#xa;, tcc&#xa;, fcsj&#xa;, jhlc&#xa;, bc_type &#xa;, bcs&#xa;, fcno&#xa;, xl_dir&#xa;, isfb&#xa;from bsth_c_s_ttinfo_detail t left join &#xa;bsth_c_s_gbi g on t.lp &#x3d; g.id &#xa;where &#xa;g.xl &#x3d; &#x3f; and&#xa;t.ttinfo &#x3d; &#x3f; &#xa;order by t.bcs asc</sql>
     <limit>0</limit>
     <lookup>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</lookup>
     <execute_each_row>N</execute_each_row>
@@ -106,6 +106,48 @@
         <appender-ref ref="TRAFFIC" />  
     </logger>
+    <!-- schedule 数据工具操作日志 -->
+    <appender name="DATATOOLS"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_BASE}/schedule/datatools/datatools.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BASE}/schedule/datatools/datatools-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
+            </pattern>
+        </layout>
+    </appender>
+    <!-- schedule 时刻表操作日志 -->
+    <appender name="TIMETABLE"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_BASE}/schedule/timetable/timetable.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BASE}/schedule/timetable/timetable-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
+            </pattern>
+        </layout>
+    </appender>
+    <logger name="com.bsth.service.schedule.impl.TTInfoDetailServiceImpl" level="INFO" additivity="false" >
+        <appender-ref ref="TIMETABLE" />
+    </logger>
+    <logger name="com.bsth.service.schedule.utils.DataToolsServiceImpl" level="INFO" additivity="false" >
+        <appender-ref ref="TIMETABLE" />
+        <appender-ref ref="DATATOOLS" />
+    </logger>
+
 	<!-- 日志输出级别 -->
 	<root level="info">
 		<appender-ref ref="STDOUT" />
 <!DOCTYPE html>
 <html lang="zh">
 <head>
-<meta name="renderer" content="webkit" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-<meta charset="UTF-8">
-<title>调度系统</title>
-
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="Cache-control" content="no-cache">
-<meta http-equiv="Cache" content="no-cache">
-
-<!-- Font Awesome 图标字体 -->
-<link href="/metronic_v4.5.4/plugins/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
-<!-- Bootstrap style -->
-<link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
-<!-- jsTree 数插件 -->
-<link href="/metronic_v4.5.4/plugins/jstree/dist/themes/default/style.min.css" rel="stylesheet" type="text/css" />
-<!-- MULTI-select 多选下拉框美化 -->
-<link href="/metronic_v4.5.4/plugins/jquery-multi-select/css/multi-select.css" rel="stylesheet" type="text/css" />
-
-<!-- editable -->
-<link href="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css" rel="stylesheet" type="text/css" />
-<!-- METRONIC style -->
-<link href="/metronic_v4.5.4/layout4/css/themes/light.min.css" rel="stylesheet" type="text/css" id="style_color" />
-<link href="/metronic_v4.5.4/css/components.css" rel="stylesheet" type="text/css" />
-<link href="/metronic_v4.5.4/css/plugins.css" rel="stylesheet" type="text/css" />
-<link href="/metronic_v4.5.4/layout4/css/layout.min.css" rel="stylesheet" type="text/css" />
-<link href="/metronic_v4.5.4/layout4/css/custom.min.css" rel="stylesheet" type="text/css" />
-<!-- select2 下拉框插件 -->
-<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
-<link href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
-<!-- layer 弹层 插件 -->
-<link href="/assets/plugins/layer-v2.4/layer/skin/layer.css" rel="stylesheet" type="text/css" />
-<!-- fileinput 上传 插件 -->
-<link href="/assets/plugins/fileinput/css/fileinput.min.css" rel="stylesheet" type="text/css" />
-<!-- iCheck 单选框和复选框 -->
-<link href="/metronic_v4.5.4/plugins/icheck/skins/all.css" rel="stylesheet" type="text/css" />
-<!-- 日期控件 -->
-<link href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css" />
-<!-- table 表格控件 -->
-<link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" type="text/css" />
-
-<!-- handsontable样式 -->
-<link rel="stylesheet" href="/assets/bower_components/handsontable/dist/handsontable.full.css"/>
-<!-- schedule计划调度AngularJS模块主css -->
-<link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css" type="text/css"/>
-
-<style type="text/css">
-.searchForm{
-
-}
-.searchForm .form-group .control-label{
-	padding-right: 0px;
-	text-align: right;
-	margin-top: 7px;
-}
-.searchForm .form-group>div{
-	padding-left: 10px;
-	padding-right: 0px;
-}
-.searchForm .row>div{
-	padding-left: 0px;
-    padding-right: 0px;
-    padding: 5px 0 5px 0;
-    width: 270px;
-    display: inline-block;
-}
-.searchForm .form-actions{
-	
-}
-tr.row-active td {
-    border-bottom: 1px solid blue!important;
-    color: blue;
-}
-.ms-container .ms-selectable li.ms-elem-selectable, .ms-container .ms-selection li.ms-elem-selection {
-    font-size: 14px;
-}
-.ms-container .ms-selectable li.ms-elem-selectable, .ms-container .ms-selection li.ms-elem-selection{
-	padding: 6px 26px;
-}
-.ms-container .ms-list{
-	height: 306px;
-}
-.ms-container .ms-selectable, .ms-container .ms-selection{
-	width: 47%;
-}
-.ms-container {
-    width: 470px;
-    margin: auto;
-}
-.multi-custom-header-left{
-    text-align: center;
-    padding: 7px;
-    color: #3B3F51;
-}
-.multi-custom-header-right{
-	text-align: center;
-    padding: 7px;
-    font-weight: bold;
-    color: #36C6D3;
-}
-.mt-element-list .list-simple.mt-list-container ul > .mt-list-item > .list-item-content {
-    padding: 0 55px 0 0px;
-}
-.mt-element-list .list-simple.mt-list-container ul > .mt-list-item {
-    padding: 3.3px 0;
-}
-
-#route-container{
-	display: none;
-}
-
-.page-content.active{
-	display: block !important; 
-}
-
-.page-header.navbar .page-logo .logo-default {
-       margin: 0;
-}
-.page-header.navbar .top-menu .navbar-nav>li.dropdown.open .dropdown-toggle {
-    background-color: #284a99;
-}
-.page-header.navbar .page-logo{
-	    padding-right: 10px;
-}
-
-.page-logo .logo-default.logo-default-text{
-    font-weight: 600;
-    color: white !important;
-    margin-top: 19px !important;
-    font-size: 24px;
-    text-decoration: none;
-}
-.page-logo .logo-default.logo-default-text:HOVER{
-	color: #dedede !important;
-}
-
-</style>
-
-<!-- ocLazyLoading载入文件的位置 -->
-<link id="ng_load_plugins_before" />
+    <meta name="renderer" content="webkit"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta charset="UTF-8">
+    <title>调度系统</title>
+
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Cache-control" content="no-cache">
+    <meta http-equiv="Cache" content="no-cache">
+
+    <!-- Font Awesome 图标字体 -->
+    <link href="/metronic_v4.5.4/plugins/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
+    <!-- Bootstrap style -->
+    <link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
+    <!-- jsTree 数插件 -->
+    <link href="/metronic_v4.5.4/plugins/jstree/dist/themes/default/style.min.css" rel="stylesheet" type="text/css"/>
+    <!-- MULTI-select 多选下拉框美化 -->
+    <link href="/metronic_v4.5.4/plugins/jquery-multi-select/css/multi-select.css" rel="stylesheet" type="text/css"/>
+
+    <!-- editable -->
+    <link href="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css"
+          rel="stylesheet" type="text/css"/>
+    <!-- METRONIC style -->
+    <link href="/metronic_v4.5.4/layout4/css/themes/light.min.css" rel="stylesheet" type="text/css" id="style_color"/>
+    <link href="/metronic_v4.5.4/css/components.css" rel="stylesheet" type="text/css"/>
+    <link href="/metronic_v4.5.4/css/plugins.css" rel="stylesheet" type="text/css"/>
+    <link href="/metronic_v4.5.4/layout4/css/layout.min.css" rel="stylesheet" type="text/css"/>
+    <link href="/metronic_v4.5.4/layout4/css/custom.min.css" rel="stylesheet" type="text/css"/>
+    <!-- select2 下拉框插件 -->
+    <link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css"/>
+    <link href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css"/>
+    <!-- layer 弹层 插件 -->
+    <link href="/assets/plugins/layer-v2.4/layer/skin/layer.css" rel="stylesheet" type="text/css"/>
+    <!-- fileinput 上传 插件 -->
+    <link href="/assets/plugins/fileinput/css/fileinput.min.css" rel="stylesheet" type="text/css"/>
+    <!-- iCheck 单选框和复选框 -->
+    <link href="/metronic_v4.5.4/plugins/icheck/skins/all.css" rel="stylesheet" type="text/css"/>
+    <!-- 日期控件 -->
+    <link href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
+          rel="stylesheet" type="text/css"/>
+    <!-- table 表格控件 -->
+    <link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"
+          type="text/css"/>
+
+    <!-- handsontable样式 -->
+    <link rel="stylesheet" href="/assets/bower_components/handsontable/dist/handsontable.full.css"/>
+    <!-- schedule计划调度AngularJS模块主css -->
+    <link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css" type="text/css"/>
+
+    <style type="text/css">
+        .searchForm {
+
+        }
+
+        .searchForm .form-group .control-label {
+            padding-right: 0px;
+            text-align: right;
+            margin-top: 7px;
+        }
+
+        .searchForm .form-group > div {
+            padding-left: 10px;
+            padding-right: 0px;
+        }
+
+        .searchForm .row > div {
+            padding-left: 0px;
+            padding-right: 0px;
+            padding: 5px 0 5px 0;
+            width: 270px;
+            display: inline-block;
+        }
+
+        .searchForm .form-actions {
+
+        }
+
+        tr.row-active td {
+            border-bottom: 1px solid blue !important;
+            color: blue;
+        }
+
+        .ms-container .ms-selectable li.ms-elem-selectable, .ms-container .ms-selection li.ms-elem-selection {
+            font-size: 14px;
+        }
+
+        .ms-container .ms-selectable li.ms-elem-selectable, .ms-container .ms-selection li.ms-elem-selection {
+            padding: 6px 26px;
+        }
+
+        .ms-container .ms-list {
+            height: 306px;
+        }
+
+        .ms-container .ms-selectable, .ms-container .ms-selection {
+            width: 47%;
+        }
+
+        .ms-container {
+            width: 470px;
+            margin: auto;
+        }
+
+        .multi-custom-header-left {
+            text-align: center;
+            padding: 7px;
+            color: #3B3F51;
+        }
+
+        .multi-custom-header-right {
+            text-align: center;
+            padding: 7px;
+            font-weight: bold;
+            color: #36C6D3;
+        }
+
+        .mt-element-list .list-simple.mt-list-container ul > .mt-list-item > .list-item-content {
+            padding: 0 55px 0 0px;
+        }
+
+        .mt-element-list .list-simple.mt-list-container ul > .mt-list-item {
+            padding: 3.3px 0;
+        }
+
+        #route-container {
+            display: none;
+        }
+
+        .page-content.active {
+            display: block !important;
+        }
+
+        .page-header.navbar .page-logo .logo-default {
+            margin: 0;
+        }
+
+        .page-header.navbar .top-menu .navbar-nav > li.dropdown.open .dropdown-toggle {
+            background-color: #284a99;
+        }
+
+        .page-header.navbar .page-logo {
+            padding-right: 10px;
+        }
+
+        .page-logo .logo-default.logo-default-text {
+            font-weight: 600;
+            color: white !important;
+            margin-top: 19px !important;
+            font-size: 24px;
+            text-decoration: none;
+        }
+
+        .page-logo .logo-default.logo-default-text:HOVER {
+            color: #dedede !important;
+        }
+
+    </style>
+
+    <!-- ocLazyLoading载入文件的位置 -->
+    <link id="ng_load_plugins_before"/>
 </head>
 <body class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo page-sidebar-fixed">
-    <div class="page-header navbar navbar-fixed-top" style="background: linear-gradient(to bottom ,#124e78, #125688);">
-        <div class="page-header-inner ">
-            <!-- LOGO -->
-            <div class="page-logo">
-                <a href="index.html" class="logo-default logo-default-text" > 闵行公交调度系统 </a>
-                <div class="menu-toggler sidebar-toggler">
-                </div>
-            </div>
-            <!-- END LOGO -->
-            <a href="javascript:;" class="menu-toggler responsive-toggler" data-toggle="collapse" data-target=".navbar-collapse"> </a>
-            <div class="page-top">
-                <div class="top-menu">
-                    <ul class="nav navbar-nav pull-right">
-                    	<!-- 信息通知区 -->
-                        <li class="dropdown dropdown-extended dropdown-notification dropdown-dark" id="header_notification_bar">
-                            <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
-                                <i class="fa fa-bell"></i>
-                                <span class="badge badge-success"> 0 </span>
-                            </a>
-                            <ul class="dropdown-menu" style="max-width: 345px;width: 345px;">
-                                <li class="external">
-                                    <h3>今日  <span class="bold">0 条</span> 通知</h3>
-                                    <a href="javascript:;">查看全部</a>
-                                </li>
-                                <li>
-                                    <ul class="dropdown-menu-list scroller" style="height: 250px;" data-handle-color="#637283">
-                                    </ul>
-                                </li>
-                            </ul>
-                        </li>
-                        <li class="dropdown dropdown-user dropdown-dark">
-                            <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
-                                <span id="indexTopUName" class="username username-hide-on-mobile" style="vertical-align: middle;"> <i class="fa fa-user"></i></span>
-                            </a>
-                            <ul class="dropdown-menu dropdown-menu-default">
-                                <li>
-                                    <a href="javascript:;">
-                                        <i class="fa fa-user"></i> 我的信息 </a>
-                                </li>
-                                <li>
-                                    <a href="javascript:;" id="changePWD">
-                                        <i class="fa fa-unlock-alt"></i> 修改密码</a>
-                                </li>
-                                <li class="divider"> </li>
-                                <li>
-                                    <a href="javascript:;">
-                                        <i class="fa fa-lock"></i> 锁屏 </a>
-                                </li>
-                                <li>
-                                    <a href="/logout">
-                                        <i class="fa fa-key"></i> 注销登陆 </a>
-                                </li>
-                            </ul>
-                        </li>
-                    </ul>
-                </div>
+<div class="page-header navbar navbar-fixed-top" style="background: linear-gradient(to bottom ,#124e78, #125688);">
+    <div class="page-header-inner ">
+        <!-- LOGO -->
+        <div class="page-logo">
+            <a href="index.html" class="logo-default logo-default-text"> 闵行公交调度系统 </a>
+            <div class="menu-toggler sidebar-toggler">
             </div>
         </div>
-    </div>
-    <div class="page-container">
-        <div class="page-sidebar-wrapper">
-            <div class="page-sidebar navbar-collapse collapse">
-                <ul class="page-sidebar-menu page-sidebar-menu-fixed" data-keep-expanded="false" data-auto-scroll="true" data-slide-speed="200" id="leftMenuSidebar">
+        <!-- END LOGO -->
+        <a href="javascript:;" class="menu-toggler responsive-toggler" data-toggle="collapse"
+           data-target=".navbar-collapse"> </a>
+        <div class="page-top">
+            <div class="top-menu">
+                <ul class="nav navbar-nav pull-right">
+                    <!-- 信息通知区 -->
+                    <li class="dropdown dropdown-extended dropdown-notification dropdown-dark"
+                        id="header_notification_bar">
+                        <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown"
+                           data-close-others="true">
+                            <i class="fa fa-bell"></i>
+                            <span class="badge badge-success"> 0 </span>
+                        </a>
+                        <ul class="dropdown-menu" style="max-width: 345px;width: 345px;">
+                            <li class="external">
+                                <h3>今日 <span class="bold">0 条</span> 通知</h3>
+                                <a href="javascript:;">查看全部</a>
+                            </li>
+                            <li>
+                                <ul class="dropdown-menu-list scroller" style="height: 250px;"
+                                    data-handle-color="#637283">
+                                </ul>
+                            </li>
+                        </ul>
+                    </li>
+                    <li class="dropdown dropdown-user dropdown-dark">
+                        <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown"
+                           data-close-others="true">
+                            <span id="indexTopUName" class="username username-hide-on-mobile"
+                                  style="vertical-align: middle;"> <i class="fa fa-user"></i></span>
+                        </a>
+                        <ul class="dropdown-menu dropdown-menu-default">
+                            <li>
+                                <a href="javascript:;">
+                                    <i class="fa fa-user"></i> 我的信息 </a>
+                            </li>
+                            <li>
+                                <a href="javascript:;" id="changePWD">
+                                    <i class="fa fa-unlock-alt"></i> 修改密码</a>
+                            </li>
+                            <li class="divider"></li>
+                            <li>
+                                <a href="javascript:;">
+                                    <i class="fa fa-lock"></i> 锁屏 </a>
+                            </li>
+                            <li>
+                                <a href="/logout">
+                                    <i class="fa fa-key"></i> 注销登陆 </a>
+                            </li>
+                        </ul>
+                    </li>
                 </ul>
             </div>
         </div>
-        <div class="page-content-wrapper">
-                <div id="pjax-container" class="page-content"></div>
-                
-               <div id="route-container">
-                    <div ng-app="ScheduleApp">
-                        <div ng-controller="ScheduleAppController">
-
-                            <!-- loading widget -->
-                            <div id="loadingWidget" class="flyover mask" loading-widget>
-                                <div class="alert alert-info">
-                                    <strong>载入中......</strong>
-                                </div>
-                            </div>
-
-                            <div ui-view class="fade-in-up"> </div>
+    </div>
+</div>
+<div class="page-container">
+    <div class="page-sidebar-wrapper">
+        <div class="page-sidebar navbar-collapse collapse">
+            <ul class="page-sidebar-menu page-sidebar-menu-fixed" data-keep-expanded="false" data-auto-scroll="true"
+                data-slide-speed="200" id="leftMenuSidebar">
+            </ul>
+        </div>
+    </div>
+    <div class="page-content-wrapper">
+        <div id="pjax-container" class="page-content"></div>
+
+        <div id="route-container">
+            <div ng-app="ScheduleApp">
+                <div ng-controller="ScheduleAppController">
+
+                    <!-- loading widget -->
+                    <div id="loadingWidget" class="flyover mask" loading-widget>
+                        <div class="alert alert-info">
+                            <strong>载入中......</strong>
                         </div>
                     </div>
+
+                    <div ui-view class="fade-in-up"></div>
                 </div>
-        </div> 
+            </div>
+        </div>
     </div>
+</div>
 <script id="menu_list_temp" type="text/html">
-{{each list as group i}}
- <li class="heading">
-     <h3 class="uppercase">{{group.name}}</h3>
- </li>
-	{{each group.children as dir j}}
-		<li class="nav-item">
-     		<a href="javascript:;" class="nav-link nav-toggle ">
-         		<i class="{{dir.icon}}"></i>
-         		<span class="title">{{dir.name}}</span>
-         		<span class="arrow"></span>
-     		</a>
-			<ul class="sub-menu">
-			{{each dir.children as module s}}
-				 <li class="nav-item  ">
-					{{if module.container=="pjax-container"}}
-						<a href="/pages/{{module.path}}" class="nav-link " data-pjax>
-                 			<span class="title">{{module.name}}</span>
-             			</a>
-					{{else}}
-						<a href="{{module.path}}" class="nav-link " data-angularjs>
-                 			<span class="title">{{module.name}}</span>
-             			</a>
-					{{/if}}
-         		</li>
-			{{/each}}
-			</ul>
- 		</li>
-	{{/each}}
-{{/each}}
+    {{each list as group i}}
+    <li class="heading">
+        <h3 class="uppercase">{{group.name}}</h3>
+    </li>
+    {{each group.children as dir j}}
+    <li class="nav-item">
+        <a href="javascript:;" class="nav-link nav-toggle ">
+            <i class="{{dir.icon}}"></i>
+            <span class="title">{{dir.name}}</span>
+            <span class="arrow"></span>
+        </a>
+        <ul class="sub-menu">
+            {{each dir.children as module s}}
+            <li class="nav-item  ">
+                {{if module.container=="pjax-container"}}
+                <a href="/pages/{{module.path}}" class="nav-link " data-pjax>
+                    <span class="title">{{module.name}}</span>
+                </a>
+                {{else}}
+                <a href="{{module.path}}" class="nav-link " data-angularjs>
+                    <span class="title">{{module.name}}</span>
+                </a>
+                {{/if}}
+            </li>
+            {{/each}}
+        </ul>
+    </li>
+    {{/each}}
+    {{/each}}
 </script>
 <!-- jQuery -->
@@ -272,24 +299,24 @@ tr.row-active td {
 <script src="/metronic_v4.5.4/scripts/app.min.js" data-exclude=1></script>
 <script src="/metronic_v4.5.4/layout4/scripts/layout.min.js" data-exclude=1></script>
 <!-- 虚拟滚动条 -->
-<script src="/metronic_v4.5.4/plugins/jquery-slimscroll/jquery.slimscroll.min.js" ></script>
+<script src="/metronic_v4.5.4/plugins/jquery-slimscroll/jquery.slimscroll.min.js"></script>
 <!-- jsTree 树插件 -->
-<script src="/metronic_v4.5.4/plugins/jstree/dist/jstree.min.js" ></script>
+<script src="/metronic_v4.5.4/plugins/jstree/dist/jstree.min.js"></script>
 <!-- bootstrap-hover-dropDown -->
-<script src="/metronic_v4.5.4/plugins/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js" ></script>
+<script src="/metronic_v4.5.4/plugins/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js"></script>
 <!-- jquery.validate 表单验证 -->
 <script src="/metronic_v4.5.4/plugins/jquery-validation/js/jquery.validate.min.js"></script>
 <script src="/metronic_v4.5.4/plugins/jquery-validation/js/localization/messages_zh.js"></script>
 <!-- 向导式插件 -->
 <script src="/metronic_v4.5.4//plugins/bootstrap-wizard/jquery.bootstrap.wizard.min.js"></script>
 <!-- iCheck 单选框和复选框  -->
-<script src="/metronic_v4.5.4/plugins/icheck/icheck.min.js" ></script>
+<script src="/metronic_v4.5.4/plugins/icheck/icheck.min.js"></script>
 <!-- select2 下拉框 -->
-<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js" ></script>
+<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
 <!-- MULTI SELECT 多选下拉框 -->
-<script src="/metronic_v4.5.4/plugins/jquery-multi-select/js/jquery.multi-select.js" ></script>
+<script src="/metronic_v4.5.4/plugins/jquery-multi-select/js/jquery.multi-select.js"></script>
 <!-- editable.js -->
-<script src="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.min.js" ></script>
+<script src="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.min.js"></script>
 <!-- PJAX -->
 <script src="/assets/plugins/jquery.pjax.js"></script>
 <!-- layer 弹层 -->
@@ -313,7 +340,7 @@ tr.row-active td {
 <script src="/assets/plugins/pinyin.js"></script>
 <!-- 日期控件 -->
-<script src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js" ></script>
+<script src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js"></script>
 <!-- 表格控件 -->
 <!-- 统计图控件 -->
 <!--<script src="/assets/global/getEchart.js"></script>
@@ -322,130 +349,139 @@ tr.row-active td {
 <script src="/assets/js/dictionary.js"></script>
 <script data-exclude=1>
-//初始打开的片段地址
-var initFragment = "^_^initFragment^_^";
-//静态文件目录
-var dir = '/pages/';
-//片段容器
-var pjaxContainer = '#pjax-container'
-	,angJsContainer = '#route-container';
-
-$(function(){
-	$.get('/user/currentUser', function(user){
-		$('#indexTopUName').text(user.userName);
-	});
-	
-	//带 data-pjax 的链接由pjax加载
-	$(document).pjax('a[data-pjax]', pjaxContainer);
-	
-	//pjax左菜单点击事件
-	$(document).on('click','#leftMenuSidebar a[data-pjax]', function(){
-		$('#leftMenuSidebar li.nav-item.active').removeClass('active');
-		$(this).parent().addClass('active');
-        showPjax();
-	});
-	
-	//angularjs左菜单点击事件
- 	$(document).on('click','#leftMenuSidebar a[data-angularjs]', function(){
-		$('#leftMenuSidebar li.nav-item.active').removeClass('active');
-		$(this).parent().addClass('active');
-        showAngJs();
-	});
-	
-	//加载左菜单栏
-	$get('/module/findByCurrentUser', null,
-			function(ms){
-		var treeArray = createTreeData(ms);
-		treeArray.sort(function(a, b){
-				return a.createDate - b.createDate;
-		});
-		var menuHtml = template('menu_list_temp', {list: treeArray});
-		$('#leftMenuSidebar').html(menuHtml);
-
-		//----------- 检查URL ----------------
-		var h = location.hash;
-		if(initFragment && initFragment != ''){
-			showPjax();
-			//普通片段
-			loadPage(initFragment);
-			//选中菜单
-			$.each($('#leftMenuSidebar a'), function(i, item){
-				if(urlPattern($(item).attr('href'), initFragment)){
-					activeLeftMenu(item);
-				}
-			});
-		}else if(h){
-			//angularjs片段
-			showAngJs();
-			//选中菜单
-			$.each($('#leftMenuSidebar a'), function(i, item){
-				if($(item).attr('href') == h){
-					activeLeftMenu(item);
-				}
-			});
-		}
-		else{
-			//加载主页
-			loadPage('/pages/home.html');
-		}
-	});
-	
-	//修改密码
-	$('#changePWD').on('click', function(){
-		$.get('/pages/permission/user/changePWD.html', function(content){
-			layer.open({
-			  type: 1,
-			  area: ['600px','360px'],
-			  content: content,
-			  title : '修改密码',
-			  shift: 5,
-			  scrollbar: false,
-			  success: function(){
-			  }
-			});
-		});
-	});
-});
- 
-	//modal关闭时销毁dom
-	$(document).on('hidden.bs.modal', '.modal', function(){
-			$(this).remove();
-	});
-	
-	//pjax加载完成事件
-	$(document).on('pjax:success', function(){
-		var dicts = $(pjaxContainer).find('.nt-dictionary');
-		dictionaryUtils.transformDom(dicts);
-	});
-	
-	function loadPage(url){
-		$.pjax({url: url, container: pjaxContainer})
-	}
-	
-	function urlPattern(a , b){
-		var r;
-		try {
-			r = a.substring(0, a.lastIndexOf('/')) == b.substring(0, b.lastIndexOf('/'));
-		} catch (e) {
-			r = false;
-		}
-		return r;
-	}
-	
-	function showPjax(){
-		$(angJsContainer).removeClass('page-content active').hide();
-		$(pjaxContainer).addClass('page-content active');
-	}
-	
-	function showAngJs(){
-		$(pjaxContainer).html('').removeClass('page-content active').hide();
-		$(angJsContainer).addClass('page-content active');
-	}
-	
-	function activeLeftMenu(item){
-		$(item).parent('.nav-item').addClass('active').parent('.sub-menu').show().parent().addClass('open');
-	}
-	
+    //初始打开的片段地址
+    var initFragment = "^_^initFragment^_^";
+    //静态文件目录
+    var dir = '/pages/';
+    //片段容器
+    var pjaxContainer = '#pjax-container'
+            , angJsContainer = '#route-container';
+
+    $(function () {
+        $.get('/user/currentUser', function (user) {
+            $('#indexTopUName').text(user.userName);
+        });
+
+        //带 data-pjax 的链接由pjax加载
+        $(document).pjax('a[data-pjax]', pjaxContainer);
+
+        //pjax左菜单点击事件
+        $(document).on('click', '#leftMenuSidebar a[data-pjax]', function () {
+            setTitle(this);
+
+            $('#leftMenuSidebar li.nav-item.active').removeClass('active');
+            $(this).parent().addClass('active');
+            showPjax();
+        });
+
+        //angularjs左菜单点击事件
+        $(document).on('click', '#leftMenuSidebar a[data-angularjs]', function () {
+            setTitle(this);
+
+            $('#leftMenuSidebar li.nav-item.active').removeClass('active');
+            $(this).parent().addClass('active');
+            showAngJs();
+        });
+
+        //加载左菜单栏
+        $get('/module/findByCurrentUser', null,
+                function (ms) {
+                    var treeArray = createTreeData(ms);
+                    treeArray.sort(function (a, b) {
+                        return a.createDate - b.createDate;
+                    });
+                    var menuHtml = template('menu_list_temp', {list: treeArray});
+                    $('#leftMenuSidebar').html(menuHtml);
+
+                    //----------- 检查URL ----------------
+                    var h = location.hash;
+                    if (initFragment && initFragment != '') {
+                        showPjax();
+                        //普通片段
+                        loadPage(initFragment);
+                        //选中菜单
+                        $.each($('#leftMenuSidebar a'), function (i, item) {
+                            if (urlPattern($(item).attr('href'), initFragment)) {
+                                activeLeftMenu(item);
+                            }
+                        });
+                    } else if (h) {
+                        //angularjs片段
+                        showAngJs();
+                        //选中菜单
+                        $.each($('#leftMenuSidebar a'), function (i, item) {
+                            if ($(item).attr('href') == h) {
+                                activeLeftMenu(item);
+                            }
+                        });
+                    }
+                    else {
+                        //加载主页
+                        loadPage('/pages/home.html');
+                    }
+                });
+
+        //修改密码
+        $('#changePWD').on('click', function () {
+            $.get('/pages/permission/user/changePWD.html', function (content) {
+                layer.open({
+                    type: 1,
+                    area: ['600px', '360px'],
+                    content: content,
+                    title: '修改密码',
+                    shift: 5,
+                    scrollbar: false,
+                    success: function () {
+                    }
+                });
+            });
+        });
+    });
+
+    //modal关闭时销毁dom
+    $(document).on('hidden.bs.modal', '.modal', function () {
+        $(this).remove();
+    });
+
+    //pjax加载完成事件
+    $(document).on('pjax:success', function () {
+        var dicts = $(pjaxContainer).find('.nt-dictionary');
+        dictionaryUtils.transformDom(dicts);
+    });
+
+    function loadPage(url) {
+        $.pjax({url: url, container: pjaxContainer})
+    }
+
+    function urlPattern(a, b) {
+        var r;
+        try {
+            r = a.substring(0, a.lastIndexOf('/')) == b.substring(0, b.lastIndexOf('/'));
+        } catch (e) {
+            r = false;
+        }
+        return r;
+    }
+
+    function showPjax() {
+        $(angJsContainer).removeClass('page-content active').hide();
+        $(pjaxContainer).addClass('page-content active');
+    }
+
+    function showAngJs() {
+        $(pjaxContainer).html('').removeClass('page-content active').hide();
+        $(angJsContainer).addClass('page-content active');
+    }
+
+    function activeLeftMenu(item) {
+        $(item).parent('.nav-item').addClass('active').parent('.sub-menu').show().parent().addClass('open');
+        setTitle(item);
+    }
+
+    function setTitle(menuItem){
+        document.title = $('span.title', menuItem).text();
+    }
+
 </script>
 <!-- d3 -->
 <script src="/assets/js/d3.min.js" data-exclude=1></script>
@@ -478,8 +514,10 @@ $(function(){
 <!-- 百度 -->
 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT" data-exclude=1></script>
 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js" data-exclude=1></script>
-<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js" data-exclude=1></script>
-<script type="text/javascript" src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js " data-exclude=1></script>
+<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
+        data-exclude=1></script>
+<script type="text/javascript" src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
+        data-exclude=1></script>
 <script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
 <!-- 高德  -->
@@ -70,6 +70,9 @@
 <script>
 	$(function(){
+		$("#export").attr('disabled',"true");
+		
+		
 		var reqCodeMap = {"0xA1": '请求恢复运营', "0xA2": '申请调档', "0xA3": '出场请求', "0xA5": '进场请求', "0xA7": '加油请求', "0x50": '车辆故障', "0x70": '路阻报告', "0x60": '事故报告', "0x11": '扣证纠纷', "0x12" : '报警'};
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
@@ -130,14 +133,19 @@
                }
             }
         });
-		
+
+		var line = $("#line").val();
+		var xlName = $("#select2-line-container").html();
+		var date = $("#date").val();
+		var code = $("#code").val();
 		$("#query").on("click",function(){
-			var line = $("#line").val();
-			var xlName = $("#select2-line-container").html();
-			var date = $("#date").val();
-			var code = $("#code").val();
+			line = $("#line").val();
+			xlName = $("#select2-line-container").html();
+			date = $("#date").val();
+			code = $("#code").val();
+			var type = "query";
 			$(".hidden").removeClass("hidden");
-			$post('/realSchedule/account',{line:line,date:date,code:code,xlName:xlName},function(result){
+			$post('/realSchedule/account',{line:line,date:date,code:code,xlName:xlName,type:type},function(result){
 				$.each(result, function(i, obj) {
 					obj.requestType = reqCodeMap[obj.requestType];
                 });
@@ -145,8 +153,22 @@
 				var tbodyHtml = template('list_account',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
+				
+				if(result.length == 0)
+					$("#export").attr('disabled',"true");
+				else
+					$("#export").removeAttr("disabled");
+				
 			});	
-		});
+		});
+		
+		$("#export").on("click",function(){
+			var type = "export";
+			$get('/realSchedule/account', {line:line,date:date,code:code,xlName:xlName,type:type}, function(result){
+				window.open("/downloadFile/download?fileName=驾驶员请求台账"+moment(date).format("YYYYMMDD"));
+			});
+		});
+		
 	});
 </script>
 <script type="text/html" id="list_account">
@@ -49,7 +49,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="筛选"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
                     </div>
 				</form>
 			</div>
@@ -67,7 +67,8 @@
 								<td rowspan="2">线路名</td>
 								<td rowspan="2">路牌</td>
 								<td rowspan="2">车号</td>
-								<td colspan="2">车号</td>
+								<td rowspan="2">司机</td>
+								<td rowspan="2">售票员</td>
 								<td colspan="2">发车时间</td>
 								<td colspan="2">结束时间</td>
 								<td rowspan="2">修改人</td>
@@ -75,8 +76,6 @@
 								<td rowspan="2">备注</td>
 							</tr>
 							<tr>
-								<td>司机</td>
-								<td>售票员</td>
 								<td>计划</td>
 								<td>实际</td>
 								<td>计划</td>
@@ -97,7 +96,10 @@
 </div>
 <script>
-	$(function(){
+	$(function(){
+		$("#export").attr('disabled',"true");
+		
+		
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
@@ -196,14 +198,20 @@
                }
             }
         });
-		
+
+	    var line = $("#line").val();
+	    var startDate = $("#startDate").val();
+	    var endDate = $("#endDate").val();
+	    var lpName = $("#lpName").val();
+	    var code = $("#code").val();
 		$("#query").on("click",function(){
-		    var line = $("#line").val();
-		    var startDate = $("#startDate").val();
-		    var endDate = $("#endDate").val();
-		    var lpName = $("#lpName").val();
-		    var code = $("#code").val();
-		    $post("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code},function(result){
+		    line = $("#line").val();
+		    startDate = $("#startDate").val();
+		    endDate = $("#endDate").val();
+		    lpName = $("#lpName").val();
+		    code = $("#code").val();
+		    var type = "query";
+		    $post("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
 		        $("#sDate").text(startDate);
 		        $("#eDate").text(endDate);
 		        var temp = {};
@@ -228,8 +236,22 @@
                 /* var list_correctForm_statistics = template('list_correctForm_statistics',temp);
                 $('#forms .list_correctForm_statistics').html(list_correctForm_statistics); */
+                
+                if(result.length == 0)
+					$("#export").attr('disabled',"true");
+				else
+					$("#export").removeAttr("disabled");
+                
 		    });
-		});
+		});
+		
+		$("#export").on("click",function(){
+			var type = "export";
+			$get('/realSchedule/correctForm',{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
+				window.open("/downloadFile/download?fileName=修正报表"+moment(startDate).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
+			});
+		});
+		
 	});
 </script>
 <script type="text/html" id="list_correctForm">
@@ -26,7 +26,15 @@
 	<div class="col-md-12">
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
-				<form class="form-inline" action="">
+				<form class="form-inline" action="">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_daily">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdmDaily" style="width: 140px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_daily">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdmDaily" style="width: 140px;"></select>
+					</div>
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -64,15 +72,15 @@
 								<td>班次</td>
 							</tr>
 						</thead>
-						<tbody class="dailyInfo">
+						<tbody id="tbody">
 						</tbody>
 						<tr>
 							<td colspan="3">小计</td>
 							<td><span id="total_zgl">&nbsp;</span></td>
-							<td><span id="total_ksgl">&nbsp;</span></td>
+							<td><span id="total_ks">&nbsp;</span></td>
 							<td><span id="total_yh">&nbsp;</span></td>
-							<td><span id="total_bcs">&nbsp;</span></td>
+							<td><span id="total_bc">&nbsp;</span></td>
 						</tr>
 					</table>
 				</div>
@@ -82,7 +90,9 @@
 </div>
 <script>
-	$(function(){
+	$(function(){
+		var reqCodeMap = {"0xA1": '请求恢复运营', "0xA2": '申请调档', "0xA3": '出场请求', "0xA5": '进场请求', "0xA7": '加油请求', "0x50": '车辆故障', "0x70": '路阻报告', "0x60": '事故报告', "0x11": '扣证纠纷', "0x12" : '报警'};
+
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
@@ -92,6 +102,42 @@
 			locale : 'zh-cn'
 		});
+		var obj = [];
+		$.get('/user/companyData', function(result){
+			obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			
+			if(obj.length ==0){
+				 $("#gsdmDiv_daily").css('display','none');
+				 $('#gsdmDiv_daily').css('display','none');
+			}else if(obj.length ==1){
+				 $("#fgsdmDiv_daily").css('display','none');
+				if(obj[0].children.length == 1  || obj[0].children.length ==0)
+					$('#fgsdmDiv_daily').css('display','none');
+			}
+			$('#gsdmDaily').html(options);
+			updateCompany();
+		});
+
+		$("#gsdmDaily").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdmDaily').val();
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdmDaily').html(options);
+		}
+
+		
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -101,50 +147,82 @@
 			initPinYinSelect2('#line',data,'');
 		})
-		var line;
-		var date;
-		$("#query").on("click",function(){
-			line = $("#line").val();
-			var lineName=$("#select2-line-container").html();
-			date = $("#date").val();
-			$get('/realSchedule/dailyInfo',{line:line,date:date,type:'query'},function(result){
-			    $("#form_line").text(lineName);
-			    $("#form_date").text(date);
-			    var total_zgl = 0,total_ksgl = 0,total_yh = 0,total_bcs = 0;
-			    $.each(result, function(i, obj) {
-                    total_zgl = Number(obj.zgl)+Number(total_zgl);
-                    total_ksgl = Number(obj.ksgl)+Number(total_ksgl);
-                    total_yh = Number(0)+Number(total_yh);
-                    total_bcs = Number(obj.bcs)+Number(total_bcs);
-                });
-                $("#total_zgl").text(total_zgl.toFixed(2));
-                $("#total_ksgl").text(total_ksgl.toFixed(2));
-                $("#total_yh").text(total_yh.toFixed(2));
-                $("#total_bcs").text(total_bcs);
-                
-				// 把数据填充到模版中
-				var tbodyHtml = template('dailyInfo',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms .dailyInfo').html(tbodyHtml);
-			});
+
+	var line;
+	var date;
+	var gsdmDaily;
+	var fgsdmDaily;
+	$("#query").on("click",function(){
+		
+		line = $("#line").val();
+		var lineName=$("#select2-line-container").html();
+		date = $("#date").val();
+		gsdmDaily=$("#gsdmDaily").val();
+		fgsdmDaily = $("#fgsdmDaily").val();
+		
+		$post('/mcy_forms/daily',{gsdmDaily:gsdmDaily,fgsdmDaily:fgsdmDaily, line:line,date:date,type:'query'},function(result){
+			 $("#form_line").text(lineName);
+			 $("#form_date").text(date);
+			// 把数据填充到模版中
+			var tbodyHtml = template('dailyInfo',{list:result});
+			// 把渲染好的模版html文本追加到表格中
+			$('#tbody').html(tbodyHtml);
+		    line = $("#line").val();
+		  
+		    startDate = $("#startDate").val();
+		    endDate = $("#endDate").val();
+		    $("#sDate").text(startDate);
+	        $("#eDate").text(endDate);
+	        
+	        var total_zgl = 0,total_ks = 0;
+	        var total_yh = 0,total_bc = 0;
+	       
+	        $.each(result, function(i, obj) {
+	        	total_zgl +=Number(obj.zlc);
+	        	total_ks +=Number(obj.jzl1);
+	        	total_yh += Number(obj.yh);
+	        	total_bc += Number(obj.bc);
+		    	
+            });
+            $("#total_zgl").text(total_zgl.toFixed(2));
+            $("#total_ks").text(total_ks.toFixed(2));
+            $("#total_yh").text(total_yh.toFixed(2));
+            $("#total_bc").text(total_bc.toFixed(2));
+	         
+	        var temp = {};
+	        var today_account = 0;
+	        
+	        temp["line"] = $("#line").text(); 	        
+	        $.each(result, function(i, obj) {
+	            if(moment(obj.schedule_date_str).format("YYYY-MM-DD") == moment(obj.startDate).format("YYYY-MM-DD")){
+	                today_account++;
+	            } 
+                obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
+            });  
+		})
+	});
+	
+	$("#export").on("click",function(){
+		line = $("#line").val();
+		date = $("#date").val();
+		gsdmDaily=$("#gsdmDaily").val();
+		fgsdmDaily = $("#fgsdmDaily").val();
+		$post('/mcy_export/dailyExport',{gsdmDaily:gsdmDaily,fgsdmDaily:fgsdmDaily,line:line,date:date,type:'export'},function(result){
+			window.open("/downloadFile/download?fileName=班次日报表"+moment(date).format("YYYYMMDD"));
 		});
-		$("#export").on("click",function(){
-			$get('/realSchedule/dailyInfo',{line:line,date:date,type:'export'},function(result){
-				window.open("/downloadFile/download?fileName=班次日报"+moment(date).format("YYYYMMDD"));
-			});
-		});
-	});
+	});
+});
 </script>
 <script type="text/html" id="dailyInfo">
 	{{each list as obj i}}
 		<tr>
-			<td>{{obj.clZbh}}</td>
-			<td>{{obj.jGh}}</td>
+			<td>{{obj.zbh}}</td>
+			<td>{{obj.jgh}}</td>
 			<td>{{obj.jName}}</td>
-			<td>{{obj.zgl}}</td>
-			<td>{{obj.ksgl}}</td>
-			<td>0</td>
-			<td>{{obj.bcs}}</td>
+			<td>{{obj.zlc}}</td>
+			<td>{{obj.jzl1}}</td>
+			<td>{{obj.yh}}</td>
+			<td>{{obj.bc}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -69,7 +69,9 @@
 </div>
 <script>
-	$(function(){
+	$(function(){
+		$('#export').attr('disabled', "true");
+		
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
@@ -127,21 +129,35 @@
 			   }
 			}
 		});
-		
+
+		var line = $("#line").val();
+		var date = $("#date").val();
+		var code = $("#code").val();
 		$("#query").on("click",function(){
-			var line = $("#line").val();
-			var date = $("#date").val();
-			var code = $("#code").val();
+			line = $("#line").val();
+			date = $("#date").val();
+			code = $("#code").val();
+			var type = "query";
 			$(".hidden").removeClass("hidden");
 			$get('/realSchedule/historyMessage',{line:line,date:date,code:code},function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_history',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
+				
+				if(result.length == 0)
+					$("#export").attr('disabled',"true");
+				else
+					$("#export").removeAttr("disabled");
+				
 			});		
 		});
+		
 		$("#export").on("click",function(){
-		    $('#forms').tableExport({ type: 'excel', escape: 'false',filename:'(2016-02-29_2016-03-06)'});
+			var type = "export";
+			$get('/realSchedule/historyMessage', {line:line,date:date,code:code,type:type}, function(result){
+				window.open("/downloadFile/download?fileName=调度历史消息"+moment(date).format("YYYYMMDD"));
+			});
 		});
 	});
@@ -37,7 +37,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
                     </div>
 				</form>
 			</div>
@@ -37,7 +37,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
                     </div>
 				</form>
 			</div>
@@ -37,7 +37,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
                     </div>
 				</form>
 			</div>
@@ -39,7 +39,7 @@
 						<input class="btn btn-default" type="button" id="query" value="查询"/>
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
 						<input class="btn btn-default" type="button" id="print" value="打印"/>
-						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
+<!-- 						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/> -->
 					</div>
 				</form>
 			</div>
@@ -230,8 +230,7 @@
 											var total_bcjh = 0, total_bcsj = 0, total_bczxl = 0;
 											var total_gs = 0;
 											var total_zhgs = 0;
-											$
-													.each(
+											$.each(
 															result,
 															function(i, obj) {
 																total_gs += Number(obj.gsgs);
@@ -147,7 +147,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;BusInfoManageToolsCtrl&#39;, [&#39;$modalInsta
     // 上传文件组件
     self.uploader = new FileUploader({
-        url: "/cars/dataImport",
+        url: "/cars_sc/uploadAndImportFile",
         filters: [] // 用于过滤文件，比如只允许导入excel
     });
     self.uploader.onAfterAddingFile = function(fileItem)
@@ -159,7 +159,16 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;BusInfoManageToolsCtrl&#39;, [&#39;$modalInsta
     };
     self.uploader.onSuccessItem = function(fileItem, response, status, headers)
     {
-        console.info('onSuccessItem', fileItem, response, status, headers);
+        if (response.status == "SUCCESS") {
+            console.info('onSuccessItem', fileItem, response, status, headers);
+        } else {
+            fileItem.isSuccess = false;
+            fileItem.isCancel = false;
+            fileItem.isError = true;
+
+            alert(response.msg);
+        }
+
     };
     self.uploader.onErrorItem = function(fileItem, response, status, headers)
     {
@@ -59,14 +59,14 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     }
                 ),
                 dataTools: $resource(
-                    '/cars/:type',
+                    '/cars_sc/:type',
                     {},
                     {
                         dataExport: {
                             method: 'GET',
                             responseType: "arraybuffer",
                             params: {
-                                type: "dataExport"
+                                type: "exportFile"
                             },
                             transformResponse: function(data, headers){
                                 return {data : data};
@@ -146,7 +146,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;EmployInfoManageToolsCtrl&#39;, [&#39;$modalIn
     // 上传文件组件
     self.uploader = new FileUploader({
-        url: "/personnel/dataImport",
+        url: "/ee/uploadAndImportFile",
         filters: [] // 用于过滤文件，比如只允许导入excel
     });
     self.uploader.onAfterAddingFile = function(fileItem)
@@ -158,7 +158,15 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;EmployInfoManageToolsCtrl&#39;, [&#39;$modalIn
     };
     self.uploader.onSuccessItem = function(fileItem, response, status, headers)
     {
-        console.info('onSuccessItem', fileItem, response, status, headers);
+        if (response.status == "SUCCESS") {
+            console.info('onSuccessItem', fileItem, response, status, headers);
+        } else {
+            fileItem.isSuccess = false;
+            fileItem.isCancel = false;
+            fileItem.isError = true;
+
+            alert(response.msg);
+        }
     };
     self.uploader.onErrorItem = function(fileItem, response, status, headers)
     {
@@ -41,14 +41,14 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 ),
                 dataTools: $resource(
-                    '/personnel/:type',
+                    '/ee/:type',
                     {},
                     {
                         dataExport: {
                             method: 'GET',
                             responseType: "arraybuffer",
                             params: {
-                                type: "dataExport"
+                                type: "exportFile"
                             },
                             transformResponse: function(data, headers){
                                 return {data : data};
@@ -60,14 +60,14 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     }
                 ),
                 dataTools: $resource(
-                    '/cars/:type',
+                    '/cars_sc/:type',
                     {},
                     {
                         dataExport: {
                             method: 'GET',
                             responseType: "arraybuffer",
                             params: {
-                                type: "dataExport"
+                                type: "exportFile"
                             },
                             transformResponse: function(data, headers){
                                 return {data : data};
@@ -163,14 +163,14 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 ),
                 dataTools: $resource(
-                    '/personnel/:type',
+                    '/ee/:type',
                     {},
                     {
                         dataExport: {
                             method: 'GET',
                             responseType: "arraybuffer",
                             params: {
-                                type: "dataExport"
+                                type: "exportFile"
                             },
                             transformResponse: function(data, headers){
                                 return {data : data};
@@ -533,15 +533,31 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     {order: 'createDate', direction: 'DESC', id: '@id'},
                     {
                         get: {
-                            method: 'GET'
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
                         },
                         save: {
-                            method: 'POST'
+                            method: 'POST',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
                         }
                     }
                 ),
                 import: $resource(
-                    '/tidc/importfile',
+                    '/tidc/importFile',
                     {},
                     {
                         do: {
@@ -564,7 +580,15 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     {},
                     {
                         list: {
-                            method: 'GET'
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
                         }
                     }
                 ),
@@ -586,7 +610,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                             method: 'GET',
                             responseType: "arraybuffer",
                             params: {
-                                type: "dataExportExt"
+                                type: "exportFile"
                             },
                             transformResponse: function(data, headers){
                                 return {data : data};
@@ -76,19 +76,19 @@
                                     searchexp="this.insideCode"
                                     required >
                         </sa-Select5>
-                        <input type="hidden" name="cl_h" ng-model="ctrl.busConfigForSave.cl.id"
-                               remote-Validation
-                               remotevtype="cc_cars"
-                               remotevparam="{{ {'id_eq': ctrl.busConfigForSave.id, 'xl.id_eq': ctrl.busConfigForSave.xl.id, 'xl.name_eq': ctrl.busConfigForSave.xl.name, 'cl.id_eq': ctrl.busConfigForSave.cl.id} | json}}"
-                                />
+                        <!--<input type="hidden" name="cl_h" ng-model="ctrl.busConfigForSave.cl.id"-->
+                               <!--remote-Validation-->
+                               <!--remotevtype="cc_cars"-->
+                               <!--remotevparam="{{ {'id_eq': ctrl.busConfigForSave.id, 'xl.id_eq': ctrl.busConfigForSave.xl.id, 'xl.name_eq': ctrl.busConfigForSave.xl.name, 'cl.id_eq': ctrl.busConfigForSave.cl.id} | json}}"-->
+                                <!--/>-->
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required">
                         车辆必须选择
                     </div>
-                    <div class="alert alert-danger well-sm" ng-show="myForm.cl_h.$error.remote">
-                        {{$remote_msg}}
-                    </div>
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.cl_h.$error.remote">-->
+                        <!--{{$remote_msg}}-->
+                    <!--</div>-->
                 </div>
                 <div class="form-group has-success has-feedback">
@@ -76,19 +76,19 @@
                                     searchexp="this.insideCode"
                                     required >
                         </sa-Select5>
-                        <input type="hidden" name="cl_h" ng-model="ctrl.busConfigForSave.cl.id"
-                               remote-Validation
-                               remotevtype="cc_cars"
-                               remotevparam="{{ {'xl.id_eq': ctrl.busConfigForSave.xl.id, 'xl.name_eq': ctrl.busConfigForSave.xl.name, 'cl.id_eq': ctrl.busConfigForSave.cl.id} | json}}"
-                                />
+                        <!--<input type="hidden" name="cl_h" ng-model="ctrl.busConfigForSave.cl.id"-->
+                               <!--remote-Validation-->
+                               <!--remotevtype="cc_cars"-->
+                               <!--remotevparam="{{ {'xl.id_eq': ctrl.busConfigForSave.xl.id, 'xl.name_eq': ctrl.busConfigForSave.xl.name, 'cl.id_eq': ctrl.busConfigForSave.cl.id} | json}}"-->
+                                <!--/>-->
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required">
                         车辆必须选择
                     </div>
-                    <div class="alert alert-danger well-sm" ng-show="myForm.cl_h.$error.remote">
-                        {{$remote_msg}}
-                    </div>
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.cl_h.$error.remote">-->
+                        <!--{{$remote_msg}}-->
+                    <!--</div>-->
                 </div>
                 <div class="form-group has-success has-feedback">
@@ -89,19 +89,19 @@
                                     searchexp="this.personnelName + '<' + this.jobCode + '>'"
                                     required >
                         </sa-Select5>
-                        <input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id"
-                               remote-Validation
-                               remotevtype="ec_jsy"
-                               remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.jsy.id} | json}}"
-                                />
+                        <!--<input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id"-->
+                               <!--remote-Validation-->
+                               <!--remotevtype="ec_jsy"-->
+                               <!--remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.jsy.id} | json}}"-->
+                                <!--/>-->
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
                         驾驶员必须选择
                     </div>
-                    <div class="alert alert-danger well-sm" ng-show="myForm.jsy_h.$error.remote">
-                        {{$remote_msg}}
-                    </div>
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.jsy_h.$error.remote">-->
+                        <!--{{$remote_msg}}-->
+                    <!--</div>-->
                 </div>
                 <div class="form-group">
@@ -119,16 +119,16 @@
                                     searchexp="this.personnelName + '<' + this.jobCode + '>'"
                                 >
                         </sa-Select5>
-                        <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"
-                               remote-Validation
-                               remotevtype="ec_spy"
-                               remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'spy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"
-                                />
+                        <!--<input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"-->
+                               <!--remote-Validation-->
+                               <!--remotevtype="ec_spy"-->
+                               <!--remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'spy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"-->
+                                <!--/>-->
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
-                    <div class="alert alert-danger well-sm" ng-show="myForm.spy_h.$error.remote">
-                        {{$remote_msg}}
-                    </div>
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.spy_h.$error.remote">-->
+                        <!--{{$remote_msg}}-->
+                    <!--</div>-->
                 </div>
                 <!-- 其他form-group -->
@@ -89,19 +89,19 @@
                                     searchexp="this.personnelName + '<' + this.jobCode + '>'"
                                     required >
                         </sa-Select5>
-                        <input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id"
-                               remote-Validation
-                               remotevtype="ec_jsy"
-                               remotevparam="{{ {'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.jsy.id} | json}}"
-                                />
+                        <!--<input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id"-->
+                               <!--remote-Validation-->
+                               <!--remotevtype="ec_jsy"-->
+                               <!--remotevparam="{{ {'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.jsy.id} | json}}"-->
+                                <!--/>-->
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
                         驾驶员必须选择
                     </div>
-                    <div class="alert alert-danger well-sm" ng-show="myForm.jsy_h.$error.remote">
-                        {{$remote_msg}}
-                    </div>
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.jsy_h.$error.remote">-->
+                        <!--{{$remote_msg}}-->
+                    <!--</div>-->
                 </div>
                 <div class="form-group">
@@ -119,16 +119,16 @@
                                     searchexp="this.personnelName + '<' + this.jobCode + '>'"
                                 >
                         </sa-Select5>
-                        <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"
-                               remote-Validation
-                               remotevtype="ec_spy"
-                               remotevparam="{{ {'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'spy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"
-                                />
+                        <!--<input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"-->
+                               <!--remote-Validation-->
+                               <!--remotevtype="ec_spy"-->
+                               <!--remotevparam="{{ {'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'spy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"-->
+                                <!--/>-->
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
-                    <div class="alert alert-danger well-sm" ng-show="myForm.spy_h.$error.remote">
-                        {{$remote_msg}}
-                    </div>
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.spy_h.$error.remote">-->
+                        <!--{{$remote_msg}}-->
+                    <!--</div>-->
                 </div>
                 <!-- 其他form-group -->
@@ -126,6 +126,22 @@
                         </div>
                     </div>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-3 control-label">班次类型：</label>
+                        <div class="col-md-7">
+                            <sa-Select3 model="ctrl.TimeTableDetailForSave"
+                                        name="bcType"
+                                        placeholder="请选择班次类型..."
+                                        dcvalue="{{ctrl.TimeTableDetailForSave.bcType}}"
+                                        dcname="bcType"
+                                        icname="code"
+                                        icnames="name"
+                                        datatype="ScheduleType"
+                                        >
+                            </sa-Select3>
+                        </div>
+
+                    </div>
                 </div>
@@ -148,3 +164,4 @@
 </div>
+
@@ -74,6 +74,7 @@
             </div>
             <div class="portlet-body">
+                <h3><span ng-bind="ctrl.getYYDesc()"></span></h3>
                 <!--<div ng-view></div>-->
                 <div class="fixDiv">
                     <table style="width: 2000px" class="table table-striped table-bordered table-hover table-checkable order-column">
@@ -118,7 +118,7 @@
                                     required >
                         </sa-Select5>
                         <input type="hidden" name="sheetname_h" ng-model="ctrl.ttInfoDetailManageForForm.sheetvaliddesc"
-                               remote-Validationt2
+                               remote-Validation
                                remotevtype="sheet"
                                remotevparam="{{ {
                                                     'filename': ctrl.ttInfoDetailManageForForm.filename,
@@ -132,7 +132,7 @@
                         工作区必须选择
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.sheetname_h.$error.remote">
-                        {{ctrl.ttInfoDetailManageForForm.sheetvaliddesc}}
+                        {{$remote_msg}}
                     </div>
                 </div>
@@ -152,7 +152,7 @@
                                     required >
                         </sa-Select5>
                         <input type="hidden" name="lineinfo_h" ng-model="ctrl.ttInfoDetailManageForForm.lineinfo"
-                               remote-Validationt2
+                               remote-Validation
                                remotevtype="sheetli"
                                remotevparam="{{ {'lineinfoid': ctrl.ttInfoDetailManageForForm.lineinfo} | json}}"/>
                     </div>
@@ -161,9 +161,7 @@
                         线路标准必须选择
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.lineinfo_h.$error.remote">
-                        {{ctrl.ttInfoDetailManageForForm.lineinfovaliddesc}}
-
-                        上下行出场进场里程时间必须填写，上下行班次里程时间必须填写，停车场必须填写
+                        {{$remote_msg}}
                     </div>
                 </div>
@@ -89,13 +89,26 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             };
             self.uploader.onSuccessItem = function(fileItem, response, status, headers)
             {
-                self.sheetnames = response.sheetnames;
-                self.ttInfoDetailManageForForm.filename = response.fileName;
-                console.info('onSuccessItem', fileItem, response, status, headers);
+                if (response.status == "SUCCESS") {
+                    self.sheetnames = [];
+                    var sheetNames = response.sheetnames.split(",");
+                    for (var i = 0; i < sheetNames.length; i++) {
+                        self.sheetnames.push({name: sheetNames[i]});
+                    }
+                    self.ttInfoDetailManageForForm.filename = response.filename;
+                    console.info('onSuccessItem', fileItem, response, status, headers);
+                } else {
+                    self.sheetnames = [];
+                    fileItem.isSuccess = false;
+                    fileItem.isCancel = false;
+                    fileItem.isError = true;
+
+                    alert(response.msg);
+                }
+
             };
             self.uploader.onErrorItem = function(fileItem, response, status, headers)
             {
-                alert("error");
                 self.sheetnames = [];
                 console.info('onErrorItem', fileItem, response, status, headers);
             };
@@ -105,10 +118,11 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.submit = function() {
                 service.importDetail(self.ttInfoDetailManageForForm).then(
                     function(result) {
-                        $state.go("ttInfoManage");
-                    },
-                    function(result) {
-                        alert("出错啦！");
+                        if (result.status == 'SUCCESS') {
+                            $state.go("ttInfoManage");
+                        } else {
+                            alert(result.msg);
+                        }
                     }
                 );
             };
@@ -13,7 +13,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
             // 时刻表信息
             var editInfo = {
                 detailHeads: [], // 时刻表头信息
-                detailInfos: [] // 时刻表明细信息
+                detailInfos: [], // 时刻表明细信息
+                yydesc: "" // 营运汇总描述
             };
             return {
@@ -32,18 +33,24 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 refreshEditInfo: function(xlid, ttid) {
                     editInfo = {
                         detailHeads: [], // 时刻表头信息
-                        detailInfos: [] // 时刻表明细信息
+                        detailInfos: [], // 时刻表明细信息
+                        yydesc: "" // 营运汇总描述
                     };
                     service.edit.list({xlid: xlid, ttid: ttid}, function(result) {
-                        editInfo.detailHeads = result.header;
-                        editInfo.detailInfos = result.contents;
-
-                        // detailInfos里添加是否选中的flag
-                        for (var i = 0; i < editInfo.detailInfos.length; i++) {
-                            for (var j = 0; j < editInfo.detailInfos[i].length; j++) {
-                                editInfo.detailInfos[i][j].sel = false;
+                        if (result.status != 'ERROR') {
+                            editInfo.detailHeads = result.header;
+                            editInfo.detailInfos = result.contents;
+                            editInfo.yydesc = result.yy_desc;
+
+                            // detailInfos里添加是否选中的flag
+                            for (var i = 0; i < editInfo.detailInfos.length; i++) {
+                                for (var j = 0; j < editInfo.detailInfos[i].length; j++) {
+                                    editInfo.detailInfos[i][j].sel = false;
+                                }
                             }
+                        } else {
+                            alert(result.msg);
                         }
                     });
                 },
@@ -76,26 +83,40 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     for (var n = 0; n < ttinfodetailIds.length; n++) {
                         (function(index) {
                             queryClass.get({id: ttinfodetailIds[index].ttdid}, function(value) {
-                                for (var key in updateObject) {
-                                    if (updateObject[key]) {
-                                        value[key] = updateObject[key];
+                                if (value.status == 'ERROR') {
+                                    error_counts ++;
+                                    if (success_counts + error_counts == ttinfodetailIds.length) {
+                                        deferred.reject();
+                                    }
+                                } else {
+                                    for (var key in updateObject) {
+                                        if (updateObject[key]) {
+                                            value[key] = updateObject[key];
+                                        }
                                     }
                                 }
                                 value.$save(function() {
-                                    // 赋值（上下行，发车时间，班次类型）
-                                    if (value.fcsj) {
-                                        ttinfodetailIds[index].fcsj = value.fcsj;
-                                    }
-                                    if (value.xlDir) {
-                                        ttinfodetailIds[index].xldir = value.xlDir;
-                                    }
-                                    if (value.bcType) {
-                                        ttinfodetailIds[index].bc_type = value.bcType;
-                                    }
-
-                                    success_counts ++;
-                                    if (success_counts + error_counts == ttinfodetailIds.length) {
-                                        deferred.resolve();
+                                    if (value.status == 'ERROR') {
+                                        error_counts ++;
+                                        if (success_counts + error_counts == ttinfodetailIds.length) {
+                                            deferred.reject();
+                                        }
+                                    } else {
+                                        // 赋值（上下行，发车时间，班次类型）
+                                        if (value.fcsj) {
+                                            ttinfodetailIds[index].fcsj = value.fcsj;
+                                        }
+                                        if (value.xlDir) {
+                                            ttinfodetailIds[index].xldir = value.xlDir;
+                                        }
+                                        if (value.bcType) {
+                                            ttinfodetailIds[index].bc_type = value.bcType;
+                                        }
+
+                                        success_counts ++;
+                                        if (success_counts + error_counts == ttinfodetailIds.length) {
+                                            deferred.resolve();
+                                        }
                                     }
                                 }, function() {
                                     error_counts ++;
@@ -147,6 +168,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.getDetailInfos = function() {
                 return service.getEditInfo().detailInfos;
             };
+            self.getYYDesc = function() {
+                return service.getEditInfo().yydesc;
+            };
             // 刷新时刻表数据
             self.refresh = function() {
@@ -337,7 +361,6 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     delete self.TimeTableDetailForSave.zdz;
                 service.editInfos(self.TimeTableDetailForSave).then(function() {
-                    alert("批量更新成功！");
                     $state.go("ttInfoDetailManage_edit", {
                         xlid: self.xlid,
                         ttid: self.ttid,
@@ -50,7 +50,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                  */
                 dataExport: function(ttinfoid) {
                     var param = {};
-                    param.type = 'dataExportExt';
+                    param.type = 'exportFile';
                     param.ttinfoid = ttinfoid;
                     return dservice.dataTools.dataExport(param).$promise;
                 }
@@ -54,15 +54,31 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     {order: 'createDate', direction: 'DESC', id: '@id'},
                     {
                         get: {
-                            method: 'GET'
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
                         },
                         save: {
-                            method: 'POST'
+                            method: 'POST',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
                         }
                     }
                 ),
                 import: $resource(
-                    '/tidc/importfile',
+                    '/tidc/importFile',
                     {},
                     {
                         do: {
@@ -85,7 +101,15 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     {},
                     {
                         list: {
-                            method: 'GET'
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
                         }
                     }
                 ),
@@ -107,7 +131,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                             method: 'GET',
                             responseType: "arraybuffer",
                             params: {
-                                type: "dataExportExt"
+                                type: "exportFile"
                             },
                             transformResponse: function(data, headers){
                                 return {data : data};
@@ -55,7 +55,7 @@
     padding: 0;
 }
-.line_schedule .schedule-wrap i.uk-icon-question-circle{
+.line_schedule .schedule-wrap .header-title i.uk-icon-question-circle{
     cursor: pointer;
     font-size: 14px;
     color: #cccaca;
@@ -528,6 +528,7 @@ div.drop-rail[data-type=&quot;car&quot;]:before {
 dl.relevance-active dd:nth-child(n+2) {
     background: #f1efef !important;
+    color: #333;
 }
 dl.relevance-active.intimity dd:nth-child(n+2) {
@@ -684,15 +685,17 @@ label.destroy-sch small{
   border-bottom: 0;
 }
-i.add-temp-sch-icon{
-  float: right;
-  font-size: 18px;
-  cursor: pointer;
-  color: #4592b8;
-  margin: 10px 15px 0;
+.add-temp-sch-icon{
+    float: right;
+    margin: 0 3px 0;
+    padding: 0;
+    font-size: 13px;
+    text-decoration: underline;
 }
-i.add-temp-sch-icon:hover{
-  color: #2d7091;
+
+.add-temp-lp-icon{
+    cursor: pointer;
+    margin-left: 5px;
 }
@@ -1022,4 +1025,43 @@ dd.fcsjActualCell div.last-sch-sunken span._badge{
 .ct_table>.ct_table_body dl.dl-last-sch:hover div.last-sch-sunken,
 .ct_table>.ct_table_body dl.dl-last-sch.context-menu-active div.last-sch-sunken{
     background: #f5fbff;
+}
+
+dd.fcsjActualCell{
+    position: relative;
+}
+
+i.signal_state_icon{
+    position: absolute;
+    right: 5px;
+    top: 7px;
+    box-shadow: 0px 0px 11px 0 rgba(0, 0, 0, 0.2), -1px 3px 8px 0 rgba(0, 0, 0, 0.19);
+    text-indent: 0;
+    border-radius: 15px;
+    cursor: pointer;
+}
+
+i.signal_state_icon.uk-icon-question-circle{
+    color: #e85252 !important;
+}
+
+i.signal_state_icon.uk-icon-reply{
+    color: #4134e3 !important;
+    box-shadow: none;
+}
+
+.child-task-status{
+    float: right;
+    font-size: 13px;
+}
+
+.child-task-status.fail{
+    color: red;
+    text-shadow: red 0px 0px 20px;
+}
+
+.child-task-status.fail span.calc-detail{
+    font-family: Consolas,monospace,serif;
+    white-space: nowrap;
+    font-size: 14px;
 }
 \ No newline at end of file
@@ -165,8 +165,8 @@ svg.line-chart g.item:nth-last-child(3)&gt;text {
 }
 svg.line-chart g.gps-wrap>rect {
-    width: 28px;
-    height: 24px;
+    width: 34px;
+    height: 18px;
     /*fill: #fff;*/
     rx: 4px;
     cursor: pointer;
@@ -188,7 +188,7 @@ svg.line-chart g.gps-wrap&gt;rect.hover {
 svg.line-chart g.gps-wrap>text {
     font-size: 13px;
-    transform: translate(3px, 17px);
+    transform: translate(2px, 14px);
     pointer-events: none;
 }
@@ -19,11 +19,12 @@
             </div>
             <div>
               <span class="field">速度：</span>{{speed}}</div>
-            <hr>
+            <div>
+                <span class="field">时间：</span>{{dateStr}}</div>
+            {{if expectStopTime!=null}}
             <div>
               预计 {{expectStopTime}} 分钟到达终点</div>
-            <!-- <hr> -->
-            <!-- <div class="subtitle">更新时间: 10:34.26</div> -->
+            {{/if}}
             <div class="tip_map_wrap"></div>
         </div>
       </div>
@@ -43,12 +44,15 @@
             <div>
               <span class="field">设备：</span>{{gps.deviceId}}
             </div>
-            <div>
+            <div style="color: #747272;">
+                {{gps.dateStr}}
+            </div>
+            <!--<div>
               <span class="field">进站时间：</span>?
             </div>
             <div>
               <span class="field">计划发出：</span>?
-            </div>
+            </div>-->
         </div>
         </div>
@@ -13,7 +13,8 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">班次类型</label>
                     <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}" data-group=ScheduleType></select>
+                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
+                                data-group=ScheduleType></select>
                     </div>
                 </div>
             </div>
@@ -22,8 +23,8 @@
                     <label class="uk-form-label">上下行</label>
                     <div class="uk-form-controls">
                         <select name="xlDir">
-                          <option value="0">上行</option>
-                          <option value="1">下行</option>
+                            <option value="0">上行</option>
+                            <option value="1">下行</option>
                         </select>
                     </div>
                 </div>
@@ -35,7 +36,7 @@
                     <label class="uk-form-label">起点站</label>
                     <div class="uk-form-controls">
                         <select name="qdzCode" required>
-                      </select>
+                        </select>
                     </div>
                 </div>
             </div>
@@ -44,7 +45,7 @@
                     <label class="uk-form-label">终点站</label>
                     <div class="uk-form-controls">
                         <select name="zdzCode" required>
-                      </select>
+                        </select>
                     </div>
                 </div>
             </div>
@@ -82,7 +83,8 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">里程</label>
                     <div class="uk-form-controls">
-                        <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false" required>
+                        <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
+                               required>
                     </div>
                 </div>
             </div>
@@ -90,7 +92,8 @@
         <div class="uk-grid">
             <div class="uk-width-1-2">
                 <div class="uk-form-row">
-                    <label class="uk-form-label">驾驶员 <!--<i class="uk-icon-question-circle" data-uk-tooltip title="如果有驾驶员未提示，请至后台“基础信息 -人员信息”里纠正该员工的“工种”类别 "></i>--></label>
+                    <label class="uk-form-label">驾驶员
+                        <!--<i class="uk-icon-question-circle" data-uk-tooltip title="如果有驾驶员未提示，请至后台“基础信息 -人员信息”里纠正该员工的“工种”类别 "></i>--></label>
                     <div class="uk-form-controls">
                         <div class="uk-autocomplete uk-form jsy-autocom">
                             <input type="text" value="{{jGh}}/{{jName}}" name="jsy" required>
@@ -116,101 +119,139 @@
     </script>
     <script>
-        (function() {
+        (function () {
             var modal = '#schedule-addsch-modal',
-                sch, stationRoutes, parks, information;
-            $(modal).on('init', function(e, data) {
+                    sch, stationRoutes, parks, information;
+
+            var normalInfo = [];
+            $(modal).on('init', function (e, data) {
                 sch = data.sch;
+                //normal 班次里程和耗时
+                var list = gb_common.get_vals(gb_schedule_table.findScheduleByLine(sch.xlBm));
+                var upPlan = getNormalSch(list, 0)
+                        , downPlan = getNormalSch(list, 1);
+                normalInfo[0] = {time: upPlan.bcsj, mileage: upPlan.jhlc};
+                normalInfo[1] = {time: downPlan.bcsj, mileage: downPlan.jhlc};
+
+
                 var formHtml = template('schedule-addsch-form-temp', sch);
                 $('form', modal).html(formHtml);
                 //字典转换
                 dictionaryUtils.transformDom($('.nt-dictionary', modal));
                 //----------- Autocomplete --------------
-                $.get('/basic/cars', function(rs) {
+                $.get('/basic/cars', function (rs) {
                     //车辆
                     gb_common.carAutocomplete($('.car-autocom', modal), rs);
                 });
-                //$.get('/basic/all_personnel', function(rs) {
-                    //驾驶员
-                    gb_common.personAutocomplete($('.jsy-autocom', modal));
-                    //售票员
-                    gb_common.personAutocomplete($('.spy-autocom', modal));
-                //});
+                //驾驶员
+                gb_common.personAutocomplete($('.jsy-autocom', modal));
+
+                //售票员
+                gb_common.personAutocomplete($('.spy-autocom', modal));
                 //站点路由
-                stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(sch.xlBm).sort(function(a, b){
-                  return a.stationRouteCode-b.stationRouteCode;
+                stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(sch.xlBm).sort(function (a, b) {
+                    return a.stationRouteCode - b.stationRouteCode;
                 }), 'directions');
                 //停车场
-                $.get('/basic/parks', function(rs){
-                  parks=rs;
+                $.get('/basic/parks', function (rs) {
+                    parks = rs;
                 });
                 //线路标准
-                information=gb_data_basic.getLineInformation(sch.xlBm);
+                information = gb_data_basic.getLineInformation(sch.xlBm);
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
-                f.on('success.form.fv', function(e) {
+                f.on('success.form.fv', function (e) {
                     disabled_submit_btn(this);
                     e.preventDefault();
                     var data = $(this).serializeJSON();
-                    data.xlBm=sch.xlBm;
-                    data.xlName=sch.xlName;
-                    data.lpName=sch.lpName;
+                    data.xlBm = sch.xlBm;
+                    data.xlName = sch.xlName;
+                    data.lpName = sch.lpName;
                     //拆分驾驶员工号和姓名
                     data.jGh = data.jsy.split('/')[0];
                     data.jName = data.jsy.split('/')[1];
                     delete data.jsy;
                     //拆分售票员工号和姓名
-                    if(data.sGh != null){
-                      data.sGh = data.spy.split('/')[0];
-                      data.sName = data.spy.split('/')[1];
-                      delete data.spy;
+                    if (data.sGh != null) {
+                        data.sGh = data.spy.split('/')[0];
+                        data.sName = data.spy.split('/')[1];
+                        delete data.spy;
                     }
-                    gb_common.$post('/realSchedule', data, function(rs){
-                      //插入
-                      gb_schedule_table.insertSchedule(rs.t, rs.ts);
-                      $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: rs.t});
-                      UIkit.modal(modal).hide();
-                      notify_succ('新增临加班次成功');
+                    gb_common.$post('/realSchedule', data, function (rs) {
+                        //插入
+                        gb_schedule_table.insertSchedule(rs.t, rs.ts);
+                        $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: rs.t});
+                        UIkit.modal(modal).hide();
+                        notify_succ('新增临加班次成功');
                     });
                 });
                 //班次类型 和 上下行切换
-                $('[name=bcType],[name=xlDir]', f).on('change', function(){
-                  var bcType_e=$('[name=bcType]', f)
-                    , xlDir_e=$('[name=xlDir]', f);
-
-                  var routes=stationRoutes[xlDir_e.val()]
-                    ,lastCode=routes[routes.length-1].stationCode
-                    ,opts='',park_opts='';
-                  //station options
-                  $.each(routes, function(){
-                    opts+='<option value="'+this.stationCode+'">'+this.stationName+'</option>'
-                  });
-                  //park options
-                  for(var code in parks)
-                    park_opts+='<option value="'+code+'">'+parks[code]+'</option>';
-
-                  var qdz=$('[name=qdzCode]', f),zdz=$('[name=zdzCode]', f);
-                  switch (bcType_e.val()) {
-                    case 'out':
-                      qdz.html(park_opts).val(information.carPark);
-                      zdz.html(opts);
-                      break;
-                    case 'in':
-                      qdz.html(opts);
-                      zdz.html(park_opts).val(information.carPark);
-                      break;
-                    default:
-                      qdz.html(opts);
-                      zdz.html(opts).val(lastCode);
-                  }
+                $('[name=bcType],[name=xlDir]', f).on('change', function () {
+                    var bcType_e = $('[name=bcType]', f)
+                            , xlDir_e = $('[name=xlDir]', f);
+
+                    var routes = stationRoutes[xlDir_e.val()]
+                            , lastCode = routes[routes.length - 1].stationCode
+                            , opts = '', park_opts = '';
+                    //station options
+                    $.each(routes, function () {
+                        opts += '<option value="' + this.stationCode + '">' + this.stationName + '</option>'
+                    });
+                    //park options
+                    for (var code in parks)
+                        park_opts += '<option value="' + code + '">' + parks[code] + '</option>';
+
+                    var qdz = $('[name=qdzCode]', f), zdz = $('[name=zdzCode]', f);
+                    var time, mileage;
+                    switch (bcType_e.val()) {
+                        case 'out':
+                            qdz.html(park_opts).val(information.carPark);
+                            zdz.html(opts);
+                            //出场结束时间
+                            time = xlDir_e.val() == 0 ? information.upOutTimer : information.downOutTimer;
+                            mileage = xlDir_e.val() == 0 ? information.upOutMileage : information.downOutMileage;
+                            break;
+                        case 'in':
+                            qdz.html(opts);
+                            zdz.html(park_opts).val(information.carPark);
+                            //进场结束时间
+                            time = xlDir_e.val() == 0 ? information.upInTimer : information.downInTimer;
+                            mileage = xlDir_e.val() == 0 ? information.upInMileage : information.downInMileage;
+                            break;
+                        default:
+                            qdz.html(opts);
+                            zdz.html(opts).val(lastCode);
+                            time = xlDir_e.val() == 0?normalInfo[0].time:normalInfo[1].time;
+                            mileage = xlDir_e.val() == 0?normalInfo[0].mileage:normalInfo[1].mileage;
+                    }
+
+                    setEndTime(time);
+                    $('[name=jhlc]', f).val(mileage);
                 }).trigger('change');
+
+                function setEndTime(diff) {
+                    var et = moment($('[name=fcsj]', f).val(), 'HH:mm').add(diff, 'minutes').format('HH:mm');
+                    $('[name=zdsj]', f).val(et);
+                }
             });
+
+            function getNormalSch(list, updown) {
+                var sch;
+                $.each(list, function () {
+                    if (this.bcType == 'normal' && this.xlDir == updown) {
+                        sch = this;
+                        return false;
+                    }
+                });
+
+                return sch;
+            }
         })();
     </script>
 </div>
@@ -15,7 +15,7 @@
                 </div>
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
-                        <label class="uk-form-label" style="width: 75px;">放大站至</label>
+                        <label class="uk-form-label" style="width: 75px;">放站至</label>
                         <div class="uk-form-controls" style="margin-left: 75px;">
                             <select name="endStation">
                             </select>
@@ -53,11 +53,31 @@
             var remarks;
             function refreshDirectiveStr() {
+
+                var $qdz = $('[name=startStation]')
+                        , $zdz = $('[name=endStation]');
                 //指令内容
-                var qdzName = $('[name=startStation]').find("option:selected").text()
-                        , zdzName = $('[name=endStation]').find("option:selected").text();
-                remarks=' 由 ' + qdzName + ' 放站至 ' + zdzName;
-                $('[name=directiveStr]', modal).text('班次：'+sch.dfsj+remarks).trigger('input');
+                var qdzName = $qdz.find("option:selected").text()
+                        , zdzName = $zdz.find("option:selected").text();
+
+                //只修改起点
+                if(sch.qdzCode != $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 待客至 ' + qdzName + ' ，放站至 ' + zdzName;
+                }
+                //只修改终点
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 放站至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都改变
+                else if(sch.qdzCode != $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 放站至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都不改变
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 放站至 ' + zdzName;
+                }
+
+                $('[name=directiveStr]', modal).text('班次：' + sch.dfsj + remarks).trigger('input');
             }
             $('[name=startStation]', modal).on('change', function () {
@@ -6,7 +6,7 @@
             <div class="uk-grid">
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
-                        <label class="uk-form-label" style="width: 75px;">从</label>
+                        <label class="uk-form-label" style="width: 75px;">起点</label>
                         <div class="uk-form-controls" style="margin-left: 75px;">
                             <select name="startStation">
                             </select>
@@ -15,7 +15,7 @@
                 </div>
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
-                        <label class="uk-form-label" style="width: 75px;">直放至</label>
+                        <label class="uk-form-label" style="width: 75px;">终点</label>
                         <div class="uk-form-controls" style="margin-left: 75px;">
                             <select name="endStation">
                             </select>
@@ -53,12 +53,30 @@
             var remarks;
             function refreshDirectiveStr() {
+                var $qdz = $('[name=startStation]')
+                        , $zdz = $('[name=endStation]');
                 //指令内容
-                var qdzName = $('[name=startStation]').find("option:selected").text()
-                        , zdzName = $('[name=endStation]').find("option:selected").text();
+                var qdzName = $qdz.find("option:selected").text()
+                        , zdzName = $zdz.find("option:selected").text();
-                remarks=' 由 ' + qdzName + ' 直放至 ' + zdzName;
-                $('[name=directiveStr]', modal).text('班次：'+sch.dfsj+ remarks).trigger('input');
+                //只修改起点
+                if(sch.qdzCode != $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 待客至 ' + qdzName + ' ，直放至 ' + zdzName;
+                }
+                //只修改终点
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ sch.qdzName +' 直放至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都改变
+                else if(sch.qdzCode != $qdz.val() && sch.zdzCode != $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 直放至 ' + zdzName + ' 开始待客';
+                }
+                //起终点都不改变
+                else if(sch.qdzCode == $qdz.val() && sch.zdzCode == $zdz.val()){
+                    remarks = ' 从 '+ qdzName +' 直放至 ' + zdzName;
+                }
+
+                $('[name=directiveStr]', modal).text('班次：' + sch.dfsj + remarks).trigger('input');
             }
             $('[name=startStation]', modal).on('change', function () {
@@ -98,7 +116,7 @@
                 f.on('success.form.fv', function (e) {
                     e.preventDefault();
                     var data = $(this).serializeJSON();
-                   // notify_wait('准备下发指令')
+                    // notify_wait('准备下发指令')
                     //下发指令
                     $.post('/directive/phrase', {nbbm: sch.clZbh, text: data.directiveStr}, function (rs) {
                         if (rs == 0) {
@@ -128,7 +146,10 @@
             function changeBcType() {
                 //将班次类型调整为直放
-                gb_common.$post('/realSchedule/changeBcType/'+sch.id, {bcType: 'venting', remarks: remarks}, function(rs){
+                gb_common.$post('/realSchedule/changeBcType/' + sch.id, {
+                    bcType: 'venting',
+                    remarks: remarks
+                }, function (rs) {
                     UIkit.modal(modal).hide();
                     gb_schedule_table.updateSchedule(rs.t);
                     //触发父容器刷新事件
@@ -18,13 +18,17 @@
                         <div class="uk-form-row">
                             <label class="uk-form-label" style="width: 50px;">路牌</label>
                             <div class="uk-form-controls" style="margin-left: 51px;">
-                                <select name="lpName"></select>
+                                <select name="lpName" style="width: 120px;"></select>
+                                <i class="uk-icon-plus add-temp-lp-icon" title="临加路牌" data-uk-tooltip></i>
                             </div>
                         </div>
                     </div>
                     <div class="uk-width-1-3">
                         <div class="uk-form-row">
-                            <i class="uk-icon-plus add-temp-sch-icon" title="新增临加班次" data-uk-tooltip></i>
+                            <!--<i class="uk-icon-plus add-temp-sch-icon" title="新增临加班次" data-uk-tooltip></i>-->
+                            <!--<button class="uk-button uk-button-primary add-temp-sch-icon">临加班次</button>-->
+                            <!--<a class="uk-button add-temp-sch-icon"><i class="uk-icon-plus"></i> 临加班次</a>-->
+                            <a class="uk-button uk-button-link add-temp-sch-icon"> 临加班次</a>
                         </div>
                     </div>
                 </div>
@@ -51,7 +55,9 @@
         </div>
         <div class="uk-panel uk-panel-box uk-panel-box-secondary" style="padding-bottom: 0;">
-            <h3 class="uk-panel-title">子任务列表</h3>
+            <h3 class="uk-panel-title" id="childTaskTitle">
+                子任务列表
+            </h3>
             <div class="ct_table_wrap ct_table_no_border" style="height: 142px;">
                 <div class="ct_table sub-task-table">
                     <div class="ct_table_head">
@@ -131,6 +137,12 @@
         </dl>
         {{/each}}
     </script>
+
+    <script id="sub_task-fail-status-temp" type="text/html">
+        <div class="child-task-status fail"><i class="uk-icon-times-circle"></i> 营运里程 与主任务不符，请检查子任务
+            <span class="calc-detail">{{calcs}}</span></div>
+    </script>
+
     <script>
         (function () {
             var modal_opts = {center: false, bgclose: false, modal: false}
@@ -140,6 +152,7 @@
                     s_t_body = '.sub-task-table .ct_table_body',
                     folder = '/real_control_v2/fragments/line_schedule/context_menu',
                     sch, schList, lp2SchMap;
+
             $(modal).on('init', function (e, data) {
                 sch = data.sch;
@@ -163,10 +176,16 @@
                 //路牌下拉框
                 $('[name=lpName]', f).on('change', function () {
-                    var list = lp2SchMap[$(this).val()].sort(gb_schedule_table.schedule_sort),
-                            htmlBody = template('schedule-main-table-temp', {
-                                list: list
-                            });
+                    var list = [];
+
+                    try {
+                        list = lp2SchMap[$(this).val()].sort(gb_schedule_table.schedule_sort);
+
+                    } catch (e) {
+                    }
+                    var htmlBody = template('schedule-main-table-temp', {
+                        list: list
+                    });
                     $(m_t_body, modal).html(htmlBody);
                     $(s_t_body, modal).empty();
                 });
@@ -218,7 +237,7 @@
                 if (opts && opts.sch) {
                     selectedDl(opts.sch);
                 }
-            }
+            };
             //刷新子任务表格
             var sub_task_update = function () {
@@ -230,7 +249,30 @@
                 tbody.html(htmlStr);
                 //字典转换
                 dictionaryUtils.transformDom($('.nt-dictionary', tbody));
-            }
+
+                //检查子任务营运里程
+                $('#childTaskTitle .child-task-status', modal).remove();
+                var i = 0;
+                if (sch.cTasks.length == 0)
+                    return;
+                var sum = 0, calcs = '';
+                $.each(sch.cTasks, function () {
+                    if (this.mileageType == 'service') {
+                        sum = gb_common.accAdd(sum, this.mileage);
+                        calcs += (' + ' + this.mileage);
+                        i++;
+                    }
+                });
+                //公里与主任务不符合
+                if (sum != sch.jhlc) {
+                    if (i > 1)
+                        calcs += ('=' + sum);
+                    calcs += (' ≠ ' + sch.jhlc);
+                    calcs = calcs.substr(3);
+                    var htmlStr = template('sub_task-fail-status-temp', {calcs: calcs});
+                    $('#childTaskTitle', modal).append(htmlStr);
+                }
+            };
             //新增临加
             var add_temp_sch = function () {
@@ -241,7 +283,7 @@
                 open_modal(folder + '/add_temp_sch.html', {
                     sch: sch
                 }, modal_opts);
-            }
+            };
             //删除临加班次
             var remove_sch = function () {
@@ -254,7 +296,6 @@
                         //前端数据更新
                         gb_schedule_table.updateSchedule(rs.ts);
                         gb_schedule_table.deheteSchedule(rs.delete);
-                        //m_s_table_update();
                         $('.main-schedule-table', modal).trigger('refresh');
                     });
                 }, '确定删除');
@@ -359,6 +400,21 @@
             gb_ct_table.fixedHead($('.ct_table_wrap', modal));
             $('.add-temp-sch-icon', modal).on('click', add_temp_sch);
+            //临加路牌
+            $('.add-temp-lp-icon', modal).on('click', function () {
+                var index = 0, max;
+                for (var lp in lp2SchMap) {
+                    if (lp.indexOf('临') != -1) {
+                        max = lp.substr(lp.indexOf('临') + 1);
+                        if (!isNaN(max))
+                            index = parseInt(max);
+                    }
+                }
+
+                var lpName = '临' + (index + 1);
+                lp2SchMap[lpName] = [];
+                $('[name=lpName]', f).append('<option value="' + lpName + '">' + lpName + '</option>').val(lpName).trigger('change');
+            });
             function sub_task_sort(a, b) {
                 return a.id - b.id;
@@ -83,7 +83,7 @@
                                 <dd data-sort-val={{sch.dfsjT}} dbclick dbclick-type="dfsj" dbclick-val="{{sch.dfsj}}">
                                     {{sch.dfsj}}
                                 </dd>
-                                <dd class="
+                                <dd data-uk-observe class="
                                     {{if sch.status==-1}}
                                       tl-qrlb
                                     {{else if sch.status==2}}
@@ -130,7 +130,7 @@
     </script>
     <script id="line-schedule-sfsj-temp" type="text/html">
-        <dd class="
+        <dd data-uk-observe class="
     {{if status==-1}}
       tl-qrlb
     {{else if status==2}}
+<div class="uk-modal ct-form-modal" id="signal_state_config-modal">
+    <div class="uk-modal-dialog" style="width: 530px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>信号标记设置</h2></div>
+
+        <p style="border-bottom: 1px solid #efefef;color: grey;padding-bottom: 9px;">
+            <small>
+                <i class="uk-icon-question-circle"> </i>
+                设置项将会保存在本地客户端，清理缓存和更换电脑会重置.</small>
+        </p>
+        <form class="uk-form uk-form-horizontal">
+            <div class="uk-grid">
+                <div class="uk-width-2-3 uk-container-center">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">是否启用</label>
+                        <div class="uk-form-controls">
+                            <select name="enable">
+                                <option value="1">启用</option>
+                                <option value="0">禁用</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+                <button type="button" class="uk-button uk-modal-close">取消</button>
+                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+            </div>
+        </form>
+    </div>
+
+    <script>
+        (function() {
+            var modal = '#signal_state_config-modal';
+            var f = $('form', modal);
+
+            $(modal).on('init', function(e, data) {
+                var val = gb_signal_state.isEnable()?1:0;
+                $('[name=enable]', f).val(val);
+            });
+
+            f.formValidation(gb_form_validation_opts);
+            f.on('success.form.fv', function(e) {
+                e.preventDefault();
+                var data = $(this).serializeJSON();
+
+                if(data.enable=='1')
+                    gb_signal_state.enable();
+                else
+                    gb_signal_state.disable();
+
+                UIkit.modal(modal).hide();
+            });
+
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -15,12 +15,6 @@ var gb_data_gps = (function() {
     };
     var refresh = function(cb) {
-        /*$.get('/gps/real/line', {
-            lineCodes: gb_data_basic.line_idx
-        }, function(rs) {
-            refreshData(rs);
-            cb();
-        });*/
         $.ajax({
             url: '/gps/real/line',
             data:{lineCodes: gb_data_basic.line_idx},
@@ -30,7 +24,7 @@ var gb_data_gps = (function() {
             },
             error: function (xr, t) {
                 notify_err('刷新GPS失败，稍后重试' + t);
-                //cb();
+                cb();
             }
         });
     };
@@ -50,9 +44,9 @@ var gb_data_gps = (function() {
                         upArr.push(this);
             } else
                 addArr.push(this);
-            //起终点 拼接方向标识
-            if(this.sEPoint)
-                this.stopNo=this.stopNo+'_'+this.upDown;
+
+            //时间格式化
+            this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
             realData[this.deviceId] = this;
         });
@@ -84,15 +78,15 @@ var gb_data_gps = (function() {
                 rs.push(realData[device]);
         }
         return rs;
-    }
+    };
     var findOne = function(deviceId){
       return realData[deviceId];
-    }
+    };
     var findGpsByNbbm = function(nbbm){
       return realData[gb_data_basic.nbbm2deviceMap()[nbbm]];
-    }
+    };
     return {
         fixedTimeRefresh: fixedTimeRefresh,
+/** gps 信号异常状态，无效 | 越界 | 超速 */
+
+var gb_gps_abnormal = (function () {
+
+    //按线路分组的路段数据
+    var allRoads;
+
+    //gps无效
+    var gpsInvalid = function (gps) {
+        return gps.lat == 0 || gps.lon == 0;
+    };
+
+    //越界
+    var gpsOutOfBounds = function (gps) {
+        var roads = allRoads[gps.lineId + '_' + gps.upDown];
+        if (!roads)
+            return;
+
+        //最短距离
+        var min, distance;
+        $.each(roads, function () {
+            distance = minDistanceFromRoad(this.pos, gps);
+            if(!min || min > distance)
+                min = distance;
+        });
+
+        //console.log('最短距离', min, gps);
+    };
+
+    /**
+     * 初始化数据
+     */
+    var initData = function () {
+        //获取线路路段数据
+        gb_common.$get('/realMap/multiSectionRoute', {codeIdx: gb_data_basic.line_idx}, function (rs) {
+            var list = [];
+            $.each(rs.section, function () {
+                list.push({
+                    line: this['LINE_CODE'],
+                    updown: this['DIRECTIONS'],
+                    pos: parseCoords(this['GSECTION_VECTOR']),
+                    route_code: this['SECTIONROUTE_CODE'],
+                    code: this['SECTION_CODE'],
+                    name: this['SECTION_NAME']
+                });
+            });
+            //按线路_走向 分组数据
+            allRoads = groupByLineAndUpdown(list);
+            console.log('路段数据', allRoads);
+        });
+    };
+
+    function minDistanceFromRoad(pos, gps){
+        var distance, min;
+        var len = pos.length - 1;
+        for(var i = 0; i < len; i ++){
+            distance = geolib.getDistanceFromLine({
+                latitude: gps.lat,
+                longitude: gps.lon
+            }, pos[i], pos[i + 1]);
+
+            if(!min || min > distance)
+                min = distance;
+        }
+
+        return min;
+    }
+
+    function groupByLineAndUpdown(list) {
+        var rs = {},
+            key;
+        $.each(list, function () {
+            key = this.line + '_' + this.updown;
+            if (!rs[key])
+                rs[key] = [];
+
+            rs[key].push(this);
+        });
+
+        return rs;
+    }
+
+    function parseCoords(str) {
+        var array = str.substr(11, str.length - 2).split(','), rs = [], temps;
+        $.each(array, function (i, coords) {
+            temps = coords.split(' ');
+            rs.push({
+                latitude: parseFloat(temps[1]),
+                longitude: parseFloat(temps[0])
+            });
+        });
+
+        return rs;
+    }
+
+    return {
+        initData: initData,
+        check: function (gps) {
+            if(!allRoads){
+                return;
+            }
+
+            gpsOutOfBounds(gps);
+        }
+    }
+})();
 \ No newline at end of file
@@ -93,6 +93,11 @@
         "id": 3.1,
         "text": "TTS",
         "event": "tts_config"
+      },
+      {
+        "id": 3.2,
+        "text": "信号标记",
+        "event": "signal_state"
       }
     ]
   }
 /* line schedule table  context menu*/
-var gb_schedule_context_menu = (function() {
+var gb_schedule_context_menu = (function () {
     var modal_opts = {
             center: false,
@@ -8,35 +8,38 @@ var gb_schedule_context_menu = (function() {
         },
         folder = '/real_control_v2/fragments/line_schedule/context_menu';
     var callbackHandler = {
-        dftz: function(sch) {
+        dftz: function (sch) {
             open_modal(folder + '/dftz.html', {
                 sch: sch
             }, modal_opts);
         },
-        multi_tzrc: function(schArray) {
+        multi_tzrc: function (schArray) {
             open_modal(folder + '/multi_tzrc.html', {
                 list: schArray
             }, modal_opts);
         },
-        multi_dftz: function(schArray) {
+        multi_dftz: function (schArray) {
+            var list = schArray.filter(function (sch) {
+                return sch.bcType != 'out' && sch.bcType != 'in' && sch.fcsjActual == null;
+            });
             open_modal(folder + '/multi_dftz.html', {
-                list: schArray
+                list: list
             }, modal_opts);
         },
-        jhlb: function(sch) {
+        jhlb: function (sch) {
             open_modal(folder + '/jhlb.html', {
                 sch: sch
             }, modal_opts);
         },
-        cxlb: function(sch) {
+        cxlb: function (sch) {
             if (!sch.destroy)
                 return notify_err('烂掉的班次才能执行此操作！');
             var content = '<h3>确定要撤销<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>的烂班设置?</h3>'
-            alt_confirm(content, function() {
+            alt_confirm(content, function () {
                 gb_common.$post('/realSchedule/revokeDestroy', {
                     id: sch.id
-                }, function(rs) {
+                }, function (rs) {
                     gb_schedule_table.updateSchedule(rs.t);
                     notify_succ('撤销烂班操作成功！');
@@ -45,20 +48,20 @@ var gb_schedule_context_menu = (function() {
                 });
             }, '确认撤销');
         },
-        sftz: function(sch) {
+        sftz: function (sch) {
             open_modal(folder + '/sftz.html', {
                 sch: sch
             }, modal_opts);
         },
-        cxsf: function(sch) {
+        cxsf: function (sch) {
             if (!sch.fcsjActual)
                 return notify_err('车辆未实发，无法执行该操作！');
             var content = '<h3>确定要撤销<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>的实发时间?</h3>'
-            alt_confirm(content, function() {
+            alt_confirm(content, function () {
                 gb_common.$post('/realSchedule/revokeRealOutgo', {
                     id: sch.id
-                }, function(rs) {
+                }, function (rs) {
                     gb_schedule_table.updateSchedule(rs.ts);
                     notify_succ('撤销实发操作成功！');
                     //calc 应发未发
@@ -66,27 +69,27 @@ var gb_schedule_context_menu = (function() {
                 });
             }, '确认撤销实发');
         },
-        fcxxwt: function(sch) {
+        fcxxwt: function (sch) {
             open_modal(folder + '/fcxxwt.html', {
                 sch: sch
             }, modal_opts);
         },
-        lj_zrw: function(sch) {
+        lj_zrw: function (sch) {
             open_modal(folder + '/lj_zrw.html', {
                 sch: sch
             }, modal_opts);
         },
-        tzrc: function(sch) {
+        tzrc: function (sch) {
             open_modal(folder + '/tzrc.html', {
                 sch: sch
             }, modal_opts);
         },
-        zlcf: function(sch) {
+        zlcf: function (sch) {
             var text = sch.clZbh + '重发调度指令？ [路牌： ' + sch.lpName + '  计划时间：' + sch.fcsj + '  待发时间：' + sch.dfsj + ']';
-            alt_confirm(text, function() {
+            alt_confirm(text, function () {
                 //走短语下发
                 $.post('/directive/dispatch', {id: sch.id},
-                    function(code) {
+                    function (code) {
                         if (code == 0)
                             notify_succ('发送指令成功');
                         else
@@ -95,12 +98,12 @@ var gb_schedule_context_menu = (function() {
             }, '确定下发指令');
         },
         jgtz: function (schArray) {
-            var idArr=[];
-            $.each(schArray, function(){
-               idArr.push(this.id);
+            var idArr = [];
+            $.each(schArray, function () {
+                idArr.push(this.id);
             });
-            var elem = UIkit.modal.prompt('请输入间隔（分钟）',0, function(newValue) {
-                if (!isNaN(newValue) && newValue>0) {
+            var elem = UIkit.modal.prompt('请输入间隔（分钟）', 0, function (newValue) {
+                if (!isNaN(newValue) && newValue > 0) {
                     gb_common.$post_arr('/realSchedule/spaceAdjust', {ids: idArr, space: newValue}, function (rs) {
                         //刷新数据
                         gb_schedule_table.updateSchedule(rs.ts);
@@ -120,7 +123,7 @@ var gb_schedule_context_menu = (function() {
     $.contextMenu({
         selector: '.line_schedule .ct_table_body dl:not([class="drag-active"])',
         className: 'schedule-ct-menu',
-        callback: function(key, options) {
+        callback: function (key, options) {
             var $tbody = options.$trigger.parent(),
                 id = $('.context-menu-active', $tbody).data('id'),
                 lineCode = $tbody.parents('li.line_schedule').data('id'),
@@ -166,13 +169,13 @@ var gb_schedule_context_menu = (function() {
     $.contextMenu({
         selector: '.line_schedule .ct_table_body dl.drag-active',
         className: 'schedule-ct-menu',
-        callback: function(key, options) {
+        callback: function (key, options) {
             var $tbody = options.$trigger.parent(),
                 lineCode = $tbody.parents('li.line_schedule').data('id'),
                 schArray = [],
                 all = gb_schedule_table.findScheduleByLine(lineCode);
-            $tbody.find('dl.drag-active').each(function() {
+            $tbody.find('dl.drag-active').each(function () {
                 schArray.push(all[$(this).data('id')]);
             });
@@ -190,4 +193,6 @@ var gb_schedule_context_menu = (function() {
             }
         }
     });
+
+    return callbackHandler;
 })();
@@ -67,15 +67,23 @@ var gb_schedule_table_dbclick = (function() {
             'cancel': {
                 name: '取消',
                 icon: "delete"
-            },
-            'save': {
-                name: '保存',
-                icon: "edit"
             }
         }
     });
+    
+    var sfsjCellClick = function (elem) {
+        elem.dblclick(function () {
+
+            var id = $(this).parent().data('id'),
+                lineCode = $(this).parents('li.line_schedule').data('id');
+
+            var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
+            gb_schedule_context_menu.fcxxwt(sch);
+        });
+    };
     return {
-        init: init
+        init: init,
+        sfsjCellClick:sfsjCellClick
     };
 })();
@@ -22,7 +22,7 @@ var gb_line_layout = (function() {
     };
     //图例icon tootip
-    $(document).on('mouseenter', '.schedule-wrap i.uk-icon-question-circle', function() {
+    $(document).on('mouseenter', '.schedule-wrap .header-title i.uk-icon-question-circle', function() {
         $(this).qtip({
             show: {
                 ready: true,
@@ -108,6 +108,9 @@ var gb_schedule_table = (function () {
                 }
             });
         });
+
+        //双击
+        gb_schedule_table_dbclick.sfsjCellClick($('dd.fcsjActualCell'));
     }
     //重置序号
@@ -192,20 +195,20 @@ var gb_schedule_table = (function () {
         if (!isArray(schArr))
             schArr = [schArr];
-        var tMaps={};
+        var tMaps = {};
         $.each(schArr, function () {
             line2Schedule[this.xlBm][this.id] = this;
             updateDom(this);
             //线路_车辆 过滤重复数据
-            tMaps[this.xlBm+'_'+this.clZbh]=1;
+            tMaps[this.xlBm + '_' + this.clZbh] = 1;
         });
- /*       //重新标记末班
-        var ts=[];
-        for(var k in tMaps){
-            ts = k.split('_');
-            markerLastByNbbm(ts[0], ts[1]);
-        }*/
+        /*       //重新标记末班
+         var ts=[];
+         for(var k in tMaps){
+         ts = k.split('_');
+         markerLastByNbbm(ts[0], ts[1]);
+         }*/
     };
     //update dom
@@ -218,10 +221,10 @@ var gb_schedule_table = (function () {
         //车辆自编号
         $(dds[2]).replaceWith(temps['line-schedule-nbbm-temp'](sch));
         //if (sch.qdzArrDateJH)
-        $(dds[3]).text(sch.qdzArrDateJH?sch.qdzArrDateJH:'');
+        $(dds[3]).text(sch.qdzArrDateJH ? sch.qdzArrDateJH : '');
         //if (sch.qdzArrDateSJ)
-        $(dds[4]).text(sch.qdzArrDateSJ?sch.qdzArrDateSJ:'');
+        $(dds[4]).text(sch.qdzArrDateSJ ? sch.qdzArrDateSJ : '');
         //计发时间
         $(dds[5]).replaceWith(temps['line-schedule-fcsj-temp'](sch));
@@ -229,15 +232,19 @@ var gb_schedule_table = (function () {
         //实发时间
         calc_sch_real_shift(sch);
-        var sfsjDd = temps['line-schedule-sfsj-temp'](sch);
+        var sfsjDd = $(temps['line-schedule-sfsj-temp'](sch));
+        //双击
+        gb_schedule_table_dbclick.sfsjCellClick(sfsjDd);
         $(dds[7]).replaceWith(sfsjDd);
         if (sch.remarks)
             $(dds[8]).html('<span title="' + sch.remarks + '" data-uk-tooltip="{pos:\'top-left\'}">' + sch.remarks + '</span>');
         else
             $(dds[8]).html('');
+        //信号状态标记
+        gb_signal_state.marker_sch(sch);
         //班次是车辆的最后一班
-        if(dl.hasClass('dl-last-sch'))
+        if (dl.hasClass('dl-last-sch'))
             markerLastSch([sch]);
     };
@@ -418,13 +425,13 @@ var gb_schedule_table = (function () {
     //清除线路下指定班次的 末班标记
     var removeMarkers = function (lineCode, array) {
-        var idx=[];
+        var idx = [];
         $.each(array, function () {
             idx.push(this.id);
         });
-        $('dl.dl-last-sch','li.line_schedule[data-id=' + lineCode + ']').each(function () {
-            if($(this).hasClass('dl-last-sch') && idx.indexOf($(this).data('id'))){
+        $('dl.dl-last-sch', 'li.line_schedule[data-id=' + lineCode + ']').each(function () {
+            if ($(this).hasClass('dl-last-sch') && idx.indexOf($(this).data('id'))) {
                 $(this).removeClass('dl-last-sch').find('.last-sch-sunken').remove();
             }
         });
@@ -446,6 +453,7 @@ var gb_schedule_table = (function () {
             return car_yfwf_map[lineCode];
         },
         scroToDl: scroToDl,
-        reset_drag_active_all: reset_drag_active_all
+        reset_drag_active_all: reset_drag_active_all,
+        getDl: getDl
     };
 })();
-//主调和监控模式
-var operationMode = window.localStorage.getItem('operationMode');
-if(operationMode == 0){
-    $('body>.north').addClass('monitor');
-    $(document).on('ajaxSend', interceptPOST);
-}
-else
-    $('body>.north').addClass('main');
-
-//拦截POST请求
-function interceptPOST(e, xhr, t){
-    if(t && (t.method == 'POST' || t.type == 'POST')){
-        console.log(e, xhr, t);
-        xhr.abort();
-        notify_err('监控模式！');
-    }
-}
 /* main js  */
 var gb_main_ep = new EventProxy(),
-    res_load_ep = EventProxy.create('load_data_basic', 'load_tab', 'load_home_layout', 'load_home_line_panel', function() {
+    res_load_ep = EventProxy.create('load_data_basic', 'load_tab', 'load_home_layout', 'load_home_line_panel', function () {
         var eq = gb_main_ep;
         // basic data end
         eq.once('data-basic', g_emit('tab'));
         // tabs
-        eq.once('tab', function() {
+        eq.once('tab', function () {
             gb_tabs.init(
                 g_emit('home-layout')
             );
         });
         //home layout
-        eq.once('home-layout', function() {
+        eq.once('home-layout', function () {
             gb_home_layout.layout(
                 g_emit('home-line-panel')
             );
         });
         //home line panel
-        eq.once('home-line-panel', function() {
+        eq.once('home-line-panel', function () {
             gb_home_line_panel.init(g_emit('gps-time-refresh'));
         });
         //start fixed time refresh gps
-        eq.once('gps-time-refresh', function() {
+        eq.once('gps-time-refresh', function () {
             gb_data_gps.fixedTimeRefresh();
             g_emit('line-schedule-layout')();
         });
         //line schedule layout
-        eq.once('line-schedule-layout', function() {
+        eq.once('line-schedule-layout', function () {
             gb_line_layout.layout(g_emit('render-sch-table'));
         });
         //render schedule table
-        eq.once('render-sch-table', function() {
-            gb_schedule_table.show(function(){
-              //搜索框
-              gb_sch_search.init();
+        eq.once('render-sch-table', function () {
+            gb_schedule_table.show(function () {
+                //搜索框
+                gb_sch_search.init();
+                //加载信号状态
+                gb_signal_state.init();
             });
-            //嵌入地图页面
-            $('li.map-panel','#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
+            //初始化gps异常判定
+            //gb_gps_abnormal.initData();
-            showUpdateDescription();
+            //嵌入地图页面
+            $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
+            //弹出更新说明
+            //showUpdateDescription();
         });
         function g_emit(id) {
             console.log('g_emit [' + id + ']');
-            return function() {
+            return function () {
                 console.log('eq.emitLater(' + id + ')');
                 return eq.emitLater(id);
             };
@@ -73,17 +61,17 @@ var gb_main_ep = new EventProxy(),
     });
 //modal hide remove dom
-$(document).on('hide.uk.modal', '.uk-modal', function() {
+$(document).on('hide.uk.modal', '.uk-modal', function () {
     $(this).remove();
 });
 $(document).on('click', '.ct-bottom-drawer-close', function () {
-   $(this).parents('.ct-bottom-drawer').removeClass('open');
+    $(this).parents('.ct-bottom-drawer').removeClass('open');
 });
 function connectArr(arr, separator, transFun) {
     var rs = '';
-    $.each(arr, function(i, item) {
+    $.each(arr, function (i, item) {
         if (transFun)
             item = transFun(item);
         rs += (separator + item);
@@ -102,26 +90,26 @@ var gb_form_validation_opts = {
 };
-var notify_wait = function(t) {
+var notify_wait = function (t) {
     UIkit.notify("<i class='uk-icon-spinner uk-icon-spin'></i> " + t, {
         status: 'info'
     });
 };
-var notify_succ = function(t) {
+var notify_succ = function (t) {
     UIkit.notify("<i class='uk-icon-check'></i> " + t, {
         status: 'success'
     });
 };
-var notify_err = function(t) {
+var notify_err = function (t) {
     UIkit.notify("<i class='uk-icon-times'></i> " + t, {
         status: 'danger'
     });
 };
-var alt_confirm = function(content, succ, okBtn) {
-    var modalEl = UIkit.modal.confirm(content, function() {
+var alt_confirm = function (content, succ, okBtn) {
+    var modalEl = UIkit.modal.confirm(content, function () {
         succ && succ();
         modalEl.hide();
     }, {
@@ -129,15 +117,15 @@ var alt_confirm = function(content, succ, okBtn) {
             Ok: okBtn,
             Cancel: '取消'
         }
-        ,center: true
+        , center: true
     });
 };
-var isArray = function(obj) {
+var isArray = function (obj) {
     return Object.prototype.toString.call(obj) === '[object Array]';
 };
-var notify_err_form = function(t, form) {
+var notify_err_form = function (t, form) {
     $('.uk-alert-danger', form).remove();
     $('.uk-modal-footer', form).before('<div class="uk-alert uk-alert-danger" data-uk-alert="">' +
         '<a href="" class="uk-alert-close uk-close"></a>' +
@@ -147,29 +135,29 @@ var notify_err_form = function(t, form) {
     enable_submit_btn(form);
 };
-var enable_submit_btn = function(form) {
+var enable_submit_btn = function (form) {
     var subBtn = $('button[type=submit]', form);
     if (subBtn) {
         subBtn.removeClass('disabled').removeAttr('disabled');
     }
 }
-var disabled_submit_btn = function(form) {
+var disabled_submit_btn = function (form) {
     var subBtn = $('button[type=submit]', form);
     if (subBtn) {
-        subBtn.addClass('disabled').attr('disabled','disabled');
+        subBtn.addClass('disabled').attr('disabled', 'disabled');
     }
 };
-var show_modal = function(id, dom) {
+var show_modal = function (id, dom) {
     $(document.body).append(dom);
     return UIkit.modal(id, {
         bgclose: false
     }).show();
 };
-var open_modal = function(pageUrl, data, opt) {
-    $.get(pageUrl, function(dom) {
+var open_modal = function (pageUrl, data, opt) {
+    $.get(pageUrl, function (dom) {
         if (!$(dom).hasClass('uk-modal')) {
             alert('无效的dom片段！');
             return;
@@ -188,20 +176,20 @@ var open_modal = function(pageUrl, data, opt) {
 function showUpdateDescription() {
     //更新说明
-    var updateDescription={
+    var updateDescription = {
         date: '2016-12-20',
         text: '<h5>1、回场子任务开放使用。</h5>'
     };
     var storage = window.localStorage
-        ,key = 'update_' + updateDescription.date;
+        , key = 'update_' + updateDescription.date;
     var text = storage.getItem(key);
-    if(!text){
-        var modal = '<div class="uk-modal" id="update-description-modal">'+
-            '    <div class="uk-modal-dialog">'+
-            '    <a class="uk-modal-close uk-close"></a>'+
-            '     <div class="uk-modal-header">'+
-            '      <h2>'+updateDescription.date+' 更新说明</h2></div>'+updateDescription.text+
+    if (!text) {
+        var modal = '<div class="uk-modal" id="update-description-modal">' +
+            '    <div class="uk-modal-dialog">' +
+            '    <a class="uk-modal-close uk-close"></a>' +
+            '     <div class="uk-modal-header">' +
+            '      <h2>' + updateDescription.date + ' 更新说明</h2></div>' + updateDescription.text +
             '    </div>';
         show_modal('#update-description-modal', modal);
 /* main.html north toolbar js */
-var gb_northToolbar = (function() {
+var gb_northToolbar = (function () {
-  var modal_opts={center: true,bgclose: false};
-  var currentUser;
+    var modal_opts = {center: true, bgclose: false};
+    var currentUser;
-  $.get('/real_control_v2/fragments/north/toolbar.html', function(temp){
-    ep.emit("template", temp);
-  });
+    $.get('/real_control_v2/fragments/north/toolbar.html', function (temp) {
+        ep.emit("template", temp);
+    });
+
+    $.get('/real_control_v2/js/data/json/north_toolbar.json', function (data) {
+        ep.emit("data", data);
+    });
-  $.get('/real_control_v2/js/data/json/north_toolbar.json', function(data){
-    ep.emit("data", data);
-  });
+    //当前用户信息
+    $.get('/user/currentUser', function (user) {
+        ep.emit("user", user);
+    });
-  //当前用户信息
-  $.get('/user/currentUser', function(user){
-    ep.emit("user", user);
-  });
+    var ep = EventProxy.create("template", "data", "user", function (temp, data, user) {
+        currentUser = user;
+        var t = $('#north-toolbar-temp', temp).html()
+            , htmlStr = template.render(t)({list: data, user: currentUser});
+        $('.north .north-toolbar').html(htmlStr);
-  var ep = EventProxy.create("template", "data", "user" , function (temp, data, user) {
-    currentUser=user;
-    var t = $('#north-toolbar-temp', temp).html()
-        ,htmlStr = template.render(t)({list: data, user: currentUser});
-    $('.north .north-toolbar').html(htmlStr);
+        //exit
+        $('.north .north-toolbar .exit-system').on('click', function () {
+            //关闭websocket 连接
+            gb_sch_websocket.sock.close();
+            window.location.href = '/pages/control/lineallot/allot.html';
+        });
+    });
-    //exit
-    $('.north .north-toolbar .exit-system').on('click', function(){
-      //关闭websocket 连接
-      gb_sch_websocket.sock.close();
-      window.location.href='/pages/control/lineallot/allot.html';
+    $(document).on('click', '#north_toolbar_panel li.event a', function () {
+        var event = $(this).data('event');
+        handler[event] && handler[event]();
     });
-  });
-  $(document).on('click', '#north_toolbar_panel li.event a', function(){
-    var event = $(this).data('event');
-    handler[event] && handler[event]();
-  });
+    var handler = {
+        // device report list
+        device_report: function () {
+            open_modal('/real_control_v2/fragments/north/nav/report_80.html', {}, modal_opts);
+        },
+        directive_history: function () {
+            open_modal('/real_control_v2/fragments/north/nav/directive_history.html', {}, modal_opts);
+        },
+        tts_config: function () {
+            open_modal('/real_control_v2/fragments/north/nav/tts_config.html', {}, modal_opts);
+        },
+        all_devices: function () {
+            open_modal('/real_control_v2/fragments/north/nav/all_devices.html', {}, modal_opts);
+        },
+        device_online_rate: function () {
+            open_modal('/real_control_v2/fragments/north/nav/charts/device_online_rate.html', {}, modal_opts);
+        },
+        turnout_rate: function () {
+            open_modal('/real_control_v2/fragments/north/nav/charts/car_out_rate.html', {}, modal_opts);
+        },
+        s_e_punctuality_rate: function () {
+            open_modal('/real_control_v2/fragments/north/nav/charts/strat_end_punctuality_rate.html', {}, modal_opts);
+        },
+        s_e_punctuality_rate_line: function () {
+            open_modal('/real_control_v2/fragments/north/nav/charts/s_e_punctuality_rate_line.html', {}, modal_opts);
+        },
+        history_sch_maintain: function () {
+            open_modal('/real_control_v2/fragments/north/nav/history_sch_maintain.html', {}, {
+                center: false,
+                bgclose: false
+            });
+        },
+        sch_exec_rate: function () {
+            open_modal('/real_control_v2/fragments/north/nav/charts/sch_exec_rate.html', {}, modal_opts);
+        },
+        gps_play_back: function () {
+            gb_map_play_back.initParams();
+        },
+        signal_state: function () {
+            open_modal('/real_control_v2/fragments/north/nav/signal_state_config.html', {}, modal_opts);
+        }
+    }
-  var handler = {
-    // device report list
-    device_report: function(){
-      open_modal('/real_control_v2/fragments/north/nav/report_80.html', {}, modal_opts);
-    },
-    directive_history: function(){
-      open_modal('/real_control_v2/fragments/north/nav/directive_history.html', {}, modal_opts);
-    },
-    tts_config: function(){
-      open_modal('/real_control_v2/fragments/north/nav/tts_config.html', {}, modal_opts);
-    },
-    all_devices: function(){
-      open_modal('/real_control_v2/fragments/north/nav/all_devices.html', {}, modal_opts);
-    },
-    device_online_rate: function(){
-      open_modal('/real_control_v2/fragments/north/nav/charts/device_online_rate.html', {}, modal_opts);
-    },
-    turnout_rate: function () {
-      open_modal('/real_control_v2/fragments/north/nav/charts/car_out_rate.html', {}, modal_opts);
-    },
-    s_e_punctuality_rate: function () {
-      open_modal('/real_control_v2/fragments/north/nav/charts/strat_end_punctuality_rate.html', {}, modal_opts);
-    },
-    s_e_punctuality_rate_line: function () {
-      open_modal('/real_control_v2/fragments/north/nav/charts/s_e_punctuality_rate_line.html', {}, modal_opts);
-    },
-    history_sch_maintain: function () {
-      open_modal('/real_control_v2/fragments/north/nav/history_sch_maintain.html', {}, {center: false,bgclose: false});
-    },
-    sch_exec_rate: function () {
-      open_modal('/real_control_v2/fragments/north/nav/charts/sch_exec_rate.html', {}, modal_opts);
-    },
-    gps_play_back: function () {
-      gb_map_play_back.initParams();
+    return {
+        user: function () {
+            return currentUser;
+        }
     }
-  }
 })();
+/**
+ * 班次 GPS信号状态
+ * @type {{}}
+ */
+var gb_signal_state = (function () {
+    var storage = window.localStorage;
+
+    $(document).on('click', 'i.signal_state_icon', function (e) {
+        e.stopPropagation();
+    });
+
+    var signal_state_data = {};
+    var enable = true;
+    //读取本地状态
+    var locStatus = storage.getItem("signal_state_enable");
+    if (locStatus && locStatus=='0')
+        enable = false;
+
+    var init = function () {
+        $.get('/signalState/multi', {idx: gb_data_basic.line_idx}, function (rs) {
+            //按班次ID分组
+            signal_state_data = gb_common.groupBy(rs, 'schId');
+
+            for (var schId in signal_state_data) {
+                multi_render(signal_state_data[schId]);
+            }
+        });
+    };
+
+    var multi_render = function (list) {
+        if (!enable)
+            return;
+
+        if (!list || list.length == 0)
+            return;
+        var line = list[0].lineCode
+            , schId = list[0].schId;
+
+        var sch = gb_schedule_table.findScheduleByLine(line)[schId];
+        var dl = gb_schedule_table.getDl(sch);
+        var icon = 'question-circle';
+        var t = '';
+        $.each(list, function () {
+            t += (this.text + '<br>');
+        });
+
+        if (list.length == 1 && list[0].type == 'route_reverse')
+            icon = 'reply';
+
+        var dd = $('dd.fcsjActualCell', dl);
+        var se = $('i.signal_state_icon', dd);
+        if (se && se.length > 0)
+            se.remove();
+
+        dd.append('<i data-uk-tooltip title="' + t + '" class="uk-icon-' + icon + ' signal_state_icon"></i>');
+    };
+
+    var put = function (obj) {
+        if (!signal_state_data[obj.schId]) {
+            signal_state_data[obj.schId] = [];
+        }
+
+        signal_state_data[obj.schId].push(obj);
+        multi_render(signal_state_data[obj.schId]);
+    };
+
+    var marker_sch = function (sch) {
+        var list = signal_state_data[sch.id];
+        if (list) {
+            multi_render(list);
+        }
+    };
+
+    var clearAll = function () {
+        $('.signal_state_icon').remove();
+    };
+
+    return {
+        init: init,
+        put: put,
+        marker_sch: marker_sch,
+        isEnable: function () {
+            return enable;
+        },
+        disable: function () {
+            enable = false;
+            storage.setItem("signal_state_enable", 0);
+
+            clearAll();
+        },
+        enable: function () {
+            enable = true;
+            storage.setItem("signal_state_enable", 1);
+            for (var schId in signal_state_data) {
+                multi_render(signal_state_data[schId]);
+            }
+        }
+    };
+})();
 \ No newline at end of file
+/** 调度模式 */
+
+//主调和监控模式
+var operationMode = window.localStorage.getItem('operationMode');
+if (operationMode == 0) {
+    $('body>.north').addClass('monitor');
+    $(document).on('ajaxSend', interceptPOST);
+}
+else
+    $('body>.north').addClass('main');
+
+//拦截POST请求
+function interceptPOST(e, xhr, t) {
+    if (t && (t.method == 'POST' || t.type == 'POST')) {
+        console.log(e, xhr, t);
+        xhr.abort();
+        notify_err('监控模式！');
+    }
+}
+
+
+//10分钟后提交当班调度数据
+setTimeout(function () {
+    var user = gb_northToolbar.user();
+    var data = {
+        uId: user.id,
+        uName: user.userName,
+        codeIdx: gb_data_basic.line_idx + ',',
+        main: operationMode
+    };
+
+    gb_common.$post('/dutyEmployee', data);
+}, 1000 * 60 * 10);
 \ No newline at end of file
 /* 线路模拟图 */
-var gb_svg_chart = (function() {
+var gb_svg_chart = (function () {
     //chart height
     var chart_height = 123;
@@ -11,22 +11,22 @@ var gb_svg_chart = (function() {
     //svg namespace
     var svgns = 'http://www.w3.org/2000/svg';
-    var calc_text_y = function(t) {
+    var calc_text_y = function (t) {
             return (chart_height - (chart_height / t_max_size * t.length)) / 2 + 5;
         },
-        cat_text = function(t) {
+        cat_text = function (t) {
             return t.length > t_max_size ? t.substr(0, t_max_size) : t;
         },
-        get_width = function(wrap) {
+        get_width = function (wrap) {
             return wrap.actual('outerWidth');
         },
-        get_height = function(wrap) {
+        get_height = function (wrap) {
             var h = wrap.actual('outerHeight');
             //隐藏元素取最外层的高度
             return h < 20 ? wrap.parent().actual('outerHeight') - 2 : h;
         }
-    var draw_line = function(lineCode, wrap) {
+    var draw_line = function (lineCode, wrap) {
         var data = gb_svg_data_convert.mergeRoute(gb_data_basic.stationRoutes(lineCode)),
             len = data.length;
@@ -36,22 +36,22 @@ var gb_svg_chart = (function() {
             //x scale
             ,
             xScale = d3.scale.linear().range([x_padd, w - x_padd]).domain([0, len - 1]),
-            cx = function(d, i) {
+            cx = function (d, i) {
                 return xScale(i);
             },
-            cy = function() {
+            cy = function () {
                 return (h - chart_height) / 2;
             },
-            ty = function(d) {
+            ty = function (d) {
                 return cy() + calc_text_y(cat_text(d.name[0]));
             }
             //line generator
             ,
             upLine = d3.svg.line().x(xScale).y(cy),
-            downLine = d3.svg.line().x(xScale).y(function() {
+            downLine = d3.svg.line().x(xScale).y(function () {
                 return cy() + chart_height
             }),
-            multi_text = function(d, i, that) {
+            multi_text = function (d, i, that) {
                 var dText = document.createElementNS(svgns, 'text'),
                     t = cat_text(d.name[1]);
@@ -82,14 +82,14 @@ var gb_svg_chart = (function() {
             'station_link': true
         };
         items.append('path').classed(p_clzz)
-            .attr('d', function(d, i) {
+            .attr('d', function (d, i) {
                 return i < len - 1 ? upLine([i, i + 1]) : '';
             });
         //down station link path
         p_clzz.down = true;
         items.append('path').classed(p_clzz)
-            .attr('d', function(d, i) {
+            .attr('d', function (d, i) {
                 return i < len - 1 ? downLine([i, i + 1]) : '';
             });
@@ -97,40 +97,44 @@ var gb_svg_chart = (function() {
         var c_clzz = {
             'station_circle': true
         };
-        items.select(function (d) {return d.type!=1?this:null;})
+        items.select(function (d) {
+            return d.type != 1 ? this : null;
+        })
             .append('circle').classed(c_clzz)
             .attr('cx', cx)
             .attr('cy', cy)
-            .attr('data-id', function(d) {
+            .attr('data-id', function (d) {
                 return d.id[0];
             });
         //down circle
         c_clzz.down = true;
-        items.select(function (d) {return d.type!=0?this:null;})
+        items.select(function (d) {
+            return d.type != 0 ? this : null;
+        })
             .append('circle').classed(c_clzz)
             .attr('cx', cx)
-            .attr('cy', function(d, i) {
+            .attr('cy', function (d, i) {
                 return cy(d, i) + chart_height;
             })
-            .attr('data-id', function(d) {
-                return d.type==1?d.id[0]:d.id[1];
+            .attr('data-id', function (d) {
+                return d.type == 1 ? d.id[0] : d.id[1];
             });
         //station name text
         items.append('text').classed({
-                'station_text': true,
-                'up': function(d) {
-                    return d.type == 3 ? true : false;
-                }
-            })
-            .text(function(d) {
+            'station_text': true,
+            'up': function (d) {
+                return d.type == 3 ? true : false;
+            }
+        })
+            .text(function (d) {
                 return cat_text(d.name[0]);
             })
-            .attr('title', function(d) {
+            .attr('title', function (d) {
                 return d.name[0];
             })
-            .attr('x', function(d, i) {
+            .attr('x', function (d, i) {
                 return d.type == 3 ? multi_text(d, i, this) : cx(d, i)
             })
             .attr('y', ty);
@@ -149,90 +153,95 @@ var gb_svg_chart = (function() {
     // ----- draw gps ------
     //gps 按线路站点分组后的下标映射
     var line_gps_index = {};
-    var get_circle = function(dataId, svg) {
+    var get_circle = function (dataId, svg) {
             try {
                 var circle = $('.station_circle[data-id=' + dataId + ']', svg);
                 if (circle.length == 0)
                     circle = null;
-            }catch (e){
+            } catch (e) {
                 console.log('get_circle error! station_circle data-id:' + dataId);
                 return null;
             }
             return circle;
         },
-        gx = function(gps, svg) {
-            var circle = get_circle(gps.stopNo, svg);
+        gx = function (gps, svg) {
+            var circle = get_circle(gps.stopNo + '_' + gps.upDown, svg);
             if (!circle) return -100;
             return circle.attr('cx') - 14;
         },
-        gy = function(gps, svg) {
-            var circle = get_circle(gps.stopNo, svg);
+        gy = function (gps, svg) {
+            var circle = get_circle(gps.stopNo + '_' + gps.upDown, svg);
             if (!circle) return -100;
             var cy = parseInt(circle.attr('cy')),
-                index = line_gps_index[gps.lineId][gps.stopNo][gps.deviceId];
+                index = line_gps_index[gps.lineId][gps.stopNo + '_' + gps.upDown][gps.deviceId];
-            return gps.upDown == 0 ? cy - 31 - (index * 28) : cy + 7 + (index * 28);
+            return gps.upDown == 0 ? cy - 25 - (index * 21) : cy + 7 + (index * 21);
         },
-        ups_gps = function(d) {
+        ups_gps = function (d) {
             return d.gpsUps;
         },
-        downs_gps = function(d) {
+        downs_gps = function (d) {
             return d.gpsDowns;
         },
-        gps_index_mapp = function(data) {
+        gps_index_mapp = function (data) {
             var rs = {};
-            var dataGroupStop = gb_common.groupBy(data, 'stopNo');
+            var dataGroupStop = gb_svg_data_convert.groupByStationAndUpdown(data);
             for (var stopNo in dataGroupStop) {
                 rs[stopNo] = {};
-                $.each(dataGroupStop[stopNo], function(i, gps) {
+                $.each(dataGroupStop[stopNo], function (i, gps) {
                     rs[stopNo][gps.deviceId] = i;
                 });
             }
             return rs;
         },
-        g_text = function(d) {
-            var len = (d.nbbm == false ? 0 : d.nbbm.length);
-            return len > 3 ? d.nbbm.substr(len - 3) : d.nbbm;
+        g_text = function (d) {
+            var len = (d.nbbm == false ? 0 : d.nbbm.length)
+                , t = len > 3 ? d.nbbm.substr(len - 3) : d.nbbm;
+
+            if (d.nbbm.indexOf('-') > 0) {
+                t = d.nbbm.substr(d.nbbm.indexOf('-') - 1, 1) + t;
+            }
+            return t;
         },
-        gps_key = function(d) {
+        gps_key = function (d) {
             return d.deviceId;
         },
-        gps_update_point = function(e, svg) {
-            e.transition().attr('x', function(d) {
-                    return gx(d, svg);
-                })
-                .attr('y', function(d) {
+        gps_update_point = function (e, svg) {
+            e.transition().attr('x', function (d) {
+                return gx(d, svg);
+            })
+                .attr('y', function (d) {
                     return gy(d, svg);
                 })
-                .attr('updown', function(d) {
+                .attr('updown', function (d) {
                     return d.upDown;
                 });
             //update tip position
             gb_svg_tooltip.update(e);
         },
-        rct_id = function(d) {
+        rct_id = function (d) {
             return 'rct_' + d.deviceId;
         },
-        tx_id = function(d) {
+        tx_id = function (d) {
             return 'tx_' + d.deviceId;
         }
-    var setGps = function(lineCode) {
+    var setGps = function (lineCode) {
         var svgs = $('.line-chart[data-code=' + lineCode + ']'),
             data = gb_data_gps.gpsByLineCode(lineCode);
-       var list=[];
+        var list = [];
         //过滤无站点字段的数据
-        $.each(data, function(){
-            if(!this.stopNo || this.stopNo=='')
+        $.each(data, function () {
+            if (!this.stopNo || this.stopNo == '')
                 return true;
             list.push(this);
         });
         line_gps_index[lineCode] = gps_index_mapp(list);
-        $.each(svgs, function() {
+        $.each(svgs, function () {
             //绘制gps
             draw_gps(this, list);
             //聚合gps
@@ -241,7 +250,7 @@ var gb_svg_chart = (function() {
     };
-    var draw_gps = function(svg, data) {
+    var draw_gps = function (svg, data) {
         //remove merge_hide class
         $('.merge_hide', svg).removeAttr('class');
@@ -256,22 +265,22 @@ var gb_svg_chart = (function() {
         gps_update_point(ts, svg);
     };
-    var marker_clusterer = function(svg, lineCode) {
-      //debugger
+    var marker_clusterer = function (svg, lineCode) {
+        //debugger
         var gpsArr, idxMapp = line_gps_index[lineCode];
-            //svgs = $('.line-chart[data-code=' + lineCode + ']');
+        //svgs = $('.line-chart[data-code=' + lineCode + ']');
         for (var stopNo in idxMapp) {
             gpsArr = gb_common.get_keys(idxMapp[stopNo]);
             //remove old merger point
             $('g[_id=' + 'merger_' + stopNo + ']', svg).remove();
             if (gpsArr.length <= 2)
-              continue;
+                continue;
             marker_clusterer_merge(svg, stopNo, gpsArr);
         }
     }
-    var marker_clusterer_merge = function(svg, stopNo, gpsArr) {
+    var marker_clusterer_merge = function (svg, stopNo, gpsArr) {
         //stop circle
         var circle = get_circle(stopNo, svg);
         if (!circle) return;
@@ -282,7 +291,7 @@ var gb_svg_chart = (function() {
         var svg = d3.select(svg);
         //hide old element
-        $.each(gpsArr, function(i, d) {
+        $.each(gpsArr, function (i, d) {
             $('rect[_id=rct_' + d + '],text[_id=tx_' + d + ']').attr('class', 'merge_hide');
         });
@@ -292,7 +301,7 @@ var gb_svg_chart = (function() {
             });
         //merge rect
         mergerG.append('rect').attr('x', x - 12)
-            .attr('y', function() {
+            .attr('y', function () {
                 return isDown ? y + 7 : y - 32;
             });
         //merge text
@@ -37,14 +37,15 @@ var gb_svg_map_util = (function () {
     var drawStationMarker = function (routeItem) {
         var station = routeItem.station,
+            name = routeItem.stationName,
             coord = TransGPS.wgsToBD(station.gLaty, station.gLonx);
         var marker = new BMap.Marker(new BMap.Point(coord.lng, coord.lat));
         //label
-        var offsetX = Math.abs(station.stationName.length / 2 * 12),
+        var offsetX = Math.abs(name.length / 2 * 12),
             offsetY = -20,
-            label = new BMap.Label(station.stationName, {
+            label = new BMap.Label(name, {
                 offset: new BMap.Size(-offsetX, offsetY)
             });
@@ -13,6 +13,7 @@ var gb_svg_tooltip = (function () {
         if (rect.attr('aria-describedby'))
             return;
         var gps = gb_data_gps.findOne($(this).attr('_id').split('_')[1]);
+        console.log('gps', gps);
         $(this).qtip({
             show: {
                 ready: true,
@@ -151,7 +152,7 @@ var gb_svg_tooltip = (function () {
     function searchByStop(list, stop) {
         var rs = [];
         $.each(list, function () {
-            if (this.stopNo == stop)
+            if ((this.stopNo + '_' + this.upDown) == stop)
                 rs.push(this);
         });
         return rs;
@@ -29,7 +29,7 @@ var gb_svg_data_convert = (function() {
                 var dIndex = station_indexof(down, upS, j);
                 if (dIndex == -1) {
                     op.type = 0;
-                    op.id = [upS.stationCode, -1];
+                    op.id = [get_station_code(upS), -1];
                     //占位
                     down.splice(j, 0, {});
                 } else {
@@ -38,7 +38,7 @@ var gb_svg_data_convert = (function() {
                         data.push({
                             name: [temp.stationName],
                             type: 1,
-                            id: [temp.stationCode]
+                            id: [get_station_code(temp)]
                         });
                     }
                     //delete
@@ -103,14 +103,30 @@ var gb_svg_data_convert = (function() {
     };
     var get_station_code=function (station) {
-        if(station.stationMark=='B' || station.stationMark=='E')
+        /*if(station.stationMark=='B' || station.stationMark=='E')
             return station.stationCode+'_'+station.directions;
         else
-            return station.stationCode;
+            return station.stationCode;*/
+        return station.stationCode+'_'+station.directions;
     };
     var nvl_get = function(list, index) {
         return list[index] == null ? {} : list[index];
     };
-    return {mergeRoute: mergeRoute};
+
+    var groupByStationAndUpdown = function (data) {
+        //gb_common.groupBy(data, 'stopNo')
+        var rs = {},
+            key;
+        $.each(data, function () {
+            key = this['stopNo'] + '_' + this['upDown'];
+            if (!rs[key])
+                rs[key] = [];
+
+            rs[key].push(this);
+        });
+
+        return rs;
+    };
+    return {mergeRoute: mergeRoute, groupByStationAndUpdown: groupByStationAndUpdown};
 })();
@@ -26,7 +26,7 @@ var gb_sch_websocket = (function () {
         var data = {
             operCode: 'register_line',
             idx: gb_data_basic.line_idx
-        }
+        };
         schSock.send(JSON.stringify(data));
         console.log('regListen....', data);
     }
@@ -45,21 +45,21 @@ var gb_sch_websocket = (function () {
     var calcUntreated = function (lineCode) {
         var size = $('li.line_schedule[data-id=' + lineCode + '] .sys-mailbox .sys-mail-item').length;
         $('#badge_untreated_num_' + lineCode).text(size);
-    }
+    };
     var calcUntreatedAll = function () {
         $('#main-tab-content li.line_schedule').each(function () {
             calcUntreated($(this).data('id'));
         });
-    }
+    };
     //80协议上报
     var report80 = function (msg) {
         msg.dateStr = moment(msg.timestamp).format('HH:mm');
         msg.text = gb_common.reqCode80[msg.data.requestCode];
-        if(!msg.text)
-            msg.text='（未知的请求码 '+msg.data.requestCode+'）';
+        if (!msg.text)
+            msg.text = '（未知的请求码 ' + msg.data.requestCode + '）';
         var $item = $(temps['sys-note-80-temp'](msg));
         findMailBox(msg.data.lineId).prepend($item);
@@ -68,7 +68,7 @@ var gb_sch_websocket = (function () {
         gb_tts.speak(ttsMsg, msg.data.lineId);
         calcUntreated(msg.data.lineId);
-    }
+    };
     var waitRemoves = [];
     //车辆发出
@@ -89,11 +89,12 @@ var gb_sch_websocket = (function () {
         gb_schedule_table.calc_yfwf_num(msg.t.xlBm);
         calcUntreated(msg.t.xlBm);
-    }
+    };
     //到达终点
     var zhongDian = function (msg) {
         gb_schedule_table.updateSchedule(msg.t);
+        gb_schedule_table.updateSchedule(msg.nt);
         msg.domId = 'zhongDian_' + msg.t.id + '_' + parseInt(Math.random() * 10000);
         var $item = $(temps['sys-note-42_1-temp'](msg));
@@ -107,20 +108,20 @@ var gb_sch_websocket = (function () {
         gb_tts.speak(ttsMsg, msg.t.xlBm);
         calcUntreated(msg.t.xlBm);
-    }
+    };
     //服务器通知刷新班次
     var refreshSch = function (msg) {
         gb_schedule_table.updateSchedule(msg.ts);
         /*//重新计算应发未发
-        var idx={};
-        $.each(msg.ts, function(i, t){
-            if(idx[t.xlBm])
-                return true;
-            gb_schedule_table.calc_yfwf_num(t.xlBm);
-            idx[t.xlBm]=1;
-        });*/
-    }
+         var idx={};
+         $.each(msg.ts, function(i, t){
+         if(idx[t.xlBm])
+         return true;
+         gb_schedule_table.calc_yfwf_num(t.xlBm);
+         idx[t.xlBm]=1;
+         });*/
+    };
     //80消息确认
     var d80Confirm = function (msg) {
@@ -129,12 +130,17 @@ var gb_sch_websocket = (function () {
         calcUntreated(msg.lineId);
         //重新计算应发未发
         gb_schedule_table.calc_yfwf_num(msg.lineId);
-    }
+    };
     //指令状态改变
-    var directiveStatus = function(msg){
+    var directiveStatus = function (msg) {
         gb_schedule_table.updateSchedule(msg.t);
-    }
+    };
+
+    //班次信号状态
+    var signalState = function (msg) {
+        gb_signal_state.put(msg.data);
+    };
     var msgHandle = {
         report80: report80,
@@ -142,8 +148,9 @@ var gb_sch_websocket = (function () {
         zhongDian: zhongDian,
         refreshSch: refreshSch,
         d80Confirm: d80Confirm,
-        directive: directiveStatus
-    }
+        directive: directiveStatus,
+        signal_state: signalState
+    };
     function currentSecond() {
         return Date.parse(new Date()) / 1000;
@@ -167,15 +174,15 @@ var gb_sch_websocket = (function () {
         $(this).parents('.sys-note-42').remove();
         var size = $(this).parents('.sys-mailbox').find('.sys-mail-item').length
-            ,lineCode = $(this).parents('li.line_schedule').data('id');
+            , lineCode = $(this).parents('li.line_schedule').data('id');
         $('#badge_untreated_num_' + lineCode).text(size);
     });
     //42消息点击
     $(document).on('click', '.sys-mailbox .sys-note-42', function () {
-        var lineCode=$(this).parents('li.line_schedule').data('id')
-            ,id=$(this).data('id');
+        var lineCode = $(this).parents('li.line_schedule').data('id')
+            , id = $(this).data('id');
         var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
         var dl = gb_schedule_table.scroToDl(sch);
         //高亮
@@ -205,7 +212,7 @@ var gb_sch_websocket = (function () {
                 notify_succ(rs.msg);
             cb && cb();
         });
-    }
+    };
     //定时到离站信使清理掉
@@ -107,6 +107,7 @@
     <!-- 数据 -->
     <script src="/real_control_v2/js/data/data_basic.js"></script>
     <script src="/real_control_v2/js/data/data_gps.js"></script>
+    <script src="/real_control_v2/js/data/gps_abnormal.js"></script>
     <!-- 线路模拟图 -->
     <script src="/real_control_v2/js/utils/svg_chart.js"></script>
     <script src="/real_control_v2/js/utils/svg_data_convert.js"></script>
@@ -142,6 +143,9 @@
     <script src="/real_control_v2/assets/echarts-3/echarts.js"></script>
     <!-- Geolib -->
     <script src="/real_control_v2/geolib/geolib.js"></script>
+
+    <script src="/real_control_v2/js/signal_state/signal_state.js"></script>
+    <script src="/real_control_v2/js/utils/dispatch_pattern.js"></script>
 </body>
 </html>
@@ -96,7 +96,7 @@ input[type=checkbox].disabled{
 .real_bottom_panel{
     position: absolute !important;
-    height: 256px;
+    height: 192px;
     bottom: 2px !important;
     background: #fff;
     box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
@@ -148,10 +148,14 @@
                 var logs = [];
                 for (var i = 0; i <= ei; i++) {
                     trailArray.push(new BMap.Point(gpsArray[i].bd_lon, gpsArray[i].bd_lat));
-                    if(i > 0 && logs[logs.length - 1].road.ROAD_CODE == gpsArray[i].road.ROAD_CODE)
-                        logs.pop();
-
-                    logs.push(gpsArray[i]);
+                    try {
+                        if(i > 0 && logs[logs.length - 1].road.ROAD_CODE == gpsArray[i].road.ROAD_CODE)
+                            logs.pop();
+                    }
+                    catch (e){}
+
+                    if(gpsArray[i].road)
+                        logs.push(gpsArray[i]);
                 }
                 trailPolyline.setPath(trailArray);
@@ -302,6 +306,9 @@
             gb_ct_table.fixedHead(logWrap);
             function logWrite(gps, prve) {
+                if(!gps.road || !gps.road.ROAD_CODE)
+                    return;
+
                 var code = gps.road.ROAD_CODE;
                 if (!prve || code != prve.road.ROAD_CODE) {
                     logPanel.append('<dl data-code="' + code + '" ><dd>' + gps.timeStr + '</dd><dd>' + gps.speed + '</dd><dd>' + gps.road.ROAD_NAME + '</dd><dd>正常</dd></dl>');
@@ -44,7 +44,7 @@ var gb_map_imap = (function () {
             return mapProxy;
         },
         calcGpsMarkerWidth: function (nbbm) {
-            var width = 0;
+           /* var width = 0;
             $.each(nbbm.split(''), function () {
                 if (!isNaN(this))
                     width += 7;//icon_num_width[this];
@@ -52,8 +52,8 @@ var gb_map_imap = (function () {
                     width += 10;
                 else
                     width += 16;
-            });
-            return width;
+            });*/
+            return nbbm.length * 9.8;
         }
     };
@@ -394,7 +394,7 @@ var gb_map_baidu = (function(){
 		//线路名
 		gps.lineName = gb_data_basic.lineCode2NameAll()[gps.lineId];
 		//时间
-		gps.dateStr = moment(gps.timestamp).format('YYYY-MM-DD HH:mm:ss');
+		//gps.dateStr = moment(gps.timestamp).format('YYYY-MM-DD HH:mm:ss');
 		marker.infoWindow.setContent(gb_map_overlay_mge.map_gps_win_temp(gps));
 		map.openInfoWindow(marker.infoWindow, marker.point);
+package com.bsth.service.schedule.rules;
+
+import org.apache.tika.Tika;
+
+import java.io.File;
+
+/**
+ * Created by xu on 17/1/3.
+ */
+public class Test {
+    public static void main(String[] args) throws Exception {
+        Tika tika = new Tika();
+        File file = new File("/Users/xu/Downloads/排班规则练习1.xls");
+
+        // application/vnd.ms-excel
+        // application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+
+        String detecttype = tika.detect(file);
+        System.out.println(detecttype);
+
+    }
+}