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

mcy123
2 parents 0176c846 ea43f1bc
Showing 91 changed files with 2039 additions and 1356 deletions
pom.xml
src/main/java/com/bsth/controller/DownloadController.java
src/main/java/com/bsth/controller/oil/YlbController.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/schedule/BController.java
src/main/java/com/bsth/controller/schedule/ScheduleRule1FlatController.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/ScheduleRule1FlatController.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/arrival/ArrivalData_GPS.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;  
@@ -30,12 +31,14 @@ public class DownloadController
 	@RequestMapping("download")    
     public ResponseEntity<byte[]> download(String fileName) throws IOException {
     	fileName = fileName+".xls";
-    	String moudelPath = this.getClass().getResource("/").getPath()+ "static\\pages\\forms\\export\\"+fileName;   	
+    	String moudelPath = this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileName; 
+    	System.out.println(moudelPath);
 //       String path="D:\\export\\target\\"+jName+".xls";  
         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", fileName); 
+        System.out.println( URLDecoder.decode(realFileName,"utf-8"));
         headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);   
         return new ResponseEntity<byte[]>(FileUtils.readFileToByteArray(file),    
                                           headers, HttpStatus.CREATED);    
@@ -106,24 +106,24 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			@RequestParam(defaultValue = "DESC") String direction){
 		Direction d;
-		try {
+//		try {
 		String rq=map.get("rq").toString();
 		if(!(rq=="")){
-			
-			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-			  Calendar   calendar   =   new   GregorianCalendar(); 
-			  calendar.setTime(sdf.parse(rq)); 
-			  calendar.add(calendar.DATE,1);
-			  Date date=calendar.getTime();
-			map.put("rq_ge", rq);
-			map.put("rq_le", sdf.format(date));
-			System.out.println(rq);
-			System.out.println(sdf.format(date));
-		}
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+//			
+//			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+//			  Calendar   calendar   =   new   GregorianCalendar(); 
+//			  calendar.setTime(sdf.parse(rq)); 
+//			  calendar.add(calendar.DATE,1);
+//			  Date date=calendar.getTime();
+			map.put("rq_eq", rq);
+//			map.put("rq_lt", sdf.format(date));
+//			System.out.println(rq);
+//			System.out.println(sdf.format(date));
 		}
+//		} catch (ParseException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
 		if(null != direction && direction.equals("ASC"))
 			d = Direction.ASC;
 		else
@@ -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);
+    }
 }
@@ -36,35 +36,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	/**
 	 * 
-	 * 改由通过 websocket 注册监听！！！
-	 * 
-	 * @Title: registerLine @Description: TODO(注册线路，后续才能收到数据推送) @param @param
-	 * lineCodes @throws
-	 * 用GET 防止监控模式下被拦截
-	 
-	@RequestMapping(value = "/registerLine", method = RequestMethod.GET)
-	public int registerLine(@RequestParam String lineCodes) {
-		List<String> list = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(lineCodes);
-		String userName = SecurityUtils.getCurrentUser().getUserName();
-		// 注销之前的绑定
-		for (String line : list)
-			BasicData.lineCode2SocketUserMap.get(line).remove(userName);
-		// 重新绑定
-		for (String line : list)
-			BasicData.lineCode2SocketUserMap.put(line, userName);
-
-		return 0;
-	}*/
-
-	/**
-	 * 
 	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
 	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
 	 */
 	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
 	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
-			@RequestParam String dfsj/*, String clZbh, String jsy, String spy*/) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj/*, clZbh, jsy, spy*/);
+			@RequestParam String dfsj,String bcType) {
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType);
 	}
 	/**
@@ -125,19 +103,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
 		return scheduleRealInfoService.sreachVehic(nbbm);
 	}
-
-	/**
-	 * 
-	 * @Title: adjust @Description: TODO(调整人车) @param @param id
-	 * 班次ID @param @param nbbm 内部编码 @param @param jsy 驾驶员 @param @param spy
-	 * 售票员 @throws
-
-	@RequestMapping(value = "/adjust", method = RequestMethod.POST)
-	public Map<String, Object> adjust(@RequestParam Long id, String nbbm, String jsy,
-			String spy, Integer revertLine, Integer borrowLine, String borrowTimeStr, String revertTimeStr) {
-		return scheduleRealInfoService.adjust(id, nbbm, jsy, spy, revertLine, borrowLine, borrowTimeStr, revertTimeStr);
-	}
-	 */
 	/**
 	 * 
 	 * @Title: realOutAdjust 
@@ -299,10 +264,17 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/exportWaybill")
 	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
-			@RequestParam String lpName,@RequestParam String date) {
-		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date);
+			@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
+	}
+	
+	@RequestMapping(value = "/exportWaybillQp")
+	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
 	}
+	
 	@RequestMapping(value = "/dailyInfo")
 	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
 		return scheduleRealInfoService.dailyInfo(line, date, type);
@@ -310,8 +282,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")
@@ -321,8 +293,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value="/findKMBC")
 	public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date){
-		return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date);
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date,line);
+	}
+	
+	@RequestMapping(value="/findKMBCQp")
+	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
 	}
 	@RequestMapping(value="/findLpName")
@@ -332,14 +310,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
@@ -351,21 +329,25 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value="/queryListWaybill")
 	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date){
-		String type="fqp";
-		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,type);
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
 	}
 	@RequestMapping(value="/queryListWaybillQp")
-	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date){
-		String type="qp";
-		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,type);
+	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
+			@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
 	}
 	@RequestMapping(value="/statisticsDaily")
-	public List<Map<String,Object>> statisticsDaily(@RequestParam String line,@RequestParam String date,@RequestParam String xlName){
-		return scheduleRealInfoService.statisticsDaily(line, date,xlName);
+	public List<Map<String,Object>> statisticsDaily(@RequestParam String line, @RequestParam String date,
+			@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
+	}
+	
+	@RequestMapping(value="/MapById",method = RequestMethod.GET)
+	public Map<String, Object> MapById(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapById(id);
 	}
 	/**
@@ -427,4 +409,24 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		}
 		return rs;
 	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.POST)
+	public Map<String, Object> svgAttr(@RequestParam String jsonStr){
+		return scheduleRealInfoService.svgAttr(jsonStr);
+	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.GET)
+	public Map<String, Object> findSvgAttr(@RequestParam  String idx){
+		return scheduleRealInfoService.findSvgAttr(idx);
+	}
+
+	@RequestMapping(value = "addRemarks", method = RequestMethod.POST)
+	public Map<String, Object> addRemarks(@RequestParam Long id, @RequestParam String remarks){
+		return scheduleRealInfoService.addRemarks(id, remarks);
+	}
+
+	@RequestMapping(value = "scheduleDailyQp", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.scheduleDailyQp(line,date);
+	}
 }
@@ -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.controller.BaseController;
-import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
-import com.bsth.repository.schedule.ScheduleRule1FlatRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * Created by xu on 16/7/4.
- */
-@RestController
-@RequestMapping("sr1fc")
-public class ScheduleRule1FlatController extends BaseController<ScheduleRule1Flat, Long> {
-
-    @Autowired
-    private ScheduleRule1FlatRepository scheduleRule1FlatRepository;
-
-    @Override
-    public ScheduleRule1Flat findById(@PathVariable("id") Long aLong) {
-        return scheduleRule1FlatRepository.findOneExtend(aLong);
-    }
-
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     * @param @param t
-     * @param @return    设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody ScheduleRule1Flat t){
-        return baseService.save(t);
-    }
-
-}
-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;
+package com.bsth.controller.schedule.core;
+
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/7/4.
+ */
+@RestController
+@RequestMapping("sr1fc")
+public class ScheduleRule1FlatController extends BController<ScheduleRule1Flat, Long> {
+
+
+}
@@ -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;
@@ -87,42 +87,4 @@ public class TTInfoController extends BController&lt;TTInfo, Long&gt; {
         return rtn;
     }
-}
-
-//
-//@Autowired
-//private DataToolsProperties dataToolsProperties;
-//@Autowired
-//private TTInfoRepository ttInfoRepository;
-//@Autowired
-//private TTInfoDetailRepository ttInfoDetailRepository;
-//
-//    @Override
-//    protected String getDataImportKtrClasspath() {
-//        return dataToolsProperties.getTtinfoDatainputktr();
-//    }
-//
-//    @Override
-//    public TTInfo findById(@PathVariable("id") Long aLong) {
-//        return ttInfoRepository.findOneExtend(aLong);
-//    }
-//
-//    /**
-//     * 验证。
-//     * @param map
-//     * @return
-//     */
-//    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
-//    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
-//        // 一般比较自编号是否重复
-//        return baseService.validateEquale(map);
-//    }
-//
-//    @Override
-//    public Page<TTInfo> list(@RequestParam Map<String, Object> map, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size, @RequestParam(defaultValue = "id") String order, @RequestParam(defaultValue = "DESC") String direction) {
-//        // 如果有isCancel键值，将其值变成boolean
-//        if (map.get("isCancel_eq") != null)
-//            map.put("isCancel_eq", new Boolean(map.get("isCancel_eq").toString()));
-//
-//        return super.list(map, page, size, order, direction);
-//    }
 \ No newline at end of file
+}
 \ No newline at end of file
+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);
+    }
+}
@@ -13,7 +13,6 @@ 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.*;
@@ -26,7 +25,6 @@ import java.util.concurrent.TimeUnit;
  * @date 2016年8月10日 下午3:27:45
  */
 @Component
