Merge branch 'minhang' into qingpu

潘钊
2 parents 16a4e396 93e75d0d
Showing 64 changed files with 1483 additions and 894 deletions
pom.xml
src/main/java/com/bsth/controller/DownloadController.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/TTInfoDetailController.java
src/main/java/com/bsth/controller/schedule/basicinfo/CarDeviceController.java
src/main/java/com/bsth/controller/schedule/basicinfo/CarsController.java
src/main/java/com/bsth/controller/schedule/basicinfo/EmployeeController.java
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/EmployeeConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
src/main/java/com/bsth/controller/sys/DutyEmployeeController.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/entity/CarPark.java
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/Line.java
@@ -155,6 +155,12 @@
 			<version>2.1.8</version>
 		</dependency>
  
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>1.7</version>
+        </dependency>
+
         <!-- pentaho kettle 依赖 -->
         <dependency>
             <groupId>com.pentaho.kettle</groupId>
@@ -2,6 +2,7 @@ package com.bsth.controller;
  
 import java.io.File;  
 import java.io.IOException;  
+import java.net.URLDecoder;
  
 import org.apache.commons.io.FileUtils;
 import org.springframework.context.annotation.Scope;  
@@ -35,7 +36,7 @@ public class DownloadController
         File file=new File(moudelPath);  
         HttpHeaders headers = new HttpHeaders();    
         String realFileName=new String(fileName.getBytes("UTF-8"),"iso-8859-1");//为了解决中文名称乱码问题  
-        headers.setContentDispositionFormData("attachment", realFileName);   
+        headers.setContentDispositionFormData("attachment", URLDecoder.decode(realFileName,"utf-8"));   
         headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);   
         return new ResponseEntity<byte[]>(FileUtils.readFileToByteArray(file),    
                                           headers, HttpStatus.CREATED);    
@@ -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);
+    }
 }
@@ -338,8 +338,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
  
 	@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
@@ -5,16 +5,21 @@ import com.bsth.common.ResponseCode;
 import com.bsth.entity.schedule.BEntity;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.BService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.sys.SysUserService;
 import com.google.common.base.Splitter;
