Merge branch 'minhang' into pudong

潘钊
2 parents 117dc2a5 be97e34e
Showing 46 changed files with 1089 additions and 1294 deletions
pom.xml
src/main/java/com/bsth/controller/DownloadController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/schedule/BController.java
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/controller/schedule/basicinfo/CarDeviceController.java
src/main/java/com/bsth/controller/schedule/basicinfo/CarsController.java
src/main/java/com/bsth/controller/schedule/basicinfo/EmployeeController.java
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/EmployeeConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
src/main/java/com/bsth/controller/sys/DutyEmployeeController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/ScheduleSignalState.java
src/main/java/com/bsth/data/pilot80/PilotReport.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);    
@@ -106,24 +106,24 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			@RequestParam(defaultValue = "DESC") String direction){
 		Direction d;
-		try {
+//		try {
 		String rq=map.get("rq").toString();
 		if(!(rq=="")){
-			
-			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-			  Calendar   calendar   =   new   GregorianCalendar(); 
-			  calendar.setTime(sdf.parse(rq)); 
-			  calendar.add(calendar.DATE,1);
-			  Date date=calendar.getTime();
-			map.put("rq_ge", rq);
-			map.put("rq_le", sdf.format(date));
-			System.out.println(rq);
-			System.out.println(sdf.format(date));
-		}
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+//			
+//			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+//			  Calendar   calendar   =   new   GregorianCalendar(); 
+//			  calendar.setTime(sdf.parse(rq)); 
+//			  calendar.add(calendar.DATE,1);
+//			  Date date=calendar.getTime();
+			map.put("rq_eq", rq);
+//			map.put("rq_lt", sdf.format(date));
+//			System.out.println(rq);
+//			System.out.println(sdf.format(date));
 		}
+//		} catch (ParseException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
 		if(null != direction && direction.equals("ASC"))
 			d = Direction.ASC;
 		else
@@ -59,4 +59,14 @@ public class RealMapController {
     public Map<String, Object> findRouteAndStationByLine(@RequestParam String lineCode){
         return realMapService.findRouteAndStationByLine(lineCode);
     }
+
+    /**
+     * 获取多个线路的路段信息（为前端越界计算提供数据）
+     * @param codeIdx
+     * @return
+     */
+    @RequestMapping(value = "/multiSectionRoute")
+    public Map<String, Object> multiSectionRoute(@RequestParam String codeIdx){
+        return realMapService.multiSectionRoute(codeIdx);
+    }
 }
@@ -36,35 +36,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	/**
 	 * 
-	 * 改由通过 websocket 注册监听！！！
-	 * 
-	 * @Title: registerLine @Description: TODO(注册线路，后续才能收到数据推送) @param @param
-	 * lineCodes @throws
-	 * 用GET 防止监控模式下被拦截
-	 
-	@RequestMapping(value = "/registerLine", method = RequestMethod.GET)
-	public int registerLine(@RequestParam String lineCodes) {
-		List<String> list = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(lineCodes);
-		String userName = SecurityUtils.getCurrentUser().getUserName();
-		// 注销之前的绑定
-		for (String line : list)
-			BasicData.lineCode2SocketUserMap.get(line).remove(userName);
-		// 重新绑定
-		for (String line : list)
-			BasicData.lineCode2SocketUserMap.put(line, userName);
-
-		return 0;
-	}*/
-
-	/**
-	 * 
 	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
 	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
 	 */
 	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
 	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
-			@RequestParam String dfsj/*, String clZbh, String jsy, String spy*/) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj/*, clZbh, jsy, spy*/);
+			@RequestParam String dfsj,@RequestParam String bcType) {
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType);
 	}
 	/**
@@ -125,19 +103,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
 		return scheduleRealInfoService.sreachVehic(nbbm);
 	}
-
-	/**
-	 * 
-	 * @Title: adjust @Description: TODO(调整人车) @param @param id
-	 * 班次ID @param @param nbbm 内部编码 @param @param jsy 驾驶员 @param @param spy
-	 * 售票员 @throws
-
-	@RequestMapping(value = "/adjust", method = RequestMethod.POST)
-	public Map<String, Object> adjust(@RequestParam Long id, String nbbm, String jsy,
-			String spy, Integer revertLine, Integer borrowLine, String borrowTimeStr, String revertTimeStr) {
-		return scheduleRealInfoService.adjust(id, nbbm, jsy, spy, revertLine, borrowLine, borrowTimeStr, revertTimeStr);
-	}
-	 */
 	/**
 	 * 
 	 * @Title: realOutAdjust 
@@ -338,8 +303,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
@@ -427,4 +392,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		}
 		return rs;
 	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.POST)
+	public Map<String, Object> svgAttr(@RequestParam String jsonStr){
+		return scheduleRealInfoService.svgAttr(jsonStr);
+	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.GET)
+	public Map<String, Object> findSvgAttr(@RequestParam  String idx){
+		return scheduleRealInfoService.findSvgAttr(idx);
+	}
 }
@@ -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);
+    }
+}
@@ -261,26 +261,26 @@ public class BasicData implements CommandLineRunner {
                 /**
                  * 加载运管处的站点及序号
                  * 上行从1开始，下行顺序续编
-
-                 List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
-                 if(ygcLines != null && ygcLines.size() > 0){
-                 int size = ygcLines.size();
-                 Object[] tempArray ;
-                 int num = 1;
-                 String key;
-                 String lineCode = "";
-                 for (int i = 0; i < size; i ++){
-                 tempArray = ygcLines.get(i);
-                 if(lineCode.equals("")){
-                 lineCode = tempArray[0]+"";
-                 }else if(!lineCode.equals(tempArray[0]+"")){
-                 num = 1;
-                 lineCode = tempArray[0]+"";
-                 }
-                 key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
-                 tempStationName2YgcNumber.put(key,num++);
-                 }
-                 }*/
+                 */
+                List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
+                if(ygcLines != null && ygcLines.size() > 0){
+                    int size = ygcLines.size();
+                    Object[] tempArray ;
+                    int num = 1;
+                    String key;
+                    String lineCode = "";
+                    for (int i = 0; i < size; i ++){
+                        tempArray = ygcLines.get(i);
+                        if(lineCode.equals("")){
+                            lineCode = tempArray[0]+"";
+                        }else if(!lineCode.equals(tempArray[0]+"")){
+                            num = 1;
+                            lineCode = tempArray[0]+"";
+                        }
+                        key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
+                        tempStationName2YgcNumber.put(key,num++);
+                    }
+                }
             }
             lineId2CodeMap = biMap;