-@Order(value = 1)
 public class BasicData implements CommandLineRunner {
     //公司代码和公司名对照(K: 公司编码，V:公司名)
@@ -83,9 +81,13 @@ public class BasicData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(dataLoader, 0, 2, TimeUnit.HOURS);
+        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 {
@@ -259,26 +261,26 @@ public class BasicData implements CommandLineRunner {
                 /**
                  * 加载运管处的站点及序号
                  * 上行从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;
 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();
@@ -67,16 +67,10 @@ public class GpsEntity {
 	/** 当前执行班次ID */
 	private Long schId;
-	/** 是否异常数据 */
-	private boolean abnormal;
-/*
-	private int valid;*/
-	
-	private int version;
+	/** 是否是不完整的数据 */
+	private boolean incomplete;
-	/** 是否起终点站
-	private boolean sEPoint;
-	 */
+	private int version;
 	/** 0： 站外 1：站内 2：场内 */
 	private int instation;
@@ -88,6 +82,12 @@ public class GpsEntity {
 	/** 状态 */
 	private String signalState = "normal";
+	/** 异常状态 */
+	private String abnormalStatus;
+
+	/** 越界距离 */
+	private double outOfBoundDistance;
+
 	public Integer getCompanyCode() {
 		return companyCode;
 	}
@@ -241,14 +241,6 @@ public class GpsEntity {
 		this.station = station;
 	}
-	public boolean isAbnormal() {
-		return abnormal;
-	}
-
-	public void setAbnormal(boolean abnormal) {
-		this.abnormal = abnormal;
-	}
-
 	public String getSignalState() {
 		return signalState;
 	}
@@ -264,4 +256,28 @@ public class GpsEntity {
 	public void setInstation(int instation) {
 		this.instation = instation;
 	}
+
+	public String getAbnormalStatus() {
+		return abnormalStatus;
+	}
+
+	public void setAbnormalStatus(String abnormalStatus) {
+		this.abnormalStatus = abnormalStatus;
+	}
+
+	public boolean isIncomplete() {
+		return incomplete;
+	}
+
+	public void setIncomplete(boolean incomplete) {
+		this.incomplete = incomplete;
+	}
+
+	public double getOutOfBoundDistance() {
+		return outOfBoundDistance;
+	}
+
+	public void setOutOfBoundDistance(double outOfBoundDistance) {
+		this.outOfBoundDistance = outOfBoundDistance;
+	}
 }
@@ -66,22 +66,41 @@ public class GpsRealData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,5");
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
     }
     public void put(GpsEntity gps) {
         String device = gps.getDeviceId();
-        gpsMap.put(device, gps);
+        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);
+        }
-        if (StringUtils.isNotBlank(gps.getLineId())){
+        //刷新对照
+        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.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + gps.getStopNo());
+    public String getStationName(GpsEntity gps) {
+        return BasicData.getStationNameByCode(gps.getStopNo(), gps.getLineId() + "_" + gps.getUpDown() + "_");
     }
     /**
@@ -103,7 +122,7 @@ public class GpsRealData implements CommandLineRunner {
         for (String device : set) {
             gps = gpsMap.get(device);
             //过滤异常GPS数据
-            if (gps.isAbnormal())
+            if (gps == null || gps.isIncomplete())
                 continue;
             sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
@@ -201,13 +220,11 @@ public class GpsRealData implements CommandLineRunner {
                         nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
                         if (StringUtils.isBlank(nbbm))
-                            gps.setAbnormal(true);//标记为异常数据
+                            gps.setIncomplete(true);//标记为异常数据
                         else
                             gps.setNbbm(nbbm);
                         //有更新的点位
                         updateList.add(gps);
-                        //实时GPS数据集
-                        gpsRealData.put(gps);
                     }
                     //分析数据
                     gpsRealAnalyse.analyse(updateList);
@@ -45,6 +45,9 @@ public class GeoCacheData {
     //停车场
     public static Map<String, Polygon> tccMap;
+    //线路限速信息
+    private static Map<String, Double> speedLimitMap;
+
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -94,6 +97,14 @@ public class GeoCacheData {
         return null;
     }
+    public static Double speedLimit(String lineCode){
+        return speedLimitMap.get(lineCode);
+    }
+
+    public static List<LineString> getLineStringList(GpsEntity gps){
+        return sectionCacheMap.get(gps.getLineId() + "_" + gps.getUpDown());
+    }
+
     public static List<StationRoute> midwayStation(String lineCode, int directions, String sCode, String eCode) {
         List<StationRoute> list = getStationRoute(lineCode, directions), rs = new ArrayList<>();
@@ -113,8 +124,72 @@ public class GeoCacheData {
         return tccMap.get(code);
     }
+    GeometryFactory geometryFactory = new GeometryFactory();
     public void loadData() {
-        final GeometryFactory geometryFactory = new GeometryFactory();
+        loadStationRoutesData();
+        loadTccMapData();
+        loadSpeedLimit();
+
+        //加载路段信息
+        loadRoadsData();
+    }
+
+    private void loadRoadsData() {
+        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.destroy=0 and GSECTION_VECTOR is not null order by line_code,directions,sectionroute_code";
+        List<Map<String, Object>> secList = jdbcTemplate.queryForList(sql);
+
+        String polygonStr, key;
+        String[] coords;
+        int i, len;
+
+        ArrayListMultimap<String, LineString> sectionCacheTempMap = ArrayListMultimap.create();
+        Coordinate[] cds;
+        String[] temps1, temps2;
+        for (Map<String, Object> tMap : secList) {
+            polygonStr = tMap.get("GSECTION_VECTOR").toString();
+            key = tMap.get("LINE_CODE") + "_" + tMap.get("DIRECTIONS");
+
+            coords = polygonStr.substring(11, polygonStr.length() - 1).split(",");
+            len = coords.length - 1;
+            //每2个点连一条线
+            for(i = 0; i < len; i ++){
+                temps1 = coords[i].split(" ");
+                temps2 = coords[i + 1].split(" ");
+
+                cds = new Coordinate[2];
+                cds[0] = new Coordinate(Float.parseFloat(temps1[1]), Float.parseFloat(temps1[0]));
+                cds[1] = new Coordinate(Float.parseFloat(temps2[1]), Float.parseFloat(temps2[0]));
+
+                sectionCacheTempMap.put(key, geometryFactory.createLineString(cds));
+            }
+        }
+
+        if(sectionCacheTempMap.size() > 0)
+            sectionCacheMap = sectionCacheTempMap;
+    }
+
+    private void loadTccMapData(){
+        //加载停车场数据
+        String sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null";
+        List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
+        Map<String, Polygon> tccTempMap = new HashMap<>();
+
+        Polygon polygon;
+        for (Map<String, Object> tMap : tccList) {
+
+            try {
+                polygon = geometryFactory.createPolygon(parsePolygon(tMap.get("G_PARK_POINT").toString()));
+                tccTempMap.put(tMap.get("PARK_CODE").toString()
+                        , polygon);
+            } catch (Exception e) {
+                logger.error("停车场：" + tMap.get("PARK_CODE"), e);
+            }
+        }
+        if (tccTempMap.size() > 0)
+            tccMap = tccTempMap;
+    }
+
+    private void loadStationRoutesData(){
         //加载站点路由
         String sql = "select r.LINE_CODE,r.DIRECTIONS,r.STATION_CODE,r.STATION_MARK,s.SHAPES_TYPE,s.G_LONX,s.G_LATY,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID,s.RADIUS, r.STATION_ROUTE_CODE,s.STATION_NAME from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id where r.destroy=0 order by r.station_route_code";
         List<StationRoute> routeList = jdbcTemplate.query(sql, new RowMapper<StationRoute>() {
@@ -159,26 +234,17 @@ public class GeoCacheData {
             stationCacheMap = tempMap;
             routeCodeMap = codeMap;
         }
+    }
-        //加载停车场数据
-        sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null";
-        List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
-        Map<String, Polygon> tccTempMap = new HashMap<>();
-
-        Polygon polygon;
-        for (Map<String, Object> tMap : tccList) {
-
-            try {
-                polygon = geometryFactory.createPolygon(parsePolygon(tMap.get("G_PARK_POINT").toString()));
-                tccTempMap.put(tMap.get("PARK_CODE").toString()
-                        , polygon);
-            } catch (Exception e) {
-                logger.error("停车场：" + tMap.get("PARK_CODE"), e);
-            }
+    private void loadSpeedLimit(){
+        //加载线路限速信息
+        String sql = "select l.LINE_CODE,i.SPEED_LIMIT from bsth_c_line_information i left join bsth_c_line l on i.line=l.id where i.speed_limit is not null";
+        List<Map<String, Object>> speedMap = jdbcTemplate.queryForList(sql);
+        Map<String, Double> speedTempMap = new HashMap<>();
+        for (Map<String, Object> tMap : speedMap) {
+            speedTempMap.put(tMap.get("LINE_CODE").toString(), Double.parseDouble(tMap.get("SPEED_LIMIT").toString()));
         }
-
-        if (tccTempMap.size() > 0)
-            tccMap = tccTempMap;
+        speedLimitMap = speedTempMap;
     }
     private void connectStationRoute(List<StationRoute> list) {
@@ -209,6 +275,7 @@ public class GeoCacheData {
     /**
      * 是不是终点站
+     *
      * @param lineId
      * @param upDown
      * @param stationCode
 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;
@@ -32,6 +33,11 @@ public class GpsRealAnalyse {
     InOutStationSignalHandle inOutStationSignalHandle;
     @Autowired
     ReverseSignalHandle reverseSignalHandle;
+    @Autowired
+    AbnormalStateHandle abnormalStateHandle;
+
+    @Autowired
+    GpsRealData gpsRealData;
     //50个线程
     static ExecutorService threadPool = Executors.newFixedThreadPool(50);
@@ -45,6 +51,10 @@ public class GpsRealAnalyse {
         try {
             //等待子线程结束
             count.await();
+
+            //加入实时gps对照
+            for(GpsEntity gps: list)
+                gpsRealData.put(gps);
         } catch (InterruptedException e) {
             logger.error("", e);
         }
@@ -64,14 +74,21 @@ public class GpsRealAnalyse {
         public void run() {
             try {
+                //是否有任务
+                boolean task;
                 CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
                 //掉线处理
                 offlineSignalHandle.handle(gps, prevs);
                 //状态处理
-                if(!correctSignalHandle.handle(gps, prevs))
-                    return;
+                task = correctSignalHandle.handle(gps, prevs);
                 //场，站内外判断
                 stationInsideHandle.handle(gps, prevs);
+                //异常判定（越界/超速）
+                abnormalStateHandle.handle(gps, prevs);
+
+                if(!task)
+                    return; //无任务的，到这里就结束
+
                 //反向处理
                 reverseSignalHandle.handle(gps, prevs);
                 //进出站动作处理
@@ -37,8 +37,8 @@ public class SignalState {
      * @return
      */
     public static SignalState reverseSignalSTate(ScheduleRealInfo sch, RouteReverse reverse) {
-        if(reverse.isVague())
-            return null;
+        /*if(reverse.isVague())
+            return null;*/
         SignalState state = new SignalState();
         state.setSchId(sch.getId());
+package com.bsth.data.gpsdata.arrival.handlers;
+
+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.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Point;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * GPS异常状态判定 （越界/超速）
+ * Created by panzhao on 2017/1/10.
+ */
+@Component
+public class AbnormalStateHandle extends SignalHandle{
+
+    //默认限速
+    private static final double DEFAULT_SPEED_LIMIT = 60;
+    //越界阈值
+    private static final double OUT_BOUNDS_THRESHOLD = 100;
+
+    GeometryFactory geometryFactory = new GeometryFactory();
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+
+        if(overspeed(gps))
+            return true;
+
+        if(outOfBounds((gps)))
+            return true;
+
+        return false;
+    }
+
+    /**
+     * 是否超速
+     * @param gps
+     * @return
+     */
+    public boolean overspeed(GpsEntity gps){
+        double maxSpeed = DEFAULT_SPEED_LIMIT;
+        if(GeoCacheData.speedLimit(gps.getLineId()) != null)
+            maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
+
+        if(gps.getSpeed() > maxSpeed){
+            gps.setAbnormalStatus("overspeed");
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 是否越界
+     * @param gps
+     * @return
+     */
+    public boolean outOfBounds(GpsEntity gps){
+        //场内的车不处理
+        if(gps.getInstation() == 2){
+            return false;
+        }
+
+        List<LineString> list = GeoCacheData.getLineStringList(gps);
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        double min = -1, distance;
+
+        for(LineString lineString : list){
+            distance = GeoUtils.getDistanceFromLine(lineString, point);
+
+            if(min == -1 || min > distance)
+                min = distance;
+        }
+
+        gps.setOutOfBoundDistance(min);
+        if(min > OUT_BOUNDS_THRESHOLD){
+            gps.setAbnormalStatus("outBounds");
+            return true;
+        }
+        return false;
+    }
+}
@@ -154,6 +154,7 @@ public class InOutStationSignalHandle extends SignalHandle{
                 schPrev.setZdsjActualAll(sch.getFcsjActualTime());
                 sendUtils.refreshSch(schPrev);
+                dayOfSchedule.save(schPrev);
             }
         }
     }
@@ -168,6 +169,10 @@ public class InOutStationSignalHandle extends SignalHandle{
         if(gps.getStopNo().equals(sch.getZdzCode())){
+            //进场最多提前1.2小时
+            if(sch.getBcType().equals("in") && sch.getZdsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+                return;
+
             //实达时间不覆盖
             if(StringUtils.isNotEmpty(sch.getZdsjActual()))
                 return;
@@ -211,6 +216,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             next.setZdsjActualAll(sch.getZdsjActualTime());
             sendUtils.refreshSch(next);
+            dayOfSchedule.save(next);
         }
     }
@@ -246,4 +252,4 @@ public class InOutStationSignalHandle extends SignalHandle{
         }*/
         return false;
     }
-}
+}
 \ No newline at end of file