+import jxl.Sheet;
+import jxl.Workbook;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
  
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import java.io.Serializable;
+import java.io.*;
 import java.util.*;
  
 /**
@@ -26,7 +31,7 @@ public class BController&lt;T, ID extends Serializable&gt; {
     @Autowired
     private SysUserService sysUserService;
  
-    // CRUD 操作
+    //---------------- CRUD 操作 ----------------//
     // Create操作
     @RequestMapping(method = RequestMethod.POST)
     public Map<String, Object> save(@RequestBody T t, HttpSession httpSession) {
@@ -73,6 +78,7 @@ public class BController&lt;T, ID extends Serializable&gt; {
         rtn.put("data", t);
         return rtn;
     }
+    // 查询所有操作
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     public Map<String, Object> list(@RequestParam Map<String, Object> param) {
         List<T> tList = bService.list(param);
@@ -81,6 +87,7 @@ public class BController&lt;T, ID extends Serializable&gt; {
         rtn.put("data", tList);
         return rtn;
     }
+    // 分页查询操作
     @RequestMapping(method = RequestMethod.GET)
     public Map<String, Object> list(
             @RequestParam Map<String, Object> map,
@@ -138,4 +145,99 @@ public class BController&lt;T, ID extends Serializable&gt; {
         return rtn;
     }
  
+    //---------------- 数据服务操作 ----------------//
+    // 上传excel文件
+    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+    public Map<String, Object> uploadFile(MultipartFile file) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            File file1 = bService.uploadFile(file.getOriginalFilename(), file.getBytes());
+            // excel文件名
+            String fileName = file1.getAbsolutePath();
+            // excel文件sheet
+            List<String> sheetnames = new ArrayList<>();
+            Workbook book = Workbook.getWorkbook(file1);
+            for (Sheet sheet : book.getSheets()) {
+                sheetnames.add(sheet.getName());
+            }
+
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("filename", fileName);
+            rtn.put("sheetnames", StringUtils.join(sheetnames, ","));
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    // 导入excel文件
+    @RequestMapping(value = "/importFile", method = RequestMethod.POST)
+    public Map<String, Object> importFile(@RequestParam Map<String, Object> params) {
+        Map<String, Object> rtn = new HashMap<>();
+
+        try {
+            File file = new File(String.valueOf(params.get("filename")));
+            if (!file.exists()) {
+                throw new Exception("导入文件不存在！");
+            }
+            bService.importData(file, params);
+
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("msg", "导入文件成功");
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    // 上传并导入excel文件
+    @RequestMapping(value = "/uploadAndImportFile", method = RequestMethod.POST)
+    public Map<String, Object> uploadAndImportFile(MultipartFile file) {
+        Map<String, Object> rtn = new HashMap<>();
+
+        try {
+            File file1 = bService.uploadFile(file.getOriginalFilename(), file.getBytes());
+            Map<String, Object> params = new HashMap<>();
+            bService.importData(file1, params);
+
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("msg", "上传&导入文件成功");
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    // 导出数据到xls文件
+    @RequestMapping(value = "/exportFile", method = RequestMethod.GET)
+    public void exportFile(HttpServletResponse response,
+                           @RequestParam Map<String, Object> params) throws Exception {
+        File file = bService.exportData(params);
+        // 流输出导出文件
+        response.setHeader("content-type", "application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment; filename=" + file.getName());
+        response.setContentType("application/octet-stream");
+
+        OutputStream os = response.getOutputStream();
+        BufferedOutputStream bos = new BufferedOutputStream(os);
+
+        InputStream is = new FileInputStream(file);
+        BufferedInputStream bis = new BufferedInputStream(is);
+
+        int length = 0;
+        byte[] temp = new byte[1 * 1024 * 10];
+        while ((length = bis.read(temp)) != -1) {
+            bos.write(temp, 0, length);
+        }
+        bos.flush();
+        bis.close();
+        bos.close();
+        is.close();
+    }
+
 }
-package com.bsth.controller.schedule;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.BaseController2;
-import com.bsth.entity.CarPark;
-import com.bsth.entity.LineInformation;
-import com.bsth.entity.StationRoute;
-import com.bsth.entity.schedule.GuideboardInfo;
-import com.bsth.entity.schedule.TTInfoDetail;
-import com.bsth.repository.schedule.TTInfoDetailRepository;
-import com.bsth.service.CarParkService;
-import com.bsth.service.LineInformationService;
-import com.bsth.service.StationRouteService;
-import com.bsth.service.schedule.GuideboardInfoService;
-import com.bsth.service.schedule.TTInfoDetailService;
-import com.bsth.service.schedule.utils.DataImportExportService;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import jxl.Cell;
-import jxl.Sheet;
-import jxl.Workbook;
-import jxl.write.Label;
-import jxl.write.WritableSheet;
-import jxl.write.WritableWorkbook;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by xu on 16/7/2.
- */
-@RestController
-@RequestMapping("tidc")
-public class TTInfoDetailController extends BaseController2<TTInfoDetail, Long> {
-    @Autowired
-    private TTInfoDetailService ttInfoDetailService;
-    @Autowired
-    private CarParkService carParkService;
-    @Autowired
-    private LineInformationService lineInformationService;
-    @Autowired
-    private TTInfoDetailRepository ttInfoDetailRepository;
-    @Autowired
-    private DataImportExportService dataImportExportService;
-    @Autowired
-    private StationRouteService stationRouteService;
-    @Autowired
-    private GuideboardInfoService guideboardInfoService;
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-
-    /**
-     * 1、上传Excel文件，返回文件全路径名，工作区名称列表。
-     * @param file
-     * @return
-     * @throws Exception
-     */
-
-
-    /**
-     * 2、验证sheet（以后放到规则引擎里去做）。
-     * @param filename excel文件全路径名
-     * @param sheetname sheet名字
-     * @param lineid 线路id
-     * @param linename 线路名称
-     * @return
-     */
-    @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST)
-    public Map<String, Object> validateSheet(String filename, String sheetname, Integer lineid, String linename) throws Exception {
-        Map<String, Object> rtn = new HashMap<>();
-        Workbook book = Workbook.getWorkbook(new File(filename));
-        Sheet sheet = book.getSheet(sheetname);
-        if (sheet.getRows() == 0 || sheet.getColumns() == 0) { // 工作区是否为空
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", String.format("%s 工作区没有数据！", sheetname));
-            return rtn;
-        } else {
-            if (sheet.getRows() <= 1 || sheet.getColumns() <= 1) {
-                rtn.put("status", ResponseCode.ERROR);
-                rtn.put("msg", String.format("工作区至少包含2行2列的数据"));
-                return rtn;
-            } else {
-                Cell[] cells = sheet.getRow(0); // 获取第一行数据列
-                for (int i = 0; i < cells.length; i++) {
-                    String cell_con = cells[i].getContents();
-
-                    if (StringUtils.isEmpty(cell_con)) {
-                        rtn.put("status", ResponseCode.ERROR);
-                        rtn.put("msg", String.format("第1行，第%d列数据不能为空", i + 1));
-                        return rtn;
-                    } else {
-                        // 正则表达式去除数字
-                        cell_con = cell_con.replaceAll("[\\d+]", "");
-
-                        if (i == 0) { // 第一列必须是路牌2个字
-                            if (!"路牌".equals(cell_con.trim())) {
-                                rtn.put("status", ResponseCode.ERROR);
-                                rtn.put("msg", "第1行，第1列数据必须是路牌2个字");
-                                return rtn;
-                            }
-                        } else { // 排除出场，进场，其余内容到站点路由里查询，以各个方向的起点站为查询依据
-                            if ((!"出场".equals(cell_con.trim())) &&
-                                    (!"进场".equals(cell_con.trim()))) {
-                                Map<String, Object> p1 = new HashMap<>();
-                                p1.put("line.id_eq", lineid);
-                                p1.put("stationName_eq", cell_con.trim());
-                                p1.put("stationMark_eq", "B");
-
-
-                                // TODO：这里要修改（起点站有启用撤销的标志的）
-
-                                List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
-                                if (CollectionUtils.isEmpty(stationRouteList)) {
-                                    rtn.put("status", ResponseCode.ERROR);
-                                    rtn.put("msg", String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename));
-                                    return rtn;
-                                } else if (stationRouteList.size() > 1) {
-                                    rtn.put("status", ResponseCode.ERROR);
-                                    rtn.put("msg", String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename));
-                                    return rtn;
-                                }
-                            }
-
-                        }
-                    }
-                }
-
-                // 验证路牌内容
-                Map<String, Integer> gbindexmap = new HashMap<>(); // 记录每个路牌在第几行
-                for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
-                    Cell bcell = sheet.getRow(i)[0]; // 获取第1列
-                    String bcell_con = bcell.getContents();
-                    if (StringUtils.isEmpty(bcell_con)) {
-                        rtn.put("status", ResponseCode.ERROR);
-                        rtn.put("msg", String.format("第%d行，第1列路牌无数据", i + 1));
-                        return rtn;
-                    } else if (gbindexmap.get(bcell_con.trim()) != null) {
-                        rtn.put("status", ResponseCode.ERROR);
-                        rtn.put("msg", String.format("第%d行，第1列的路牌数据与第%d行，第1列数据重复",
-                                i + 1,
-                                gbindexmap.get(bcell_con.trim())));
-                        return rtn;
-                    } else {
-                        Map<String, Object> p2 = new HashMap<>();
-                        p2.put("xl.id_eq", lineid);
-                        p2.put("lpName_eq", bcell_con.trim());
-                        List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2);
-                        if (CollectionUtils.isEmpty(guideboardInfoList)) {
-                            rtn.put("status", ResponseCode.ERROR);
-                            rtn.put("msg", String.format("第%d行，第1列的路牌在%s中不存在", i + 1, linename));
-                            return rtn;
-                        } else if (guideboardInfoList.size() > 1) {
-                            rtn.put("status", ResponseCode.ERROR);
-                            rtn.put("msg", String.format("第%d行，第1列的路牌在%s中重复", i + 1, linename));
-                            return rtn;
-                        } else {
-                            gbindexmap.put(bcell_con.trim(), i + 1);
-                        }
-                    }
-                }
-
-                // 班次时间验证，正则表达式，格式hh:mm或者hhmm
-                String el = "^(([0-1]\\d)|(2[0-4])):[0-5]\\d$"; // hh:mm格式
-                String el2 = "^(([0-1]\\d)|(2[0-4]))[0-5]\\d$"; // hhmm格式
-                Pattern p = Pattern.compile(el);
-                Pattern p2 = Pattern.compile(el2);
-
-                for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
-                    Cell[] bcells = sheet.getRow(i);
-                    for (int j = 1; j < bcells.length; j++) { // 从第2列开始
-                        String bcell_con = bcells[j].getContents();
-                        if (StringUtils.isNotEmpty(bcell_con)) {
-                            Matcher m = p.matcher(bcell_con.trim());
-                            Matcher m2 = p2.matcher(bcell_con.trim());
-                            if ((!m.matches()) && (!m2.matches())) {
-                                rtn.put("status", ResponseCode.ERROR);
-                                rtn.put("msg", String.format("第%d行，第%d列的发车时间格式不正确，格式应为hh:mm或hhmm", i + 1, j + 1));
-                                return rtn;
-                            }
-                        }
-                    }
-                }
-            }
-
-        }
-
-        rtn.put("status", ResponseCode.SUCCESS);
-        return rtn;
-    }
-
-    /**
-     * 3、验证关联的线路标准信息（以后放到规则引擎里去做）。
-     * @param lineinfoid
-     * @return
-     */
-    @RequestMapping(value = "/validate/lineinfo", method = RequestMethod.GET)
-    public Map<String, Object> validateAssoLineInfo(Integer lineinfoid) {
-        Map<String, Object> rtn = new HashMap<>();
-        LineInformation lineInformation = lineInformationService.findById(lineinfoid);
-        if (lineInformation.getUpInMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行进场里程为空");
-            return rtn;
-        } else if (lineInformation.getUpInTimer() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行进场时间为空");
-            return rtn;
-        } else if (lineInformation.getUpOutMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行出场里程为空");
-            return rtn;
-        } else if (lineInformation.getUpOutTimer() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行出场时间为空");
-            return rtn;
-        } else if (lineInformation.getUpMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行班次里程为空");
-            return rtn;
-        } else if (lineInformation.getUpTravelTime() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "上行班次时间为空");
-            return rtn;
-        } else if (lineInformation.getDownInMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行进场里程为空");
-            return rtn;
-        } else if (lineInformation.getDownInTimer() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行进场时间为空");
-            return rtn;
-        } else if (lineInformation.getDownOutMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行出场里程为空");
-            return rtn;
-        } else if (lineInformation.getDownOutTimer() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行出场时间为空");
-            return rtn;
-        } else if (lineInformation.getDownMileage() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行班次里程为空");
-            return rtn;
-        } else if (lineInformation.getDownTravelTime() == null) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "下行班次时间为空");
-            return rtn;
-        } else if (StringUtils.isEmpty(lineInformation.getCarPark())) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", "停车场必须选择");
-            return rtn;
-        }
-
-        // 单独验证停车场信息
-        String tcccode = lineInformation.getCarPark();
-        Map<String, Object> p1 = new HashMap<>();
-        p1.put("parkCode_eq", tcccode);
-        List<CarPark> carParkList = (List<CarPark>) carParkService.list(p1);
-        if (CollectionUtils.isEmpty(carParkList)) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", String.format("线路标准里的停车场code=%s，在停车场信息中未找到", tcccode));
-            return rtn;
-        } else if (carParkList.size() > 1) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", String.format("线路标准里的停车场code=%s，在停车场信息中有重复数据", tcccode));
-            return rtn;
-        } else {
-            CarPark carPark = carParkList.get(0);
-            if (StringUtils.isEmpty(carPark.getParkName())) {
-                rtn.put("status", ResponseCode.ERROR);
-                rtn.put("msg", String.format("线路标准里的停车场code=%s，在停车场信息中没有停车场名字", tcccode));
-                return rtn;
-            }
-        }
-
-        rtn.put("status", ResponseCode.SUCCESS);
-        return rtn;
-    }
-
-    /**
-     * 4、导入时刻表明细数据。
-     * @param form
-     * @return
-     */
-    @RequestMapping(value = "/importfile", method = RequestMethod.POST)
-    public Map<String, Object> importTTinfo(@RequestParam Map<String, Object> form) throws Exception {
-        Map<String, Object> rtn = new HashMap<>();
-
-        // 1、修改已经上传的excel文件，在每个起点站后标示数字，表示第几个班次
-        // 2、由于格式问题，需要把内容都转换成字符串
-        String filename = (String) form.get("filename");
-        List<String> colList = new ArrayList<>();
-        Workbook workbook = Workbook.getWorkbook(new File(filename));
-        Sheet sheet = workbook.getSheet((String) form.get("sheetname"));
-        Cell[] cells = sheet.getRow(0);
-        for (int i = 0; i < cells.length; i++) {
-            if (i == 0) {
-                colList.add(cells[i].getContents().trim());
-            } else {
-                colList.add(cells[i].getContents() + i);
-            }
-        }
-
-        WritableWorkbook writableWorkbook = Workbook.createWorkbook(new File(filename + "_temp.xls"), workbook);
-        WritableSheet sheet1 = writableWorkbook.getSheet((String) form.get("sheetname"));
-        for (int i = 0; i < sheet1.getColumns(); i++) { // 第一行数据
-            sheet1.addCell(new Label(i, 0, colList.get(i)));
-        }
-        for (int i = 1; i < sheet1.getRows(); i++) { // 第二行开始
-            Cell[] cells1 = sheet.getRow(i);
-            for (int j = 0; j < cells1.length; j++) {
-                sheet1.addCell(new Label(j, i, cells1[j].getContents()));
-            }
-        }
-        writableWorkbook.write();
-        writableWorkbook.close();
-
-        // 2、删除原有数据
-        ttInfoDetailService.deleteByTtinfo(Long.valueOf(form.get("ttid").toString()));
-
-        // 3、导入时刻表
-        // 获取停车场名字
-        LineInformation lineInformation = lineInformationService.findById(Integer.valueOf(form.get("lineinfo").toString()));
-        Map<String, Object> p1 = new HashMap<>();
-        p1.put("parkCode_eq", lineInformation.getCarPark());
-        List<CarPark> carParkList = (List<CarPark>) carParkService.list(p1);
-        String tccname = carParkList.get(0).getParkName();
-
-        ttInfoDetailService.fileDataImport(
-                new File(filename + "_temp.xls"),
-                (String) form.get("sheetname"),
-                (String) form.get("xlname"),
-                (String) form.get("ttname"),
-                tccname
-        );
-
-        return rtn;
-    }
-
-    //------------- 旧版本 --------------//
-    @RequestMapping(value = "/dataImportExtend", method = RequestMethod.POST)
-    public Map<String, Object> uploadDataAndImport(
-            MultipartFile file, String xlmc, String ttinfoname) throws Exception {
-        Map<String, Object> resultMap = new HashMap<>();
-
-        try {
-            // 查找lineinformation对象，没有报错
-            Map<String, Object> param = new HashMap<>();
-            param.put("line.name_eq", xlmc);
-            Iterator<LineInformation> lineInformationIterator = lineInformationService.list(param).iterator();
-            if (!lineInformationIterator.hasNext()) {
-                // 没有lineinformation，报错
-                resultMap.put("status", ResponseCode.ERROR);
-                resultMap.put("msg", "没有lineinfomation，线路名称=" + xlmc);
-            } else {
-                String tcccode = lineInformationIterator.next().getCarPark();
-                if (StringUtils.isEmpty(tcccode)) {
-                    // 没有停车场code，报错
-                    resultMap.put("status", ResponseCode.ERROR);
-                    resultMap.put("msg", "线路lineinfomation没有停车场code信息，线路名称=" + xlmc);
-                } else {
-                    // 使用停车场code查找停车场
-                    param.clear();;
-                    param.put("parkCode_eq", tcccode);
-                    Iterator<CarPark> carParkIterator = carParkService.list(param).iterator();
-                    if (!carParkIterator.hasNext()) {
-                        // 指定的停车场code没有找到停车场信息，报错
-                        resultMap.put("status", ResponseCode.ERROR);
-                        resultMap.put("msg", "没有找到停车场信息，停车场code=" + tcccode);
-                    } else {
-                        String tccname = carParkIterator.next().getParkName();
-                        if (StringUtils.isEmpty(tccname)) {
-                            // 没有停车场名字，报错
-                            resultMap.put("status", ResponseCode.ERROR);
-                            resultMap.put("msg", "停车场信息没有停车场名字，停车场code=" + tcccode);
-                        } else {
-                            ttInfoDetailService.fileDataImport(file, xlmc, ttinfoname, tccname);
-                            resultMap.put("status", ResponseCode.SUCCESS);
-                            resultMap.put("msg", "导入成功");
-                        }
-                    }
-                }
-            }
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            throw exp;
-        }
-
-        return resultMap;
-    }
-
-    @RequestMapping(value = "/edit/{xlid}/{ttid}", method = RequestMethod.GET)
-    public Object getEditInfo(
-            @PathVariable("xlid") Integer xlid,
-            @PathVariable("ttid") Long ttid) throws Exception {
-        // TODO：返回类型需要修正
-        return ttInfoDetailService.getEditInfo(xlid, ttid);
-    }
-
-    @Override
-    public TTInfoDetail findById(@PathVariable("id") Long aLong) {
-        return ttInfoDetailRepository.findOneExtend(aLong);
-    }
-
-    @RequestMapping(value = "/bcdetail", method = RequestMethod.GET)
-    public List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId) {
-        return ttInfoDetailRepository.findBcdetails(xlId, ttinfoId, lpId);
-    }
-
-    @Override
-    public void dataExport(HttpServletResponse response, @RequestParam Map<String, Object> param) throws Exception {
-        // 获取injectktr
-        File ktrFile2 = new File(this.getClass().getResource(
-                dataToolsProperties.getTtinfodetailOutput()).toURI());
-        param.put("injectktrfile", ktrFile2.getAbsolutePath());
-        param.put("ttinfoid", param.get("ttinfoid"));
-
-        super.dataExport(response, param);
-    }
-
-    @Override
-    protected String getDataExportKtrClasspath() {
-        return dataToolsProperties.getTtinfodetailMetaoutput();
-    }
-
-    @Override
-    protected String getDataExportFilename() {
-        return "时刻表";
-    }
-}
@@ -4,7 +4,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.CarDevice;
 import com.bsth.service.schedule.CarDeviceService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -4,7 +4,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.Cars;
 import com.bsth.service.schedule.CarsService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -4,7 +4,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.Personnel;
 import com.bsth.service.schedule.EmployeeService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -5,7 +5,7 @@ import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.service.schedule.CarConfigInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -5,7 +5,7 @@ import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -5,7 +5,7 @@ import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.repository.schedule.GuideboardInfoRepository;
 import com.bsth.service.schedule.GuideboardInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -3,7 +3,7 @@ package com.bsth.controller.schedule.core;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.TTInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+package com.bsth.controller.schedule.core;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.service.schedule.TTInfoDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by xu on 17/1/4.