-package com.bsth.data.gpsdata.arrival.handlers;
-
-import com.bsth.data.LineConfigData;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.SignalHandle;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
-import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.directive.DirectiveService;
-import com.bsth.websocket.handler.SendUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 进出站动作处理
- * Created by panzhao on 2016/12/27.
- */
-@Component
-public class InOutStationSignalHandle extends SignalHandle{
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Autowired
-    LineConfigData lineConfigData;
-
-    @Autowired
-    SendUtils sendUtils;
-
-    @Autowired
-    DirectiveService directiveService;
-
-    @Autowired
-    ScheduleSignalState scheduleSignalState;
-
-    @Autowired
-    SignalSchPlanMatcher signalSchPlanMatcher;
-
-    private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //忽略漂移信号
-        if(isDriftSignal(gps))
-            return false;
-
-        //从异常状态恢复的第一个信号
-        if(abnormalRecovery(gps, prevs)){
-            //回溯一下之前的轨迹
-            scheduleSignalState.signalRetrospect(gps);
-        }
-
-        if(isNotEmpty(prevs)){
-            GpsEntity prev = prevs.getTail();
-            if(isOutStation(gps, prev))
-                outStation(gps, prev);
-
-
-            if(isInStation(gps, prev))
-                inStation(gps, prev);
-        }
-
-        return true;
-    }
-
-    private boolean isOutStation(GpsEntity gps, GpsEntity prev){
-        //从站内到站外
-        if(prev.getInstation() > 0 && gps.getInstation() == 0)
-            return true;
-
-        //从站内到另一个站内
-        if(prev.getInstation() > 0 && gps.getInstation() > 0
-                && !prev.getStopNo().equals(gps.getStopNo()))
-            return true;
-        return false;
-    }
-
-    private boolean isInStation(GpsEntity gps, GpsEntity prev){
-        //从站外到站内
-        if(prev.getInstation() == 0 && gps.getInstation() > 0
-                /*&& !prev.getStopNo().equals(gps.getStopNo())*/){
-            return true;
-        }
-
-        //从站内到另一个站内
-        if(prev.getInstation() > 0 && gps.getInstation() > 0
-                && !prev.getStopNo().equals(gps.getStopNo()))
-            return true;
-        return false;
-    }
-
-    /**
-     * 出站
-     * @param gps 当前点
-     * @param prev 上一个点
-     */
-    private void outStation(GpsEntity gps, GpsEntity prev) {
-        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-        String qdzCode = sch.getQdzCode();
-
-        //首班出场最多提前1.2小时
-        if(dayOfSchedule.isFirstOut(sch) && sch.getDfsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
-            return;
-
-        //起点发车
-        if(qdzCode != null && prev.getStopNo().equals(qdzCode)
-                && !willDepart(gps, prev, sch)){
-
-            //发车班次匹配
-            signalSchPlanMatcher.outMatch(gps, sch);
-            sch = dayOfSchedule.executeCurr(gps.getNbbm());
-
-            //实发时间不覆盖
-            if(StringUtils.isNotEmpty(sch.getFcsjActual()))
-                return;
-
-            //实发时间
-            sch.setFcsjActualAll(gps.getTimestamp());
-            //通知客户端
-            sendUtils.sendFcsj(sch);
-            //持久化
-            dayOfSchedule.save(sch);
-
-            //出站既出场
-            outStationAndOutPark(sch);
-            logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
-        }
-        else if(sch.getBcType().equals("out")){
-            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
-            if(prev.getStopNo().equals(next.getQdzCode())){
-                //发下一个班次
-                dayOfSchedule.addExecPlan(next);
-                outStation(gps, prev);
-            }
-        }
-    }
-
-
-    private void outStationAndOutPark(ScheduleRealInfo sch){
-        LineConfig config = lineConfigData.get(sch.getXlBm());
-        if (config != null && config.getOutConfig() == 2) {
-            //出站既出场
-            ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-            if (schPrev != null && schPrev.getBcType().equals("out")) {
-                schPrev.setFcsjActualAll(sch.getFcsjActualTime());
-                schPrev.setZdsjActualAll(sch.getFcsjActualTime());
-
-                sendUtils.refreshSch(schPrev);
-            }
-        }
-    }
-
-    /**
-     * 进站
-     * @param gps 当前点
-     * @param prev 上一个点
-     */
-    private void inStation(GpsEntity gps, GpsEntity prev){
-        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-
-        if(gps.getStopNo().equals(sch.getZdzCode())){
-
-            //实达时间不覆盖
-            if(StringUtils.isNotEmpty(sch.getZdsjActual()))
-                return;
-
-            sch.setZdsjActualAll(gps.getTimestamp());
-            //已完成班次数
-            int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
-            ScheduleRealInfo next = dayOfSchedule.next(sch);
-            //通知客户端
-            sendUtils.sendZdsj(sch, next, doneSum);
-            //持久化
-            dayOfSchedule.save(sch);
-            //下发调度指令
-            directiveService.send60Dispatch(next, doneSum, "到站@系统");
-
-            //准备执行下一个班次
-            if (next != null) {
-                next.setQdzArrDatesj(sch.getZdsjActual());
-                dayOfSchedule.addExecPlan(next);
-                //进站既进场
-                inStationAndInPark(sch, next);
-                //将gps转换为下一个班次走向的站内信号
-                transformUpdown(gps, sch);
-            }
-        }
-        else if(sch.getFcsjActual() == null){
-            //有进站，但班次没有实发，向前追溯一下信号
-            scheduleSignalState.signalRetrospect(gps, sch);
-        }
-    }
-
-    /**
-     * 进站既进场
-     * @param sch
-     */
-    private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next){
-        LineConfig config = lineConfigData.get(sch.getXlBm());
-        if (next.getBcType().equals("in") &&
-                config != null && config.getOutConfig() == 2) {
-            next.setFcsjActualAll(sch.getZdsjActualTime());
-            next.setZdsjActualAll(sch.getZdsjActualTime());
-
-            sendUtils.refreshSch(next);
-        }
-    }
-
-    /**
-     * 发车漂移判定（这里出现的误判，由车辆到达中途站的时候补偿）
-     * @param gps
-     * @param prev
-     * @param task
-     * @return
-     */
-    private boolean willDepart(GpsEntity gps, GpsEntity prev, Object task){
-
-        /*ScheduleRealInfo sch = (ScheduleRealInfo) task;
-        ScheduleRealInfo prevTask = dayOfSchedule.prev(sch);
-        if(prevTask == null || prevTask.getBcType().equals("out"))
-            return false;
-
-        //计划停站时间
-        int stopTimePlan = (int) (sch.getDfsjT() - prevTask.getZdsjT());
-
-        if(stopTimePlan < 1000 * 60 * 10)
-            return false;
-
-        //实际停站时间
-        if(prevTask.getZdsjActual() != null){
-            int actualTime = (int) (gps.getTimestamp() - prevTask.getZdsjActualTime());
-
-            if(actualTime < stopTimePlan * 0.8){
-                logger.info("漂移判定");
-
-                return true;
-            }
-        }*/
-        return false;
-    }
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
+import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.directive.DirectiveService;
+import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 进出站动作处理
+ * Created by panzhao on 2016/12/27.
+ */
+@Component
+public class InOutStationSignalHandle extends SignalHandle{
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    LineConfigData lineConfigData;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    DirectiveService directiveService;
+
+    @Autowired
+    ScheduleSignalState scheduleSignalState;
+
+    @Autowired
+    SignalSchPlanMatcher signalSchPlanMatcher;
+
+    private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //忽略漂移信号
+        if(isDriftSignal(gps))
+            return false;
+
+        //从异常状态恢复的第一个信号
+        if(abnormalRecovery(gps, prevs)){
+            //回溯一下之前的轨迹
+            scheduleSignalState.signalRetrospect(gps);
+        }
+
+        if(isNotEmpty(prevs)){
+            GpsEntity prev = prevs.getTail();
+            if(isOutStation(gps, prev))
+                outStation(gps, prev);
+
+
+            if(isInStation(gps, prev))
+                inStation(gps, prev);
+        }
+
+        return true;
+    }
+
+    private boolean isOutStation(GpsEntity gps, GpsEntity prev){
+        //从站内到站外
+        if(prev.getInstation() > 0 && gps.getInstation() == 0)
+            return true;
+
+        //从站内到另一个站内
+        if(prev.getInstation() > 0 && gps.getInstation() > 0
+                && !prev.getStopNo().equals(gps.getStopNo()))
+            return true;
+        return false;
+    }
+
+    private boolean isInStation(GpsEntity gps, GpsEntity prev){
+        //从站外到站内
+        if(prev.getInstation() == 0 && gps.getInstation() > 0
+                /*&& !prev.getStopNo().equals(gps.getStopNo())*/){
+            return true;
+        }
+
+        //从站内到另一个站内
+        if(prev.getInstation() > 0 && gps.getInstation() > 0
+                && !prev.getStopNo().equals(gps.getStopNo()))
+            return true;
+        return false;
+    }
+
+    /**
+     * 出站
+     * @param gps 当前点
+     * @param prev 上一个点
+     */
+    private void outStation(GpsEntity gps, GpsEntity prev) {
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+        String qdzCode = sch.getQdzCode();
+
+        //首班出场最多提前1.2小时
+        if(dayOfSchedule.isFirstOut(sch) && sch.getDfsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+            return;
+
+        //起点发车
+        if(qdzCode != null && prev.getStopNo().equals(qdzCode)
+                && !willDepart(gps, prev, sch)){
+
+            //发车班次匹配
+            signalSchPlanMatcher.outMatch(gps, sch);
+            sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+            //实发时间不覆盖
+            if(StringUtils.isNotEmpty(sch.getFcsjActual()))
+                return;
+
+            //实发时间
+            sch.setFcsjActualAll(gps.getTimestamp());
+            //通知客户端
+            sendUtils.sendFcsj(sch);
+            //持久化
+            dayOfSchedule.save(sch);
+
+            //出站既出场
+            outStationAndOutPark(sch);
+            logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
+        }
+        else if(sch.getBcType().equals("out")){
+            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            if(prev.getStopNo().equals(next.getQdzCode())){
+                //发下一个班次
+                dayOfSchedule.addExecPlan(next);
+                outStation(gps, prev);
+            }
+        }
+    }
+
+
+    private void outStationAndOutPark(ScheduleRealInfo sch){
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (config != null && config.getOutConfig() == 2) {
+            //出站既出场
+            ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+            if (schPrev != null && schPrev.getBcType().equals("out")) {
+                schPrev.setFcsjActualAll(sch.getFcsjActualTime());
+                schPrev.setZdsjActualAll(sch.getFcsjActualTime());
+
+                sendUtils.refreshSch(schPrev);
+                dayOfSchedule.save(schPrev);
+            }
+        }
+    }
+
+    /**
+     * 进站
+     * @param gps 当前点
+     * @param prev 上一个点
+     */
+    private void inStation(GpsEntity gps, GpsEntity prev){
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+        if(gps.getStopNo().equals(sch.getZdzCode())){
+
+            //进场最多提前1.2小时
+            if(sch.getBcType().equals("in") && sch.getZdsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+                return;
+
+            //实达时间不覆盖
+            if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+                return;
+
+            sch.setZdsjActualAll(gps.getTimestamp());
+            //已完成班次数
+            int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
+            ScheduleRealInfo next = dayOfSchedule.next(sch);
+            //通知客户端
+            sendUtils.sendZdsj(sch, next, doneSum);
+            //持久化
+            dayOfSchedule.save(sch);
+            //下发调度指令
+            directiveService.send60Dispatch(next, doneSum, "到站@系统");
+
+            //准备执行下一个班次
+            if (next != null) {
+                next.setQdzArrDatesj(sch.getZdsjActual());
+                dayOfSchedule.addExecPlan(next);
+                //进站既进场
+                inStationAndInPark(sch, next);
+                //将gps转换为下一个班次走向的站内信号
+                transformUpdown(gps, sch);
+            }
+        }
+        else if(sch.getFcsjActual() == null){
+            //有进站，但班次没有实发，向前追溯一下信号
+            scheduleSignalState.signalRetrospect(gps, sch);
+        }
+    }
+
+    /**
+     * 进站既进场
+     * @param sch
+     */
+    private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next){
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (next.getBcType().equals("in") &&
+                config != null && config.getOutConfig() == 2) {
+            next.setFcsjActualAll(sch.getZdsjActualTime());
+            next.setZdsjActualAll(sch.getZdsjActualTime());
+
+            sendUtils.refreshSch(next);
+            dayOfSchedule.save(next);
+        }
+    }
+
+    /**
+     * 发车漂移判定（这里出现的误判，由车辆到达中途站的时候补偿）
+     * @param gps
+     * @param prev
+     * @param task
+     * @return
+     */
+    private boolean willDepart(GpsEntity gps, GpsEntity prev, Object task){
+
+        /*ScheduleRealInfo sch = (ScheduleRealInfo) task;
+        ScheduleRealInfo prevTask = dayOfSchedule.prev(sch);
+        if(prevTask == null || prevTask.getBcType().equals("out"))
+            return false;
+
+        //计划停站时间
+        int stopTimePlan = (int) (sch.getDfsjT() - prevTask.getZdsjT());
+
+        if(stopTimePlan < 1000 * 60 * 10)
+            return false;
+
+        //实际停站时间
+        if(prevTask.getZdsjActual() != null){
+            int actualTime = (int) (gps.getTimestamp() - prevTask.getZdsjActualTime());
+
+            if(actualTime < stopTimePlan * 0.8){
+                logger.info("漂移判定");
+
+                return true;
+            }
+        }*/
+        return false;
+    }
 }
 \ No newline at end of file