@@ -38,7 +38,7 @@ public class ReverseSignalHandle extends SignalHandle {
         if (isReverse(gps, prev)) {
             RouteReverse reverse = reverseSearch(prevs, gps);
-            if (reverse.getCount() >= 4
+            if (reverse.getCount() >= 3
                     && reverse.isClose()
                     && !GeoCacheData.isEndStation(gps.getLineId(), gps.getUpDown(), reverse.getTurned())) {
                 scheduleSignalState.reverseAnalyse(reverse);
@@ -3,10 +3,7 @@ package com.bsth.data.gpsdata.arrival.utils;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
+import com.vividsolutions.jts.geom.*;
 import java.util.List;
 import java.util.Map;
@@ -90,6 +87,36 @@ public class GeoUtils {
         return Math.PI * degree / 180;
     }
+    /**
+     * 计算点 到 线的距离
+     * @param line
+     * @param p
+     * @return
+     */
+    public static double getDistanceFromLine(LineString line, Point p){
+        Point s = line.getStartPoint();
+        Point e = line.getEndPoint();
+
+        double d1 = getDistance(s, p);
+        double d2 = getDistance(p, e);
+        double d3 = getDistance(s, e);
+        double distance = 0;
+
+        double alpha = Math.acos((d1*d1 + d3*d3 - d2*d2)/(2*d1*d3));
+        double beta = Math.acos((d2*d2 + d3*d3 - d1*d1)/(2*d2*d3));
+
+        if(alpha>Math.PI/2) {
+            distance = d1;
+        }
+        else if(beta > Math.PI/2) {
+            distance = d2;
+        }
+        else {
+            distance = Math.sin(alpha) * d1;
+        }
+        return distance;
+    }
+
     /**
      * gps 是否在某个停车场内
@@ -100,7 +100,8 @@ public class ScheduleSignalState {
             //记录信号状态
             SignalState signalState = SignalState.reverseSignalSTate(sch, reverse);
-            signalStateData.put(signalState);
+            if(signalState != null)
+                signalStateData.put(signalState);
         }
     }
@@ -248,4 +249,4 @@ public class ScheduleSignalState {
         SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
         signalStateData.put(signalState);
     }
-}
+}
 \ No newline at end of file
@@ -60,7 +60,7 @@ 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("YT-CD008"))
+            /*if(nbbm.equals("W9H-003"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
@@ -77,20 +77,14 @@ public class PilotReport {
 			ScheduleRealInfo outSch = dayOfSchedule.nextByBcType(nbbm, "out");
 			//如果有对应出场班次
 			if(outSch != null){
-				
 				//没有计划里程的出场班次，出场既是首发站，发送下一班次的营运指令
 				if(outSch.getJhlc() == null)
 					outSch = dayOfSchedule.next(outSch);
 				//下发调度指令
 				directiveService.send60Dispatch(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
-/*				d80.setRemarks("计划出场时间：" + outSch.getDfsj());
-				//当前GPS位置
-				GpsEntity gps = gpsRealData.get(d80.getDeviceId());
-				if(null != gps)
-					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));*/
-				
-				//sendUtils.refreshSch(outSch);
+				//下发线路切换指令
+				directiveService.lineChange(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
 			}else
 				d80.setRemarks("没有出场计划");
@@ -2,6 +2,8 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.bsth.Application;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.FirstScheduleCheckThread;
 import com.bsth.data.gpsdata.GpsRealData;
@@ -33,6 +35,7 @@ import org.springframework.stereotype.Component;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 /**
  * @author PanZhao
@@ -82,6 +85,9 @@ public class DayOfSchedule implements CommandLineRunner {
     @Autowired
     GpsRealData gpsRealData;
+    @Autowired
+    BasicData.BasicDataLoader basicDataLoader;
+
     /**
      * 线路当前使用的排班的日期
      */
@@ -122,11 +128,12 @@ public class DayOfSchedule implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
+        basicDataLoader.loadAllData();
         //从数据库恢复排班
         //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);
         //首班出场指令补发器
@@ -556,8 +563,12 @@ public class DayOfSchedule implements CommandLineRunner {
      */
     public boolean isFirstOut(ScheduleRealInfo sch){
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-        if(list.get(0).equals(sch) && sch.getBcType().equals("out"))
-            return true;
+        try {
+            if(list.get(0) == sch && sch.getBcType().equals("out"))
+                return true;
+        } catch (IndexOutOfBoundsException e) {
+            logger.error("小小的数组越界，无伤大雅！");
+        }
         return false;
     }
 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.realcontrol;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 主页SVG模拟图属性设置
+ * Created by panzhao on 2017/1/6.
+ */
+@Entity
+@Table(name = "bsth_c_svg_attr")
+public class SvgAttribute {
+
+    @Id
+    private String lineCode;
+
+    /**
+     * 要隐藏的站点编码  , 号分割多个
+     */
+    private String hideStations;
+
+    /**
+     * 站点别名 json对象字符串
+     */
+    private String nicknames;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getHideStations() {
+        return hideStations;
+    }
+
+    public void setHideStations(String hideStations) {
+        this.hideStations = hideStations;
+    }
+
+    public String getNicknames() {
+        return nicknames;
+    }
+
+    public void setNicknames(String nicknames) {
+        this.nicknames = nicknames;
+    }
+}
@@ -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.schedule.rule;
 import com.bsth.entity.Line;
+import com.bsth.entity.schedule.BEntity;
 import com.bsth.entity.schedule.CarConfigInfo;
-import com.bsth.entity.sys.SysUser;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
@@ -35,7 +35,7 @@ import java.util.Date;
         )
 })
-public class ScheduleRule1Flat {
+public class ScheduleRule1Flat extends BEntity {
     /** 主键Id */
     @Id
     @GeneratedValue
@@ -74,19 +74,6 @@ public class ScheduleRule1Flat {
     /** 翻班格式（TODO：这个用在车子上的，暂时不管）*/
     private String fbgs;
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public Long getId() {
         return id;
     }
@@ -175,35 +162,4 @@ public class ScheduleRule1Flat {
         this.fbgs = fbgs;
     }
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
+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
@@ -18,13 +18,16 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> findByLines(List<String> lines);
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and bc_type not in ('in','out') order by (lpName+1),clZbh,realExecDate,fcsj")
+	List<ScheduleRealInfo> scheduleDailyQp(String line,String date);
+	
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.id,s.jGh,s.clZbh,s.lpName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo(String line,String date);
 	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
-	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
+	@Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.clZbh ")
 	List<ScheduleRealInfo> queryUserInfo3(String line,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
@@ -71,7 +74,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') 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)
+	@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') "
@@ -79,13 +82,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " and clZbh like %?5% order by s.fcsj")
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
-	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') order by bcs")
-	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date);
+	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsjActual")
+	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
-	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and bcType='normal' order by bcs")
-	List<ScheduleRealInfo> queryListWaybill2(String jName,String clZbh,String lpName,String date);
+	@Query(value="select s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsjActual")
+	List<ScheduleRealInfo> queryListWaybill2(String clZbh,String date,String line);
-	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by bcs")
+	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsjActual")
 	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d')  order by bcs")
@@ -110,7 +113,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY realExecDate,fcsj,xlBm,clZbh")
 	List<Map<String,Object>> yesterdayDataList(String line,String date);
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
+package com.bsth.repository.realcontrol;
+
+import com.bsth.entity.realcontrol.SvgAttribute;
+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/8.
+ */
+@Repository
+public interface SvgAttributeRepository extends BaseRepository<SvgAttribute, String> {
+    @Query("select s from SvgAttribute s where s.lineCode in ?1")
+    List<SvgAttribute> findSvgAttr(List<String> lineCodes);
+}
@@ -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>{
-
-}
@@ -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;
@@ -11,6 +11,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -25,6 +26,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.BusIntervalService;
 import com.bsth.service.schedule.PeopleCarPlanService;
+import com.bsth.util.ReportUtils;
 @Service
@@ -324,13 +326,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String[] date1 = startDate.split("-");
 		String[] date2 = endDate.split("-");
-		startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
-		endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
+//		startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
+//		endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
 		String Date = "";
 		if(startDate.equals(endDate))
-			Date = startDate;
+			Date = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
 		else
-			Date = startDate + "--" + endDate;
+			Date = date1[0] + "年" + date1[1] + "月" + date1[2] + "日" + "--"
+					+ date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
 //		String[] split = times.split("-");
 //		int startTime = Integer.valueOf(split[0].split(":")[0])*60 + Integer.valueOf(split[0].split(":")[1]);
@@ -514,6 +517,24 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
 		}
+
+		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();
+			try {
+				listI.add(resList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould\\busInterval"+statu+".xls",
+						path+"export\\班次间隔统计表" + sdfSimple.format(sdfMonth.parse(startDate)) 
+						+ "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
 		return resList;
 	}
@@ -672,8 +693,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String[] date1 = startDate.split("-");
 		String[] date2 = endDate.split("-");
 		String date = "";
-		startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
-		endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
+//		startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
+//		endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
 		if(startDate.equals(endDate)){
 			date = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
 		} else {
@@ -1044,6 +1065,27 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			modelMap.put("dataList", dataList);
 		}
+		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<?>>();
+			ReportUtils ee = new ReportUtils();
+			if(statu.equals("0"))
+				modelMap.put("lpType", "路牌数量");
+			else if(statu.equals("1"))
+				modelMap.put("lpType", "路牌名");
+			try {
+				listI.add(((List<Map<String, Object>>)modelMap.get("dataList")).iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { modelMap }, path+"mould\\timeAndSpeed.xls",
+						path+"export\\行驶时间及车速统计表" + sdfSimple.format(sdfMonth.parse(startDate)) 
+						+ "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
 		return modelMap;
 	}
 package com.bsth.service.impl;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
@@ -30,7 +13,14 @@ import com.bsth.util.FTPClientUtils;
 import com.bsth.util.PackTarGZUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.*;
 /**
  * 
@@ -985,6 +975,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			List<String> idx = Splitter.on(',').splitToList(lineIds);
 			//路由
 			List<StationRoute> list = new ArrayList<>();
+
+
 			/**
 			 * in 查询符 无法和 @EntityGraph 同时配合使用，这可能是一个bug
 			 * 暂时只能循环单线路查询
@@ -993,9 +985,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			for(String id : idx){
 				list.addAll(repository.findByLineCode(id));
 			}
-			
+
+			for(StationRoute sr : list){
+				sr.setLine(null);
+			}
 			//过滤部分字段
-			String jsonStr = JSON.toJSONString(list, new PropertyFilter() {
+			/*String jsonStr = JSON.toJSONString(list, new PropertyFilter() {
 				@Override
 				public boolean apply(Object object, String name, Object value) {
@@ -1003,10 +998,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 						return false;
 					return true;
 				}
-			});
+			});*/
 			rs.put("status", ResponseCode.SUCCESS);
-			rs.put("list", jsonStr);
+			rs.put("list", list);
 		}catch(Exception e){
 			logger.error("", e);
 			rs.put("status", ResponseCode.ERROR);
@@ -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 {
@@ -391,36 +390,44 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			Map<String,Object> map = new HashMap<String,Object>();
 			for(Map<String,Object> schRealInfo:listGroup){
 				if(schRealInfo != null){
+					map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
+					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
+					/**
+					 * 如果car==null，则说明该车辆是从线调中换车功能中加进去的，
+					 * 在cars基础信息中查不到车辆的信息，所以忽略该车辆
+ 					 */
+					if(car == null){
+						continue;
+					}
 					//计算总公里和空驶公里，营运公里=总公里-空驶公里
 					double totalKilometers = 0,emptyKilometers =0;
 					sf.append("<LCYH>");
-					map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
-					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
-//					Cars car = carsRepository.findCarByClzbh(schRealInfo.getClZbh());
 					sf.append("<RQ>"+date+"</RQ>");
 					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
 					sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
-					for(ScheduleRealInfo scheduleRealInfo:list){
-						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("clZbh")+"")
-								.equals(scheduleRealInfo.getClZbh())){
-							Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-							//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
-							if(childTaskPlans.isEmpty()){
-								if(scheduleRealInfo.getStatus() == 2){
-									totalKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
-									if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-											|| scheduleRealInfo.getBcType().equals("venting")){
-										emptyKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
+					if(list != null && list.size() > 0){
+						for(ScheduleRealInfo scheduleRealInfo:list){
+							if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("clZbh")+"")
+									.equals(scheduleRealInfo.getClZbh())){
+								Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+								//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
+								if(childTaskPlans.isEmpty()){
+									if(scheduleRealInfo.getStatus() == 2){
+										totalKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
+										if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+												|| scheduleRealInfo.getBcType().equals("venting")){
+											emptyKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
+										}
 									}
-								}
-							}else{
-								Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-								while(it.hasNext()){
-									ChildTaskPlan childTaskPlan = it.next();
-									if(!childTaskPlan.isDestroy()){
-										totalKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();
-										if(childTaskPlan.getMileageType().equals("empty")){
-											emptyKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();;
+								}else{
+									Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+									while(it.hasNext()){
+										ChildTaskPlan childTaskPlan = it.next();
+										if(!childTaskPlan.isDestroy()){
+											totalKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();
+											if(childTaskPlan.getMileageType().equals("empty")){
+												emptyKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();;
+											}
 										}
 									}
 								}
@@ -605,8 +612,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getQdzName())).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
-						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzName())).append("</ZDXH>");
+						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
+								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzName())).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
 								.append("</JHDDSJ>");
 						sBuffer.append("</BC>");
@@ -132,7 +132,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 				t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 				t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
-				t.setRq(dBefore);
+				t.setRq(sdf.parse(rq));
 				repository.save(t);
 				result = "success";
 			} catch (Exception e) {
@@ -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);
 }
@@ -15,7 +15,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Collection<ScheduleRealInfo>> findByLines(String lines);
-	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj/*,String nbbm,String jsy,String spy*/);
+	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType);
 	Map<String, Object> destroy(String idsStr/*, int spaceAdjust*/, String  remarks, String reason/*, int spaceNum*/);
@@ -61,11 +61,13 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<ScheduleRealInfo> queryUserInfo(String line,String date,String state);
-	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date);
+	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date,String line);
+	
+	List<ScheduleRealInfo> exportWaybillQp(String clZbh,String date,String line);
 	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);