+ */
+@RestController
+@RequestMapping("tidc")
+public class TTInfoDetailController extends BController<TTInfoDetail, Long> {
+    @Autowired
+    private TTInfoDetailService ttInfoDetailService;
+
+    @RequestMapping(value = "/bcdetail", method = RequestMethod.GET)
+    public List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId) {
+        return ttInfoDetailService.findBcdetails(xlId, ttinfoId, lpId);
+    }
+
+    /**
+     * 验证sheet（以后放到规则引擎里去做）。
+     * @param filename excel文件全路径名
+     * @param sheetname sheet名字
+     * @param lineid 线路id
+     * @param linename 线路名称
+     * @return
+     */
+    @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST)
+    public Map<String, Object> validate_sheet(String filename, String sheetname, Integer lineid, String linename) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    /**
+     * 验证关联的线路标准信息（以后放到规则引擎里去做）。
+     * @param lineinfoid
+     * @return
+     */
+    @RequestMapping(value = "/validate/lineinfo", method = RequestMethod.GET)
+    public Map<String, Object> validate_lineInfo(Integer lineinfoid) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            ttInfoDetailService.validateAssoLineInfo(lineinfoid);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    /**
+     * 获取时刻表明细编辑信息。
+     * @param xlid 线路id
+     * @param ttid 时刻表id
+     * @return
+     */
+    @RequestMapping(value = "/edit/{xlid}/{ttid}", method = RequestMethod.GET)
+    public Map<String, Object> getEditInfo(@PathVariable("xlid") Integer xlid,
+                                           @PathVariable("ttid") Long ttid) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            TTInfoDetailService.EditInfo editInfo = ttInfoDetailService.getEditInfo(xlid, ttid);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", editInfo);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+}
+package com.bsth.controller.sys;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.sys.DutyEmployee;
+import com.bsth.service.sys.DutyEmployeeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/1/5.
+ */
+@RestController
+@RequestMapping("dutyEmployee")
+public class DutyEmployeeController extends BaseController<DutyEmployee, Long> {
+
+    @Autowired
+    DutyEmployeeService dutyEmployeeService;
+
+    @RequestMapping(value = "queryByLineAndTime")
+    public List<DutyEmployee> getDutyEmployee(@RequestParam String lineCode, @RequestParam String startTime, @RequestParam String endTime) {
+        return dutyEmployeeService.getDutyEmployee(lineCode, startTime, endTime);
+    }
+}
@@ -154,6 +154,7 @@ public class InOutStationSignalHandle extends SignalHandle{
                 schPrev.setZdsjActualAll(sch.getFcsjActualTime());
  
                 sendUtils.refreshSch(schPrev);
+                dayOfSchedule.save(schPrev);
             }
         }
     }
@@ -211,6 +212,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             next.setZdsjActualAll(sch.getZdsjActualTime());
  
             sendUtils.refreshSch(next);
+            dayOfSchedule.save(next);
         }
     }
  
@@ -84,6 +84,8 @@ public class PilotReport {
  
 				//下发调度指令
 				directiveService.send60Dispatch(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
+				//下发线路切换指令
+				directiveService.lineChange(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
 /*				d80.setRemarks("计划出场时间：" + outSch.getDfsj());
 				//当前GPS位置
 				GpsEntity gps = gpsRealData.get(d80.getDeviceId());
 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
@@ -19,7 +19,7 @@ import java.util.Date;
                 @NamedAttributeNode("cl")
         })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class CarConfigInfo extends BEntity implements Serializable {
  
     /** 主健Id */
@@ -22,7 +22,7 @@ import java.io.Serializable;
             @NamedAttributeNode("xl")
     })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class EmployeeConfigInfo extends BEntity implements Serializable {
  
     /** 主键Id */
@@ -15,7 +15,7 @@ import javax.persistence.*;
                 @NamedAttributeNode("xl")
         })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class GuideboardInfo extends BEntity {
  
     /** 主键Id */
 package com.bsth.entity.schedule;
  
 import com.bsth.entity.Line;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  
 import javax.persistence.*;
 import java.util.Date;
@@ -17,6 +18,7 @@ import java.util.Date;
                 @NamedAttributeNode("updateBy")
         })
 })
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class TTInfo extends BEntity {
  
     /** 主键Id */
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  
 import javax.persistence.*;
  
@@ -21,6 +22,7 @@ import javax.persistence.*;
                 @NamedAttributeNode("tcc")
         })
 })
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class TTInfoDetail extends BEntity {
  
     /** 主健Id */
+package com.bsth.entity.sys;
+
+import javax.persistence.*;
+
+/**
+ * 当班调度员
+ * Created by panzhao on 2017/1/5.
+ */
+@Entity
+@Table(name = "bsth_c_sys_duty_employee")
+public class DutyEmployee {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /**
+     * 员工ID
+     */
+    private Integer uId;
+
+    /**
+     * 员工姓名
+     */
+    private String uName;
+
+    /**
+     * 线路编码 ,号分割多个
+     */
+    private String codeIdx;
+
+    /**
+     * 登入线调时间
+     */
+    private Long ts;
+
+    /**
+     * 是否主调模式进入
+     */
+    private boolean main;
+
+    public Integer getuId() {
+        return uId;
+    }
+
+    public void setuId(Integer uId) {
+        this.uId = uId;
+    }
+
+    public String getuName() {
+        return uName;
+    }
+
+    public void setuName(String uName) {
+        this.uName = uName;
+    }
+
+    public String getCodeIdx() {
+        return codeIdx;
+    }
+
+    public void setCodeIdx(String codeIdx) {
+        this.codeIdx = codeIdx;
+    }
+
+    public Long getTs() {
+        return ts;
+    }
+
+    public void setTs(Long ts) {
+        this.ts = ts;
+    }
+
+    public boolean isMain() {
+        return main;
+    }
+
+    public void setMain(boolean main) {
+        this.main = main;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}
-package com.bsth.entity.sys;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-/**
- * 
- * @ClassName: SessionLog
- * @Description: TODO(session日志)
- * @author PanZhao
- * @date 2016年7月20日 下午4:46:27
- *
- */
-@Entity
-@Table(name = "bsth_c_sys_sessionlog")
-public class SessionLog {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-
-	@ManyToOne
-	private SysUser user;
-
-	/** 登录时间 */
-	private Date loginDate;
-
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-
-	/** 登出时间 */
-	private Date logoutDate;
-
-	/** 登出方式 0：主动登出， -1：其他 */
-	private int logoutType;
-	
-	/** 登录IP  */
-	private String ip;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public SysUser getUser() {
-		return user;
-	}
-
-	public void setUser(SysUser user) {
-		this.user = user;
-	}
-
-	public Date getLoginDate() {
-		return loginDate;
-	}
-
-	public void setLoginDate(Date loginDate) {
-		this.loginDate = loginDate;
-	}
-
-	public Date getCreateDate() {
-		return createDate;
-	}
-
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-
-	public Date getLogoutDate() {
-		return logoutDate;
-	}
-
-	public void setLogoutDate(Date logoutDate) {
-		this.logoutDate = logoutDate;
-	}
-
-	public int getLogoutType() {
-		return logoutType;
-	}
-
-	public void setLogoutType(int logoutType) {
-		this.logoutType = logoutType;
-	}
-
-	public String getIp() {
-		return ip;
-	}
-
-	public void setIp(String ip) {
-		this.ip = ip;
-	}
-}
-package com.bsth.entity.sys;
-
-import java.util.Date;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-/**
- * 
- * @ClassName: SignControl
- * @Description: TODO(进出线调记录)
- * @author PanZhao
- * @date 2016年7月20日 下午4:50:50
- *
- */
-@Entity
-@Table(name = "bsth_c_sys_sign")
-public class SignControl {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-
-	@ManyToOne
-	private SessionLog session;
-
-	/** 登出线调时间 */
-	private Date outDate;
-
-	/** 在线时长 */
-	private Long onLineTimel;
-
-	/** 0: 主调模式， 1：监控模式 */
-	private int signType;
-	
-	/** 用户名 */
-	private String userName;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public SessionLog getSession() {
-		return session;
-	}
-
-	public void setSession(SessionLog session) {
-		this.session = session;
-	}
-
-	public Date getOutDate() {
-		return outDate;
-	}
-
-	public void setOutDate(Date outDate) {
-		this.outDate = outDate;
-	}
-
-	public Long getOnLineTimel() {
-		return onLineTimel;
-	}
-
-	public void setOnLineTimel(Long onLineTimel) {
-		this.onLineTimel = onLineTimel;
-	}
-
-	public int getSignType() {
-		return signType;
-	}
-
-	public void setSignType(int signType) {
-		this.signType = signType;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-}
@@ -9,7 +9,8 @@ import java.util.Set;
  
 @Entity
 @Table(name = "bsth_c_sys_user")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+//@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class SysUser {
  
 	@Id
@@ -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>{
-
-}
@@ -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);
 }
@@ -95,7 +95,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
  
 	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);
  