-package com.bsth.data.gpsdata.arrival.utils;
-
-import com.bsth.data.LineConfigData;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.SignalStateData;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.entity.RouteReverse;
-import com.bsth.data.gpsdata.arrival.entity.SignalAbnormal;
-import com.bsth.data.gpsdata.arrival.entity.SignalState;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 班次信号状态分析
- * Created by panzhao on 2016/12/29.
- */
-@Component
-public class ScheduleSignalState {
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    LineConfigData lineConfigData;
-
-    @Autowired
-    SignalStateData signalStateData;
-
-    /**
-     * 路由反向分析
-     */
-    public void reverseAnalyse(RouteReverse reverse) {
-        ScheduleRealInfo sch = dayOfSchedule.executeCurr(reverse.getNbbm());
-
-        String bcType = sch.getBcType();
-
-        switch (bcType) {
-            case "out":
-                outReverseAnalyse(sch, reverse);
-                break;
-            case "normal":
-                normalReverseAnalyse(sch, reverse);
-                break;
-        }
-    }
-
-    /**
-     * 出场班次路由反向分析
-     *
-     * @param sch
-     */
-    private void outReverseAnalyse(ScheduleRealInfo sch, RouteReverse reverse) {
-        long t = reverse.getCt();
-        //出场班次终点时间前，允许反向轨迹
-        if (sch.getZdsjT() != null && sch.getZdsjT() > t) {
-            return;
-        }
-
-        int rt;
-        //从实发 到 当前时间 < 计划运送时间 * 0.9
-        if (sch.getFcsjActual() != null && sch.getBcsj() != null) {
-            rt = (int) (t - sch.getFcsjActualTime());
-            if (rt < sch.getBcsj() * 0.9)
-                return;
-        }
-
-        ScheduleRealInfo next = dayOfSchedule.next(sch);
-        if (next.getXlDir().equals(sch.getXlDir()))
-            return;
-
-        //时间足够下一个班次待发时间运行到当前站
-        int runTime = reverse.getCount() * 1500 * 60;
-        if (next.getDfsjT() + runTime < t) {
-            //跳到下一个班次
-            dayOfSchedule.addExecPlan(next);
-        }
-    }
-
-    /**
-     * 正常班次路由反向分析
-     *
-     * @param sch
-     * @param reverse
-     */
-    private void normalReverseAnalyse(ScheduleRealInfo sch, RouteReverse reverse) {
-        LineConfig conf = lineConfigData.get(sch.getXlBm());
-
-        if (conf.isReadReverse()) {
-            //跳下一个班次
-            ScheduleRealInfo next = dayOfSchedule.next(sch);
-            if (next != null)
-                dayOfSchedule.addExecPlan(next);
-
-            //记录信号状态
-            SignalState signalState = SignalState.reverseSignalSTate(sch, reverse);
-            if(signalState != null)
-                signalStateData.put(signalState);
-        }
-    }
-
-    public void signalRetrospect(GpsEntity gps) {
-        signalRetrospect(gps, dayOfSchedule.executeCurr(gps.getNbbm()));
-    }
-
-    /**
-     * 信号追溯
-     *
-     * @param gps
-     * @param sch
-     */
-    public void signalRetrospect(GpsEntity gps, ScheduleRealInfo sch) {
-        //回放数据，是否有掉线或者漂移
-        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
-        if (queue == null || queue.size() == 0 /*|| gps.getInstation() == 0*/)
-            return;
-
-        //起始时间点
-        long st = 0;
-        ScheduleRealInfo prev = dayOfSchedule.prev(sch);
-
-        if (prev != null) {
-            if (prev.getZdsjActual() != null)
-                st = prev.getZdsjActualTime();
-            else
-                st = (GeoCacheData.midwayStation(gps.getLineId(), gps.getUpDown(), sch.getQdzCode(), gps.getStopNo()).size() + 1) * (1000 * 60 * 5);
-        }
-
-        Object[] tempArray = queue.getQueue();
-        int len = tempArray.length;
-
-        Object[] array = new Object[len + 1];
-        System.arraycopy(tempArray, 0, array, 0, len);
-        array[len] = gps;
-
-        String gpsState = "";
-        GpsEntity tempGps, nearGps = null;
-        int i = len - 1;
-        for (; i >= 0; i--) {
-            tempGps = (GpsEntity) array[i];
-
-            gpsState = tempGps.getSignalState();
-            if (gpsState.equals("truncation"))
-                break;
-            else if (gpsState.equals("drift")) {
-                nearGps = (GpsEntity) array[i + 1];
-                break;
-            } else if (gpsState.equals("reconnection")) {
-                nearGps = tempGps;
-                break;
-            }
-
-            if (tempGps.getTimestamp() < st)
-                break;
-        }
-
-        if (nearGps != null && i > 0) {
-            createSignalAbnormal(gpsState, nearGps, i, array, sch);
-        }
-    }
-
-    private void createSignalAbnormal(String gpsState, GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
-        switch (gpsState) {
-            case "drift":
-                driftSignalAbnormal(nearGps, i, array, sch);
-                break;
-            case "reconnection":
-                offlineSignalAbnormal(nearGps, ((GpsEntity) array[i - 1]), sch);
-                break;
-        }
-    }
-
-    /**
-     * 掉线异常状态记录
-     *
-     * @param e
-     * @param s
-     */
-    private void offlineSignalAbnormal(GpsEntity e, GpsEntity s, ScheduleRealInfo sch) {
-        long st = s.getTimestamp(), et = e.getTimestamp();
-
-        //掉线超过10分钟才记录
-        if (et - st < (1000 * 60 * 10))
-            return;
-
-        SignalAbnormal signalAbnormal = new SignalAbnormal();
-        signalAbnormal.setSt(st);
-        signalAbnormal.setEt(et);
-        signalAbnormal.setAbnormalType("reconnection");
-        signalAbnormal.setDestCode(sch.getQdzCode());
-        signalAbnormal.setOutOrIn(0);
-
-        //截断GPS
-        e.setSignalState("truncation");
-
-        //记录信号状态
-        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
-        signalStateData.put(signalState);
-    }
-
-    /**
-     * 漂移异常状态记录
-     *
-     * @param nearGps
-     * @param i
-     * @param array
-     */
-    private void driftSignalAbnormal(GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
-        GpsEntity gps, s = null;
-        //找到漂移开始时间
-        for (; i >= 0; i--) {
-            gps = (GpsEntity) array[i];
-
-            if (!gps.getSignalState().equals("drift") || i == 0
-                    || gps.getSignalState().equals("truncation")) {
-                s = gps;
-                break;
-            }
-        }
-
-        long st = s.getTimestamp(), et = nearGps.getTimestamp();
-        if (et - st < (1000 * 60 * 3))
-            return;
-        /*if (s != null){
-            st = s.getTimestamp();
-            //漂移小于3分钟
-            if(et - st < (1000 * 60 * 3))
-                return;
-        }*/
-
-
-        SignalAbnormal signalAbnormal = new SignalAbnormal();
-        signalAbnormal.setSt(st);
-        signalAbnormal.setEt(et);
-        signalAbnormal.setAbnormalType("drift");
-        signalAbnormal.setDestCode(sch.getQdzCode());
-        signalAbnormal.setOutOrIn(0);
-
-        //截断GPS
-        nearGps.setSignalState("truncation");
-
-        //记录信号状态
-        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
-        signalStateData.put(signalState);
-    }
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.SignalStateData;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.entity.RouteReverse;
+import com.bsth.data.gpsdata.arrival.entity.SignalAbnormal;
+import com.bsth.data.gpsdata.arrival.entity.SignalState;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 班次信号状态分析
+ * Created by panzhao on 2016/12/29.
+ */
+@Component
+public class ScheduleSignalState {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    LineConfigData lineConfigData;
+
+    @Autowired
+    SignalStateData signalStateData;
+
+    /**
+     * 路由反向分析
+     */
+    public void reverseAnalyse(RouteReverse reverse) {
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(reverse.getNbbm());
+
+        String bcType = sch.getBcType();
+
+        switch (bcType) {
+            case "out":
+                outReverseAnalyse(sch, reverse);
+                break;
+            case "normal":
+                normalReverseAnalyse(sch, reverse);
+                break;
+        }
+    }
+
+    /**
+     * 出场班次路由反向分析
+     *
+     * @param sch
+     */
+    private void outReverseAnalyse(ScheduleRealInfo sch, RouteReverse reverse) {
+        long t = reverse.getCt();
+        //出场班次终点时间前，允许反向轨迹
+        if (sch.getZdsjT() != null && sch.getZdsjT() > t) {
+            return;
+        }
+
+        int rt;
+        //从实发 到 当前时间 < 计划运送时间 * 0.9
+        if (sch.getFcsjActual() != null && sch.getBcsj() != null) {
+            rt = (int) (t - sch.getFcsjActualTime());
+            if (rt < sch.getBcsj() * 0.9)
+                return;
+        }
+
+        ScheduleRealInfo next = dayOfSchedule.next(sch);
+        if (next.getXlDir().equals(sch.getXlDir()))
+            return;
+
+        //时间足够下一个班次待发时间运行到当前站
+        int runTime = reverse.getCount() * 1500 * 60;
+        if (next.getDfsjT() + runTime < t) {
+            //跳到下一个班次
+            dayOfSchedule.addExecPlan(next);
+        }
+    }
+
+    /**
+     * 正常班次路由反向分析
+     *
+     * @param sch
+     * @param reverse
+     */
+    private void normalReverseAnalyse(ScheduleRealInfo sch, RouteReverse reverse) {
+        LineConfig conf = lineConfigData.get(sch.getXlBm());
+
+        if (conf.isReadReverse()) {
+            //跳下一个班次
+            ScheduleRealInfo next = dayOfSchedule.next(sch);
+            if (next != null)
+                dayOfSchedule.addExecPlan(next);
+
+            //记录信号状态
+            SignalState signalState = SignalState.reverseSignalSTate(sch, reverse);
+            if(signalState != null)
+                signalStateData.put(signalState);
+        }
+    }
+
+    public void signalRetrospect(GpsEntity gps) {
+        signalRetrospect(gps, dayOfSchedule.executeCurr(gps.getNbbm()));
+    }
+
+    /**
+     * 信号追溯
+     *
+     * @param gps
+     * @param sch
+     */
+    public void signalRetrospect(GpsEntity gps, ScheduleRealInfo sch) {
+        //回放数据，是否有掉线或者漂移
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        if (queue == null || queue.size() == 0 /*|| gps.getInstation() == 0*/)
+            return;
+
+        //起始时间点
+        long st = 0;
+        ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+
+        if (prev != null) {
+            if (prev.getZdsjActual() != null)
+                st = prev.getZdsjActualTime();
+            else
+                st = (GeoCacheData.midwayStation(gps.getLineId(), gps.getUpDown(), sch.getQdzCode(), gps.getStopNo()).size() + 1) * (1000 * 60 * 5);
+        }
+
+        Object[] tempArray = queue.getQueue();
+        int len = tempArray.length;
+
+        Object[] array = new Object[len + 1];
+        System.arraycopy(tempArray, 0, array, 0, len);
+        array[len] = gps;
+
+        String gpsState = "";
+        GpsEntity tempGps, nearGps = null;
+        int i = len - 1;
+        for (; i >= 0; i--) {
+            tempGps = (GpsEntity) array[i];
+
+            gpsState = tempGps.getSignalState();
+            if (gpsState.equals("truncation"))
+                break;
+            else if (gpsState.equals("drift")) {
+                nearGps = (GpsEntity) array[i + 1];
+                break;
+            } else if (gpsState.equals("reconnection")) {
+                nearGps = tempGps;
+                break;
+            }
+
+            if (tempGps.getTimestamp() < st)
+                break;
+        }
+
+        if (nearGps != null && i > 0) {
+            createSignalAbnormal(gpsState, nearGps, i, array, sch);
+        }
+    }
+
+    private void createSignalAbnormal(String gpsState, GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
+        switch (gpsState) {
+            case "drift":
+                driftSignalAbnormal(nearGps, i, array, sch);
+                break;
+            case "reconnection":
+                offlineSignalAbnormal(nearGps, ((GpsEntity) array[i - 1]), sch);
+                break;
+        }
+    }
+
+    /**
+     * 掉线异常状态记录
+     *
+     * @param e
+     * @param s
+     */
+    private void offlineSignalAbnormal(GpsEntity e, GpsEntity s, ScheduleRealInfo sch) {
+        long st = s.getTimestamp(), et = e.getTimestamp();
+
+        //掉线超过10分钟才记录
+        if (et - st < (1000 * 60 * 10))
+            return;
+
+        SignalAbnormal signalAbnormal = new SignalAbnormal();
+        signalAbnormal.setSt(st);
+        signalAbnormal.setEt(et);
+        signalAbnormal.setAbnormalType("reconnection");
+        signalAbnormal.setDestCode(sch.getQdzCode());
+        signalAbnormal.setOutOrIn(0);
+
+        //截断GPS
+        e.setSignalState("truncation");
+
+        //记录信号状态
+        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
+        signalStateData.put(signalState);
+    }
+
+    /**
+     * 漂移异常状态记录
+     *
+     * @param nearGps
+     * @param i
+     * @param array
+     */
+    private void driftSignalAbnormal(GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
+        GpsEntity gps, s = null;
+        //找到漂移开始时间
+        for (; i >= 0; i--) {
+            gps = (GpsEntity) array[i];
+
+            if (!gps.getSignalState().equals("drift") || i == 0
+                    || gps.getSignalState().equals("truncation")) {
+                s = gps;
+                break;
+            }
+        }
+
+        long st = s.getTimestamp(), et = nearGps.getTimestamp();
+        if (et - st < (1000 * 60 * 3))
+            return;
+        /*if (s != null){
+            st = s.getTimestamp();
+            //漂移小于3分钟
+            if(et - st < (1000 * 60 * 3))
+                return;
+        }*/
+
+
+        SignalAbnormal signalAbnormal = new SignalAbnormal();
+        signalAbnormal.setSt(st);
+        signalAbnormal.setEt(et);
+        signalAbnormal.setAbnormalType("drift");
+        signalAbnormal.setDestCode(sch.getQdzCode());
+        signalAbnormal.setOutOrIn(0);
+
+        //截断GPS
+        nearGps.setSignalState("truncation");
+
+        //记录信号状态
+        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
+        signalStateData.put(signalState);
+    }
 }
 \ No newline at end of file
@@ -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
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 主页SVG模拟图属性设置
+ * Created by panzhao on 2017/1/6.
+ */
+@Entity
+@Table(name = "bsth_c_svg_attr")
+public class SvgAttribute {
+
+    @Id
+    private String lineCode;
+
+    /**
+     * 要隐藏的站点编码  , 号分割多个
+     */
+    private String hideStations;
+
+    /**
+     * 站点别名 json对象字符串
+     */
+    private String nicknames;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getHideStations() {
+        return hideStations;
+    }
+
+    public void setHideStations(String hideStations) {
+        this.hideStations = hideStations;
+    }
+
+    public String getNicknames() {
+        return nicknames;
+    }
+
+    public void setNicknames(String nicknames) {
+        this.nicknames = nicknames;
+    }
+}
@@ -19,7 +19,7 @@ import java.util.Date;
                 @NamedAttributeNode("cl")
         })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class CarConfigInfo extends BEntity implements Serializable {
     /** 主健Id */
@@ -22,7 +22,7 @@ import java.io.Serializable;
             @NamedAttributeNode("xl")
     })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class EmployeeConfigInfo extends BEntity implements Serializable {
     /** 主键Id */
@@ -15,7 +15,7 @@ import javax.persistence.*;
                 @NamedAttributeNode("xl")
         })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class GuideboardInfo extends BEntity {
     /** 主键Id */
 package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
 import java.util.Date;
@@ -17,6 +18,7 @@ import java.util.Date;
                 @NamedAttributeNode("updateBy")
         })
 })
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class TTInfo extends BEntity {
     /** 主键Id */
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
@@ -21,6 +22,7 @@ import javax.persistence.*;
                 @NamedAttributeNode("tcc")
         })
 })
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class TTInfoDetail extends BEntity {
     /** 主健Id */
+package com.bsth.entity.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
@@ -110,7 +110,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY realExecDate,fcsj,xlBm,clZbh")
 	List<Map<String,Object>> yesterdayDataList(String line,String date);
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
+package com.bsth.repository.realcontrol;
+
+import com.bsth.entity.realcontrol.SvgAttribute;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/1/8.
+ */
+@Repository
+public interface SvgAttributeRepository extends BaseRepository<SvgAttribute, String> {
+    @Query("select s from SvgAttribute s where s.lineCode in ?1")
+    List<SvgAttribute> findSvgAttr(List<String> lineCodes);
+}
@@ -34,7 +34,10 @@ public interface TTInfoDetailRepository extends BaseRepository&lt;TTInfoDetail, Lon
     @Query("select cc from TTInfoDetail cc where cc.id=?1")
     TTInfoDetail findOneExtend(Long aLong);
-    void deleteByTtinfoId(Long ttid);
+//    TODO：在findOne中  @EntityGraph 无效
+//    @EntityGraph(value = "tTInfoDetail_xl_lp_qdz_zdz_tcc", type = EntityGraph.EntityGraphType.FETCH)
+//    @Override
+//    TTInfoDetail findOne(Long aLong);
     @Query(value = "select max(tt.fcno) as mx from bsth_c_s_ttinfo_detail tt where tt.xl =?1 and tt.ttinfo =?2", nativeQuery = true)
     Long findMaxFcno(Integer xlid, Long ttinfoid);
@@ -44,6 +47,6 @@ public interface TTInfoDetailRepository extends BaseRepository&lt;TTInfoDetail, Lon
     @Modifying
     @Query(value = "delete from TTInfoDetail t where t.ttinfo.id = ?1")
-    void deleteByTtinfo(Long ttinfoid);
+    void deleteByTtinfoIdWithModify(Long ttinfoid);
 }