@@ -87,21 +89,25 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String,Object> findKMBC1(String jName,String clZbh, String date,String enddate);
-	Map<String,Object> findKMBC(String jName,String clZbh,String lpName,String date);
+	Map<String,Object> findKMBC(String jName,String clZbh,String lpName,String date,String line);
+	
+	Map<String,Object> findKMBCQp(String clZbh,String date,String line);
 	Map<String,Object> findKMBC2(String jName,String clZbh,String date);
 	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);
+	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
+	List<ScheduleRealInfo> queryListWaybillQp(String clZbh,String date,String line);
+	
 	Map<String, Object> removeChildTask(Long taskId);
-	List<Map<String,Object>> statisticsDaily(String line,String date,String xlName);
+	List<Map<String,Object>> statisticsDaily(String line, String date, String xlName, String type);
 	//List<Object> scheduleDaily(String line,String date);
@@ -128,4 +134,14 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     Map<String,Object> changeBcType(Long id, String bcType, String remarks);
     Map<String,Object> historySave(ScheduleRealInfo sch);
+  
+    Map<String, Object> MapById(Long id) ;
+		
+    Map<String,Object> svgAttr(String jsonStr);
+
+	Map<String,Object> findSvgAttr(String idx);
+
+    Map<String,Object> addRemarks(Long id, String remarks);
+
+	List<Map<String, Object>> scheduleDailyQp(String line ,String date);
 }