@@ -122,7 +122,7 @@ public class RealMapServiceImpl implements RealMapService {
             rs.put("section", secList);
  
             //查询站点信息
-            sql="select r.STATION_NAME,r.STATION_ROUTE_CODE,r.LINE_CODE,r.STATION_CODE,r.STATION_MARK,s.G_LONX,s.G_LATY, r.DIRECTIONS from bsth_c_stationroute r INNER JOIN bsth_c_station s on r.station=s.id and r.line_code=? and r.destroy=0";
+            sql = "select r.STATION_NAME,r.STATION_ROUTE_CODE,r.LINE_CODE,r.STATION_CODE,r.STATION_MARK,s.G_LONX,s.G_LATY, r.DIRECTIONS from bsth_c_stationroute r INNER JOIN bsth_c_station s on r.station=s.id and r.line_code=? and r.destroy=0";
             List<Map<String, Object>> stationList = jdbcTemplate.queryForList(sql, lineCode);
             rs.put("station", stationList);
  
@@ -134,6 +134,31 @@ public class RealMapServiceImpl implements RealMapService {
         return rs;
     }
  
+    @Override
+    public Map<String, Object> multiSectionRoute(String codeIdx) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            List<String> idArray = Splitter.on(",").splitToList(codeIdx);
+            //拼接in语句
+            String inStr = "";
+            for (String code : idArray) {
+                inStr += (",'" + code + "'");
+            }
+            inStr = " (" + inStr.substring(1) + ")";
+
+            String sql = "SELECT r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,s.SECTION_NAME,ST_AsText (s.GSECTION_VECTOR) AS GSECTION_VECTOR,r.DIRECTIONS FROM bsth_c_sectionroute r INNER JOIN bsth_c_section s ON r.section = s.id WHERE r.line_code in " + inStr + " AND r.destroy = 0 order by r.line_code, r.directions,r.sectionroute_code";
+
+            List<Map<String, Object>> secList = jdbcTemplate.queryForList(sql);
+            rs.put("section", secList);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (DataAccessException e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+
+        return rs;
+    }
+
     /**
      * wgs 坐标数组转 百度
      *
@@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -1304,8 +1305,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
 	@Override
 	public List<ScheduleRealInfo> correctForm(String line, String startDate,
-			String endDate, String lpName, String code) {
+			String endDate, String lpName, String code, String type) {
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line,startDate,endDate,lpName,code);
+		
+		if(type != null && type.length() != 0 && type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			m.put("startDate", startDate);
+			m.put("endDate", endDate);
+			try {
+				listI.add(list.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould\\correctForm.xls",
+						path+"export\\" + URLEncoder.encode("修正报表", "UTF-8") + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
 		return list;
 	}
  
 package com.bsth.service.schedule;
  
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
  
@@ -10,8 +12,8 @@ import java.util.Map;
 /**
  * 基础service接口。
  */
-public interface BService<T, ID extends Serializable> {
-    // CRUD 操作
+public interface BService<T, ID extends Serializable> extends DataToolsService {
+    //---------------- CRUD 操作 ----------------//
     // Create，Update操作
     T save(T t);
     <S extends T> List<S> bulkSave(List<S> entities); // 批量保存（TODO：待测试）
@@ -22,4 +24,5 @@ public interface BService&lt;T, ID extends Serializable&gt; {
     List<T> list(Map<String, Object> param);
     // Delete操作
     void delete(ID id) throws ScheduleException;
+
 }
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.service.schedule.exception.ScheduleException;
  
 /**
  * Created by xu on 16/5/9.
 package com.bsth.service.schedule;
  
 import com.bsth.entity.CarDevice;
+import com.bsth.service.schedule.exception.ScheduleException;
  
 /**
  * Created by xu on 16/12/15.
 package com.bsth.service.schedule;
  
 import com.bsth.entity.Cars;
+import com.bsth.service.schedule.exception.ScheduleException;
  
 /**
  * Created by xu on 16/12/8.
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.service.schedule.exception.ScheduleException;
  
 /**
  * Created by xu on 16/5/10.
 package com.bsth.service.schedule;
  
 import com.bsth.entity.Personnel;
+import com.bsth.service.schedule.exception.ScheduleException;
  
 /**
  * Created by xu on 16/12/15.
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.service.schedule.exception.ScheduleException;
  
 /**
  * Created by xu on 16/5/11.
 package com.bsth.service.schedule;
  
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -463,7 +464,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				listI.add(resList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
 				ee.excelReplace(listI, new Object[] { m }, path+"mould\\workDaily.xls",
-						path+"export\\营运服务日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+						path+"export\\营运服务日报表"+ sdfSimple.format(sdfMonth.parse(date))+".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -937,7 +938,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				tempMap.put("sjfcFirst0", "/");
 				tempMap.put("delayFirst0", "/");
 			}
-			if(moban0.getZdsjActual() != null){
+			if(moban0.getFcsjActual() != null){
 				String[] split = moban0.getFcsjActual().split(":");
 				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 				long delay = moban0.getFcsjT() - min;
@@ -963,7 +964,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				tempMap.put("sjfcFirst1", "/");
 				tempMap.put("delayFirst1", "/");
 			}
-			if(moban1.getZdsjActual() != null){
+			if(moban1.getFcsjActual() != null){
 				String[] split = moban1.getFcsjActual().split(":");
 				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 				long delay = moban1.getFcsjT() - min;
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.TTInfoDetail;
-import com.bsth.service.BaseService;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
  
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
  
 /**
  * Created by xu on 16/7/2.
  */
-public interface TTInfoDetailService extends BaseService<TTInfoDetail, Long> {
-
-    void deleteByTtinfo(Long ttinfoid);
+public interface TTInfoDetailService extends BService<TTInfoDetail, Long> {
  
     /**
      * 发车信息内部类。
@@ -34,7 +30,12 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
         public FcInfo() {
         }
  
-        public FcInfo(String ttdid_str, String bc_type, String fcsj, String xldir, String isfb) {
+        public FcInfo(
+                String ttdid_str,
+                String bc_type,
+                String fcsj,
+                String xldir,
+                String isfb) {
             this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
             this.bc_type = bc_type;
             this.fcsj = fcsj;
@@ -98,6 +99,9 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
         /** 内容数据 */
         private List<List<FcInfo>> contents = new ArrayList<>();
  
+        /** 营运描述 */
+        private String yy_desc;
+
         public List<String> getHeader() {
             return header;
         }
@@ -113,6 +117,14 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
         public void setContents(List<List<FcInfo>> contents) {
             this.contents = contents;
         }
+
+        public String getYy_desc() {
+            return yy_desc;
+        }
+
+        public void setYy_desc(String yy_desc) {
+            this.yy_desc = yy_desc;
+        }
     }
  
     /**
@@ -121,22 +133,28 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
      * @param ttid 时刻表id
      * @return
      */
-    EditInfo getEditInfo(Integer xlid, Long ttid) throws Exception;
+    EditInfo getEditInfo(Integer xlid, Long ttid) throws ScheduleException;
+
+    /**
+     * 验证sheet（以后放到规则引擎里去做）。
+     * @param filename excel文件全路径名
+     * @param sheetname sheet名字
+     * @param lineid 线路id
+     */
+    void validateExcelSheet(
+            String filename,
+            String sheetname,
+            Integer lineid,
+            String linename) throws ScheduleException;
  
     /**
-     * 上传并导入数据，和DataImportExportService的同名方法有差别。
-     * @param datafile form上传文件
-     * @param xlmc 线路名称
-     * @param ttinfoname 时刻表名字
-     * @param tccname 停车场名字
-     * @throws Exception
+     * 验证关联的线路标准信息（以后放到规则引擎里去做）。
+     * @param lineinfoid 线路id
      */
-    void fileDataImport(MultipartFile datafile,
-                               String xlmc,
-                               String ttinfoname,
-                               String tccname) throws Exception;
+    void validateAssoLineInfo(Integer lineinfoid) throws ScheduleException;
  
-    void fileDataImport(File file, String sheetname, String xlmc, String ttinfoname, String tccname) throws Exception;
+    // TODO：这个方法可以用通用方法解决，以后改
+    List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId);
  
  
 }
-package com.bsth.service.schedule;
-
-import com.bsth.entity.schedule.TTInfoDetail;
-import com.bsth.repository.schedule.TTInfoDetailRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.service.schedule.utils.DataImportExportService;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import jxl.Sheet;
-import jxl.Workbook;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.pentaho.di.trans.Trans;
-import org.pentaho.di.trans.TransMeta;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by xu on 16/7/2.
- */
-@Service
-@EnableConfigurationProperties(DataToolsProperties.class)
-public class TTInfoDetailServiceImpl extends BaseServiceImpl<TTInfoDetail, Long> implements TTInfoDetailService {
-    @Autowired
-    private DataImportExportService dataImportExportService;
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-    @Autowired
-    private TTInfoDetailRepository ttInfoDetailRepository;
-
-    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
-    @Override
-    public void deleteByTtinfo(Long ttinfoid) {
-        ttInfoDetailRepository.deleteByTtinfo(ttinfoid);
-    }
-
-    /**
-     * 获取待编辑的数据。
-     * @param xlid 线路id
-     * @param ttid 时刻表id
-     * @return
-     */
-    @Override
-    public EditInfo getEditInfo(Integer xlid, Long ttid) throws Exception {
-        // 1、使用ktr转换获取输出文件
-        // 1.1、获取转换用ktr
-        File ktrFile = new File(this.getClass().getResource(
-                dataToolsProperties.getTtinfodetailForeditktr()).toURI());
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-//        trans.setLogLevel(LogLevel.DEBUG);
-        // 1.2、设定命名参数，TODO：之后还要添加其他命名参数
-        String outputFilePath = "ttinfodetail_" + new DateTime().toString("yyyy-MM-dd_HH-mm-ss");
-        trans.setParameterValue("tempfilepath", dataToolsProperties.getTransTempdir() + File.separator + outputFilePath); // 数据输出文件路径
-        trans.setParameterValue("xlid", String.valueOf(xlid));
-        trans.setParameterValue("ttid", String.valueOf(ttid));
-        // 1.3、执行转换
-        trans.execute(null);
-        // 1.4、等待转换结束
-        trans.waitUntilFinished();
-
-        // 1.5、判定ktr错误数，注意这种错误代表部分数据错误，不会终止转换执行，一般设计ktr的时候，会有错误输出文件，TODO：以后考虑使用日志实时输出
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-
-        // 1.6、获取最大的发车数，用于输出数据的数量
-        Long maxfcno = ttInfoDetailRepository.findMaxFcno(xlid, ttid);
-        if (maxfcno == null)
-            return new EditInfo();
-
-        // 2、读取ktr生成的excel数据，组织编辑用数据返回
-        // 2-1、读取Excel文件
-        Workbook book = Workbook.getWorkbook(new File(dataToolsProperties.getTransTempdir() +
-                File.separator + outputFilePath + ".xls"));
-        Sheet sheet = book.getSheet(0);
-        EditInfo editInfo = new EditInfo();
-        // 2-2、处理数据
-        String[] headarrays = new String[maxfcno.intValue() + 1];
-        headarrays[0] = "路牌";
-        for (int r = 1; r < sheet.getRows(); r++) {
-            List<FcInfo> fcInfos = new ArrayList<>();
-            // 每行第一列都是路牌
-            fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null)); // 用fcsj放置路牌显示
-            for (int c = 1; c <= maxfcno * 6; ) {
-                String ttdid_str = sheet.getCell(c, r).getContents(); // 时刻表明细id
-                String fcsj = sheet.getCell(c + 1, r).getContents(); // 发车时间
-                String fzdname = sheet.getCell(c + 2, r).getContents(); // 发车站点名称
-                String bctype = sheet.getCell(c + 3, r).getContents(); // 班次类型
-                String xldir = sheet.getCell(c + 4, r).getContents(); // 线路上下行
-                String isfb = sheet.getCell(c + 5, r).getContents(); // 是否分班
-
-                FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb);
-
-                if (StringUtils.isNotEmpty(fzdname))
-                    headarrays[(int)(c / 6) + 1] = fzdname;
-                fcInfos.add(fcInfo);
-
-                c += 6;
-            }
-            editInfo.getContents().add(fcInfos);
-        }
-        editInfo.getHeader().addAll(Arrays.asList(headarrays));
-
-        return editInfo;
-    }
-
-    @Override
-    /**
-     * 上传并导入数据，和DataImportExportService的同名方法有差别。
-     * @param datafile form上传文件
-     * @param xlmc 线路名称
-     * @param ttinfoname 时刻表名字
-     * @param tccname 停车场名字
-     * @throws Exception
-     */
-    public void fileDataImport(MultipartFile datafile,
-                               String xlmc,
-                               String ttinfoname,
-                               String tccname) throws Exception {
-        // 上传数据文件
-        File uploadFile = dataImportExportService.uploadFile(datafile);
-        fileDataImport(uploadFile, "工作表1", xlmc, ttinfoname, tccname);
-
-    }
-
-    @Override
-    public void fileDataImport(File uploadFile, String sheetname, String xlmc, String ttinfoname, String tccname) throws Exception {
-        // 1、上传数据文件
-        System.out.println("线路名称：" + xlmc);
-        System.out.println("时刻表名称：" + ttinfoname);
-        System.out.println("停车场名字：" + tccname);
-        System.out.println("时刻表明细上传文件：" + uploadFile);
-
-        // 2、jexcelapi读取excel文件
-        Workbook book = Workbook.getWorkbook(uploadFile);
-        Sheet sheet = book.getSheet(0);
-        List<String> columnames = new ArrayList<>();
-        for (int i = 0; i < sheet.getColumns(); i++) { // 获取第一行，数据，作为列名
-            columnames.add(sheet.getCell(i, 0).getContents());
-        }
-
-        System.out.println("表头1：" + StringUtils.join(columnames.toArray(), ","));
-
-        // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
-        // 2.1、初始化kettle（组件初始化已经做了）
-        // 2.2、创建转换元数据，转换
-        File ktrFile = new File(this.getClass().getResource(
-                dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI());
-        File ktrFile2 = new File(this.getClass().getResource(
-                dataToolsProperties.getTtinfodetailDatainputktr()).toURI());
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-        // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
-        trans.setParameterValue("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
-        trans.setParameterValue("filepath", uploadFile.getAbsolutePath()); // 指定导入数据文件的位置
-        trans.setParameterValue("sheetname", sheetname); // sheet工作区的名字
-        trans.setParameterValue("erroroutputdir", dataToolsProperties.getTransErrordir()); // ktr转换错误输出目录
-        trans.setParameterValue("xlname", xlmc); // 线路名称
-        trans.setParameterValue("ttinfoname", ttinfoname); // 时刻表名称
-        trans.setParameterValue("tccname", tccname); // 停车场名字
-        trans.setParameterValue("excelfieldnames", StringUtils.join(columnames.toArray(), ",")); // 时刻表excel输入字段名，以逗号连接
-        columnames.remove(0);
-        trans.setParameterValue("normalizefieldnames", StringUtils.join(columnames.toArray(), ",")); // 数据范式化字段名，以逗号连接
-
-        // TODO：可以考虑设定日志输出
-        // 2.4、执行转换
-        trans.execute(null);
-        // 2.5、等待转换结束
-        trans.waitUntilFinished();
-
-        // 3、判定ktr错误数，注意这种错误代表部分数据错误，不会终止转换执行，一般设计ktr的时候，会有错误输出文件，TODO：以后考虑使用日志实时输出
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-    }
-}
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.TTInfo;
+import com.bsth.service.schedule.exception.ScheduleException;
  
 /**
  * Created by xu on 16/5/12.
-package com.bsth.service.schedule;
+package com.bsth.service.schedule.exception;
  
 /**
  * Created by xu on 16/12/5.
@@ -3,16 +3,19 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.BaseRepository;
 import com.bsth.service.schedule.BService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
  
 import javax.persistence.EntityManager;
+import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -29,6 +32,10 @@ public class BServiceImpl&lt;T, ID extends Serializable&gt; implements BService&lt;T, ID&gt;
     @Value("${hibernate.jdbc.batch_size}")
     private int batchSize;
  
+    @Autowired
+    @Qualifier(value = "dataToolsServiceImpl")
+    private DataToolsService dataToolsService;
+
     /** 日志记录器 */
     protected Logger logger = LoggerFactory.getLogger(this.getClass());
  
@@ -108,4 +115,19 @@ public class BServiceImpl&lt;T, ID extends Serializable&gt; implements BService&lt;T, ID&gt;
  
         baseRepository.delete(id);
     }
