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 89 changed files with 2038 additions and 1278 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;