@@ -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 坐标数组转 百度
      *
 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;
@@ -16,6 +17,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.drools.compiler.lang.DRL5Expressions.type_return;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
@@ -463,7 +465,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 +939,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 +965,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;
@@ -1011,6 +1013,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String line = map.get("line").toString();
 		String date = map.get("date").toString();
 		String code = map.get("code").toString();
+		String type = map.get("type").toString();
 		if(date.length() == 0)
 			date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
@@ -1041,8 +1044,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			if(company.length() != 0){
 				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
 			}
-			sql += " order by fcsj";
-			
+			sql += " order by xl_name, fcsj";
+
 			list = jdbcTemplate.query(sql,
 					new RowMapper<Map<String, Object>>(){
 				@Override
@@ -1071,8 +1074,13 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			e.printStackTrace();
 		}
+		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+		List<String> keyList = new ArrayList<String>();
 		for(Map<String, Object> m : list){
 			String key = m.get("line") + "/" + m.get("clZbh") + "/" + m.get("jGh") + "/" + m.get("jName");
+			if(!keyList.contains(m.get("line").toString())){
+				keyList.add(m.get("line").toString());
+			}
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<Map<String, Object>>());
 			keyMap.get(key).add(m);
@@ -1119,7 +1127,58 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("sjf", sjf);
 			tempMap.put("wqr", wqr);
 			tempMap.put("workList", keyMap.get(key));
-			resList.add(tempMap);
+			tempList.add(tempMap);
+		}
+		
+		for(String key : keyList){
+			for(Map<String, Object> m : tempList){
+				if(key.equals(m.get("line").toString())){
+					resList.add(m);
+				}
+			}
+		}
+		
+		if(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();
+			try {
+				listI.add(resList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould\\commandState.xls",
+						path+"export\\指令状态分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
+		if(type.equals("export1")){
+			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();
+			String jsy = map.get("jsy").toString();
+			try {
+				for(Map<String, Object> map1 : resList){
+					if(jsy.equals(map1.get("jsy").toString())){
+						List<Map<String, Object>> temp = (List<Map<String, Object>>)map1.get("workList");
+						listI.add(temp.iterator());
+						m.put("detail", "日期：" + map1.get("date") + "  公司：" + map1.get("company")
+								+ "  分公司：" + map1.get("subCompany") + "  线路：" + map1.get("line")
+								+ "  车辆：" + map1.get("clZbh") + "  人员：" + map1.get("jsy"));
+					}
+				}
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould\\commandState1.xls",
+						path+"export\\指令状态明细" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
 		}
 		return resList;
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
-import com.bsth.service.BaseService;
 /**
  * Created by xu on 16/7/4.
  */
-public interface ScheduleRule1FlatService extends BaseService<ScheduleRule1Flat, Long> {
+public interface ScheduleRule1FlatService extends BService<ScheduleRule1Flat, Long> {
 }
-package com.bsth.service.schedule;
-
-import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
-import com.bsth.service.impl.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by xu on 16/7/4.
- */
-@Service
-public class ScheduleRule1FlatServiceImpl extends BaseServiceImpl<ScheduleRule1Flat, Long> implements ScheduleRule1FlatService {
-}
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.TTInfoDetail;
-import com.bsth.service.BaseService;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 /**
  * Created by xu on 16/7/2.
  */
-public interface TTInfoDetailService extends BaseService<TTInfoDetail, Long> {
-
-    void deleteByTtinfo(Long ttinfoid);
+public interface TTInfoDetailService extends BService<TTInfoDetail, Long> {
     /**
      * 发车信息内部类。
@@ -34,7 +30,12 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
         public FcInfo() {
         }
-        public FcInfo(String ttdid_str, String bc_type, String fcsj, String xldir, String isfb) {
+        public FcInfo(
+                String ttdid_str,
+                String bc_type,
+                String fcsj,
+                String xldir,
+                String isfb) {
             this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
             this.bc_type = bc_type;
             this.fcsj = fcsj;
@@ -98,6 +99,9 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
         /** 内容数据 */
         private List<List<FcInfo>> contents = new ArrayList<>();
+        /** 营运描述 */
+        private String yy_desc;
+
         public List<String> getHeader() {
             return header;
         }
@@ -113,6 +117,14 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
         public void setContents(List<List<FcInfo>> contents) {
             this.contents = contents;
         }
+
+        public String getYy_desc() {
+            return yy_desc;
+        }
+
+        public void setYy_desc(String yy_desc) {
+            this.yy_desc = yy_desc;
+        }
     }
     /**
@@ -121,22 +133,28 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
      * @param ttid 时刻表id
      * @return
      */
-    EditInfo getEditInfo(Integer xlid, Long ttid) throws Exception;
+    EditInfo getEditInfo(Integer xlid, Long ttid) throws ScheduleException;
+
+    /**
+     * 验证sheet（以后放到规则引擎里去做）。
+     * @param filename excel文件全路径名
+     * @param sheetname sheet名字
+     * @param lineid 线路id
+     */
+    void validateExcelSheet(
+            String filename,
+            String sheetname,
+            Integer lineid,
+            String linename) throws ScheduleException;
     /**
-     * 上传并导入数据，和DataImportExportService的同名方法有差别。
-     * @param datafile form上传文件
-     * @param xlmc 线路名称
-     * @param ttinfoname 时刻表名字
-     * @param tccname 停车场名字
-     * @throws Exception
+     * 验证关联的线路标准信息（以后放到规则引擎里去做）。
+     * @param lineinfoid 线路id
      */
-    void fileDataImport(MultipartFile datafile,
-                               String xlmc,
-                               String ttinfoname,
-                               String tccname) throws Exception;
+    void validateAssoLineInfo(Integer lineinfoid) throws ScheduleException;
-    void fileDataImport(File file, String sheetname, String xlmc, String ttinfoname, String tccname) throws Exception;
+    // TODO：这个方法可以用通用方法解决，以后改
+    List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId);
 }
-package com.bsth.service.schedule;
-
-import com.bsth.entity.schedule.TTInfoDetail;
-import com.bsth.repository.schedule.TTInfoDetailRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.service.schedule.utils.DataImportExportService;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import jxl.Sheet;
-import jxl.Workbook;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.pentaho.di.trans.Trans;
-import org.pentaho.di.trans.TransMeta;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by xu on 16/7/2.
- */
-@Service
-@EnableConfigurationProperties(DataToolsProperties.class)
-public class TTInfoDetailServiceImpl extends BaseServiceImpl<TTInfoDetail, Long> implements TTInfoDetailService {
-    @Autowired
-    private DataImportExportService dataImportExportService;
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-    @Autowired
-    private TTInfoDetailRepository ttInfoDetailRepository;
-
-    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
-    @Override
-    public void deleteByTtinfo(Long ttinfoid) {
-        ttInfoDetailRepository.deleteByTtinfo(ttinfoid);
-    }
-
-    /**
-     * 获取待编辑的数据。
-     * @param xlid 线路id
-     * @param ttid 时刻表id
-     * @return
-     */
-    @Override
-    public EditInfo getEditInfo(Integer xlid, Long ttid) throws Exception {
-        // 1、使用ktr转换获取输出文件
-        // 1.1、获取转换用ktr
-        File ktrFile = new File(this.getClass().getResource(
-                dataToolsProperties.getTtinfodetailForeditktr()).toURI());
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-//        trans.setLogLevel(LogLevel.DEBUG);
-        // 1.2、设定命名参数，TODO：之后还要添加其他命名参数
-        String outputFilePath = "ttinfodetail_" + new DateTime().toString("yyyy-MM-dd_HH-mm-ss");
-        trans.setParameterValue("tempfilepath", dataToolsProperties.getTransTempdir() + File.separator + outputFilePath); // 数据输出文件路径
-        trans.setParameterValue("xlid", String.valueOf(xlid));
-        trans.setParameterValue("ttid", String.valueOf(ttid));
-        // 1.3、执行转换
-        trans.execute(null);
-        // 1.4、等待转换结束
-        trans.waitUntilFinished();
-
-        // 1.5、判定ktr错误数，注意这种错误代表部分数据错误，不会终止转换执行，一般设计ktr的时候，会有错误输出文件，TODO：以后考虑使用日志实时输出
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-
-        // 1.6、获取最大的发车数，用于输出数据的数量
-        Long maxfcno = ttInfoDetailRepository.findMaxFcno(xlid, ttid);
-        if (maxfcno == null)
-            return new EditInfo();
-
-        // 2、读取ktr生成的excel数据，组织编辑用数据返回
-        // 2-1、读取Excel文件
-        Workbook book = Workbook.getWorkbook(new File(dataToolsProperties.getTransTempdir() +
-                File.separator + outputFilePath + ".xls"));
-        Sheet sheet = book.getSheet(0);
-        EditInfo editInfo = new EditInfo();
-        // 2-2、处理数据
-        String[] headarrays = new String[maxfcno.intValue() + 1];
-        headarrays[0] = "路牌";
-        for (int r = 1; r < sheet.getRows(); r++) {
-            List<FcInfo> fcInfos = new ArrayList<>();
-            // 每行第一列都是路牌
-            fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null)); // 用fcsj放置路牌显示
-            for (int c = 1; c <= maxfcno * 6; ) {
-                String ttdid_str = sheet.getCell(c, r).getContents(); // 时刻表明细id
-                String fcsj = sheet.getCell(c + 1, r).getContents(); // 发车时间
-                String fzdname = sheet.getCell(c + 2, r).getContents(); // 发车站点名称
-                String bctype = sheet.getCell(c + 3, r).getContents(); // 班次类型
-                String xldir = sheet.getCell(c + 4, r).getContents(); // 线路上下行
-                String isfb = sheet.getCell(c + 5, r).getContents(); // 是否分班
-
-                FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb);
-
-                if (StringUtils.isNotEmpty(fzdname))
-                    headarrays[(int)(c / 6) + 1] = fzdname;
-                fcInfos.add(fcInfo);
-
-                c += 6;
-            }
-            editInfo.getContents().add(fcInfos);
-        }
-        editInfo.getHeader().addAll(Arrays.asList(headarrays));
-
-        return editInfo;
-    }
-
-    @Override
-    /**
-     * 上传并导入数据，和DataImportExportService的同名方法有差别。
-     * @param datafile form上传文件
-     * @param xlmc 线路名称
-     * @param ttinfoname 时刻表名字
-     * @param tccname 停车场名字
-     * @throws Exception
-     */
-    public void fileDataImport(MultipartFile datafile,
-                               String xlmc,
-                               String ttinfoname,
-                               String tccname) throws Exception {
-        // 上传数据文件
-        File uploadFile = dataImportExportService.uploadFile(datafile);
-        fileDataImport(uploadFile, "工作表1", xlmc, ttinfoname, tccname);
-
-    }
-
-    @Override
-    public void fileDataImport(File uploadFile, String sheetname, String xlmc, String ttinfoname, String tccname) throws Exception {
-        // 1、上传数据文件
-        System.out.println("线路名称：" + xlmc);
-        System.out.println("时刻表名称：" + ttinfoname);
-        System.out.println("停车场名字：" + tccname);
-        System.out.println("时刻表明细上传文件：" + uploadFile);
-
-        // 2、jexcelapi读取excel文件
-        Workbook book = Workbook.getWorkbook(uploadFile);
-        Sheet sheet = book.getSheet(0);
-        List<String> columnames = new ArrayList<>();
-        for (int i = 0; i < sheet.getColumns(); i++) { // 获取第一行，数据，作为列名
-            columnames.add(sheet.getCell(i, 0).getContents());
-        }
-
-        System.out.println("表头1：" + StringUtils.join(columnames.toArray(), ","));
-
-        // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
-        // 2.1、初始化kettle（组件初始化已经做了）
-        // 2.2、创建转换元数据，转换
-        File ktrFile = new File(this.getClass().getResource(
-                dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI());
-        File ktrFile2 = new File(this.getClass().getResource(
-                dataToolsProperties.getTtinfodetailDatainputktr()).toURI());
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-        // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
-        trans.setParameterValue("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
-        trans.setParameterValue("filepath", uploadFile.getAbsolutePath()); // 指定导入数据文件的位置
-        trans.setParameterValue("sheetname", sheetname); // sheet工作区的名字
-        trans.setParameterValue("erroroutputdir", dataToolsProperties.getTransErrordir()); // ktr转换错误输出目录
-        trans.setParameterValue("xlname", xlmc); // 线路名称
-        trans.setParameterValue("ttinfoname", ttinfoname); // 时刻表名称
-        trans.setParameterValue("tccname", tccname); // 停车场名字
-        trans.setParameterValue("excelfieldnames", StringUtils.join(columnames.toArray(), ",")); // 时刻表excel输入字段名，以逗号连接
-        columnames.remove(0);
-        trans.setParameterValue("normalizefieldnames", StringUtils.join(columnames.toArray(), ",")); // 数据范式化字段名，以逗号连接
-
-        // TODO：可以考虑设定日志输出
-        // 2.4、执行转换
-        trans.execute(null);
-        // 2.5、等待转换结束
-        trans.waitUntilFinished();
-
-        // 3、判定ktr错误数，注意这种错误代表部分数据错误，不会终止转换执行，一般设计ktr的时候，会有错误输出文件，TODO：以后考虑使用日志实时输出
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-    }
-}
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.TTInfo;
+import com.bsth.service.schedule.exception.ScheduleException;
 /**
  * Created by xu on 16/5/12.
-package com.bsth.service.schedule;
+package com.bsth.service.schedule.exception;
 /**
  * Created by xu on 16/12/5.
@@ -3,16 +3,19 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.BaseRepository;
 import com.bsth.service.schedule.BService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import javax.persistence.EntityManager;
+import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -29,6 +32,10 @@ public class BServiceImpl&lt;T, ID extends Serializable&gt; implements BService&lt;T, ID&gt;
     @Value("${hibernate.jdbc.batch_size}")
     private int batchSize;
+    @Autowired
+    @Qualifier(value = "dataToolsServiceImpl")
+    private DataToolsService dataToolsService;
+
     /** 日志记录器 */
     protected Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -108,4 +115,19 @@ public class BServiceImpl&lt;T, ID extends Serializable&gt; implements BService&lt;T, ID&gt;
         baseRepository.delete(id);
     }
+
+    @Override
+    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+        return dataToolsService.uploadFile(filename, filedata);
+    }
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        dataToolsService.importData(file, params);
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        return dataToolsService.exportData(params);
+    }
 }