+package com.bsth.repository.sys;
+
+import com.bsth.entity.sys.DutyEmployee;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/1/5.
+ */
+@Repository
+public interface DutyEmployeeRepository extends BaseRepository<DutyEmployee, Long>{
+
+    @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
+    List<DutyEmployee> findByLineAndTime(String lineCode, long st, long et);
+}
-package com.bsth.repository.sys;
-
-import org.springframework.stereotype.Repository;
-
-import com.bsth.entity.sys.SessionLog;
-import com.bsth.repository.BaseRepository;
-
-@Repository
-public interface SessionLogRepository extends BaseRepository<SessionLog, Integer>{
-
-}
 package com.bsth.service.impl;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
@@ -30,7 +13,14 @@ import com.bsth.util.FTPClientUtils;
 import com.bsth.util.PackTarGZUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.*;
 /**
  * 
@@ -985,6 +975,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			List<String> idx = Splitter.on(',').splitToList(lineIds);
 			//路由
 			List<StationRoute> list = new ArrayList<>();
+
+
 			/**
 			 * in 查询符 无法和 @EntityGraph 同时配合使用，这可能是一个bug
 			 * 暂时只能循环单线路查询
@@ -993,9 +985,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			for(String id : idx){
 				list.addAll(repository.findByLineCode(id));
 			}
-			
+
+			for(StationRoute sr : list){
+				sr.setLine(null);
+			}
 			//过滤部分字段
-			String jsonStr = JSON.toJSONString(list, new PropertyFilter() {
+			/*String jsonStr = JSON.toJSONString(list, new PropertyFilter() {
 				@Override
 				public boolean apply(Object object, String name, Object value) {
@@ -1003,10 +998,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 						return false;
 					return true;
 				}
-			});
+			});*/
 			rs.put("status", ResponseCode.SUCCESS);