+
+    @Override
+    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+        return dataToolsService.uploadFile(filename, filedata);
+    }
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        dataToolsService.importData(file, params);
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        return dataToolsService.exportData(params);
+    }
 }
@@ -3,7 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.service.schedule.CarConfigInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.ScheduleRule1FlatService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -4,7 +4,7 @@ import com.bsth.entity.CarDevice;
 import com.bsth.entity.Cars;
 import com.bsth.service.CarsService;
 import com.bsth.service.schedule.CarDeviceService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -2,19 +2,91 @@ package com.bsth.service.schedule.impl;
  
 import com.bsth.entity.Cars;
 import com.bsth.service.schedule.CarsService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
  
 /**
  * Created by xu on 16/12/8.
  */
+@EnableConfigurationProperties(DataToolsProperties.class)
 @Service(value = "carsServiceImpl_sc")
 public class CarsServiceImpl extends BServiceImpl<Cars, Integer> implements CarsService {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(CarsServiceImpl.class);
+
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导入车辆基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getCarsDatainputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filepath", file.getAbsolutePath());
+            ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            super.importData(file, ktrParms);
+
+            LOGGER.info("//---------------- 导入车辆基础信息 success... ----------------//");
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导入车辆基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导出车辆基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getCarsDataoutputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", "车辆基础信息_download-");
+
+            File file = super.exportData(ktrParms);
+
+            LOGGER.info("//---------------- 导出车辆基础信息 success... ----------------//");
+
+            return file;
+
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导出车辆基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
  
     @Override
     @Transactional
@@ -3,7 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.ScheduleRule1FlatService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -2,19 +2,92 @@ package com.bsth.service.schedule.impl;
  
 import com.bsth.entity.Personnel;
 import com.bsth.service.schedule.EmployeeService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
  
 /**
  * Created by xu on 16/12/15.
  */
+@EnableConfigurationProperties(DataToolsProperties.class)
 @Service
 public class EmployeeServiceImpl extends BServiceImpl<Personnel, Integer> implements EmployeeService {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(EmployeeServiceImpl.class);
+
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导入人员基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getEmployeesDatainputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filepath", file.getAbsolutePath());
+            ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            super.importData(file, ktrParms);
+
+            LOGGER.info("//---------------- 导入人员基础信息 success... ----------------//");
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导入人员基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导出人员基础信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getEmployeesDataoutputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", "人员基础信息_download-");
+
+            File file = super.exportData(ktrParms);
+
+            LOGGER.info("//---------------- 导出人员基础信息 success... ----------------//");
+
+            return file;
+
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导出人员基础信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
     @Override
     @Transactional
     public void validate_gh(Personnel personnel) throws ScheduleException {
@@ -3,7 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.GuideboardInfoService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.TTInfoDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -2,7 +2,7 @@ package com.bsth.service.schedule.impl;
  
 import com.bsth.entity.schedule.rule.RerunRule;
 import com.bsth.service.schedule.RerunService;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.CarPark;
+import com.bsth.entity.LineInformation;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.repository.schedule.TTInfoDetailRepository;
+import com.bsth.service.CarParkService;
+import com.bsth.service.LineInformationService;
+import com.bsth.service.StationRouteService;
+import com.bsth.service.schedule.GuideboardInfoService;
+import com.bsth.service.schedule.TTInfoDetailService;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsProperties;
+import jxl.Cell;
+import jxl.Sheet;
+import jxl.Workbook;
+import jxl.write.Label;
+import jxl.write.WritableSheet;
+import jxl.write.WritableWorkbook;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by xu on 17/1/3.
+ */
+@Service
+@EnableConfigurationProperties(DataToolsProperties.class)
+public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> implements TTInfoDetailService {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(TTInfoDetailServiceImpl.class);
+
+    @Autowired
+    private GuideboardInfoService guideboardInfoService;
+    @Autowired
+    private StationRouteService stationRouteService;
+    @Autowired
+    private LineInformationService lineInformationService;
+    @Autowired
+    private CarParkService carParkService;
+    @Autowired
+    private TTInfoDetailRepository ttInfoDetailRepository;
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    @Override
+    public TTInfoDetail findById(Long aLong) {
+        return ttInfoDetailRepository.findOneExtend(aLong);
+    }
+
+    @Override
+    public void importData(
+            File file,
+            Map<String, Object> params) throws ScheduleException {
+
+        try {
+            LOGGER.info("//---------------- 导入时刻表明细 start... ----------------//");
+
+            String filename = file.getAbsolutePath(); // xls文件名
+            String sheetname = String.valueOf(params.get("sheetname")); // sheet名字
+            Long ttid = Long.valueOf(String.valueOf(params.get("ttid"))); // 时刻表id
+            Long xlid = Long.valueOf(String.valueOf(params.get("xlid"))); // 线路id
+            Integer lineid = Integer.valueOf(String.valueOf(params.get("lineinfo"))); // 线路标准id
+            String xlname = String.valueOf(params.get("xlname")); // 线路名字
+            String ttname = String.valueOf(params.get("ttname")); // 时刻表名字
+
+            LOGGER.info("参数1, xls文件名={},sheet名字={}", filename, sheetname);
+            LOGGER.info("参数2, 线路id={},线路名字={}", xlid, xlname);
+            LOGGER.info("参数3, 时刻表id={},时刻表名字={}", ttid, ttname);
+
+            LOGGER.info("转换xls文件格式成文本格式...");
+            // 1、修改已经上传的excel文件，在每个起点站后标示数字，表示第几个班次
+            // 2、由于格式问题，需要把内容都转换成字符串
+            List<String> colList = new ArrayList<>();
+            Workbook workbook = Workbook.getWorkbook(new File(filename));
+            Sheet sheet = workbook.getSheet(sheetname);
+            Cell[] cells = sheet.getRow(0);
+            for (int i = 0; i < cells.length; i++) {
+                if (i == 0) {
+                    colList.add(cells[i].getContents().trim());
+                } else {
+                    colList.add(cells[i].getContents() + i);
+                }
+            }
+
+            File fileCal = new File(filename + "_stringType.xls");
+            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal, workbook);
+            WritableSheet sheet1 = writableWorkbook.getSheet(sheetname);
+            for (int i = 0; i < sheet1.getColumns(); i++) { // 第一行数据
+                sheet1.addCell(new Label(i, 0, colList.get(i)));
+            }
+            for (int i = 1; i < sheet1.getRows(); i++) { // 第二行开始
+                Cell[] cells1 = sheet.getRow(i);
+                for (int j = 0; j < cells1.length; j++) {
+                    sheet1.addCell(new Label(j, i, cells1[j].getContents()));
+                }
+            }
+            writableWorkbook.write();
+            writableWorkbook.close();
+
+            // 2、删除原有数据
+            // 操作在ktr内部执行
+
+            // 3、导入时刻表
+            // 获取停车场名字
+            LOGGER.info("获取停车场名字...");
+            LineInformation lineInformation = lineInformationService.findById(lineid);
+            Map<String, Object> p1 = new HashMap<>();
+            p1.put("parkCode_eq", lineInformation.getCarPark());
+            List<CarPark> carParkList = (List<CarPark>) carParkService.list(p1);
+            String tccname = carParkList.get(0).getParkName();
+            LOGGER.info("停车场名字={}", tccname);
+
+
+            // 计算表头参数
+            Workbook book = Workbook.getWorkbook(fileCal);
+            Sheet sheet_exp = book.getSheet(sheetname);
+            List<String> columnames = new ArrayList<>();
+            for (int i = 0; i < sheet_exp.getColumns(); i++) { // 获取第一行，数据，作为列名
+                columnames.add(sheet_exp.getCell(i, 0).getContents());
+            }
+            LOGGER.info("表头={}", StringUtils.join(columnames.toArray(), ","));
+
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI());
+            File ktrFile2 = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailDatainputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filepath", fileCal.getAbsolutePath());
+            ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            // 附加参数
+            ktrParms.put("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
+            ktrParms.put("sheetname", sheetname); // sheet工作区的名字
+            ktrParms.put("xlname", xlname); // 线路名称
+            ktrParms.put("ttinfoname", ttname); // 时刻表名称
+            ktrParms.put("ttid", ttid.intValue()); // 时刻表id
+            ktrParms.put("tccname", tccname); // 停车场名字
+            ktrParms.put("excelfieldnames", StringUtils.join(columnames.toArray(), ",")); // 时刻表excel输入字段名，以逗号连接
+            columnames.remove(0);
+            ktrParms.put("normalizefieldnames", StringUtils.join(columnames.toArray(), ",")); // 数据范式化字段名，以逗号连接
+
+            super.importData(fileCal, ktrParms);
+
+            LOGGER.info("//---------------- 导入时刻表明细 success... ----------------//");
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导入时刻表明细 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导出时刻表明细 start... ----------------//");
+
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailMetaoutput()).toURI());
+            File ktrFile2 = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailOutput()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", String.format("时刻表_(id=%s)_download-", String.valueOf(params.get("ttinfoid"))));
+
+            // 附加参数
+            ktrParms.put("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
+            ktrParms.put("ttinfoid", String.valueOf(params.get("ttinfoid")));
+
+            File file = super.exportData(ktrParms);
+
+            LOGGER.info("//---------------- 导出时刻表明细 success... ----------------//");
+
+            return file;
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导出时刻表明细 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public EditInfo getEditInfo(Integer xlid, Long ttid) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 start... ----------------//");
+
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailForeditktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", "todo");
+
+            // 附加参数
+            String outputFilePath = String.format("ttinfodetail_(id=%s)_foredit-%s",
+                    String.valueOf(ttid), new DateTime().toString("yyyyMMddHHmmss"));
+
+            ktrParms.put("tempfilepath", dataToolsProperties.getTransTempdir() + File.separator + outputFilePath); // 数据输出文件路径
+            ktrParms.put("xlid", String.valueOf(xlid));
+            ktrParms.put("ttid", String.valueOf(ttid));
+
+            super.exportData(ktrParms);
+
+            // 1.6、获取最大的发车数，用于输出数据的数量
+            Long maxfcno = ttInfoDetailRepository.findMaxFcno(xlid, ttid);
+            if (maxfcno == null)
+                return new EditInfo();
+
+            // 2、读取ktr生成的excel数据，组织编辑用数据返回
+            // 2-1、读取Excel文件
+            Workbook book = Workbook.getWorkbook(new File(dataToolsProperties.getTransTempdir() +
+                    File.separator + outputFilePath + ".xls"));
+            Sheet sheet = book.getSheet(0);
+            EditInfo editInfo = new EditInfo();
+            // 2-2、处理数据
+            int all_bc = 0; // 总班次
+            double all_lc_ks = 0; // 总空驶里程
+            double all_lc_yy = 0; // 总营运里程
+
+            String[] headarrays = new String[maxfcno.intValue() + 3];
+            headarrays[0] = "路牌";
+            headarrays[maxfcno.intValue() + 1] = "空驶班次/空驶里程";
+            headarrays[maxfcno.intValue() + 2] = "运营班次/运营里程";
+
+            for (int r = 1; r < sheet.getRows(); r++) {
+                List<FcInfo> fcInfos = new ArrayList<>();
+                // 每行第一列都是路牌
+                fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null)); // 用fcsj放置路牌显示
+
+                int bc_ks = 0; // 空驶班次
+                int bc_yy = 0; // 营运班次
+                double lc_ks = 0; // 空驶里程
+                double lc_yy = 0; // 营运里程
+
+                for (int c = 1; c <= maxfcno * 7; ) {
+                    String ttdid_str = sheet.getCell(c, r).getContents(); // 时刻表明细id
+                    String fcsj = sheet.getCell(c + 1, r).getContents(); // 发车时间
+                    String jhlc = sheet.getCell(c + 2, r).getContents(); // 计划里程
+                    String fzdname = sheet.getCell(c + 3, r).getContents(); // 发车站点名称
+                    String bctype = sheet.getCell(c + 4, r).getContents(); // 班次类型
+                    String xldir = sheet.getCell(c + 5, r).getContents(); // 线路上下行
+                    String isfb = sheet.getCell(c + 6, r).getContents(); // 是否分班
+
+                    FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb);
+
+                    if (StringUtils.isNotEmpty(fzdname))
+                        headarrays[(int)(c / 7) + 1] = fzdname;
+                    fcInfos.add(fcInfo);
+
+                    c += 7;
+
+                    // 计算班次里程
+                    if (StringUtils.isNotEmpty(jhlc)) {
+                        if ("in".equals(bctype) || "out".equals(bctype)) {
+                            bc_ks += 1;
+                            lc_ks += Double.valueOf(jhlc);
+
+                            all_bc += 1;
+                            all_lc_ks += Double.valueOf(jhlc);
+
+                        } else {
+                            bc_yy += 1;
+                            lc_yy += Double.valueOf(jhlc);
+
+                            all_bc += 1;
+                            all_lc_yy += Double.valueOf(jhlc);
+                        }
+                    }
+
+                }
+
+                // 添加一列 空驶班次/空驶里程，fcsj放置数据
+                fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_ks, lc_ks), null, null));
+
+                // 添加一列 营运班次/营运里程，fcsj放置数据
+                fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_yy, lc_yy), null, null));
+
+                editInfo.getContents().add(fcInfos);
+            }
+            editInfo.getHeader().addAll(Arrays.asList(headarrays));
+
+            editInfo.setYy_desc(String.format("班次=%d,空驶里程=%.2f,营运里程=%.2f", all_bc, all_lc_ks, all_lc_yy));
+
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 success... ----------------//");
+
+            return editInfo;
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+
+
+    @Override
+    public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename) throws ScheduleException {
+        try {
+            Workbook book = Workbook.getWorkbook(new File(filename));
+            Sheet sheet = book.getSheet(sheetname);
+            if (sheet.getRows() == 0 || sheet.getColumns() == 0) { // 工作区是否为空
+                throw new Exception(String.format("%s 工作区没有数据！", sheetname));
+            } else {
+                if (sheet.getRows() <= 1 || sheet.getColumns() <= 1) {
+                    throw new Exception(String.format("工作区至少包含2行2列的数据"));
+                } else {
+                    Cell[] cells = sheet.getRow(0); // 获取第一行数据列
+                    for (int i = 0; i < cells.length; i++) {
+                        String cell_con = cells[i].getContents();
+
+                        if (StringUtils.isEmpty(cell_con)) {
+                            throw new Exception(String.format("第1行，第%d列数据不能为空", i + 1));
+                        } else {
+                            // 正则表达式去除数字
+                            cell_con = cell_con.replaceAll("[\\d+]", "");
+
+                            if (i == 0) { // 第一列必须是路牌2个字
+                                if (!"路牌".equals(cell_con.trim())) {
+                                    throw new Exception("第1行，第1列数据必须是路牌2个字");
+                                }
+                            } else { // 排除出场，进场，其余内容到站点路由里查询，以各个方向的起点站为查询依据
+                                if ((!"出场".equals(cell_con.trim())) &&
+                                        (!"进场".equals(cell_con.trim()))) {
+                                    Map<String, Object> p1 = new HashMap<>();
+                                    p1.put("line.id_eq", lineid);
+                                    p1.put("stationName_eq", cell_con.trim());
+                                    p1.put("stationMark_eq", "B");
+
+
+                                    // TODO：这里要修改（起点站有启用撤销的标志的）
+
+                                    List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
+                                    if (CollectionUtils.isEmpty(stationRouteList)) {
+                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename));
+                                    } else if (stationRouteList.size() > 1) {
+                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename));
+                                    }
+                                }
+
+                            }
+                        }
+                    }
+
+                    // 验证路牌内容
+                    Map<String, Integer> gbindexmap = new HashMap<>(); // 记录每个路牌在第几行
+                    for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
+                        Cell bcell = sheet.getRow(i)[0]; // 获取第1列
+                        String bcell_con = bcell.getContents();
+                        if (StringUtils.isEmpty(bcell_con)) {
+                            throw new Exception(String.format("第%d行，第1列路牌无数据", i + 1));
+                        } else if (gbindexmap.get(bcell_con.trim()) != null) {
+                            throw new Exception(String.format("第%d行，第1列的路牌数据与第%d行，第1列数据重复",
+                                    i + 1,
+                                    gbindexmap.get(bcell_con.trim())));
+                        } else {
+                            Map<String, Object> p2 = new HashMap<>();
+                            p2.put("xl.id_eq", lineid);
+                            p2.put("lpName_eq", bcell_con.trim());
+                            List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2);
+                            if (CollectionUtils.isEmpty(guideboardInfoList)) {
+                                throw new Exception(String.format("第%d行，第1列的路牌在%s中不存在", i + 1, linename));
+                            } else if (guideboardInfoList.size() > 1) {
+                                throw new Exception(String.format("第%d行，第1列的路牌在%s中重复", i + 1, linename));
+                            } else {
+                                gbindexmap.put(bcell_con.trim(), i + 1);
+                            }
+                        }
+                    }
+
+                    // 班次时间验证，正则表达式，格式hh:mm或者hhmm
+                    String el = "^(([0-1]\\d)|(2[0-4])):[0-5]\\d$"; // hh:mm格式
+                    String el2 = "^(([0-1]\\d)|(2[0-4]))[0-5]\\d$"; // hhmm格式
+                    Pattern p = Pattern.compile(el);
+                    Pattern p2 = Pattern.compile(el2);
+
+                    for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
+                        Cell[] bcells = sheet.getRow(i);
+                        for (int j = 1; j < bcells.length; j++) { // 从第2列开始
+                            String bcell_con = bcells[j].getContents();
+                            if (StringUtils.isNotEmpty(bcell_con)) {
+                                Matcher m = p.matcher(bcell_con.trim());
+                                Matcher m2 = p2.matcher(bcell_con.trim());
+                                if ((!m.matches()) && (!m2.matches())) {
+                                    throw new Exception(String.format("第%d行，第%d列的发车时间格式不正确，格式应为hh:mm或hhmm", i + 1, j + 1));
+                                }
+                            }
+                        }
+                    }
+                }
+
+            }
+        } catch (Exception exp) {
+            throw new ScheduleException(exp.getMessage());
+        }
+
+    }
+
+    @Override
+    public void validateAssoLineInfo(Integer lineinfoid) throws ScheduleException {
+        LineInformation lineInformation = lineInformationService.findById(lineinfoid);
+        if (lineInformation.getUpInMileage() == null) {
+            throw new ScheduleException("上行进场里程为空");
+        } else if (lineInformation.getUpInTimer() == null) {
+            throw new ScheduleException("上行进场时间为空");
+        } else if (lineInformation.getUpOutMileage() == null) {
+            throw new ScheduleException("上行出场里程为空");
+        } else if (lineInformation.getUpOutTimer() == null) {
+            throw new ScheduleException("上行出场时间为空");
+        } else if (lineInformation.getUpMileage() == null) {
+            throw new ScheduleException("上行班次里程为空");
+        } else if (lineInformation.getUpTravelTime() == null) {
+            throw new ScheduleException("上行班次时间为空");
+        } else if (lineInformation.getDownInMileage() == null) {
+            throw new ScheduleException("下行进场里程为空");
+        } else if (lineInformation.getDownInTimer() == null) {
+            throw new ScheduleException("下行进场时间为空");
+        } else if (lineInformation.getDownOutMileage() == null) {
+            throw new ScheduleException("下行出场里程为空");
+        } else if (lineInformation.getDownOutTimer() == null) {
+            throw new ScheduleException("下行出场时间为空");
+        } else if (lineInformation.getDownMileage() == null) {
+            throw new ScheduleException("下行班次里程为空");
+        } else if (lineInformation.getDownTravelTime() == null) {
+            throw new ScheduleException("下行班次时间为空");
+        } else if (StringUtils.isEmpty(lineInformation.getCarPark())) {
+            throw new ScheduleException("停车场必须选择");
+        }
+
+        // 单独验证停车场信息
+        String tcccode = lineInformation.getCarPark();
+        Map<String, Object> p1 = new HashMap<>();
+        p1.put("parkCode_eq", tcccode);
+        List<CarPark> carParkList = (List<CarPark>) carParkService.list(p1);
+        if (CollectionUtils.isEmpty(carParkList)) {
+            throw new ScheduleException(String.format("线路标准里的停车场code=%s，在停车场信息中未找到", tcccode));
+        } else if (carParkList.size() > 1) {
+            throw new ScheduleException(String.format("线路标准里的停车场code=%s，在停车场信息中有重复数据", tcccode));
+        } else {
+            CarPark carPark = carParkList.get(0);
+            if (StringUtils.isEmpty(carPark.getParkName())) {
+                throw new ScheduleException(String.format("线路标准里的停车场code=%s，在停车场信息中没有停车场名字", tcccode));
+            }
+        }
+
+    }
+
+    @Override
+    public List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId) {
+        return ttInfoDetailRepository.findBcdetails(xlId, ttinfoId, lpId);
+    }
+}
 package com.bsth.service.schedule.impl;
  
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.TTInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+package com.bsth.service.schedule.utils;
+
+import com.bsth.service.schedule.exception.ScheduleException;
+
+import java.io.File;
+import java.util.Map;
+
+/**
+ * 数据服务接口。
+ */
+public interface DataToolsService {
+    //----------------- 数据服务操作 --------------//
+    // 上传文件
+    File uploadFile(String filename, byte[] filedata) throws ScheduleException;
+    // 导入数据
+    void importData(File file, Map<String, Object> params) throws ScheduleException;
+    // 导出数据
+    File exportData(Map<String, Object> params) throws ScheduleException;
+}
+package com.bsth.service.schedule.utils;
+
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.google.common.io.Files;
+import org.apache.tika.Tika;
+import org.joda.time.DateTime;
+import org.pentaho.di.core.KettleEnvironment;
+import org.pentaho.di.core.logging.KettleLogStore;
+import org.pentaho.di.core.logging.LoggingBuffer;
+import org.pentaho.di.core.logging.LoggingRegistry;
+import org.pentaho.di.core.util.EnvUtil;
+import org.pentaho.di.trans.Trans;
+import org.pentaho.di.trans.TransMeta;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Created by xu on 17/1/3.
+ */
+@Service
+@EnableConfigurationProperties(DataToolsProperties.class)
+public class DataToolsServiceImpl implements DataToolsService, InitializingBean {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(DataToolsServiceImpl.class);
+
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    /**
+     * 自定义kettle环境初始化定义。
+     */
+    private void ktrEnvironmentInit() throws Exception {
+        // 由于kettle.properties可能没有（没有安装过kettle），
+        // 导致 EnvUtil.environmentInit() 报找不到kettle.properties文件
+        // 所以这里重写 EnvUtil.environmentInit() 方法
+
+        if (Thread.currentThread().getContextClassLoader() == null) {
+            Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
+        }
+
+        // 获取配置文件
+        File file = new File(getClass().getResource(dataToolsProperties.getKettleProperties()).toURI());
+        Properties kettleProperties = EnvUtil.readProperties(file.getAbsolutePath());
+        EnvUtil.applyKettleProperties(kettleProperties);
+        System.getProperties().put("Internal.Cluster.Size", "1");
+        System.getProperties().put("Internal.Slave.Transformation.Number", "0");
+        System.getProperties().put("Internal.Slave.Server.Name", "slave-trans-name");
+        System.getProperties().put("Internal.Step.CopyNr", "0");
+        System.getProperties().put("Internal.Step.Name", "step-name");
+        System.getProperties().put("Internal.Step.Partition.ID", "partition-id");
+        System.getProperties().put("Internal.Step.Partition.Number", "0");
+        System.getProperties().put("Internal.Step.Unique.Count", "1");
+        System.getProperties().put("Internal.Step.Unique.Number", "0");
+        if (!kettleProperties.containsKey("vfs.sftp.org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder.USER_DIR_IS_ROOT")) {
+            System.getProperties().put("vfs.sftp.org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder.USER_DIR_IS_ROOT", "false");
+        }
+
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        // 初始化kettle环境（自定义）
+        ktrEnvironmentInit();
+
+        // 添加全局ktr变量，并覆盖原来的设置
+        Map<String, String> kvars = new HashMap<>();
+        kvars.put("v_db_ip", dataToolsProperties.getKvarsDbip());
+        kvars.put("v_db_uname", dataToolsProperties.getKvarsDbuname());
+        kvars.put("v_db_pwd", dataToolsProperties.getKvarsDbpwd());
+        kvars.put("v_db_dname", dataToolsProperties.getKvarsDbdname());
+        EnvUtil.applyKettleProperties(kvars, true);
+        KettleEnvironment.init();
+    }
+
+    @Override
+    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+        // 上传文件
+        try {
+            LOGGER.info("start uploadFile...originalFilename={}", filename);
+            File newFile = new File(dataToolsProperties.getFileuploadDir() + File.separator +
+                    filename + "-upload-" + new DateTime().toString("yyyyMMddHHmmss") + ".xls");
+            // TODO：判定是否excel数据
+            Tika tika = new Tika();
+            String type = tika.detect(filedata);
+            // application/x-tika-msoffice
+            LOGGER.info("文件格式={}", type);
+            if ("application/vnd.ms-excel".equals(type) || "application/x-tika-msoffice".equals(type)) {
+                // .xls 2007的格式
+                Files.write(filedata, newFile);
+            } else if ("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equals(type)) {
+                // .xlsx 2007之后的格式
+                throw new Exception("暂时不支持.xlsx格式文件！");
+            } else {
+                // 非excel文件
+                throw new Exception("非.xls格式文件！");
+            }
+
+            LOGGER.info("uploadFile success...newFilename={}", newFile.getAbsolutePath());
+
+            return newFile;
+        } catch (Exception exp) {
+            LOGGER.info("uploadFile failed...stackTrace...");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException("上传文件错误！");
+        }
+    }
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        // 导入数据
+        String transLogId = "";
+        String transMetaLogId = "";
+        try {
+            LOGGER.info("start importData...originalFilename={}", file.getAbsolutePath());
+            // 检查参数
+            String transpath = String.valueOf(params.get("transpath"));
+            if ("null".equals(transpath)) {
+                throw new Exception(
+                        "没有指定transpath参数值，无法确定ktr转换文件！");
+            }
+            File ktrFile = new File(transpath);
+            // 设置文件路径，错误输出文件路径参数
+            params.put("filepath", file.getAbsolutePath());
+            params.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
+            // 2.1、初始化kettle（组件初始化已经做了）
+            // 2.2、创建转换元数据，转换
+            TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
+            Trans trans = new Trans(transMeta);
+            // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
+            for (String key : params.keySet()) {
+                trans.setParameterValue(key, String.valueOf(params.get(key)));
+            }
+            // 2.4、执行转换
+            trans.execute(null);
+            // 2.5、等待转换结束
+            trans.waitUntilFinished();
+
+            // 获取日志
+            transLogId = trans.getLogChannelId();
+            transMetaLogId = transMeta.getLogChannelId();
+
+            LoggingBuffer loggingBuffer = KettleLogStore.getAppender();
+            StringBuffer stringBuffer = loggingBuffer.getBuffer(
+                    trans.getLogChannelId(), false
+            );
+            if (trans.getErrors() > 0) {
+                throw new Exception(stringBuffer.toString());
+            }
+            LOGGER.info(stringBuffer.toString());
+            LOGGER.info("importData success...");
+
+        } catch (Exception exp) {
+            LOGGER.info("importData failed...statckTrace...");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException("导入数据错误！");
+        } finally {
+            // 清除日志操作
+            KettleLogStore.discardLines(transLogId, true);
+            KettleLogStore.discardLines(transMetaLogId, true);
+            LoggingRegistry.getInstance().removeIncludingChildren(transLogId);
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        // 导出数据
+        String transLogId = "";
+        String transMetaLogId = "";
+        try {
+            LOGGER.info("start exportData...");
+            // 检查参数
+            String filename = String.valueOf(params.get("filename"));
+            if ("null".equals(filename)) {
+                filename = "temp";
+            }
+            String transpath = String.valueOf(params.get("transpath"));
+            if ("null".equals(transpath)) {
+                throw new Exception(
+                        "没有指定transpath参数值，无法确定ktr转换文件！");
+            }
+            File ktrFile = new File(transpath);
+            // 设置文件路径参数
+            String filepath = dataToolsProperties.getFileoutputDir() +
+                    File.separator +
+                    filename +
+                    new DateTime().toString("yyyyMMddHHmmss") + ".xls";
+            params.put("filepath", filepath);
+
+            // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
+            // 2.1、初始化kettle（组件初始化已经做了）
+            // 2.2、创建转换元数据，转换
+            TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
+            Trans trans = new Trans(transMeta);
+            // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
+            for (String key : params.keySet()) {
+                trans.setParameterValue(key, String.valueOf(params.get(key)));
+            }
+            // 2.4、执行转换
+            trans.execute(null);
+            // 2.5、等待转换结束
+            trans.waitUntilFinished();
+
+            // 获取日志
+            transLogId = trans.getLogChannelId();
+            transMetaLogId = transMeta.getLogChannelId();
+
+            LoggingBuffer loggingBuffer = KettleLogStore.getAppender();
+            StringBuffer stringBuffer = loggingBuffer.getBuffer(
+                    trans.getLogChannelId(), false
+            );
+            if (trans.getErrors() > 0) {
+                throw new Exception(stringBuffer.toString());
+            }
+            LOGGER.info(stringBuffer.toString());
+            LOGGER.info("exportData success...");
+
+            return new File(filepath);
+        } catch (Exception exp) {
+            LOGGER.info("exportData failed...statckTrace...");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException("导出数据错误！");
+        } finally {
+            // 清除日志操作
+            KettleLogStore.discardLines(transLogId, true);
+            KettleLogStore.discardLines(transMetaLogId, true);
+            LoggingRegistry.getInstance().removeIncludingChildren(transLogId);
+        }
+    }
+}
+package com.bsth.service.sys;
+
+import com.bsth.entity.sys.DutyEmployee;
+import com.bsth.service.BaseService;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/1/5.
+ */
+public interface DutyEmployeeService extends BaseService<DutyEmployee, Long> {
+
+    List<DutyEmployee> getDutyEmployee(String lineCode, String startTime, String endTime);
+}
+package com.bsth.service.sys.impl;
+
+import com.bsth.entity.sys.DutyEmployee;
+import com.bsth.repository.sys.DutyEmployeeRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.DutyEmployeeService;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/1/5.
+ */
+@Service
+public class DutyEmployeeServiceImpl extends BaseServiceImpl<DutyEmployee, Long> implements DutyEmployeeService {
+
+    @Autowired
+    DutyEmployeeRepository dutyEmployeeRepository;
+
+    @Override
+    public Map<String, Object> save(DutyEmployee dutyEmployee) {
+        //登入时间，当前时间 - 10分钟
+        dutyEmployee.setTs(System.currentTimeMillis() - (1000 * 60 * 10));
+        return super.save(dutyEmployee);
+    }
+
+
+    /**
+     * 获取当班调度
+     *
+     * @param lineCode  线路编码
+     * @param startTime 开始时间 yyyy-MM-ddHH:mm
+     * @param endTime   结束时间 yyyy-MM-ddHH:mm
+     * @return
+     */
+    public List<DutyEmployee> getDutyEmployee(String lineCode, String startTime, String endTime) {
+        DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+        return dutyEmployeeRepository.findByLineAndTime(lineCode + ",", fmtyyyyMMddHHmm.parseMillis(startTime), fmtyyyyMMddHHmm.parseMillis(endTime));
+    }
+}