@@ -3,7 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.service.schedule.CarConfigInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.ScheduleRule1FlatService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -4,7 +4,7 @@ import com.bsth.entity.CarDevice;
 import com.bsth.entity.Cars;
 import com.bsth.service.CarsService;
 import com.bsth.service.schedule.CarDeviceService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -2,19 +2,91 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.Cars;
 import com.bsth.service.schedule.CarsService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 /**
  * Created by xu on 16/12/8.
  */
+@EnableConfigurationProperties(DataToolsProperties.class)
 @Service(value = "carsServiceImpl_sc")
 public class CarsServiceImpl extends BServiceImpl<Cars, Integer> implements CarsService {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(CarsServiceImpl.class);
+
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导入车辆基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getCarsDatainputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filepath", file.getAbsolutePath());
+            ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            super.importData(file, ktrParms);
+
+            LOGGER.info("//---------------- 导入车辆基础信息 success... ----------------//");
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导入车辆基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导出车辆基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getCarsDataoutputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", "车辆基础信息_download-");
+
+            File file = super.exportData(ktrParms);
+
+            LOGGER.info("//---------------- 导出车辆基础信息 success... ----------------//");
+
+            return file;
+
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导出车辆基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
     @Override
     @Transactional
@@ -3,7 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.ScheduleRule1FlatService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -2,19 +2,92 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.Personnel;
 import com.bsth.service.schedule.EmployeeService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 /**
  * Created by xu on 16/12/15.
  */
+@EnableConfigurationProperties(DataToolsProperties.class)
 @Service
 public class EmployeeServiceImpl extends BServiceImpl<Personnel, Integer> implements EmployeeService {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(EmployeeServiceImpl.class);
+
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导入人员基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getEmployeesDatainputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filepath", file.getAbsolutePath());
+            ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            super.importData(file, ktrParms);
+
+            LOGGER.info("//---------------- 导入人员基础信息 success... ----------------//");
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导入人员基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导出人员基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getEmployeesDataoutputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", "人员基础信息_download-");
+
+            File file = super.exportData(ktrParms);
+
+            LOGGER.info("//---------------- 导出人员基础信息 success... ----------------//");
+
+            return file;
+
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导出人员基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
     @Override
     @Transactional
     public void validate_gh(Personnel personnel) throws ScheduleException {
@@ -3,7 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.GuideboardInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.TTInfoDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -2,7 +2,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.rule.RerunRule;
 import com.bsth.service.schedule.RerunService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.service.schedule.ScheduleRule1FlatService;
+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 java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/7/4.
+ */
+@EnableConfigurationProperties(DataToolsProperties.class)
+@Service
+public class ScheduleRule1FlatServiceImpl extends BServiceImpl<ScheduleRule1Flat, Long> implements ScheduleRule1FlatService {
+    /** 日志记录器 */
+    private static Logger LOGGER = LoggerFactory.getLogger(ScheduleRule1FlatServiceImpl.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.getScheduleruleDatainputktr()).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.getScheduleruleOutput()).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());
+        }
+    }
+}
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.CarPark;
+import com.bsth.entity.LineInformation;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.repository.schedule.TTInfoDetailRepository;
+import com.bsth.service.CarParkService;
+import com.bsth.service.LineInformationService;
+import com.bsth.service.StationRouteService;
+import com.bsth.service.schedule.GuideboardInfoService;
+import com.bsth.service.schedule.TTInfoDetailService;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsProperties;
+import jxl.Cell;
+import jxl.Sheet;
+import jxl.Workbook;
+import jxl.write.Label;
+import jxl.write.WritableSheet;
+import jxl.write.WritableWorkbook;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by xu on 17/1/3.
+ */
+@Service
+@EnableConfigurationProperties(DataToolsProperties.class)
+public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> implements TTInfoDetailService {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(TTInfoDetailServiceImpl.class);
+
+    @Autowired
+    private GuideboardInfoService guideboardInfoService;
+    @Autowired
+    private StationRouteService stationRouteService;
+    @Autowired
+    private LineInformationService lineInformationService;
+    @Autowired
+    private CarParkService carParkService;
+    @Autowired
+    private TTInfoDetailRepository ttInfoDetailRepository;
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    @Override
+    public TTInfoDetail findById(Long aLong) {
+        return ttInfoDetailRepository.findOneExtend(aLong);
+    }
+
+    @Override
+    public void importData(
+            File file,
+            Map<String, Object> params) throws ScheduleException {
+
+        try {
+            LOGGER.info("//---------------- 导入时刻表明细 start... ----------------//");
+
+            String filename = file.getAbsolutePath(); // xls文件名
+            String sheetname = String.valueOf(params.get("sheetname")); // sheet名字
+            Long ttid = Long.valueOf(String.valueOf(params.get("ttid"))); // 时刻表id
+            Long xlid = Long.valueOf(String.valueOf(params.get("xlid"))); // 线路id
+            Integer lineid = Integer.valueOf(String.valueOf(params.get("lineinfo"))); // 线路标准id
+            String xlname = String.valueOf(params.get("xlname")); // 线路名字
+            String ttname = String.valueOf(params.get("ttname")); // 时刻表名字
+
+            LOGGER.info("参数1, xls文件名={},sheet名字={}", filename, sheetname);
+            LOGGER.info("参数2, 线路id={},线路名字={}", xlid, xlname);
+            LOGGER.info("参数3, 时刻表id={},时刻表名字={}", ttid, ttname);
+
+            LOGGER.info("转换xls文件格式成文本格式...");
+            // 1、修改已经上传的excel文件，在每个起点站后标示数字，表示第几个班次
+            // 2、由于格式问题，需要把内容都转换成字符串
+            List<String> colList = new ArrayList<>();
+            Workbook workbook = Workbook.getWorkbook(new File(filename));
+            Sheet sheet = workbook.getSheet(sheetname);
+            Cell[] cells = sheet.getRow(0);
+            for (int i = 0; i < cells.length; i++) {
+                if (i == 0) {
+                    colList.add(cells[i].getContents().trim());
+                } else {
+                    colList.add(cells[i].getContents() + i);
+                }
+            }
+
+            File fileCal = new File(filename + "_stringType.xls");
+            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal, workbook);
+            WritableSheet sheet1 = writableWorkbook.getSheet(sheetname);
+            for (int i = 0; i < sheet1.getColumns(); i++) { // 第一行数据
+                sheet1.addCell(new Label(i, 0, colList.get(i)));
+            }
+            for (int i = 1; i < sheet1.getRows(); i++) { // 第二行开始
+                Cell[] cells1 = sheet.getRow(i);
+                for (int j = 0; j < cells1.length; j++) {
+                    sheet1.addCell(new Label(j, i, cells1[j].getContents()));
+                }
+            }
+            writableWorkbook.write();
+            writableWorkbook.close();
+
+            // 2、删除原有数据
+            // 操作在ktr内部执行
+
+            // 3、导入时刻表
+            // 获取停车场名字
+            LOGGER.info("获取停车场名字...");
+            LineInformation lineInformation = lineInformationService.findById(lineid);
+            Map<String, Object> p1 = new HashMap<>();
+            p1.put("parkCode_eq", lineInformation.getCarPark());
+            List<CarPark> carParkList = (List<CarPark>) carParkService.list(p1);
+            String tccname = carParkList.get(0).getParkName();
+            LOGGER.info("停车场名字={}", tccname);
+
+
+            // 计算表头参数
+            Workbook book = Workbook.getWorkbook(fileCal);
+            Sheet sheet_exp = book.getSheet(sheetname);
+            List<String> columnames = new ArrayList<>();
+            for (int i = 0; i < sheet_exp.getColumns(); i++) { // 获取第一行，数据，作为列名
+                columnames.add(sheet_exp.getCell(i, 0).getContents());
+            }
+            LOGGER.info("表头={}", StringUtils.join(columnames.toArray(), ","));
+
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI());
+            File ktrFile2 = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailDatainputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filepath", fileCal.getAbsolutePath());
+            ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            // 附加参数
+            ktrParms.put("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
+            ktrParms.put("sheetname", sheetname); // sheet工作区的名字
+            ktrParms.put("xlname", xlname); // 线路名称
+            ktrParms.put("ttinfoname", ttname); // 时刻表名称
+            ktrParms.put("ttid", ttid.intValue()); // 时刻表id
+            ktrParms.put("tccname", tccname); // 停车场名字
+            ktrParms.put("excelfieldnames", StringUtils.join(columnames.toArray(), ",")); // 时刻表excel输入字段名，以逗号连接
+            columnames.remove(0);
+            ktrParms.put("normalizefieldnames", StringUtils.join(columnames.toArray(), ",")); // 数据范式化字段名，以逗号连接
+
+            super.importData(fileCal, ktrParms);
+
+            LOGGER.info("//---------------- 导入时刻表明细 success... ----------------//");
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导入时刻表明细 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导出时刻表明细 start... ----------------//");
+
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailMetaoutput()).toURI());
+            File ktrFile2 = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailOutput()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", String.format("时刻表_(id=%s)_download-", String.valueOf(params.get("ttinfoid"))));
+
+            // 附加参数
+            ktrParms.put("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
+            ktrParms.put("ttinfoid", String.valueOf(params.get("ttinfoid")));
+
+            File file = super.exportData(ktrParms);
+
+            LOGGER.info("//---------------- 导出时刻表明细 success... ----------------//");
+
+            return file;
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导出时刻表明细 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public EditInfo getEditInfo(Integer xlid, Long ttid) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 start... ----------------//");
+
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailForeditktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", "todo");
+
+            // 附加参数
+            String outputFilePath = String.format("ttinfodetail_(id=%s)_foredit-%s",
+                    String.valueOf(ttid), new DateTime().toString("yyyyMMddHHmmss"));
+
+            ktrParms.put("tempfilepath", dataToolsProperties.getTransTempdir() + File.separator + outputFilePath); // 数据输出文件路径
+            ktrParms.put("xlid", String.valueOf(xlid));
+            ktrParms.put("ttid", String.valueOf(ttid));
+
+            super.exportData(ktrParms);
+
+            // 1.6、获取最大的发车数，用于输出数据的数量
+            Long maxfcno = ttInfoDetailRepository.findMaxFcno(xlid, ttid);
+            if (maxfcno == null)
+                return new EditInfo();
+
+            // 2、读取ktr生成的excel数据，组织编辑用数据返回
+            // 2-1、读取Excel文件
+            Workbook book = Workbook.getWorkbook(new File(dataToolsProperties.getTransTempdir() +
+                    File.separator + outputFilePath + ".xls"));
+            Sheet sheet = book.getSheet(0);
+            EditInfo editInfo = new EditInfo();
+            // 2-2、处理数据
+            int all_bc = 0; // 总班次
+            double all_lc_ks = 0; // 总空驶里程
+            double all_lc_yy = 0; // 总营运里程
+
+            String[] headarrays = new String[maxfcno.intValue() + 3];
+            headarrays[0] = "路牌";
+            headarrays[maxfcno.intValue() + 1] = "空驶班次/空驶里程";
+            headarrays[maxfcno.intValue() + 2] = "运营班次/运营里程";
+
+            for (int r = 1; r < sheet.getRows(); r++) {
+                List<FcInfo> fcInfos = new ArrayList<>();
+                // 每行第一列都是路牌
+                fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null)); // 用fcsj放置路牌显示
+
+                int bc_ks = 0; // 空驶班次
+                int bc_yy = 0; // 营运班次
+                double lc_ks = 0; // 空驶里程
+                double lc_yy = 0; // 营运里程
+
+                for (int c = 1; c <= maxfcno * 7; ) {
+                    String ttdid_str = sheet.getCell(c, r).getContents(); // 时刻表明细id
+                    String fcsj = sheet.getCell(c + 1, r).getContents(); // 发车时间
+                    String jhlc = sheet.getCell(c + 2, r).getContents(); // 计划里程
+                    String fzdname = sheet.getCell(c + 3, r).getContents(); // 发车站点名称
+                    String bctype = sheet.getCell(c + 4, r).getContents(); // 班次类型
+                    String xldir = sheet.getCell(c + 5, r).getContents(); // 线路上下行
+                    String isfb = sheet.getCell(c + 6, r).getContents(); // 是否分班
+
+                    FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb);
+
+                    if (StringUtils.isNotEmpty(fzdname))
+                        headarrays[(int)(c / 7) + 1] = fzdname;
+                    fcInfos.add(fcInfo);
+
+                    c += 7;
+
+                    // 计算班次里程
+                    if (StringUtils.isNotEmpty(jhlc)) {
+                        if ("in".equals(bctype) || "out".equals(bctype)) {
+                            bc_ks += 1;
+                            lc_ks += Double.valueOf(jhlc);
+
+                            all_bc += 1;
+                            all_lc_ks += Double.valueOf(jhlc);
+
+                        } else {
+                            bc_yy += 1;
+                            lc_yy += Double.valueOf(jhlc);
+
+                            all_bc += 1;
+                            all_lc_yy += Double.valueOf(jhlc);
+                        }
+                    }
+
+                }
+
+                // 添加一列 空驶班次/空驶里程，fcsj放置数据
+                fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_ks, lc_ks), null, null));
+
+                // 添加一列 营运班次/营运里程，fcsj放置数据
+                fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_yy, lc_yy), null, null));
+
+                editInfo.getContents().add(fcInfos);
+            }
+            editInfo.getHeader().addAll(Arrays.asList(headarrays));
+
+            editInfo.setYy_desc(String.format("班次=%d,空驶里程=%.2f,营运里程=%.2f", all_bc, all_lc_ks, all_lc_yy));
+
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 success... ----------------//");
+
+            return editInfo;
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+
+
+    @Override
+    public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename) throws ScheduleException {
+        try {
+            Workbook book = Workbook.getWorkbook(new File(filename));
+            Sheet sheet = book.getSheet(sheetname);
+            if (sheet.getRows() == 0 || sheet.getColumns() == 0) { // 工作区是否为空
+                throw new Exception(String.format("%s 工作区没有数据！", sheetname));
+            } else {
+                if (sheet.getRows() <= 1 || sheet.getColumns() <= 1) {
+                    throw new Exception(String.format("工作区至少包含2行2列的数据"));
+                } else {
+                    Cell[] cells = sheet.getRow(0); // 获取第一行数据列
+                    for (int i = 0; i < cells.length; i++) {
+                        String cell_con = cells[i].getContents();
+
+                        if (StringUtils.isEmpty(cell_con)) {
+                            throw new Exception(String.format("第1行，第%d列数据不能为空", i + 1));
+                        } else {
+                            // 正则表达式去除数字
+                            cell_con = cell_con.replaceAll("[\\d+]", "");
+
+                            if (i == 0) { // 第一列必须是路牌2个字
+                                if (!"路牌".equals(cell_con.trim())) {
+                                    throw new Exception("第1行，第1列数据必须是路牌2个字");
+                                }
+                            } else { // 排除出场，进场，其余内容到站点路由里查询，以各个方向的起点站为查询依据
+                                if ((!"出场".equals(cell_con.trim())) &&
+                                        (!"进场".equals(cell_con.trim()))) {
+                                    Map<String, Object> p1 = new HashMap<>();
+                                    p1.put("line.id_eq", lineid);
+                                    p1.put("stationName_eq", cell_con.trim());
+                                    p1.put("stationMark_eq", "B");
+
+
+                                    // TODO：这里要修改（起点站有启用撤销的标志的）
+
+                                    List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
+                                    if (CollectionUtils.isEmpty(stationRouteList)) {
+                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename));
+                                    } else if (stationRouteList.size() > 1) {
+                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename));
+                                    }
+                                }
+
+                            }
+                        }
+                    }
+
+                    // 验证路牌内容
+                    Map<String, Integer> gbindexmap = new HashMap<>(); // 记录每个路牌在第几行
+                    for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
+                        Cell bcell = sheet.getRow(i)[0]; // 获取第1列
+                        String bcell_con = bcell.getContents();
+                        if (StringUtils.isEmpty(bcell_con)) {
+                            throw new Exception(String.format("第%d行，第1列路牌无数据", i + 1));
+                        } else if (gbindexmap.get(bcell_con.trim()) != null) {
+                            throw new Exception(String.format("第%d行，第1列的路牌数据与第%d行，第1列数据重复",
+                                    i + 1,
+                                    gbindexmap.get(bcell_con.trim())));
+                        } else {
+                            Map<String, Object> p2 = new HashMap<>();
+                            p2.put("xl.id_eq", lineid);
+                            p2.put("lpName_eq", bcell_con.trim());
+                            List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2);
+                            if (CollectionUtils.isEmpty(guideboardInfoList)) {
+                                throw new Exception(String.format("第%d行，第1列的路牌在%s中不存在", i + 1, linename));
+                            } else if (guideboardInfoList.size() > 1) {
+                                throw new Exception(String.format("第%d行，第1列的路牌在%s中重复", i + 1, linename));
+                            } else {
+                                gbindexmap.put(bcell_con.trim(), i + 1);
+                            }
+                        }
+                    }
+
+                    // 班次时间验证，正则表达式，格式hh:mm或者hhmm
+                    String el = "^(([0-1]\\d)|(2[0-4])):[0-5]\\d$"; // hh:mm格式
+                    String el2 = "^(([0-1]\\d)|(2[0-4]))[0-5]\\d$"; // hhmm格式
+                    Pattern p = Pattern.compile(el);
+                    Pattern p2 = Pattern.compile(el2);
+
+                    for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
+                        Cell[] bcells = sheet.getRow(i);
+                        for (int j = 1; j < bcells.length; j++) { // 从第2列开始
+                            String bcell_con = bcells[j].getContents();
+                            if (StringUtils.isNotEmpty(bcell_con)) {
+                                Matcher m = p.matcher(bcell_con.trim());
+                                Matcher m2 = p2.matcher(bcell_con.trim());
+                                if ((!m.matches()) && (!m2.matches())) {
+                                    throw new Exception(String.format("第%d行，第%d列的发车时间格式不正确，格式应为hh:mm或hhmm", i + 1, j + 1));
+                                }
+                            }
+                        }
+                    }
+                }
+
+            }
+        } catch (Exception exp) {
+            throw new ScheduleException(exp.getMessage());
+        }
+
+    }
+
+    @Override
+    public void validateAssoLineInfo(Integer lineinfoid) throws ScheduleException {
+        LineInformation lineInformation = lineInformationService.findById(lineinfoid);
+        if (lineInformation.getUpInMileage() == null) {
+            throw new ScheduleException("上行进场里程为空");
+        } else if (lineInformation.getUpInTimer() == null) {
+            throw new ScheduleException("上行进场时间为空");
+        } else if (lineInformation.getUpOutMileage() == null) {
+            throw new ScheduleException("上行出场里程为空");
+        } else if (lineInformation.getUpOutTimer() == null) {
+            throw new ScheduleException("上行出场时间为空");
+        } else if (lineInformation.getUpMileage() == null) {
+            throw new ScheduleException("上行班次里程为空");
+        } else if (lineInformation.getUpTravelTime() == null) {
+            throw new ScheduleException("上行班次时间为空");
+        } else if (lineInformation.getDownInMileage() == null) {
+            throw new ScheduleException("下行进场里程为空");
+        } else if (lineInformation.getDownInTimer() == null) {
+            throw new ScheduleException("下行进场时间为空");
+        } else if (lineInformation.getDownOutMileage() == null) {
+            throw new ScheduleException("下行出场里程为空");
+        } else if (lineInformation.getDownOutTimer() == null) {
+            throw new ScheduleException("下行出场时间为空");
+        } else if (lineInformation.getDownMileage() == null) {
+            throw new ScheduleException("下行班次里程为空");
+        } else if (lineInformation.getDownTravelTime() == null) {
+            throw new ScheduleException("下行班次时间为空");
+        } else if (StringUtils.isEmpty(lineInformation.getCarPark())) {
+            throw new ScheduleException("停车场必须选择");
+        }
+
+        // 单独验证停车场信息
+        String tcccode = lineInformation.getCarPark();
+        Map<String, Object> p1 = new HashMap<>();
+        p1.put("parkCode_eq", tcccode);
+        List<CarPark> carParkList = (List<CarPark>) carParkService.list(p1);
+        if (CollectionUtils.isEmpty(carParkList)) {
+            throw new ScheduleException(String.format("线路标准里的停车场code=%s，在停车场信息中未找到", tcccode));
+        } else if (carParkList.size() > 1) {
+            throw new ScheduleException(String.format("线路标准里的停车场code=%s，在停车场信息中有重复数据", tcccode));
+        } else {
+            CarPark carPark = carParkList.get(0);
+            if (StringUtils.isEmpty(carPark.getParkName())) {
+                throw new ScheduleException(String.format("线路标准里的停车场code=%s，在停车场信息中没有停车场名字", tcccode));
+            }
+        }
+
+    }
+
+    @Override
+    public List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId) {
+        return ttInfoDetailRepository.findBcdetails(xlId, ttinfoId, lpId);
+    }
+}
 package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.TTInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -45,9 +45,6 @@ public class DataToolsProperties {
     private String kvarsDbdname;
     /**------------------------- 导入数据ktr --------------------------*/
-    /** 测试temp的ktr转换文件 */
-    @NotNull
-    private String tempDatainputktr;
     /** 车辆信息导入ktr转换 */
     @NotNull
     private String carsDatainputktr;
@@ -69,12 +66,16 @@ public class DataToolsProperties {
     /** 时刻表明细信息导入（元数据） */
     @NotNull
     private String ttinfodetailMetadatainputktr;
-    /** 时刻表明细编辑用数据（TODO：之后要换成元数据形式输入） */
+    /** 时刻表明细编辑用数据 */
     @NotNull
     private String ttinfodetailForeditktr;
     /** 时刻表明细信息导入 */
     @NotNull
     private String ttinfodetailDatainputktr;
+    /** 排班规则信息导入 */
+    @NotNull
+    private String scheduleruleDatainputktr;
+
     /**------------------------- 导出数据ktr --------------------------*/
     /** 车辆信息导出ktr转换 */
@@ -84,9 +85,14 @@ public class DataToolsProperties {
     @NotNull
     private String employeesDataoutputktr;
     /** 时刻表导出元数据ktr转换 */
+    @NotNull
     private String ttinfodetailMetaoutput;
     /** 时刻表导出数据ktr转换 */
+    @NotNull
     private String ttinfodetailOutput;
+    @NotNull
+    /** 排版规则导出数据ktr转换 */
+    private String scheduleruleOutput;
     // TODO：
@@ -106,14 +112,6 @@ public class DataToolsProperties {
         this.transErrordir = transErrordir;
     }
-    public String getTempDatainputktr() {
-        return tempDatainputktr;
-    }
-
-    public void setTempDatainputktr(String tempDatainputktr) {
-        this.tempDatainputktr = tempDatainputktr;
-    }
-
     public String getCarsDatainputktr() {
         return carsDatainputktr;
     }
@@ -202,6 +200,14 @@ public class DataToolsProperties {
         this.ttinfodetailDatainputktr = ttinfodetailDatainputktr;
     }
+    public String getScheduleruleDatainputktr() {
+        return scheduleruleDatainputktr;
+    }
+
+    public void setScheduleruleDatainputktr(String scheduleruleDatainputktr) {
+        this.scheduleruleDatainputktr = scheduleruleDatainputktr;
+    }
+
     public String getKettleProperties() {
         return kettleProperties;
     }
@@ -273,4 +279,12 @@ public class DataToolsProperties {
     public void setTtinfodetailOutput(String ttinfodetailOutput) {
         this.ttinfodetailOutput = ttinfodetailOutput;
     }
+
+    public String getScheduleruleOutput() {
+        return scheduleruleOutput;
+    }
+
+    public void setScheduleruleOutput(String scheduleruleOutput) {
+        this.scheduleruleOutput = scheduleruleOutput;
+    }
 }
+package com.bsth.service.schedule.utils;
+
+import com.bsth.service.schedule.exception.ScheduleException;
+
+import java.io.File;
+import java.util.Map;
+
+/**
+ * 数据服务接口。
+ */
+public interface DataToolsService {
+    //----------------- 数据服务操作 --------------//
+    // 上传文件
+    File uploadFile(String filename, byte[] filedata) throws ScheduleException;
+    // 导入数据
+    void importData(File file, Map<String, Object> params) throws ScheduleException;
+    // 导出数据
+    File exportData(Map<String, Object> params) throws ScheduleException;
+}