-			rs.put("list", jsonStr);
+			rs.put("list", list);
 		}catch(Exception e){
 			logger.error("", e);
 			rs.put("status", ResponseCode.ERROR);
@@ -390,36 +390,44 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			Map<String,Object> map = new HashMap<String,Object>();
 			for(Map<String,Object> schRealInfo:listGroup){
 				if(schRealInfo != null){
+					map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
+					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
+					/**
+					 * 如果car==null，则说明该车辆是从线调中换车功能中加进去的，
+					 * 在cars基础信息中查不到车辆的信息，所以忽略该车辆
+ 					 */
+					if(car == null){
+						continue;
+					}
 					//计算总公里和空驶公里，营运公里=总公里-空驶公里
 					double totalKilometers = 0,emptyKilometers =0;
 					sf.append("<LCYH>");
-					map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
-					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
-//					Cars car = carsRepository.findCarByClzbh(schRealInfo.getClZbh());
 					sf.append("<RQ>"+date+"</RQ>");
 					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
 					sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
-					for(ScheduleRealInfo scheduleRealInfo:list){
-						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("clZbh")+"")
-								.equals(scheduleRealInfo.getClZbh())){
-							Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-							//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
-							if(childTaskPlans.isEmpty()){
-								if(scheduleRealInfo.getStatus() == 2){
-									totalKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
-									if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-											|| scheduleRealInfo.getBcType().equals("venting")){
-										emptyKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
+					if(list != null && list.size() > 0){
+						for(ScheduleRealInfo scheduleRealInfo:list){
+							if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("clZbh")+"")
+									.equals(scheduleRealInfo.getClZbh())){
+								Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+								//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
+								if(childTaskPlans.isEmpty()){
+									if(scheduleRealInfo.getStatus() == 2){
+										totalKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
+										if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+												|| scheduleRealInfo.getBcType().equals("venting")){
+											emptyKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
+										}
 									}
-								}
-							}else{
-								Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-								while(it.hasNext()){
-									ChildTaskPlan childTaskPlan = it.next();
-									if(!childTaskPlan.isDestroy()){
-										totalKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();
-										if(childTaskPlan.getMileageType().equals("empty")){
-											emptyKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();;
+								}else{
+									Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+									while(it.hasNext()){
+										ChildTaskPlan childTaskPlan = it.next();
+										if(!childTaskPlan.isDestroy()){
+											totalKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();
+											if(childTaskPlan.getMileageType().equals("empty")){
+												emptyKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();;
+											}
 										}
 									}
 								}
@@ -604,8 +612,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getQdzName())).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
-						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzName())).append("</ZDXH>");
+						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
+								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzName())).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
 								.append("</JHDDSJ>");
 						sBuffer.append("</BC>");
@@ -132,7 +132,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 				t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 				t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
-				t.setRq(dBefore);
+				t.setRq(sdf.parse(rq));
 				repository.save(t);
 				result = "success";
 			} catch (Exception e) {
@@ -13,4 +13,6 @@ public interface RealMapService {
     Map<String,Object> findRouteByLine(String lineCode);
     Map<String,Object> findRouteAndStationByLine(String lineCode);
+
+    Map<String,Object> multiSectionRoute(String codeIdx);
 }
@@ -15,7 +15,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Collection<ScheduleRealInfo>> findByLines(String lines);
-	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj/*,String nbbm,String jsy,String spy*/);
+	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType);
 	Map<String, Object> destroy(String idsStr/*, int spaceAdjust*/, String  remarks, String reason/*, int spaceNum*/);
@@ -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);
@@ -128,4 +128,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     Map<String,Object> changeBcType(Long id, String bcType, String remarks);
     Map<String,Object> historySave(ScheduleRealInfo sch);
+
+    Map<String,Object> svgAttr(String jsonStr);
+
+	Map<String,Object> findSvgAttr(String idx);
 }
@@ -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 坐标数组转 百度
      *