Merge branch 'minhang' into qingpu

# Conflicts: # src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java # src/main/resources/application-dev.properties # src/main/resources/static/index.html # src/main/resources/static/login.html # src/main/resources/static/real_control_v2/css/line_schedule.css # src/main/resources/static/real_control_v2/main.html

Merge branch 'minhang' into qingpu
# Conflicts: # src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java # src/main/resources/application-dev.properties # src/main/resources/static/index.html # src/main/resources/static/login.html # src/main/resources/static/real_control_v2/css/line_schedule.css # src/main/resources/static/real_control_v2/main.html
潘钊
2 parents c5d6b4e6 a716be64
Showing 64 changed files with 2210 additions and 1157 deletions
pom.xml
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/BaseController.java
src/main/java/com/bsth/controller/BaseController2.java
src/main/java/com/bsth/controller/BusinessController.java
src/main/java/com/bsth/controller/CarsController.java
src/main/java/com/bsth/controller/DownloadController.java
src/main/java/com/bsth/controller/PersonnelController.java
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/realcontrol/DataManagerController.java
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bsth</groupId>
@@ -237,6 +237,33 @@
 			<version>1.13</version>
 		</dependency>
  
+		<dependency>
+			<groupId>org.dbunit</groupId>
+			<artifactId>dbunit</artifactId>
+			<version>2.4.9</version>
+			<scope>test</scope>
+
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<version>1.2.132</version>
+			<scope>test</scope>
+		</dependency>
+
+
+		<dependency>
+			<groupId>ojdbc</groupId>
+			<artifactId>ojdbc</artifactId>
+			<version>14</version>
+		</dependency>
 	</dependencies>
  
 	<dependencyManagement>
@@ -2,10 +2,6 @@ package com.bsth;
  
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -13,10 +9,13 @@ import org.springframework.boot.context.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
  
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
  
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(12);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(13);
  
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -36,4 +36,14 @@ public class Constants {
  
 	public static final String SESSION_USERNAME = "sessionUserName";
 	public static final String COMPANY_AUTHORITYS = "cmyAuths";
+
+	/**
+	 * 解除调度指令和班次的外键约束
+	 */
+	public static final String REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch=?";
+
+	/**
+	 * 批量解除调度指令和班次的外键约束
+	 */
+	public static final String MULTI_REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch in ";
 }
 package com.bsth.controller;
  
-import com.bsth.common.ResponseCode;
 import com.bsth.service.BaseService;
-import com.bsth.service.schedule.utils.DataImportExportService;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.util.CollectionUtils;
 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.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
  
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
@@ -35,8 +29,6 @@ public class BaseController&lt;T, ID extends Serializable&gt; {
  
     @Autowired
     protected BaseService<T, ID> baseService;
-    @Autowired
-    DataImportExportService dataImportExportService;
  
     /**
      * @param @param map 查询条件
@@ -126,115 +118,4 @@ public class BaseController&lt;T, ID extends Serializable&gt; {
         return baseService.delete(id);
     }
  
-    /**
-     * 上传数据文件，并使用ktr转换文件导入数据。
-     *
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataImport", method = RequestMethod.POST)
-    public Map<String, Object> uploadDataAndImport(MultipartFile file) throws Exception {
-        Map<String, Object> resultMap = new HashMap<>();
-
-        try {
-            // 获取ktr转换文件绝对路径
-            File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
-            System.out.println(ktrfile.getAbsolutePath());
-            // 导入数据
-            dataImportExportService.fileDataImport(file, ktrfile);
-
-            resultMap.put("status", ResponseCode.SUCCESS);
-            resultMap.put("msg", "导入成功");
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            resultMap.put("status", ResponseCode.ERROR);
-            resultMap.put("msg", exp.getLocalizedMessage());
-        }
-
-        return resultMap;
-    }
-
-    /**
-     * 使用ktr导出数据。
-     *
-     * @param response
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response) throws Exception {
-        dataExport(response, null);
-    }
-
-    @RequestMapping(value = "/dataExportExt", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response, @RequestParam Map<String, Object> param) throws Exception {
-        // 1、使用ktr转换获取输出文件
-        File ktrfile = new File(this.getClass().getResource(getDataExportKtrClasspath()).toURI());
-        File outputfile = null;
-        if (!CollectionUtils.isEmpty(param)) {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile,
-                    param);
-        } else {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile);
-        }
-
-        System.out.println(outputfile.getName());
-        String filePath = outputfile.getAbsolutePath();
-        String fp[] = filePath.split(File.separator);
-        String fileName = fp[fp.length - 1];
-
-        // TODO：使用ktr获取导出数据
-
-        response.setHeader("conent-type", "application/octet-stream");
-        response.setContentType("application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment; filename=" + "东东");
-
-        OutputStream os = response.getOutputStream();
-        BufferedOutputStream bos = new BufferedOutputStream(os);
-
-        InputStream is = null;
-
-        is = new FileInputStream(filePath);
-        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();
-    }
-
-    /**
-     * @return 数据导出的ktr转换文件类路径。
-     */
-    protected String getDataExportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
-    /**
-     * @return 导出文件名。
-     */
-    protected String getDataExportFilename() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定导出的文件路径名
-        throw new RuntimeException("必须override，并指定导出文件名");
-    }
-
-    /**
-     * @return 数据导入的ktr转换文件类路径。
-     */
-    protected String getDataImportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导入功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
 }
-package com.bsth.controller;
-
-
-import com.bsth.common.ResponseCode;
-import com.bsth.service.BaseService;
-import com.bsth.service.schedule.utils.DataImportExportService;
-import com.google.common.base.Splitter;
-import jxl.Sheet;
-import jxl.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
-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.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by xu on 16/11/3.
- */
-public class BaseController2<T, ID extends Serializable> {
-
-    @Autowired
-    protected BaseService<T, ID> baseService;
-    @Autowired
-    DataImportExportService dataImportExportService;
-
-    /**
-     *
-     * @Title: list
-     * @Description: TODO(多条件分页查询)
-     * @param @param map 查询条件
-     * @param @param page 页码
-     * @param @param size 每页显示数量
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.GET)
-    public Page<T> list(@RequestParam Map<String, Object> map,
-                        @RequestParam(defaultValue = "0") int page,
-                        @RequestParam(defaultValue = "10") int size,
-                        @RequestParam(defaultValue = "id") String order,
-                        @RequestParam(defaultValue = "DESC") String direction){
-
-        // 允许多个字段排序，order可以写单个字段，也可以写多个字段
-        // 多个字段格式：{col1},{col2},{col3},....,{coln}
-        List<String> order_columns = Splitter.on(",").trimResults().splitToList(order);
-        // 多字段排序：DESC,ASC...
-        List<String> order_dirs = Splitter.on(",").trimResults().splitToList(direction);
-
-        if (order_dirs.size() == 1) { // 所有字段采用一种排序
-            if (null != order_dirs.get(0) && order_dirs.get(0).equals("ASC")) {
-                return baseService.list(map, new PageRequest(page, size, new Sort(Sort.Direction.ASC, order_columns)));
-            } else {
-                return baseService.list(map, new PageRequest(page, size, new Sort(Sort.Direction.DESC, order_columns)));
-            }
-        } else if (order_columns.size() == order_dirs.size()) {
-            List<Sort.Order> orderList = new ArrayList<>();
-            for (int i = 0; i < order_columns.size(); i++) {
-                if (null != order_dirs.get(i) && order_dirs.get(i).equals("ASC")) {
-                    orderList.add(new Sort.Order(Sort.Direction.ASC, order_columns.get(i)));
-                } else {
-                    orderList.add(new Sort.Order(Sort.Direction.DESC, order_columns.get(i)));
-                }
-            }
-            return baseService.list(map, new PageRequest(page, size, new Sort(orderList)));
-        } else {
-            throw new RuntimeException("多字段排序参数格式问题，排序顺序和字段数不一致");
-        }
-    }
-
-    /**
-     *
-     * @Title: list
-     * @Description: TODO(多条件查询)
-     * @param @param map
-     * @throws
-     */
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    public Iterable<T> list(@RequestParam Map<String, Object> map){
-        return baseService.list(map);
-    }
-
-    /**
-     * 这里保存直接返回保存后的对象，不自己定义Map返回了，和前端angularjs配合。
-     * form也可以提交，但是页面参数可能不全，
-     * json的化比较灵活，但是貌似有多余属性也会报错，或者碰到lazy属性值，也有问题
-     * 不论form，还是json提交都能解决问题，就看哪个方便哪个来
-     *
-     * @param t 参数需要使用@RequestBody转换json成对象
-     * @return
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public T save(@RequestBody T t) {
-        baseService.save(t);
-        return t;
-    }
-
-    @RequestMapping(value="/{id}", method = RequestMethod.POST)
-    public T update(@RequestBody T t) {
-        baseService.save(t);
-        return t;
-    }
-
-    /**
-     *
-     * @Title: findById
-     * @Description: TODO(根据主键获取单个对象)
-     * @param @param id
-     * @throws
-     */
-    @RequestMapping(value="/{id}",method = RequestMethod.GET)
-    public T findById(@PathVariable("id") ID id){
-        return baseService.findById(id);
-    }
-
-    /**
-     *
-     * @Title: delete
-     * @Description: TODO(根据主键删除对象)
-     * @param @param id
-     * @throws
-     */
-    @RequestMapping(value="/{id}",method = RequestMethod.DELETE)
-    public Map<String, Object> delete(@PathVariable("id") ID id){
-        return baseService.delete(id);
-    }
-
-    /**
-     * 上传数据文件，并使用ktr转换文件导入数据。
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataImport", method = RequestMethod.POST)
-    public Map<String, Object> uploadDataAndImport(MultipartFile file) throws Exception {
-        Map<String, Object> resultMap = new HashMap<>();
-
-        try {
-            // 获取ktr转换文件绝对路径
-            File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
-            System.out.println(ktrfile.getAbsolutePath());
-            // 导入数据
-            dataImportExportService.fileDataImport(file, ktrfile);
-
-            resultMap.put("status", ResponseCode.SUCCESS);
-            resultMap.put("msg", "导入成功");
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            resultMap.put("status", ResponseCode.ERROR);
-            resultMap.put("msg", exp.getLocalizedMessage());
-        }
-
-        return resultMap;
-    }
-
-    /**
-     * 使用ktr导出数据。
-     * @param response
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response) throws Exception {
-        dataExport(response, null);
-    }
-
-    @RequestMapping(value = "/dataExportExt", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response, @RequestParam Map<String, Object> param) throws Exception {
-        // 1、使用ktr转换获取输出文件
-        File ktrfile = new File(this.getClass().getResource(getDataExportKtrClasspath()).toURI());
-        File outputfile = null;
-        if (!CollectionUtils.isEmpty(param)) {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile,
-                    param);
-        } else {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile);
-        }
-
-        System.out.println(outputfile.getName());
-        System.out.println(outputfile.getAbsolutePath());
-
-        String filePath = outputfile.getAbsolutePath();
-//        String fp[] = filePath.split(File.separator);
-//        String fileName = fp[fp.length - 1];
-
-        // TODO：使用ktr获取导出数据
-
-        response.setHeader("conent-type", "application/octet-stream");
-        response.setContentType("application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment; filename=" + "东东");
-
-        OutputStream os = response.getOutputStream();
-        BufferedOutputStream bos = new BufferedOutputStream(os);
-
-        InputStream is = null;
-
-        is = new FileInputStream(filePath);
-        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();
-    }
-
-    /**
-     * @return 数据导出的ktr转换文件类路径。
-     */
-    protected String getDataExportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
-    /**
-     * @return 导出文件名。
-     */
-    protected String getDataExportFilename() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定导出的文件路径名
-        throw new RuntimeException("必须override，并指定导出文件名");
-    }
-
-    /**
-     * @return 数据导入的ktr转换文件类路径。
-     */
-    protected String getDataImportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导入功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
-
-    public static class ExcelFileOutput {
-        private String fileName;
-        private List<Map<String, Object>> sheetnames = new ArrayList<>();
-
-        public String getFileName() {
-            return fileName;
-        }
-
-        public void setFileName(String fileName) {
-            this.fileName = fileName;
-        }
-
-        public List<Map<String, Object>> getSheetnames() {
-            return sheetnames;
-        }
-
-        public void setSheetnames(List<Map<String, Object>> sheetnames) {
-            this.sheetnames = sheetnames;
-        }
-    }
-
-    /**
-     * 上传Excel文件，返回文件全路径名，工作区名称列表。
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
-    public ExcelFileOutput fileUpload(MultipartFile file) throws Exception {
-        // 返回对象
-        ExcelFileOutput rs = new ExcelFileOutput();
-
-        // 上传文件
-        File file1 = dataImportExportService.uploadFile(file);
-        // 获取文件的sheet
-        Workbook book = Workbook.getWorkbook(file1);
-        for (Sheet sheet : book.getSheets()) {
-            String sheetname = sheet.getName();
-            Map<String, Object> s = new HashMap<>();
-            s.put("name", sheetname);
-            rs.getSheetnames().add(s);
-        }
-
-        rs.setFileName(file1.getAbsolutePath());
-        return rs;
-    }
-
-}
 package com.bsth.controller;
  
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
  
 import com.bsth.entity.Business;
+import com.bsth.service.BusinessService;
+import com.bsth.util.GetUIDAndCode;
  
 /**
  * 
@@ -23,5 +27,11 @@ import com.bsth.entity.Business;
 @RestController
 @RequestMapping("business")
 public class BusinessController extends BaseController<Business, Integer> {
-
+	@Autowired
+	private BusinessService businessService;
+	
+	@RequestMapping(value = "getCompCode", method = RequestMethod.GET)
+	public long getLineCode() {
+		return businessService.getCompCode();
+	}
 }
 package com.bsth.controller;
  
-import com.bsth.common.ResponseCode;
 import com.bsth.entity.Cars;
-import com.bsth.service.schedule.utils.DataImportExportService;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Created by xu on 16/5/31.
  */
 @RestController
 @RequestMapping("cars")
-@EnableConfigurationProperties(DataToolsProperties.class)
-public class CarsController extends BaseController2<Cars, Integer> {
-
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-    @Autowired
-    private DataImportExportService dataImportExportService;
-
-    /**
-     * 验证。
-     * @param map
-     * @return
-     */
-    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
-    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
-        // 一般比较自编号是否重复
-        return baseService.validateEquale(map);
-    }
-
-    // uploadFile post
-
-    // 验证excel sheet
-    @RequestMapping(value = "/validate/sheet", method = RequestMethod.GET)
-    public Map<String, Object> validateSheet() throws Exception {
-        Map<String, Object> rtn = new HashMap<>();
-
-        // TODO：
-
-        rtn.put("status", ResponseCode.SUCCESS);
-        return rtn;
-    }
-
-    @RequestMapping(value = "/importfile", method = RequestMethod.POST)
-    public Map<String, Object> importData(
-            @RequestParam Map<String, Object> form)
-            throws Exception {
-        Map<String, Object> rtn = new HashMap<>();
-
-        // TODO：
-        String filename = (String) form.get("filename");
-
-
-        try {
-            // 获取ktr转换文件绝对路径
-            File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
-            System.out.println(ktrfile.getAbsolutePath());
-            // 导入数据
-            dataImportExportService.fileDataImport(new File(filename), ktrfile);
-
-            rtn.put("status", ResponseCode.SUCCESS);
-            rtn.put("msg", "导入成功");
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", exp.getLocalizedMessage());
-        }
-
-        return rtn;
-    }
-
-
-    @Override
-    protected String getDataImportKtrClasspath() {
-        return dataToolsProperties.getCarsDatainputktr();
-    }
-
-    @Override
-    protected String getDataExportKtrClasspath() {
-        return dataToolsProperties.getCarsDataoutputktr();
-    }
+public class CarsController extends BaseController<Cars, Integer> {
  
-    @Override
-    protected String getDataExportFilename() {
-        return "车辆基础数据";
-    }
 }
@@ -100,4 +100,29 @@ public class DownloadController
         os.close();
         file.delete();
     }  
+    
+    
+    @RequestMapping("downloadModel")
+    public void downloadModel(HttpServletResponse response,String fileName)
+    		throws IOException {
+//    	String fileNames=URLDecoder.decode(fileName,"UTF-8");
+    	fileName =fileName + ".xls";
+    	String moudelPath = this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileName; 
+    	File file = new File(moudelPath);// path是根据日志路径和文件名拼接出来的
+//        String filename = file.getName();// 获取日志文件名称
+        InputStream fis = new BufferedInputStream(new FileInputStream(moudelPath));
+        byte[] buffer = new byte[fis.available()];
+        fis.read(buffer);
+        fis.close();
+        response.reset();
+        response.addHeader("Content-Disposition", "attachment;filename=" + new String(fileName.replaceAll(" ", "").getBytes("utf-8"),"iso8859-1"));
+        response.addHeader("Content-Length", "" + file.length());
+        OutputStream os = new BufferedOutputStream(response.getOutputStream());
+        response.setContentType("application/octet-stream");
+        os.write(buffer);// 输出文件
+        os.flush();
+        os.close();
+    }
+    
+    
 }
@@ -2,10 +2,11 @@ package com.bsth.controller;
  
 import com.bsth.entity.Personnel;
 import com.bsth.service.PersonnelService;
-import com.bsth.service.schedule.utils.DataToolsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
  
 import java.util.List;
 import java.util.Map;
@@ -15,54 +16,11 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("personnel")
-@EnableConfigurationProperties(DataToolsProperties.class)
 public class PersonnelController extends BaseController<Personnel, Integer> {
  
     @Autowired
-    private DataToolsProperties dataToolsProperties;
-
-    @Autowired
     private PersonnelService service;
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     * @param @param t
-     * @param @return    设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody Personnel t){
-        return baseService.save(t);
-    }
-
-    /**
-     * 验证。
-     * @param map
-     * @return
-     */
-    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
-    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
-        // 一般比较相同公司下工号是否相同
-        return baseService.validateEquale(map);
-    }
-
-    @Override
-    protected String getDataImportKtrClasspath() {
-        return dataToolsProperties.getEmployeesDatainputktr();
-    }
-
-    @Override
-    protected String getDataExportKtrClasspath() {
-        return dataToolsProperties.getEmployeesDataoutputktr();
-    }
  
-    @Override
-    protected String getDataExportFilename() {
-        return "人员基础信息";
-    }
-    
     @RequestMapping(value = "/sreachPersonnel", method = RequestMethod.GET)
 	public List<Map<String, String>> sreachPersonnel(@RequestParam String jobCode) {
 		return service.sreachPersonnel(jobCode);
@@ -48,13 +48,9 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	 */
 	@RequestMapping(value="sectionSave" , method = RequestMethod.POST)
 	public Map<String, Object> sectionSave(@RequestParam Map<String, Object> map) {
-		
 		map.put("createBy", "");
-		
 		map.put("updateBy", "");
-		
 		return service.sectionSave(map);
-		
 	}
  
 	/**
@@ -35,6 +35,17 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 	@Autowired
 	SectionRouteService routeService;
  
+	 /**
+     * @param @param map
+     * @throws
+     * @Title: list
+     * @Description: TODO(多条件查询)
+     */
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    public Iterable<SectionRoute> list(@RequestParam Map<String, Object> map) {
+        return routeService.list(map);
+    }
+	
 	/**
 	 * @Description :TODO(查询路段信息)
 	 * 
@@ -57,7 +68,6 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 	 */
 	@RequestMapping(value = "/findSectionRouteInfoFormId",method = RequestMethod.GET)
 	public List<Map<String, Object>> findSectionRouteInfoFormId(@RequestParam Map<String, Object> map) {
-		
 		return routeService.findSectionRouteInfoFormId(map);
 	}
  
@@ -72,4 +82,14 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 	public List<Map<String, Object>> findUpStationRouteCode(@RequestParam Map<String, Object> map) {
 		return routeService.findUpSectionRouteCode(map);
 	}
+	
+	/**
+	 * @Description :TODO(引用路段)
+	 * 
+	 * @return List<Map<String, Object>> 
+	 */
+	@RequestMapping(value = "/quoteSection" , method = RequestMethod.POST)
+	public Map<String, Object> quoteSection(@RequestParam Map<String, Object> map) {
+		return routeService.quoteSection(map);
+	}
 }
@@ -60,16 +60,12 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	 */
 	@RequestMapping(value="collectionSave" , method = RequestMethod.POST)
 	public Map<String, Object> collectionSave(@RequestParam Map<String, Object> map) {
-		
 		return service.systemSaveStations(map);
-		
 	}
  
 	@RequestMapping(value="manualSave" , method = RequestMethod.POST)
 	public Map<String, Object> manualSave(@RequestParam Map<String, Object> map) {
-		
 		return service.manualSave(map);
-		
 	}
  
 	/**
@@ -89,13 +85,9 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	 */
 	@RequestMapping(value="stationSave" , method = RequestMethod.POST)
 	public Map<String, Object> stationSave(@RequestParam Map<String, Object> map) {
-		
 		map.put("createBy", "");
-		
 		map.put("updateBy", "");
-		
 		return service.stationSaveMap(map);
-		
 	}
  
 	/**
@@ -36,6 +36,17 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
     @Autowired
     StationRouteRepository stationRouteRepository;
  
+    /**
+     * @param @param map
+     * @throws
+     * @Title: list
+     * @Description: TODO(多条件查询)
+     */
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    public Iterable<StationRoute> list(@RequestParam Map<String, Object> map) {
+        return service.list(map);
+    }
+    
 	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
@@ -111,7 +122,6 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	 */
 	@RequestMapping(value = "/findStationRouteInfo",method = RequestMethod.GET)
 	public List<Map<String, Object>> findStationRouteInfo(@RequestParam Map<String, Object> map) {
-		
 		return service.findStationRouteInfo(map);
 	}
  
@@ -127,8 +137,26 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
      */
     @RequestMapping(value = "/multiLine", method = RequestMethod.GET)
     public Map<String, Object> findByMultiLine(@RequestParam String lineIds){
-    	
     	return service.findByMultiLine(lineIds);
     }
  
+    /**
+     * 
+     * @Title: updSwitchDir 
+     * @Description: TODO(上下行切换) 
+     */
+    @RequestMapping(value = "/updSwitchDir", method = RequestMethod.POST)
+    public Map<String, Object> updSwitchDir(@RequestParam String lineIds){
+    	return service.updSwitchDir(lineIds);
+    }
+	
+    /**
+     * 
+     * @Title: upddis 
+     * @Description: TODO(更新站距) 
+     */
+    @RequestMapping(value = "/upddis",method = RequestMethod.POST)
+	public Map<String, Object> upddis(@RequestParam Map<String, Object> map) {
+		return service.upddis(map);
+	}
 }
@@ -28,6 +28,7 @@ import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.service.forms.ExportService;
 import com.bsth.service.forms.FormsService;
+import com.bsth.util.Arith;
 import com.bsth.util.ReportUtils;
  
 @RestController
@@ -82,7 +83,7 @@ public class ExportController {
 	}
  
 	// 班次车辆人员日统计
-	@RequestMapping(value = "/shifdayExport", method = RequestMethod.POST)
+	@RequestMapping(value = "/shifdayExport", method = RequestMethod.GET)
 	public List<Map<String, Object>> shifdayExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
@@ -122,7 +123,7 @@ public class ExportController {
 	}
  
 	// 班次车辆人员月统计
-	@RequestMapping(value = "/shiftuehiclemanthExport", method = RequestMethod.POST)
+	@RequestMapping(value = "/shiftuehiclemanthExport", method = RequestMethod.GET)
 	public List<Map<String, Object>> shiftuehiclemanthExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
@@ -147,12 +148,18 @@ public class ExportController {
 		}
  
 		try {
+			String	mouldurl = null;
+			if(map.get("empnames").equals("驾驶员")){
+			mouldurl="mould/shiftuehiclemanth.xls";
+			}else if(map.get("empnames").equals("售票员")){
+				mouldurl="mould/shiftuehiclemanthspy.xls";
+			}else if(map.get("empnames").equals("车辆自编号")){
+				mouldurl="mould/shiftuehiclemanthclzbh.xls";
+			}
 			listI.add(resList.iterator());
-
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould/shiftuehiclemanth.xls", path
-					+ "export/班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
-
+			ee.excelReplace(listI, new Object[] { map }, path +mouldurl,
+					path + "export/班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -161,7 +168,7 @@ public class ExportController {
 	}
  
 	// 路单数据报表
-	@RequestMapping(value = "/singledataExport", method = RequestMethod.POST)
+	@RequestMapping(value = "/singledataExport", method = RequestMethod.GET)
 	public List<Map<String, Object>> singledataExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
@@ -207,12 +214,12 @@ public class ExportController {
 	}
  
 	// 车辆加注
-	@RequestMapping(value = "/vehicleloadingExport", method = RequestMethod.POST)
+	@RequestMapping(value = "/vehicleloadingExport", method = RequestMethod.GET)
 	public List<Map<String, Object>> vehicleloadingExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
-		List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),map.get("line").toString(),
+		List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("line").toString(),
 				map.get("data").toString());
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		int i = 1;
@@ -246,7 +253,7 @@ public class ExportController {
 	}
  
 	// 运营服务阶段报表
-	@RequestMapping(value = "/operationserviceExport", method = RequestMethod.POST)
+	@RequestMapping(value = "/operationserviceExport", method = RequestMethod.GET)
 	public List<Map<String, Object>> operationserviceExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
@@ -552,17 +559,13 @@ public class ExportController {
 		List<Daily> allline = formsService.daily(map);
  
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		Float zgl=0f;
-		Float ks=0f;
-		Float yh=0f;
-		Float bc=0f;
+		double zgl=0.0;
+		double ks=0.0;
+		double yh=0.0;
+		int bc=0;
 		Map<String, Object> m ;
 		for (Daily d : allline) {
 			m = new HashMap<String, Object>();
-			zgl +=d.getZlc()==""?0f:Float.valueOf(d.getZlc());
-			ks +=d.getJzl1()==""?0f:Float.valueOf(d.getJzl1());
-			yh +=d.getYh()==""?0f:Float.valueOf(d.getYh());
-			bc +=d.getBc()==""?0f:Float.valueOf(d.getBc());
 			m.put("zbh", d.getZbh());
 			m.put("jgh",d.getJgh());
 			m.put("jName", d.getjName());
@@ -570,9 +573,13 @@ public class ExportController {
 			m.put("jzl1", d.getJzl1());
 			m.put("yh", d.getYh());
 			m.put("bc", d.getBc());
+			zgl =Arith.add(zgl, d.getZlc());
+			ks =Arith.add(ks, d.getJzl1());
+			yh =Arith.add(yh, d.getYh());
+			bc +=Integer.parseInt(d.getBc());
  
 			resList.add(m);
-			}
+		}
  
 		m=new HashMap<String,Object>();
 		m.put("total_zgl", zgl);
@@ -52,14 +52,14 @@ public class MCY_FormsController {
 	}
  
 	// 班次车辆人员月报表
-	@RequestMapping(value = "/shiftuehiclemanth", method = RequestMethod.POST)
+	@RequestMapping(value = "/shiftuehiclemanth", method = RequestMethod.GET)
 	public List<Shiftuehiclemanth> shiftuehiclemanth(@RequestParam Map<String, Object> map) {
  
 		return formsService.shiftuehiclemanth(map);
 	}
  
 	// 班次车辆人员日统计
-	@RequestMapping(value = "/shifday", method = RequestMethod.POST)
+	@RequestMapping(value = "/shifday", method = RequestMethod.GET)
 	public List<Shifday> shifday(@RequestParam Map<String, Object> map) {
  
 		return formsService.shifday(map);
@@ -73,21 +73,20 @@ public class MCY_FormsController {
 	}
  
 	// 路单数据
-	@RequestMapping(value = "/singledata", method = RequestMethod.POST)
+	@RequestMapping(value = "/singledata", method = RequestMethod.GET)
 	public List<Singledata> singledata(@RequestParam Map<String, Object> map) {
  
 		return formsService.singledata(map);
 	}
  
 	// 车辆加注
-	@RequestMapping(value = "/vehicleloading", method = RequestMethod.POST)
-	public List<Vehicleloading> vehicleloading(@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,
-			@RequestParam String line, @RequestParam String data) {
-		return formsService.vehicleloading(gsdmVehic, fgsdmVehic, line, data);
+	@RequestMapping(value = "/vehicleloading", method = RequestMethod.GET)
+	public List<Vehicleloading> vehicleloading(@RequestParam String line, @RequestParam String data) {
+		return formsService.vehicleloading(line, data);
 	}
  
 	// 运营服务阶段报表
-	@RequestMapping(value = "/operationservice", method = RequestMethod.POST)
+	@RequestMapping(value = "/operationservice", method = RequestMethod.GET)
 	public List<Operationservice> operationservice(@RequestParam Map<String, Object> map) {
  
 		return formsService.operationservice(map);
@@ -96,4 +96,34 @@ public class GpsController {
     public Map<String, Object> gpsCompletion(@RequestParam long schId) {
         return gpsService.gpsCompletion(schId);
     }
+
+    /**
+     * 历史GPS查询 ，第二版轨迹回放用
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v2/{nbbm}")
+    public Map<String, Object> history_v2(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et){
+        return gpsService.history_v2(nbbm, st, et);
+    }
+
+    /**
+     * 安全驾驶数据 分页查询
+     * @param map
+     * @param page
+     * @param size
+     * @param order
+     * @param direction
+     * @return
+     */
+    @RequestMapping(value = "/safeDriv")
+    public Map<String, Object> safeDrivList(@RequestParam Map<String, Object> map,
+                                       @RequestParam(defaultValue = "0") int page,
+                                       @RequestParam(defaultValue = "15") int size,
+                                       @RequestParam(defaultValue = "timestamp") String order,
+                                       @RequestParam(defaultValue = "DESC") String direction){
+        return gpsService.safeDrivList(map , page, size, order, direction);
+    }
 }
 package com.bsth.controller.oil;
  
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
  
@@ -17,6 +20,7 @@ import com.bsth.controller.BaseController;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.service.oil.DlbService;
+import com.bsth.util.ReportUtils;
 import com.google.common.base.Splitter;
  
 @RestController
@@ -124,4 +128,57 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 		}
 		return list;
 	}
+	
+
+	@RequestMapping(value = "/listExport",method = RequestMethod.POST)
+	public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Dlb> dlb= service.listDlb(map);
+//		(new CustomerSpecs<Ylb>(map)).iterator();
+		List<Map<String, Object>>  resList = new ArrayList<Map<String, Object>>();
+		for (Dlb y : dlb) {
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("rq", y.getRq());
+			m.put("gsname",y.getGsname() );
+			m.put("xlname", y.getXlname());
+			m.put("nbbm", y.getNbbm());
+			m.put("jsy", y.getJsy());
+			m.put("cdl", y.getCdl());
+			m.put("czcd", y.getCzcd()+"%");
+			m.put("jzcd", y.getJzcd()+"%");
+			m.put("hd", y.getHd());
+			String shyy ="无";
+			if(y.getShyy()!=null){
+				 if(shyy.equals("1")){shyy="票务用油";}
+				 else if(shyy.equals("2")){shyy="保养用油";}
+				 else if(shyy.equals("3")){shyy="报废车用油";}
+				 else if(shyy.equals("4")){shyy="其它用油";}
+				 else if(shyy.equals("5")){shyy="人保部";}
+				 else if(shyy.equals("6")){shyy="车队";}
+				 else if(shyy.equals("7")){shyy="车间(高保)";}
+				 else if(shyy.equals("8")){shyy="车间(小修)";}
+				 else{shyy ="无";}
+			}
+			m.put("shyy", shyy);
+			m.put("sh", y.getSh());
+			m.put("zlc", y.getZlc());
+			m.put("bglyh", y.getBglyh());
+			resList.add(m);
+		}
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould/listDl.xls",
+				path+"export/"+map.get("rq").toString()+ "进出场存电量.xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}	
+			
+		return resList;
+		
+	}
+	
 }
@@ -238,9 +238,11 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("rq", y.getRq());
 			m.put("gsname",y.getGsname() );
+			m.put("fgsname", y.getFgsname());
 			m.put("xlname", y.getXlname());
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
+			m.put("name", y.getName());
 			m.put("jzl", y.getJzl());
 			m.put("czlc", y.getCzlc());
 			m.put("jzlc", y.getJzlc());
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import com.bsth.entity.Line;
+import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,9 +13,7 @@ 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;
+import java.util.*;
  
 @RestController
 @RequestMapping("/basic")
@@ -126,4 +126,23 @@ public class BasicDataController {
 	public Map<String, String> nbbm2PlateNo(){
 		return basicData.getNbbm2PlateNo();
 	}
+
+
+	/**
+	 * 获取线路配车信息
+	 * @return
+	 */
+	@RequestMapping("/ccInfo")
+	public Map<String, Collection<String>> ccInfo(){
+
+		ArrayListMultimap<String, String> listMultimap = ArrayListMultimap.create();
+		Set<String> ks = BasicData.nbbm2LineMap.keySet();
+
+		Line line;
+		for(String nbbm : ks){
+			line = BasicData.nbbm2LineMap.get(nbbm);
+			listMultimap.put(line.getLineCode(), nbbm);
+		}
+		return listMultimap.asMap();
+	}
 }
+package com.bsth.controller.realcontrol;
+
+import com.bsth.service.realcontrol.DataManagerService;
+import org.apache.commons.lang3.StringEscapeUtils;
+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.Map;
+
+/**
+ * 数据管理，包括从老系统的数据迁移。新系统的数据校验等
+ * Created by panzhao on 2017/4/17.
+ */
+@RestController
+@RequestMapping("dataManager")
+public class DataManagerController {
+
+    @Autowired
+    DataManagerService dataManagerService;
+
+    @RequestMapping("cars/old_now")
+    public Map<String, Object> carInfos(@RequestParam Integer lineId){
+        return dataManagerService.carInfos(lineId);
+    }
+
+    @RequestMapping("car/updateDevices")
+    public Map<String, Object> updateDevices(@RequestParam String jsonStr){
+        jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
+        return dataManagerService.updateDevices(jsonStr);
+    }
+}
@@ -14,39 +14,91 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
  
 	@Autowired
 	LineConfigService lineConfigService;
-	
+
+	/**
+	 * 检查是否有线路配置信息
+	 * @param codeArray
+	 * @return
+	 */
 	@RequestMapping("/check")
 	public Map<String, Object> check(@RequestParam String[] codeArray){
 		return lineConfigService.check(codeArray);
 	}
-	
+
+	/**
+	 * 初始化线路配置
+	 * @param lineCode
+	 * @return
+	 * @throws Exception
+	 */
 	@RequestMapping("/init/{lineCode}")
 	public Integer init(@PathVariable("lineCode") String lineCode) throws Exception{
 		return lineConfigService.init(lineCode);
 	}
-	
+
+	/**
+	 * 修改班次刷新时间
+	 * @param time
+	 * @param lineCode
+	 * @return
+	 */
 	@RequestMapping(value = "/editTime", method = RequestMethod.POST)
 	public Map<String, Object> editStartOptTime(@RequestParam String time,@RequestParam String lineCode){
 		return lineConfigService.editStartOptTime(time, lineCode);
 	}
-	
+
+	/**
+	 * 修改出场时间类型
+	 * @param lineCode
+	 * @param type
+	 * @return
+	 */
 	@RequestMapping(value = "/editOutTimeType", method = RequestMethod.POST)
-	public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type){
-		return lineConfigService.editOutTimeType(lineCode, type);
+	public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type,@RequestParam String parkCode,@RequestParam String stationCode){
+		return lineConfigService.editOutTimeType(lineCode, type, parkCode, stationCode);
 	}
  
+	/**
+	 * 启用原线路回场
+	 * @param lineCode
+	 * @param enable
+	 * @return
+	 */
 	@RequestMapping(value = "/enableInParkForSource", method = RequestMethod.POST)
 	public Map<String, Object> enableInParkForSource(@RequestParam String lineCode, @RequestParam int enable){
 		return lineConfigService.enableInParkForSource(lineCode, enable);
 	}
  
+	/**
+	 * 根据线路编码获取配置信息
+	 * @param lineCode
+	 * @return
+	 */
 	@RequestMapping(value = "/getByLineCode")
 	public LineConfig getByLineCode(@RequestParam String lineCode){
 		return lineConfigService.getByLineCode(lineCode);
 	}
  
+	/**
+	 * 到站缓冲区设置
+	 * @param lineCode
+	 * @param field
+	 * @param value
+	 * @return
+	 */
 	@RequestMapping(value = "/bufferTimeDiff", method = RequestMethod.POST)
 	public Map<String, Object> bufferTimeDiff(@RequestParam String lineCode, @RequestParam String field,@RequestParam String value){
 		return lineConfigService.bufferTimeDiff(lineCode, field, value);
 	}
+
+	/**
+	 * 应急停靠设置
+	 * @param map
+	 * @return
+	 */
+	@RequestMapping(value = "/yjtkSet", method = RequestMethod.POST)
+	public Map<String, Object> yjtkSet(@RequestParam Map<String, String> map){
+		//System.out.println(map);
+		return lineConfigService.yjtkSet(map);
+	}
 }
 package com.bsth.controller.realcontrol;
  
 import com.alibaba.fastjson.JSONArray;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
@@ -185,16 +186,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
  
 	/**
 	 * 
-	 * @Title: trustStatus @Description: TODO(线路托管状态) @param @param lineCodes
-	 * 线路编码 @throws
-	 */
-	@RequestMapping(value = "/trustStatus")
-	public Map<Integer, Integer> trustStatus(@RequestParam String lineCodes) {
-		return scheduleRealInfoService.trustStatus(lineCodes);
-	}
-	
-	/**
-	 * 
 	 * @Title: outgoAdjustAll 
 	 * @Description: TODO(批量待发调整) 
 	 * @param @param list
@@ -206,17 +197,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		params = StringEscapeUtils.unescapeHtml4(params);
 		return scheduleRealInfoService.outgoAdjustAll(params);
 	}
-
-	/**
-	 * 
-	 * @Title: changeTrustStatus @Description: TODO(切换线路托管状态) @param @param
-	 * lineCode 线路编码 @param @param status 托管状态 @throws
-	 */
-	@RequestMapping(value = "/trustStatus/change", method = RequestMethod.POST)
-	public int changeTrustStatus(@RequestParam Integer lineCode, @RequestParam Integer status) {
-		//ScheduleBuffer.trustMap.put(lineCode, status);
-		return 200;
-	}
  
 	/**
 	 * 
@@ -242,12 +222,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.findRouteByLine(lineCode);
 	}
  
-	@RequestMapping(value = "/test/getSch")
-	public int getSch(){
-		//getSchedulePlanThread.start();
-		return 1;
-	}
-	
 	/**
 	 * 
 	 * @Title: removeChildTask 
@@ -268,7 +242,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/lineCode/{lineCode}")
 	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
-		//return ScheduleBuffer.realSchedulListMap.get(lineCode);
 		return dayOfSchedule.findByLineCode(lineCode);
 	}
  
@@ -368,9 +341,36 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
  
 	@RequestMapping(value="/statisticsDailyTj")
-	public List<Map<String,Object>> statisticsDailyTj(@RequestParam String line, @RequestParam String date,
-			@RequestParam String date2,@RequestParam String xlName, @RequestParam String type){
-		return scheduleRealInfoService.statisticsDailyTj(line, date,date2, xlName, type);
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
 	}
  
 	@RequestMapping(value="/MapById",method = RequestMethod.GET)
@@ -419,10 +419,10 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.changeBcType(id, bcType, remarks);
 	}
  
-	@RequestMapping(value="/history", method=RequestMethod.POST)
+/*	@RequestMapping(value="/history", method=RequestMethod.POST)
 	public Map<String,Object> historySave(ScheduleRealInfo sch){
 		return scheduleRealInfoService.historySave(sch);
-	}
+	}*/
  
  
 	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
@@ -486,4 +486,54 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> lpChangeMulti(@RequestParam String leftIdx, @RequestParam String rightIdx,@RequestParam int type){
 		return scheduleRealInfoService.lpChangeMulti(leftIdx, rightIdx, type);
 	}
+
+	/**
+	 * 删除当日实际排班
+	 * @return
+	 */
+	@RequestMapping(value = "deleteRealSchedule", method = RequestMethod.POST)
+	public Map<String, Object> deleteRealSchedule(@RequestParam String lineCode){
+		return dayOfSchedule.deleteRealSchedule(lineCode);
+	}
+
+	/**
+	 * 从计划表重新加载当日排班
+	 * @param lineCode
+	 * @return
+	 */
+	@RequestMapping(value = "reLoadRealSchedule", method = RequestMethod.POST)
+	public Map<String, Object> reLoadRealSchedule(@RequestParam String lineCode){
+		Map<String, Object> rs = new HashMap<>();
+		List<ScheduleRealInfo> list = dayOfSchedule.findByLineCode(lineCode);
+		if(list != null && list.size() > 0){
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", "失败，" + list.get(0).getXlName() + "当日存在实际排班，无法重新加载。");
+			return rs;
+		}
+
+		int code = dayOfSchedule.reloadSch(lineCode);
+		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
+		return rs;
+	}
+
+	/**
+	 * 误点调整
+	 * @param idx
+	 * @param minute
+	 * @return
+	 */
+	@RequestMapping(value = "lateAdjust", method = RequestMethod.POST)
+	public Map<String, Object> lateAdjust(@RequestParam String idx,@RequestParam float minute ){
+		return scheduleRealInfoService.lateAdjust(idx, minute);
+	}
+
+	/**
+	 * 获取所有应发未到的班次
+	 * @param idx
+	 * @return
+	 */
+	@RequestMapping(value = "allLate2")
+	public List<ScheduleRealInfo> allLate2(@RequestParam String idx){
+		return scheduleRealInfoService.allLate2(idx);
+	}
 }
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 相关数据异常检测
+ * Created by panzhao on 2017/4/14.
+ */
+@RestController
+@RequestMapping("anomalyCheck")
+public class anomalyCheckController {
+
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+    /**
+     * 出现重复班次的车辆
+     * @param nbbm
+     */
+    @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
+    public void schRepeat(@RequestParam String nbbm){
+        logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
+        List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+
+        Set<ScheduleRealInfo> set = new HashSet<>();
+        for(ScheduleRealInfo sch : list){
+            if(!set.add(sch)){
+                logger.info("出现一次重复班次，班次ID：" + sch.getId());
+            }
+        }
+
+        if(set.size() > 0){
+            dayOfSchedule.replaceByNbbm(nbbm, set);
+        }
+    }
+}
 package com.bsth.controller.report;
  
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
  
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.entity.excep.ArrivalInfo;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.report.ReportService;
+import com.bsth.util.ReportUtils;
  
 @RestController
 @RequestMapping("report")
@@ -21,22 +24,152 @@ public class ReportController {
 	@Autowired
 	ReportService service;
  
-	@RequestMapping(value="/queryListBczx" ,method = RequestMethod.POST)
+	@RequestMapping(value="/queryListBczx" ,method = RequestMethod.GET)
 	public List<ScheduleRealInfo> queryListBczx(@RequestParam String clzbh,@RequestParam String line,@RequestParam String date){
 		return service.queryListBczx(line,date,clzbh);
 	}
  
-	@RequestMapping(value="/queryListZdxx" ,method = RequestMethod.POST)
+	@RequestMapping(value="/queryListZdxx" ,method = RequestMethod.GET)
 	public List<ArrivalInfo> queryListZdxx(@RequestParam String clzbh,@RequestParam String line,
 			@RequestParam String date,@RequestParam String fcsj,@RequestParam String ddsj){
 		return service.queryListZdxx(line,date,clzbh,fcsj,ddsj);
 	}
-	@RequestMapping(value="/queryListClzd" ,method = RequestMethod.POST)
+	
+	@RequestMapping(value="/exportQueryListZdxx" ,method = RequestMethod.GET)
+	public List<Map<String, Object>> exportQueryListZdxx(@RequestParam String clzbh,@RequestParam String line,
+			@RequestParam String date,@RequestParam String fcsj,@RequestParam String ddsj){
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<ArrivalInfo> list=service.queryListZdxx(line,date,clzbh,fcsj,ddsj);
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		int i=1;
+		for (ArrivalInfo a:list ) {
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("i", i);
+			m.put("nbbm", a.getNbbm());
+			m.put("stopName", a.getStopName());
+			m.put("jzsj", a.getJzsj());
+			m.put("czsj", a.getCzsj());
+			m.put("kgm", "");
+			m.put("upDown", a.getUpDown()==0?"上行":"下行");
+			m.put("kmsd", "");
+			m.put("bufa", "");
+			m.put("skcs", "");
+			m.put("skje", "");
+			m.put("mfskcs", "");
+			m.put("mfskje", "");
+			resList.add(m);
+			i++;
+		}
+		
+		try {
+			Map<String, Object> map=new HashMap<String, Object>();
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/inoutstation.xls",
+					path + "export/班次到离站.xls");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return resList;
+	}
+	
+	
+	@RequestMapping(value="/queryListClzd" ,method = RequestMethod.GET)
 	public List<ArrivalInfo> queryListClzd(@RequestParam String zd,@RequestParam String line,
 			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
 		return service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
 	}
  
+	
+	
+	
+	@RequestMapping(value="/exportQueryListClzd" ,method = RequestMethod.GET)
+	public List<Map<String, Object>>  exportQueryListClzd(@RequestParam String zd,@RequestParam String line,
+			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<ArrivalInfo> list=service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		int i=1;
+		for (ArrivalInfo a:list ) {
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("i", i);
+			m.put("nbbm", a.getNbbm());
+			m.put("stopName", a.getStopName());
+			m.put("jzsj", a.getJzsj());
+			m.put("czsj", a.getCzsj());
+			m.put("kgm", "");
+			m.put("upDown", a.getUpDown()==0?"上行":"下行");
+			m.put("kmsd", "");
+			m.put("bufa", "");
+			m.put("skcs", "");
+			m.put("skje", "");
+			m.put("mfskcs", "");
+			m.put("mfskje", "");
+			resList.add(m);
+			i++;
+		}
+		
+		try {
+			Map<String, Object> map=new HashMap<String, Object>();
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/inoutstation.xls",
+					path + "export/班次到离站.xls");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return resList;
+	}
+	
+	
+	@RequestMapping(value="/jobSummaryExport" ,method = RequestMethod.GET)
+	public List<Map<String, Object>> jobSummaryExport(@RequestParam Map<String, Object> map){
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		String lineName=map.get("lineName").toString();
+		String date=map.get("date").toString();
+		ReportUtils ee = new ReportUtils();
+		 List<Map<String,Object>> fwqlList= service.jobFwqk(map);
+		 List<Map<String, Object>> lgqlList=service.jobLjqk(map);
+		 map=service.jobHzxx(map);
+		 map.put("lineName", lineName);
+		 map.put("date",date);
+		 if(fwqlList.size()<=0){
+			 Map<String, Object> newMap=new HashMap<String,Object>();
+			 	newMap.put("nr", " ");
+				newMap.put("lp", " ");
+				newMap.put("nbbm", " ");
+				newMap.put("jgh", " ");
+				newMap.put("dz", " ");
+				newMap.put("sj", " ");
+				newMap.put("lbbc", " ");
+				newMap.put("lblc", " ");
+				newMap.put("jyqp", " ");
+				fwqlList.add(newMap);
+		 }
+		if(lgqlList.size()<=0){
+			Map<String, Object> newMap=new HashMap<String,Object>();
+			newMap.put("lp", " ");
+			newMap.put("nbbm", " ");
+			newMap.put("jgh", " ");
+			newMap.put("dz", " ");
+			newMap.put("sj", " ");
+			newMap.put("ljlc"," ");
+			newMap.put("jyqp", " ");
+			lgqlList.add(newMap);
+		}
+		try {
+			listI.add(fwqlList.iterator());
+			listI.add(lgqlList.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/jobSummary.xls",
+					path + "export/调度员工作汇总日报.xls");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return new ArrayList<Map<String, Object>>();
+	}
 	@RequestMapping(value = "/sreachZd", method = RequestMethod.GET)
 	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx,@RequestParam String zd) {
 		return service.sreachZd(line,zdlx, zd);
@@ -5,11 +5,7 @@ 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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
  
 import java.util.HashMap;
 import java.util.List;
@@ -88,6 +84,20 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
         }
         return rtn;
     }
+
+    @RequestMapping(value = "/zd_tcc", method = RequestMethod.GET)
+    public Map<String, Object> getZdAndTccInfo(Integer lineid, Integer xldir) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            List<Map<String, Object>> list = ttInfoDetailService.findZdAndTcc(lineid, xldir);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", list);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
  
     /**
      * 时刻表明细批量插入
@@ -237,4 +237,9 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 		}
 		return msg;
 	}
+
+	@RequestMapping(value = "/register" ,method = RequestMethod.POST)
+	public Map<String, Object> register(SysUser u){
+		return sysUserService.register(u);
+	}
 }
@@ -31,7 +31,7 @@ public class BasicData implements CommandLineRunner {
     //公司代码和公司名对照(K: 公司编码，V:公司名)
     public static Map<String, String> businessCodeNameMap;
  
-    //分公司公司代码和分公司公司名对照(K: 公司编码+分公司编码，V:分公司公司名)
+    //分公司公司代码和分公司公司名对照(K: 公司编码_分公司编码，V:分公司公司名)
     public static Map<String, String> businessFgsCodeNameMap;
  
     //设备号和车辆自编号 （K: 设备编码 ，V：车辆自编号）
@@ -332,6 +332,7 @@ public class BasicData implements CommandLineRunner {
                 }
  
                 perTempMap.put(jobCode, p);
+                
                 allPersonMap.put(jobCode, p.getPersonnelName());
             }
  
 package com.bsth.data;
  
+import com.bsth.Application;
 import com.bsth.entity.Line;
 import com.bsth.entity.realcontrol.D80ReplyTemp;
 import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.oplog.normal.OpLogger;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.LineService;
 import com.bsth.service.realcontrol.LineConfigService;
 import org.slf4j.Logger;
@@ -14,101 +15,151 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
  
 import java.util.*;
+import java.util.concurrent.TimeUnit;
  
 /**
- * 
+ * @author PanZhao
  * @ClassName: LineConfigData
  * @Description: TODO(线路配置数据管理)
- * @author PanZhao
  * @date 2016年8月15日 下午2:50:19
- *
  */
 @Component
 @Order(value = 2)
 public class LineConfigData implements CommandLineRunner {
-	
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	// 线路编码和配置
-	private Map<String, LineConfig> lineConfMap;
-
-	@Autowired
-	LineConfigService lineConfigService;
-	
-	@Autowired
-	LineService lineService;
-	
-	@Autowired
-	OpLogger opLog;
-
-	@Override
-	public void run(String... arg0) throws Exception {
-		lineConfMap = new HashMap<>();
-
-		Iterator<LineConfig> itr = lineConfigService.findAll().iterator();
-		while (itr.hasNext()) 
-			setBuffer(itr.next());
-		
-		opLog.info("Line_config_data");
-	}
-	
-	public LineConfig get(String lineCode){
-		return lineConfMap.get(lineCode);
-	}
-	
-	public Collection<LineConfig> getAll(){
-		return lineConfMap.values();
-	}
-	
-	public void set(LineConfig conf){
-		lineConfigService.save(conf);
-		setBuffer(conf);
-	}
-	
-	public void setBuffer(LineConfig conf){
-		lineConfMap.put(conf.getLine().getLineCode(), conf);
-	}
-
-	/**
-	 * 
-	 * @Title: init 
-	 * @Description: TODO(初始化配置信息) 
-	 */
-	public void init(String lineCode) throws Exception{
-		LineConfig conf = new LineConfig();
-		//线路
-		Line line = lineService.findByLineCode(lineCode);
-		if(null == line)
-			throw new NullPointerException("异常的lineCode");
-		
-		conf.setLine(line);
-		//开始运营时间
-		conf.setStartOpt("02:00");
-		//托管状态
-		conf.setTrust(true);
-		//出场时间类型
-		conf.setOutConfig(0);
-		//进场时间类型
-		//conf.setInConfig(1);
-		//短语模板
-		conf.setPhraseTemps("");
-		//调度指令模板 
-		conf.setSchDirectiveTemp("");
-		
-		//80指令回复
-		D80ReplyTemp t50 = new D80ReplyTemp(conf, (short)0x50, "同意，回电详谈", "不同意，请回电")
-				,t60 =  new D80ReplyTemp(conf, (short)0x60, "同意，回电详谈", "不同意，请回电")
-				,tA2 = new D80ReplyTemp(conf, (short)0xA2, "同意，回电详谈", "不同意，请回电")
-				,t70 = new D80ReplyTemp(conf, (short)0x70, "同意，回电详谈", "不同意，请回电")
-				,t11 = new D80ReplyTemp(conf, (short)0x11, "同意，回电详谈", "不同意，请回电");
-		
-		Set<D80ReplyTemp> temps = conf.getD80Temps();
-		temps.add(t50);
-		temps.add(t60);
-		temps.add(tA2);
-		temps.add(t70);
-		temps.add(t11);
-		
-		set(conf);
-	}
+
+    static Logger logger = LoggerFactory.getLogger(LineConfigData.class);
+
+    // 线路编码和配置
+    private Map<String, LineConfig> lineConfMap;
+
+    @Autowired
+    LineConfigService lineConfigService;
+
+    @Autowired
+    LineService lineService;
+
+    //入库缓冲
+    static LinkedList<LineConfig> saveBuffers = new LinkedList<>();
+
+    @Autowired
+    LineConfigPersistThread configPersistThread;
+
+    @Override
+    public void run(String... arg0) throws Exception {
+        lineConfMap = new HashMap<>();
+
+        Iterator<LineConfig> itr = lineConfigService.findAll().iterator();
+        while (itr.hasNext())
+            setBuffer(itr.next());
+
+        //异步入库
+        Application.mainServices.scheduleWithFixedDelay(configPersistThread, 60, 60, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 起点发出，应用缓冲区设置参数
+     * @param sch
+     * @param timestamp
+     * @return
+     */
+    public long applyOut(ScheduleRealInfo sch, Long timestamp) {
+        LineConfig config = lineConfMap.get(sch.getXlBm());
+        int diff = sch.getXlDir()=="0"?config.getUpOutDiff():config.getDownOutDiff();
+        return timestamp - (diff * 1000);
+    }
+
+    /**
+     * 终点到达，应用缓冲区设置参数
+     * @param sch
+     * @param timestamp
+     * @return
+     */
+    public long applyIn(ScheduleRealInfo sch, Long timestamp){
+        LineConfig config = lineConfMap.get(sch.getXlBm());
+        int diff = sch.getXlDir()=="0"?config.getUpInDiff():config.getDownInDiff();
+        return timestamp - (diff * 1000);
+    }
+
+    @Component
+    private static class LineConfigPersistThread extends Thread {
+
+        @Autowired
+        LineConfigService lineConfigService;
+
+        @Override
+        public void run() {
+            LineConfig config;
+            for (int i = 0; i < 800; i++) {
+                config = saveBuffers.poll();
+                if (config == null)
+                    break;
+
+                try {
+                    lineConfigService.save(config);
+                }catch (Exception e){
+                    logger.error("", e);
+                }
+            }
+        }
+    }
+
+    public LineConfig get(String lineCode) {
+        return lineConfMap.get(lineCode);
+    }
+
+    public Collection<LineConfig> getAll() {
+        return lineConfMap.values();
+    }
+
+    public void set(LineConfig conf) {
+        //lineConfigService.save(conf);
+        saveBuffers.add(conf);
+        setBuffer(conf);
+    }
+
+    public void setBuffer(LineConfig conf) {
+        lineConfMap.put(conf.getLine().getLineCode(), conf);
+    }
+
+    /**
+     * @Title: init
+     * @Description: TODO(初始化配置信息)
+     */
+    public void init(String lineCode) throws Exception {
+        LineConfig conf = new LineConfig();
+        //线路
+        Line line = lineService.findByLineCode(lineCode);
+        if (null == line)
+            throw new NullPointerException("异常的lineCode");
+
+        conf.setLine(line);
+        //开始运营时间
+        conf.setStartOpt("02:00");
+        //托管状态
+        conf.setTrust(true);
+        //出场时间类型
+        conf.setOutConfig(0);
+        //进场时间类型
+        //conf.setInConfig(1);
+        //短语模板
+        conf.setPhraseTemps("");
+        //调度指令模板
+        conf.setSchDirectiveTemp("");
+
+        //80指令回复  闵行用
+        D80ReplyTemp t50 = new D80ReplyTemp(conf, (short) 0x50, "同意，回电详谈", "不同意，请回电"), t60 = new D80ReplyTemp(conf, (short) 0x60, "同意，回电详谈", "不同意，请回电"), tA2 = new D80ReplyTemp(conf, (short) 0xA2, "同意，回电详谈", "不同意，请回电"), t70 = new D80ReplyTemp(conf, (short) 0x70, "同意，回电详谈", "不同意，请回电"), t11 = new D80ReplyTemp(conf, (short) 0x11, "同意，回电详谈", "不同意，请回电");
+
+        //应急停靠默认值
+        conf.setYjtkStart("00:00");
+        conf.setYjtkEnd("23:59");
+
+        Set<D80ReplyTemp> temps = conf.getD80Temps();
+        temps.add(t50);
+        temps.add(t60);
+        temps.add(tA2);
+        temps.add(t70);
+        temps.add(t11);
+
+        set(conf);
+    }
 }
@@ -85,7 +85,7 @@ public abstract class SignalHandle {
             gps.setStopNo(station.getCode());
         }
  
-        logger.info(fmtHHmm.print(gps.getTimestamp()) + " 车辆 ：" + gps.getNbbm() + " 切换到走向 : " + updown);
+        logger.info(gps.getTimestamp() + " -" + fmtHHmm.print(gps.getTimestamp()) + " 车辆 ：" + gps.getNbbm() + " 切换到走向 : " + updown);
     }
  
     /**
@@ -48,12 +48,6 @@ public class CorrectSignalHandle extends SignalHandle {
             gps.setState(0);
         }
  
-        /*if(gps.getState() != 0){
-            logger.info(gps.getNbbm() + " 纠正状态到营运");
-            //切换到营运状态
-            directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "纠正@系统");
-        }*/
-
         return true;
     }
 }
@@ -8,6 +8,7 @@ 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.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
@@ -135,13 +136,19 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(StringUtils.isNotEmpty(sch.getFcsjActual()))
                 return;
  
+            //应用到离站缓冲区设置参数
+            long rsT = lineConfigData.applyOut(sch, gps.getTimestamp());
+
             //实发时间
-            sch.setFcsjActualAll(gps.getTimestamp());
+            sch.setFcsjActualAll(rsT);
             //通知客户端
             sendUtils.sendFcsj(sch);
             //持久化
             dayOfSchedule.save(sch);
  
+            //清理应发未发标记
+            LateAdjustHandle.remove(sch);
+
             if(sch.getBcType().equals("out")){
                 //出场时，切换成营运状态
                 directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
@@ -152,12 +159,32 @@ public class InOutStationSignalHandle extends SignalHandle{
         }
         else if(sch.getBcType().equals("out")){
             ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            //如果下一个班次是区间，并且是环线
+            if(next != null && next.getBcType().equals("region")){
+                next = dayOfSchedule.nextSame(next);
+                if(next == null || !next.getQdzName().equals(next.getZdzName())){
+                    return;
+                }
+            }
             if(next != null && prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
                 dayOfSchedule.addExecPlan(next);
                 outStation(gps, prev);
             }
         }
+        //当前班次是区间
+        else if(sch.getBcType().equals("region")){
+            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            if(next==null || !next.getQdzName().equals(next.getZdzName())){
+                return;
+            }
+            //是环线
+            if(prev.getStopNo().equals(next.getQdzCode())){
+                //发下一个班次
+                dayOfSchedule.addExecPlan(next);
+                outStation(gps, prev);
+            }
+        }
     }
  
  
@@ -215,24 +242,39 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(StringUtils.isNotEmpty(sch.getZdsjActual()))
                 return;
  
-            sch.setZdsjActualAll(gps.getTimestamp());
+            //应用到离站缓冲区设置参数
+            long rsT = lineConfigData.applyIn(sch, gps.getTimestamp());
+
+            sch.setZdsjActualAll(rsT);
+
+            //通知误点停靠程序，有车辆到站
+            LateAdjustHandle.carArrive(gps);
+
             //已完成班次数
             int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
             ScheduleRealInfo next = dayOfSchedule.next(sch);
-            //通知客户端
-            sendUtils.sendZdsj(sch, next, doneSum);
             //持久化
             dayOfSchedule.save(sch);
  
-            //准备执行下一个班次
-            if (next != null) {
-                next.setQdzArrDatesj(sch.getZdsjActual());
+            if(next != null){
                 dayOfSchedule.addExecPlan(next);
                 //进站既进场
                 inStationAndInPark(sch, next);
+            }
+
+            //该路牌的下一个班次，起点实际到达时间
+            ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch);
+            if(lpNext != null){
+                lpNext.setQdzArrDatesj(sch.getZdsjActual());
+            }
+
+            //通知客户端
+            sendUtils.sendZdsj(sch, lpNext, doneSum);
+
+            //准备执行下一个班次
+            if (next != null) {
                 //将gps转换为下一个班次走向的站内信号
                 transformUpdown(gps, next);
-
                 //下发调度指令
                 directiveService.send60Dispatch(next, doneSum, "到站@系统");
  
@@ -254,7 +296,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             //如果当前班次是出场，并且进的是下一个班次的终点
             if(sch.getBcType().equals("out")){
                 ScheduleRealInfo next = dayOfSchedule.next(sch);
-                if(next.getZdzCode().equals(gps.getStopNo())){
+                if(next != null && next.getZdzCode().equals(gps.getStopNo())){
                     List<ScheduleRealInfo> halfList = dayOfSchedule.findByNbbm(sch.getClZbh());
                     //和当前进站信号最匹配的一个班次
                     ScheduleRealInfo nearSch = nearScheduleByGpsIn(gps, halfList);
@@ -30,7 +30,8 @@ public class OfflineSignalHandle extends SignalHandle{
  
         if(isNotEmpty(prevs)){
             GpsEntity prev = prevs.getTail();
-            int space = (int) (gps.getTimestamp() - prev.getTimestamp());
+            //间隔太大就丢弃，不管之前还是之后
+            int space = Math.abs((int) (gps.getTimestamp() - prev.getTimestamp()));
             if(space > OFFLINE_TIME)
                 gps.setSignalState("reconnection");
  
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("SXC-YD012"))
+            /*if(nbbm.equals("W7C-001"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
  
+package com.bsth.data.safe_driv;
+
+/**
+ * 安全驾驶
+ * Created by panzhao on 2017/4/6.
+ */
+public class SafeDriv {
+
+    /**
+     * 时间
+     * 2017-04-06 08:00:00.0
+     */
+    private String Startime;
+
+    /**
+     * 时间戳
+     */
+    private Long ts;
+
+    /**
+     * 设备编号
+     */
+    private String sbbh;
+
+    /**
+     * 线路名称
+     */
+    private String xlmc;
+
+    private String xlbm;
+
+    /**
+     * 车辆自编号
+     */
+    private String clzbh;
+
+    /**
+     * 车牌号
+     */
+    private String cph;
+
+    /**
+     * 检查属性
+     * 双脱手 0 单脱手 1 其他为0都是异常
+     */
+    private String jctype;
+
+    /**
+     * 异常种类
+     * 手部检测: 1
+     * 脸部检测: 5
+     * 摄像头检测: 2
+     * 安全带检测: 3
+     * 袖章检测: 4
+     */
+    private String yczltype;
+
+    @Override
+    public int hashCode() {
+        return ("safe_" + (this.getClzbh() + this.getStartime())).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        SafeDriv s2 = (SafeDriv)obj;
+        return (this.getClzbh() + this.getStartime()).equals(s2.getClzbh() + s2.getStartime());
+    }
+
+    public String getStartime() {
+        return Startime;
+    }
+
+    public void setStartime(String startime) {
+        Startime = startime;
+    }
+
+    public String getSbbh() {
+        return sbbh;
+    }
+
+    public void setSbbh(String sbbh) {
+        this.sbbh = sbbh;
+    }
+
+    public String getXlmc() {
+        return xlmc;
+    }
+
+    public void setXlmc(String xlmc) {
+        this.xlmc = xlmc;
+    }
+
+    public String getClzbh() {
+        return clzbh;
+    }
+
+    public void setClzbh(String clzbh) {
+        this.clzbh = clzbh;
+    }
+
+    public String getCph() {
+        return cph;
+    }
+
+    public void setCph(String cph) {
+        this.cph = cph;
+    }
+
+    public String getJctype() {
+        return jctype;
+    }
+
+    public void setJctype(String jctype) {
+        this.jctype = jctype;
+    }
+
+    public String getYczltype() {
+        return yczltype;
+    }
+
+    public void setYczltype(String yczltype) {
+        this.yczltype = yczltype;
+    }
+
+    public Long getTs() {
+        return ts;
+    }
+
+    public void setTs(Long ts) {
+        this.ts = ts;
+    }
+
+    public String getXlbm() {
+        return xlbm;
+    }
+
+    public void setXlbm(String xlbm) {
+        this.xlbm = xlbm;
+    }
+}
+package com.bsth.data.safe_driv;
+
+import com.bsth.websocket.handler.SendUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 安全驾驶
+ * Created by panzhao on 2017/4/6.
+ */
+@Component
+public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware {
+
+    private static Set<SafeDriv> data;
+
+    @Autowired
+    SafeDrivDataLoadThread safeDrivDataLoadThread;
+
+    static SendUtils sendUtils;
+
+    /**
+     * 车辆自编号 和 最新一条数据对照
+     */
+    private static Map<String, SafeDriv> safeMap;
+
+    static {
+        data = new HashSet<>();
+        safeMap = new HashMap<>();
+    }
+
+    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
+    public static void put(SafeDriv sd){
+        sd.setTs(fmt.parseMillis(sd.getStartime()));
+
+        if(sd.getYczltype().indexOf("A") == -1)
+            sd.setYczltype("A" + sd.getYczltype());
+
+        //SafeDriv old = safeMap.get(sd.getClzbh());
+        if(!data.contains(sd)){
+            //通知客户端
+            sendUtils.sendSafeDriv(sd);
+            data.add(sd);
+            safeMap.put(sd.getClzbh(), sd);
+        }
+    }
+
+    public static Set<SafeDriv> findAll(){
+        return data;
+    }
+
+    public static void clear(){
+        data = new HashSet<>();
+        safeMap = new HashMap<>();
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        //定时加载安全驾驶数据
+        //Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 4, TimeUnit.SECONDS);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        sendUtils = applicationContext.getBean(SendUtils.class);
+    }
+}
+package com.bsth.data.safe_driv;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.List;
+
+/**
+ * 安全驾驶数据加载线程
+ * Created by panzhao on 2017/4/6.
+ */
+@Component
+public class SafeDrivDataLoadThread extends Thread{
+
+    private final static String url = "http://180.166.5.82:9988//bsth-safedriving/Crlcxb/realtimeInterface.do";
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        List<SafeDriv> list = null;
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+        try {
+            httpClient = HttpClients.createDefault();
+            HttpGet get = new HttpGet(url);
+
+            response = httpClient.execute(get);
+
+            HttpEntity entity = response.getEntity();
+            if (null != entity) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                StringBuffer stringBuffer = new StringBuffer();
+                String str = "";
+                while ((str = br.readLine()) != null)
+                    stringBuffer.append(str);
+
+
+                list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class);
+                /**
+                 * 模拟数据
+
+                SafeDriv sd1 = new SafeDriv();
+                sd1.setYczltype("1");
+                sd1.setClzbh("W2B-001");
+                sd1.setStartime("2017-04-07 08:00:00.0");
+
+                SafeDriv sd2 = new SafeDriv();
+                sd2.setYczltype("2");
+                sd2.setClzbh("W2B-002");
+                sd2.setStartime("2017-04-07 08:02:00.0");
+
+                SafeDriv sd3 = new SafeDriv();
+                sd3.setYczltype("3");
+                sd3.setClzbh("W2B-003");
+                sd3.setStartime("2017-04-07 08:03:00.0");
+
+                SafeDriv sd4 = new SafeDriv();
+                sd4.setYczltype("4");
+                sd4.setClzbh("W2B-004");
+                sd4.setStartime("2017-04-07 08:04:00.0");
+
+                SafeDriv sd5 = new SafeDriv();
+                sd5.setYczltype("5");
+                sd5.setClzbh("W2B-005");
+                sd5.setStartime("2017-04-07 08:05:00.0");
+
+                list.add(sd1);
+                list.add(sd2);
+                list.add(sd3);
+                list.add(sd4);
+                list.add(sd5);
+                 */
+                for(SafeDriv sd : list){
+                    SafeDrivCenter.put(sd);
+                }
+            }
+
+            httpClient.close();
+            response.close();
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+        }
+    }
+}
@@ -3,12 +3,18 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
-import com.bsth.data.schedule.thread.*;
+import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
+import com.bsth.data.schedule.thread.CalcOilThread;
+import com.bsth.data.schedule.thread.SchedulePstThread;
+import com.bsth.data.schedule.thread.ScheduleRefreshThread;
+import com.bsth.data.schedule.thread.SubmitToTrafficManage;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -17,8 +23,9 @@ import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.util.BatchSaveUtils;
 import com.bsth.util.DateUtils;
 import com.bsth.websocket.handler.SendUtils;
+import com.google.common.base.Predicate;
 import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.TreeMultimap;
+import com.google.common.collect.Collections2;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -27,6 +34,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
  
 import java.text.ParseException;
@@ -52,16 +61,16 @@ public class DayOfSchedule implements CommandLineRunner {
     // 按车辆分组的班次数据
     private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
  
+    //按路牌分组的班次数据 线路编码_路牌名称 ——> 班次list
+    private static ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap;
+
     // 班次主键映射
     private static Map<Long, ScheduleRealInfo> id2SchedulMap;
  
-    // 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
-    private static TreeMultimap<String, String> nbbm2SEStationMap;
-
     //车辆 ——> 当前执行班次
     private static Map<String, ScheduleRealInfo> carExecutePlanMap;
  
-    // 持久化缓冲区
+    // 持久化
     public static LinkedList<ScheduleRealInfo> pstBuffer;
  
     // 排序器
@@ -95,11 +104,12 @@ public class DayOfSchedule implements CommandLineRunner {
  
     static {
         nbbmScheduleMap = ArrayListMultimap.create();
+        lpScheduleMap = ArrayListMultimap.create();
+
         id2SchedulMap = new HashMap<>();
         pstBuffer = new LinkedList<>();
         schFCSJComparator = new ScheduleComparator.FCSJ();
         currSchDateMap = new HashMap<>();
-        nbbm2SEStationMap = TreeMultimap.create();
         carExecutePlanMap = new HashMap<>();
  
         schedulePlanMap = new HashMap<>();
@@ -138,11 +148,11 @@ public class DayOfSchedule implements CommandLineRunner {
         //dataRecovery();
  
         //翻班线程
-        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
 //        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
         //班次误点扫描
-//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
  
         //每天凌晨2点20提交数据到运管处
         long diff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
@@ -150,10 +160,10 @@ public class DayOfSchedule implements CommandLineRunner {
             diff += (1000 * 60 * 60 * 24);
  
         logger.info(diff / 1000 / 60 + "分钟之后提交到运管处");
-        //Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleAtFixedRate(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
  
         //计算油、公里加注
-        Application.mainServices.scheduleWithFixedDelay(calcOilThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        Application.mainServices.scheduleAtFixedRate(calcOilThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
  
         //指令持久化线程
         Application.mainServices.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
@@ -226,10 +236,14 @@ public class DayOfSchedule implements CommandLineRunner {
             //添加到缓存
             putAll(list);
  
+
+            Set<String> lps = searchAllLP(list);
+            for(String lp : lps){
+                //计算“起点站应到”时间
+                schAttrCalculator.calcQdzTimePlan(lpScheduleMap.get(lineCode + "_" + lp));
+            }
             Set<String> cars = searchAllCars(list);
             for (String nbbm : cars) {
-                //计算“起点站应到”时间
-                schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
                 //车辆 ——> 要执行的班次对照
                 reCalcExecPlan(nbbm);
             }
@@ -244,10 +258,14 @@ public class DayOfSchedule implements CommandLineRunner {
         return 0;
     }
  
+    public int reloadSch(String lineCode){
+        return reloadSch(lineCode, calcSchDate(lineCode), true);
+    }
+
     /**
      * @Title: searchAllCars
      * @Description: TODO(搜索班次集合中的车辆)
-     */
+    */
     private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
         Set<String> cars = new HashSet<>();
         for (ScheduleRealInfo sch : list)
@@ -256,6 +274,18 @@ public class DayOfSchedule implements CommandLineRunner {
         return cars;
     }
  
+    /**
+     * @Title: searchAllCars
+     * @Description: TODO(搜索班次集合中的路牌)
+     */
+    private Set<String> searchAllLP(List<ScheduleRealInfo> list) {
+        Set<String> lps = new HashSet<>();
+        for (ScheduleRealInfo sch : list)
+            lps.add(sch.getLpName());
+
+        return lps;
+    }
+
     private void putAll(List<ScheduleRealInfo> list) {
         for (ScheduleRealInfo sch : list)
             put(sch);
@@ -301,6 +331,17 @@ public class DayOfSchedule implements CommandLineRunner {
             }
         }
  
+        //清理路牌对照
+        List<String> lprms = new ArrayList<>();
+        Set<String> lps = lpScheduleMap.keySet();
+        for(String lp : lps){
+            if(lp.indexOf(lineCode + "_") != -1)
+                lprms.add(lp);
+        }
+
+        for(String lp : lprms)
+            lpScheduleMap.removeAll(lp);
+
         logger.info(lineCode + "排班清理 " + count);
     }
  
@@ -379,10 +420,15 @@ public class DayOfSchedule implements CommandLineRunner {
                     sch.setLate(false);
                 }
  
+                //售票员为空设置为""字符串
+                if(StringUtils.isEmpty(sch.getsGh())){
+                    sch.setsGh("");
+                    sch.setsName("");
+                }
                 sch.setJhlcOrig(sch.getJhlc());
-                //计划里程为0，设置NULL
-                //if (sch.getJhlc() != null && sch.getJhlc() == 0)
-                //    sch.setJhlc(null);
+                //保留备注
+                if(StringUtils.isNotEmpty(sch.getRemark()))
+                    sch.setRemarks(sch.getRemark());
             }
         } catch (Exception e) {
             logger.error("", e);
@@ -480,18 +526,31 @@ public class DayOfSchedule implements CommandLineRunner {
         return id2SchedulMap.get(id);
     }
  
-    public Set<String> getSEStationList(String nbbm) {
-        return nbbm2SEStationMap.get(nbbm);
-    }
  
     /**
      * @Title: next
      * @Description: TODO(下一个班次)
      */
     public ScheduleRealInfo next(ScheduleRealInfo sch) {
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        return next(list, sch);
+    }
  
+    /**
+     * 下一个相同走向的班次
+     * @param sch
+     * @return
+     */
+    public ScheduleRealInfo nextSame(final ScheduleRealInfo sch){
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-        int outConfig = -1;
+        Collection<ScheduleRealInfo> subList = Collections2.filter(list, new Predicate<ScheduleRealInfo>(){
+
+            @Override
+            public boolean apply(ScheduleRealInfo item) {
+                return item.getXlDir().equals(sch.getXlDir());
+            }
+        });
+        /*int outConfig = -1;
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (config != null)
             outConfig = config.getOutConfig();
@@ -515,21 +574,22 @@ public class DayOfSchedule implements CommandLineRunner {
                     && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
  
-            if (flag) {
+            if (flag && temp.getXlDir().equals(sch.getXlDir())) {
                 next = temp;
                 break;
             }
-        }
-        return next;
+        }*/
+        return next(subList, sch);
     }
  
+
     /**
-     * 下一个相同走向的班次
-     * @param sch
+     * 下一个班次
+     * @param list 班次集合
+     * @param sch 当前班次
      * @return
      */
-    public ScheduleRealInfo nextSame(ScheduleRealInfo sch){
-        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+    private ScheduleRealInfo next(Collection<ScheduleRealInfo> list , ScheduleRealInfo sch){
         int outConfig = -1;
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (config != null)
@@ -554,7 +614,7 @@ public class DayOfSchedule implements CommandLineRunner {
                     && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
  
-            if (flag && temp.getXlDir().equals(sch.getXlDir())) {
+            if (flag) {
                 next = temp;
                 break;
             }
@@ -610,16 +670,21 @@ public class DayOfSchedule implements CommandLineRunner {
  
         String nbbm = sch.getClZbh();
         nbbmScheduleMap.put(nbbm, sch);
-        nbbm2SEStationMap.put(nbbm, sch.getQdzCode());
-        nbbm2SEStationMap.put(nbbm, sch.getZdzCode());
  
         //主键索引
         id2SchedulMap.put(sch.getId(), sch);
+        //路牌对照表
+        addLPMapp(sch);
+
         //跨24点的，再save一次
         if (!sch.getRealExecDate().equals(sch.getScheduleDateStr()))
             save(sch);
     }
  
+    public void addLPMapp(ScheduleRealInfo sch){
+        lpScheduleMap.put(sch.getXlBm() + "_" + sch.getLpName(), sch);
+    }
+
     public void delete(ScheduleRealInfo sch) {
         //ScheduleRealInfo sch = id2SchedulMap.get(id);
         if (!sch.isSflj())
@@ -627,38 +692,25 @@ public class DayOfSchedule implements CommandLineRunner {
  
         nbbmScheduleMap.remove(sch.getClZbh(), sch);
         id2SchedulMap.remove(sch.getId());
+        lpScheduleMap.remove(sch.getXlBm() + "_" + sch.getLpName(), sch);
         //return sch;
     }
  
-//	public void calcQdzTimePlan(String nbbm){
-//		schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
-//	}
  
-    public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm) {
+/*    public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm) {
         Collections.sort(nbbmScheduleMap.get(nbbm), schFCSJComparator);
         return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
-    }
-
-    /**
-     *
-     * @Title: nextAll
-     * @Description: TODO(之后的所有班次)
-     */
-/*	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
-        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		// 排序
-		Collections.sort(list, schFCSJComparator);
+    }*/
  
-		List<ScheduleRealInfo> rs = new ArrayList<>();
-		ScheduleRealInfo temp;
-		for (int i = 0; i < list.size() - 1; i++) {
-			temp = list.get(i);
-			if(temp.getFcsjT() > sch.getFcsjT())
-				rs.add(temp);
+    public List<ScheduleRealInfo> updateQdzTimePlan(String lpName) {
+        List<ScheduleRealInfo> list = lpScheduleMap.get(lpName);
+        Collections.sort(list, schFCSJComparator);
+        return schAttrCalculator.updateQdzTimePlan(list);
+    }
  
-		}
-		return rs;
-	}*/
+    public List<ScheduleRealInfo> updateQdzTimePlan(ScheduleRealInfo sch) {
+        return updateQdzTimePlan(sch.getXlBm() + "_" + sch.getLpName());
+    }
  
     /**
      * @Title: doneSum
@@ -818,9 +870,9 @@ public class DayOfSchedule implements CommandLineRunner {
      */
     public List<ScheduleRealInfo> changeCar(ScheduleRealInfo sch, String newClZbh) {
         List<ScheduleRealInfo> ups = new ArrayList<>();
-        String oldClzbh = sch.getClZbh();
+        /*String oldClzbh = sch.getClZbh();
         if (oldClzbh.equals(newClZbh))
-            return ups;
+            return ups;*/
  
  
         //变更相关映射信息
@@ -828,12 +880,10 @@ public class DayOfSchedule implements CommandLineRunner {
  
         sch.setClZbh(newClZbh);
         nbbmScheduleMap.put(newClZbh, sch);
-        nbbm2SEStationMap.put(newClZbh, sch.getQdzCode());
-        nbbm2SEStationMap.put(newClZbh, sch.getZdzCode());
  
         //重新计算班次应到时间
-        ups.addAll(updateQdzTimePlan(oldClzbh));
-        ups.addAll(updateQdzTimePlan(newClZbh));
+        //ups.addAll(updateQdzTimePlan(oldClzbh));
+        //ups.addAll(updateQdzTimePlan(newClZbh));
  
         //重新计算车辆当前执行班次
         reCalcExecPlan(newClZbh);
@@ -850,7 +900,9 @@ public class DayOfSchedule implements CommandLineRunner {
     }
  
     public void reCalcExecPlan(String nbbm){
-        carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(nbbmScheduleMap.get(nbbm)));
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
+        Collections.sort(list, schFCSJComparator);
+        carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(list));
     }
  
     /**
@@ -875,44 +927,90 @@ public class DayOfSchedule implements CommandLineRunner {
         return false;
     }
  
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
     /**
-     * 获取班次的计划停站时间
-     * @param sch
+     * 删除实际排班
+     * @param lineCode
      * @return
+     */
+    public Map<String, Object> deleteRealSchedule(String lineCode) {
+        Map<String, Object> rs = new HashMap<>();
  
-    public int stopTimePlan(Object task) {
+        try {
+            String rq = currSchDateMap.get(lineCode);
+            if(StringUtils.isNotEmpty(rq)){
+                List<ScheduleRealInfo> all = findByLineCode(lineCode);
+                //解除gps 和班次之间的关联
+                List<ScheduleRealInfo> unions = calcUnion(all, carExecutePlanMap.values());
+                for(ScheduleRealInfo sch : unions){
+                    removeExecPlan(sch.getClZbh());
+                }
+                //解除调度指令和班次的外键约束
+                StringBuilder inStr = new StringBuilder("(");
+                for(ScheduleRealInfo sch : all){
+                    inStr.append(sch.getId() + ",");
+                }
+                inStr.deleteCharAt(inStr.length() - 1).append(")");
+                jdbcTemplate.update(Constants.MULTI_REMOVE_DIRECTIVE_SCH_FK + " " + inStr.toString());
  
-    ScheduleRealInfo sch = prev((ScheduleRealInfo) task);
+                //删除班次数据
+                removeRealSch(lineCode, rq);
+                //删除相关班次修正记录
  
-    sch.getzdsj
-    return -1;
-    }*/
+            }
+            rs.put("status", ResponseCode.SUCCESS);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            if(e instanceof DataIntegrityViolationException)
+                rs.put("msg", "失败，违反数据约束！！");
+            else
+                rs.put("msg", e.getMessage());
+        }
+
+        return rs;
+    }
  
     /**
+     * 计算并集
      *
-     * @Title: linkToSchPlan
-     * @Description: TODO(车辆关联到班次)
+     * @param all
+     * @param sub
+     * @return
      */
-/*	public void linkToSchPlan(String nbbm) {
-		//当前GPS状态
-		GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
-		if(null == gps)
-			return;
-		
-		//班次集合
-		List<ScheduleRealInfo> schArr = nbbmScheduleMap.get(nbbm);
-		
-		for(ScheduleRealInfo sch : schArr){
-			if(sch.getStatus() == 2)
-				continue;
-			if(sch.isDestroy())
-				continue;
-			if(!sch.getXlBm().equals(gps.getLineId()) 
-					|| Integer.parseInt(sch.getXlDir()) != gps.getUpDown().intValue())
-				continue;
-			
-			addExecPlan(sch);
-			break;
-		}
-	}*/
+    public List<ScheduleRealInfo> calcUnion(Collection<ScheduleRealInfo> c1, Collection<ScheduleRealInfo> c2) {
+        List<ScheduleRealInfo> rs = new ArrayList<>();
+
+        for (ScheduleRealInfo sch : c1) {
+            if(c2.contains(sch)){
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    /**
+     * 覆盖一辆车的所有班次
+     * @param nbbm
+     * @param sets
+     */
+    public void replaceByNbbm(String nbbm, Set<ScheduleRealInfo> sets){
+        nbbmScheduleMap.removeAll(nbbm);
+        nbbmScheduleMap.putAll(nbbm, sets);
+        //重新计算班次应到时间
+        updateQdzTimePlan(nbbm);
+    }
+
+    /**
+     * 获取该班次所在路牌的下一个班次
+     * @param sch
+     * @return
+     */
+    public ScheduleRealInfo nextByLp(ScheduleRealInfo sch) {
+        List<ScheduleRealInfo> list = lpScheduleMap.get(sch.getXlBm() + "_" + sch.getLpName());
+        Collections.sort(list, schFCSJComparator);
+        return next(list, sch);
+    }
 }
 \ No newline at end of file
@@ -104,7 +104,7 @@ public class SchAttrCalculator {
 	/**
 	 * 
 	 * @Title: calcQdzTimePlan 
-	 * @Description: TODO(计算班次的起点应到时间，list 必须是同一辆车的班次) 
+	 * @Description: TODO(计算班次的起点应到时间)
 	 */
 	public void calcQdzTimePlan(List<ScheduleRealInfo> list){
 		Collections.sort(list, new ScheduleComparator.FCSJ());
@@ -116,12 +116,13 @@ public class SchAttrCalculator {
 		ScheduleRealInfo prve = list.get(0), curr;
 		for(int i = 1; i < len; i ++){
 			curr = list.get(i);
-			if(prve.getZdzName().equals(curr.getQdzName())){
+
+			if(prve.getZdzName().equals(curr.getQdzName())
+					|| prve.getZdzCode().equals(curr.getQdzCode())){
 				curr.setQdzArrDateJH(prve.getZdsj());
-				if(StringUtils.isNotEmpty(prve.getZdsjActual()) && StringUtils.isEmpty(curr.getQdzArrDatesj()))
+				if(StringUtils.isNotEmpty(prve.getZdsjActual()))
 					curr.setQdzArrDatesj(prve.getZdsjActual());
 			}
-			
 			prve = curr;
 		}
 	}
@@ -129,7 +130,7 @@ public class SchAttrCalculator {
 	/**
 	 * 
 	 * @Title: updateQdzTimePlan 
-	 * @Description: TODO(更新班次的起点应到时间，list 必须是同一辆车的班次) 并返回被更新的班次 
+	 * @Description: TODO(更新班次的起点应到时间) 并返回被更新的班次
 	 */
 	public List<ScheduleRealInfo> updateQdzTimePlan(List<ScheduleRealInfo> list){
 		Collections.sort(list, new ScheduleComparator.FCSJ());
@@ -143,7 +144,8 @@ public class SchAttrCalculator {
 		for(int i = 1; i < len; i ++){
 			curr = list.get(i);
  
-			if(prve.getZdzName().equals(curr.getQdzName())){
+			if(prve.getZdzName().equals(curr.getQdzName())
+					|| prve.getZdzCode().equals(curr.getQdzCode())){
  
 				if(curr.getQdzArrDateJH() != null && prve.getZdsj().equals(curr.getQdzArrDateJH())){
 					prve = curr;
+
+package com.bsth.data.schedule.late_adjust;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.util.Arith;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 误点自动调整待发 处理程序
+ *
+ * 注意 ：这里的误点是指应发未到
+ * Created by panzhao on 2017/4/16.
+ */
+@Component
+public class LateAdjustHandle implements ApplicationContextAware{
+
+    static LineConfigData lineConfigData;
+    static SendUtils sendUtils;
+
+    static Logger logger = LoggerFactory.getLogger(LateAdjustHandle.class);
+
+    /**
+     * 应发未到车辆 和 班次
+     */
+    private static Map<String, ScheduleRealInfo> lateSchMap;
+
+
+    static {
+        lateSchMap = new HashMap<>();
+    }
+
+    /**
+     * 新增一个误点班次
+     * @param sch
+     */
+    public static void putLate(ScheduleRealInfo sch){
+        try {
+            //进出场班次不需要
+            if(sch.getBcType().equals("in") || sch.getBcType().equals("out"))
+                return;
+            //线路配置
+            LineConfig config = lineConfigData.get(sch.getXlBm());
+            if(sch.getLateMinute() == 0){
+                if(config.isEnableYjtk()){
+                    sch.setLateMinute(sch.getXlDir().equals("0")?config.getUpStopMinute():config.getDownStopMinute());
+                }
+                else
+                    return;
+            }
+
+            if(sch.getDfsj().compareTo(config.getYjtkStart()) > 0
+                    && sch.getDfsj().compareTo(config.getYjtkEnd()) <= 0){
+
+                ScheduleRealInfo cancel = null;
+                //之前存在误点班次没有发出
+                ScheduleRealInfo old = lateSchMap.get(sch.getClZbh());
+                if(old != null && old.getDfsjT() < sch.getDfsjT()){
+                    remove(old);
+                    cancel = old;
+                    logger.info("【应发未到】old 班次 " + old.getId() + " -被覆盖！");
+                }
+
+                lateSchMap.put(sch.getClZbh(), sch);
+                //通知客户端
+                sch.setLate2(true);
+                sendUtils.sendAutoWdtz(sch, cancel);
+
+                logger.info("【应发未到】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+
+
+    /**
+     * 获取所有应发未到的班次
+     * @return
+     */
+    public static Collection<ScheduleRealInfo> allLateSch(){
+        return lateSchMap.values();
+    }
+
+    public static void remove(ScheduleRealInfo sch){
+        try {
+            if(lateSchMap.get(sch.getClZbh()) == sch){
+                lateSchMap.remove(sch.getClZbh());
+                sch.setLate2(false);
+                sch.setLateMinute(0);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 车辆到站
+     * @param gps
+     */
+    public static void carArrive(GpsEntity gps){
+        try{
+            if(gps.getInstation() != 1)
+                return;
+
+            ScheduleRealInfo sch = lateSchMap.get(gps.getNbbm());
+            if(sch == null)
+                return;
+
+            //进的是班次起点（名称一样即可）
+            gps.setStationName(BasicData.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo()));
+            if(gps.getStationName().equals(sch.getQdzName())
+                    && sch.getLateMinute() > 0){
+                //自动调整待发 到达时间 + 停靠时间
+                long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
+                sch.setDfsjAll(dt);
+                sch.setDfAuto(true);
+                //取消应发未到标记
+                sch.setLate2(false);
+
+                lateSchMap.remove(sch.getClZbh());
+                logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("", e);
+        }
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        lineConfigData = applicationContext.getBean(LineConfigData.class);
+        sendUtils = applicationContext.getBean(SendUtils.class);
+    }
+}
 \ No newline at end of file
-package com.bsth.data.schedule.thread;
+package com.bsth.data.schedule.late_adjust;
  
  
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
  
 /**
- * 
- * @ClassName: ScheduleLateThread 
- * @Description: TODO(班次误点扫描线程) 
- * @author PanZhao 
- * @date 2016年8月31日 下午3:09:02 
+ *
+ * @ClassName: ScheduleLateThread
+ * @Description: TODO(班次误点扫描线程)
+ * @author PanZhao
+ * @date 2016年8月31日 下午3:09:02
  *
  */
 @Component
@@ -27,29 +27,42 @@ public class ScheduleLateThread extends Thread{
  
 	@Autowired
 	DayOfSchedule dayOfSchedule;
-	
+
 	@Autowired
 	SendUtils sendUtils;
-	
+
 	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.FCSJ();
-	
+
 	@Override
 	public void run() {
 		List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
 		Collections.sort(all, cpm);
-		
+
 		long t = System.currentTimeMillis();
 		int size = all.size();
-		
+
 		ScheduleRealInfo sch;
 		for(int i = 0; i < size; i ++){
 			sch = all.get(i);
 			if(sch.getDfsjT() > t)
 				break;
-			
-			if(sch.isLate() == false 
-					&& sch.getStatus() == 0 
-					&& sch.getFcsjActual() == null){
+
+			if(sch.isLate())
+				continue;
+
+			if(sch.getStatus() == 0
+					&& StringUtils.isEmpty(sch.getFcsjActual())){
+
+				//检查应发未到 当前班次无起点到达时间
+				if(StringUtils.isEmpty(sch.getQdzArrDateSJ())){
+					ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+					//上一个班次也没有实际终点到达时间
+					if(prev != null && StringUtils.isEmpty(prev.getZdsjActual())){
+						//进入误点调整程序
+						LateAdjustHandle.putLate(sch);
+					}
+				}
+
 				//应发未发
 				sch.setLate(true);
 				//通知客户端
@@ -57,4 +70,4 @@ public class ScheduleLateThread extends Thread{
 			}
 		}
 	}
-}
+}
 \ No newline at end of file
 package com.bsth.data.schedule.thread;
  
+import com.bsth.service.oil.DlbService;
+import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.service.oil.YlbService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,7 +17,8 @@ public class CalcOilThread extends Thread{
  
     @Autowired
     YlbService ylbService;
-
+    @Autowired
+    DlbService dlbService;
     Logger logger = LoggerFactory.getLogger(this.getClass());
  
     @Override
@@ -23,7 +26,11 @@ public class CalcOilThread extends Thread{
         try{
             logger.info("开始计算路单里程加注量....");
             ylbService.obtainDsq();
+            dlbService.obtainDsq();
             logger.info("计算路单里程加注量结束！");
+
+            //清除安全驾驶数据 先临时蹭这个线程
+            SafeDrivCenter.clear();
         } catch(Exception e){
             logger.error("计算路单里程加注量失败",e);
         }
@@ -2,7 +2,6 @@ package com.bsth.data.schedule.thread;
  
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.arrival.ArrivalData_GPS;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
@@ -29,8 +28,8 @@ public class ScheduleRefreshThread extends Thread{
 	@Autowired
 	DayOfSchedule dayOfSchedule;
  
-	@Autowired
-	ArrivalData_GPS arrivalData;
+	/*@Autowired
+	ArrivalData_GPS arrivalData;*/
  
 	@Autowired
 	LineConfigData lineConfs;
@@ -58,8 +57,6 @@ public class ScheduleRefreshThread extends Thread{
 				if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
  
 					logger.info(lineCode + "开始翻班， " + currSchDate);
-					//清除进出站数据
-					arrivalData.clearRAMData(lineCode);
 					//清除指令数据
 					Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
 					for(String car : cars)
 package com.bsth.entity;
  
+import java.util.Date;
+
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -40,6 +43,29 @@ public class Business {
  
 	// 描述
 	private String descriptions;
+	
+	// 创建日期
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+			
+	// 修改日期
+	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
  
 	public Integer getId() {
 		return id;
@@ -64,6 +64,12 @@ public class LineInformation {
 	// 晚高峰结束时间 00:00
 	private String lateEndTime;
  
+	// 小夜高峰开始时间 00:00
+	private String xygfkssj;
+
+	// 小夜高峰结束时间 00:00
+	private String xygfjssj;
+	
 	// 早高峰上行行驶时间
 	private Double earlyUpTime;
  
@@ -91,15 +97,6 @@ public class LineInformation {
 	// 停车场
 	private String carPark;
  
-	// 进场时间
-	private Double  paradeTime;
-	
-	// 出场时间
-	private Double outTime;
-	
-	// 进场里程
-	private Double paradeMileage;
-	
 	// 上行进场时间
 	private Double upInTimer; 
  
@@ -123,7 +120,82 @@ public class LineInformation {
  
 	// 下行出场里程
 	private Double downOutMileage;
+
+	// 早高峰大间隔（分钟）老调度系统字段,暂时保留
+	private Double earlyIntervalLg;
+
+	// 晚高峰大间隔（分钟）老调度系统字段,暂时保留
+	private Double lateIntervalLg;
+
+	// 平时大间隔（分钟）老调度系统字段,暂时保留
+	private Double intervalLg;
+
+	// 限速（平时）老调度系统字段,暂时保留
+	private Double speedLimit;
+	
+	// 限速（雨天）老调度系统字段,暂时保留
+	private Double rainLimit;
+	
+	// 限速（大雾）老调度系统字段,暂时保留
+	private Double fogLimit;
  
+	// 限速（冰雪）老调度系统字段,暂时保留
+	private Double snowLimit;
+	
+	// 限速（节庆）老调度系统字段,暂时保留
+	private Double festivalSpeedLimit;
+	
+	// 滞站
+	private Integer lagStation;
+	
+	// 越站
+	private Integer skip;
+	
+	// 超速
+	private Integer speeding;
+	
+	// 串线
+	private Integer  crossedLine;
+	
+	// 越界
+	private Integer overflights;
+	
+	// 描述
+	private String descriptions;
+	
+	// 创建人
+	private Integer createBy;
+			
+	// 修改人
+	private Integer updateBy;
+	
+	// 创建日期
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+	
+	// 修改日期
+	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
+
+	@ManyToOne
+	private Line line;
+	
+	public String getXygfkssj() {
+		return xygfkssj;
+	}
+
+	public void setXygfkssj(String xygfkssj) {
+		this.xygfkssj = xygfkssj;
+	}
+
+	public String getXygfjssj() {
+		return xygfjssj;
+	}
+
+	public void setXygfjssj(String xygfjssj) {
+		this.xygfjssj = xygfjssj;
+	}
+
 	public Double getUpInTimer() {
 		return upInTimer;
 	}
@@ -188,68 +260,6 @@ public class LineInformation {
 		this.downOutMileage = downOutMileage;
 	}
  
-	// 出场里程
-	private Double outMileage;
-
-	// 早高峰大间隔（分钟）
-	private Double earlyIntervalLg;
-
-	// 晚高峰大间隔（分钟）
-	private Double lateIntervalLg;
-
-	// 平时大间隔（分钟）
-	private Double intervalLg;
-
-	// 限速（平时）
-	private Double speedLimit;
-	
-	// 限速（雨天）
-	private Double rainLimit;
-	
-	// 限速（大雾）
-	private Double fogLimit;
-	
-	// 限速（冰雪）
-	private Double snowLimit;
-	
-	// 限速（节庆）
-	private Double festivalSpeedLimit;
-	
-	// 滞站
-	private Integer lagStation;
-	
-	// 越站
-	private Integer skip;
-	
-	// 超速
-	private Integer speeding;
-	
-	// 串线
-	private Integer  crossedLine;
-	
-	// 越界
-	private Integer overflights;
-	
-	// 描述
-	private String descriptions;
-	
-	// 创建人
-	private Integer createBy;
-			
-	// 修改人
-	private Integer updateBy;
-	
-	// 创建日期
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-	
-	// 修改日期
-	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-	private Date updateDate;
-
-	@ManyToOne
-	private Line line;
-	
 	public Integer getId() {
 		return id;
 	}
@@ -416,39 +426,6 @@ public class LineInformation {
 	public void setCarPark(String carPark) {
 		this.carPark = carPark;
 	}
-
-	public Double getParadeTime() {
-		return paradeTime;
-	}
-
-	public void setParadeTime(Double paradeTime) {
-		this.paradeTime = paradeTime;
-	}
-
-	public Double getOutTime() {
-		return outTime;
-	}
-
-	public void setOutTime(Double outTime) {
-		this.outTime = outTime;
-	}
-
-	public Double getParadeMileage() {
-		return paradeMileage;
-	}
-
-	public void setParadeMileage(Double paradeMileage) {
-		this.paradeMileage = paradeMileage;
-	}
-
-	public Double getOutMileage() {
-		return outMileage;
-	}
-
-	public void setOutMileage(Double outMileage) {
-		this.outMileage = outMileage;
-	}
-
 	public Double getEarlyIntervalLg() {
 		return earlyIntervalLg;
 	}
@@ -52,7 +52,7 @@ public class SectionRoute {
 	// 是否撤销
 	private Integer destroy;
  
-	/** 是否有路段限速数据  <0：未分段；1：分段>*/
+	/** 是否有路段限速数据  <0：分段；1：未分段>*/
 	private Integer isRoadeSpeed;
  
 	// 描述
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
  
 /**
  * 掉线
@@ -65,7 +66,46 @@ public class Offline {
 	 */
 	private Date createDate;
  
-	
+	@Transient
+	private String nbbm;
+	@Transient
+	private String jsy;
+	@Transient
+	private String lpname;
+    @Transient
+    private Long ts;
+    
+    @Transient
+    private String tsdate;
+    @Transient
+    private String deviceid;
+    
+	public String getDeviceid() {
+		return deviceid;
+	}
+
+	public void setDeviceid(String deviceid) {
+		this.deviceid = deviceid;
+	}
+
+
+
+	public String getTsdate() {
+		return tsdate;
+	}
+
+	public void setTsdate(String tsdate) {
+		this.tsdate = tsdate;
+	}
+
+	public Long getTs() {
+		return ts;
+	}
+
+	public void setTs(Long ts) {
+		this.ts = ts;
+	}
+
 	public Integer getId() {
 		return id;
 	}
@@ -146,5 +186,29 @@ public class Offline {
 		this.timestampDate = timestampDate;
 	}
  
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
  
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public String getLpname() {
+		return lpname;
+	}
+
+	public void setLpname(String lpname) {
+		this.lpname = lpname;
+	}
+
+	
 }
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
  
 /**
  * 越界
@@ -72,7 +73,12 @@ public class Outbound {
 	 * 	时间
 	 */
 	private Date createDate;
-	
+	@Transient
+	private String nbbm;
+	@Transient
+	private String jsy;
+	@Transient
+	private String lpname;
  
 	public Integer getId() {
 		return id;
@@ -162,5 +168,29 @@ public class Outbound {
 		this.timestampDate = timestampDate;
 	}
  
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public String getLpname() {
+		return lpname;
+	}
+
+	public void setLpname(String lpname) {
+		this.lpname = lpname;
+	}
+
  
 }
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
  
 /**
  * 超速
@@ -66,6 +67,13 @@ public class Speeding {
 	private String timestampDate;
  
  
+	@Transient
+	private String nbbm;
+	@Transient
+	private String jsy;
+	@Transient
+	private String lpname;
+	
 	/**
 	 * 	创建时间
 	 */
@@ -161,6 +169,30 @@ public class Speeding {
 		this.timestampDate = timestampDate;
 	}
  
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public String getLpname() {
+		return lpname;
+	}
+
+	public void setLpname(String lpname) {
+		this.lpname = lpname;
+	}
+
  
  
 }
@@ -3,7 +3,7 @@ package com.bsth.entity.mcy_forms;
 public class Operationservice {
  
 	private String xlName;//线路
-	
+	private String xlBm;//线路编码
 	private String jzl;//加注量
  
 	private String xhl;//消耗量
@@ -81,6 +81,14 @@ public class Operationservice {
 	public void setSjbc(String sjbc) {
 		this.sjbc = sjbc;
 	}
+
+	public String getXlBm() {
+		return xlBm;
+	}
+
+	public void setXlBm(String xlBm) {
+		this.xlBm = xlBm;
+	}
  
  
 }
@@ -22,6 +22,17 @@ public class Shiftuehiclemanth {
  
 	private String jgh;
 	private String zbh;
+	public String getSgh() {
+		return sgh;
+	}
+
+	public void setSgh(String sgh) {
+		this.sgh = sgh;
+	}
+
+	private String sgh;
+	
+	
 	public String getJgh() {
 		return jgh;
 	}
@@ -20,6 +20,8 @@ public class Waybillday {
  
 	private String zlc;//里程
  
+	private String sh;//损耗
+	
 	public String getJgh() {
 		return jgh;
 	}
@@ -110,6 +112,15 @@ public class Waybillday {
 	public void setYl(String yl) {
 		this.yl = yl;
 	}
+
+	public String getSh() {
+		return sh;
+	}
+
+	public void setSh(String sh) {
+		this.sh = sh;
+	}
+	
  
  
 }
@@ -63,6 +63,11 @@ public class Ylb {
 	@Transient
 	private String gsname;
  
+	@Transient
+	private String fgsname;
+	
+	@Transient
+	private String name;
  
 	public Integer getId() {
 		return id;
@@ -299,6 +304,22 @@ public class Ylb {
 	}
  
  
+	public String getFgsname() {
+		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
+	}
+
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
+
+	public String getName() {
+		return BasicData.allPerson.get(this.jsy);
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
  
  
  
@@ -223,7 +223,7 @@ public class ChildTaskPlan {
  
 	@Override
 	public int hashCode() {
-		return ("" + this.getId() + this.getSchedule().getId()).hashCode();
+		return ("cTask" + this.getId() + this.getSchedule().getId()).hashCode();
 	}
  
 	@Override
@@ -50,6 +50,9 @@ public class LineConfig {
 	/** 出站既出场 对应的停车场 */
 	private String twinsPark;
  
+	/** 出站既出场 对应的起点站 */
+	private String twinsStation;
+
 	/** 短语模板 , 号分隔多个 */
 	private String phraseTemps;
  
@@ -79,7 +82,9 @@ public class LineConfig {
 	 * 应急停靠
 	 */
 	private boolean enableYjtk;
+	/** HH:mm */
 	private String yjtkStart;
+	/** HH:mm */
 	private String yjtkEnd;
 	private int upStopMinute;
 	private int downStopMinute;
@@ -268,4 +273,12 @@ public class LineConfig {
 	public void setEnableYjtk(boolean enableYjtk) {
 		this.enableYjtk = enableYjtk;
 	}
+
+	public String getTwinsStation() {
+		return twinsStation;
+	}
+
+	public void setTwinsStation(String twinsStation) {
+		this.twinsStation = twinsStation;
+	}
 }
@@ -21,6 +21,11 @@ public class OilStationSociety {
     private String stationName;
  
     /**
+     * 加油站编码（为空则默认社会加油站）
+     */
+    private String stationCode;
+
+    /**
      * 上行进场距离
      */
     private Double upInMile;
@@ -137,4 +142,12 @@ public class OilStationSociety {
     public void setDownOutTime(int downOutTime) {
         this.downOutTime = downOutTime;
     }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
 }
@@ -139,12 +139,22 @@ public class ScheduleRealInfo {
 	/** 是否是临加班次 */
 	private boolean sflj;
  
-	/** 是否误点*/
+	/** 是否误点  （应发未发）*/
 	@Transient
 	private boolean late;
  
+	/** 是否误点 （应发未到） */
+	@Transient
+	private boolean late2;
+	/** 误点停靠时间 */
+	@Transient
+	private float lateMinute;
+
 	/** 备注*/
 	private String remarks;
+
+	/** 原计划排班备注 */
+	private String remark;
  
 	/**待发时间（格式 HH:mm） */
 	private String dfsj;
@@ -168,7 +178,7 @@ public class ScheduleRealInfo {
 	private String qdzArrDatesj;
  
 	/** 子任务 */
-	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "schedule")
 	private Set<ChildTaskPlan> cTasks = new HashSet<>();
  
 	/** 关联的公司名称 */
@@ -769,7 +779,10 @@ public class ScheduleRealInfo {
  
 	public void destroy(){
 		this.jhlc = 0.0;
+		if(this.isSflj())
+			this.jhlcOrig = 0.0;
 		this.status = -1;
+		this.clearFcsjActual();
 	}
  
 	public boolean isDestroy(){
@@ -875,4 +888,28 @@ public class ScheduleRealInfo {
 		else
 			this.setLate(false);
 	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public float getLateMinute() {
+		return lateMinute;
+	}
+
+	public void setLateMinute(float lateMinute) {
+		this.lateMinute = lateMinute;
+	}
+
+	public boolean isLate2() {
+		return late2;
+	}
+
+	public void setLate2(boolean late2) {
+		this.late2 = late2;
+	}
 }
@@ -2,8 +2,11 @@ package com.bsth.entity.schedule;
  
 import com.bsth.entity.Line;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.commons.lang3.BooleanUtils;
  
 import javax.persistence.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -53,6 +56,30 @@ public class SchedulePlan extends BEntity {
     @OneToMany(mappedBy = "schedulePlan", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private List<SchedulePlanInfo> schedulePlanInfoList = new ArrayList<>();
  
+
+    public static String generateInsertSql() {
+        String sql = "insert into bsth_c_s_sp " +
+                " (xl, schedule_from_time, schedule_to_time, " +
+                "tt_info_names, tt_info_ids, is_history_plan_first, plan_result, " +
+                "create_by, update_by, create_date, update_date) " +
+                "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        return sql;
+    }
+
+    public void preparedStatementSet(PreparedStatement ps) throws SQLException {
+        ps.setInt(1, this.xl.getId());
+        ps.setDate(2, new java.sql.Date(this.scheduleFromTime.getTime()));
+        ps.setDate(3, new java.sql.Date(this.scheduleToTime.getTime()));
+        ps.setString(4, this.ttInfoNames);
+        ps.setString(5, this.ttInfoIds);
+        ps.setInt(6, BooleanUtils.isTrue(this.isHistoryPlanFirst) ? 1 : 0);
+        ps.setString(7, this.planResult);
+        ps.setInt(8, this.getCreateBy().getId());
+        ps.setInt(9, this.getUpdateBy().getId());
+        ps.setTimestamp(10, new java.sql.Timestamp(this.getCreateDate().getTime()));
+        ps.setTimestamp(11, new java.sql.Timestamp(this.getUpdateDate().getTime()));
+    }
+
     public Long getId() {
         return id;
     }
@@ -6,6 +6,9 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import org.apache.commons.lang3.StringUtils;
  
 import javax.persistence.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Types;
 import java.util.Date;
 import java.util.List;
  
@@ -88,16 +91,18 @@ public class SchedulePlanInfo {
     @Column(nullable = false)
     private String xlDir;
     /** 起点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
-    @Column(nullable = false)
-    private Integer qdz;
+    // 这个字段以后不用了
+//    @Column(nullable = false)
+//    private Integer qdz;
     /** 起点站code */
     private String qdzCode;
     /** 起点站名字 */
     @Column(nullable = false)
     private String qdzName;
     /** 终点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
-    @Column(nullable = false)
-    private Integer zdz;
+    // 这个字段以后不用了
+//    @Column(nullable = false)
+//    private Integer zdz;
     /** 终点站code */
     private String zdzCode;
     /** 终点站名字 */
@@ -128,6 +133,9 @@ public class SchedulePlanInfo {
     /** 关联的时刻表名字 */
     private String ttInfoName;
  
+    /** 时刻表的明细备注 */
+    private String remark;
+
  
     /** 创建人 */
     @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
@@ -143,12 +151,15 @@ public class SchedulePlanInfo {
     private Date updateDate;
  
  
+//    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+//    @JoinTable(
+//            name = "bsth_c_s_sp_r_info",
+//            joinColumns = @JoinColumn(name = "sp_info_id"),
+//            inverseJoinColumns = @JoinColumn(name = "sp_id")
+//    )
+//    private SchedulePlan schedulePlan;
+
     @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    @JoinTable(
-            name = "bsth_c_s_sp_r_info",
-            joinColumns = @JoinColumn(name = "sp_info_id"),
-            inverseJoinColumns = @JoinColumn(name = "sp_id")
-    )
     private SchedulePlan schedulePlan;
  
     public SchedulePlanInfo() {}
@@ -235,28 +246,10 @@ public class SchedulePlanInfo {
         // 时刻明细数据
         this.xlDir = ttInfoDetail.getXlDir(); // 线路上下行
         this.bcType = ttInfoDetail.getBcType(); // 班次类型
-        if ("out".equals(this.bcType)) { // 出场班次
-            this.qdz = ttInfoDetail.getTcc().getId(); // 起点站-停车场id
-            this.qdzCode = ttInfoDetail.getTcc().getParkCode(); // 起点站-停车场code
-            this.qdzName = ttInfoDetail.getTcc().getParkName(); // 起点站-停车场name
-            this.zdz = ttInfoDetail.getZdz().getId(); // 终点站id
-            this.zdzCode = ttInfoDetail.getZdz().getStationCod(); // 终点站code
-            this.zdzName = ttInfoDetail.getZdz().getStationName(); // 终点站name
-        } else if ("in".equals(this.bcType)) { // 进场班次
-            this.qdz = ttInfoDetail.getQdz().getId(); // 起点站id
-            this.qdzCode = ttInfoDetail.getQdz().getStationCod(); // 起点站code
-            this.qdzName = ttInfoDetail.getQdz().getStationName(); // 起点站name
-            this.zdz = ttInfoDetail.getTcc().getId(); // 终点站-停车场id
-            this.zdzCode = ttInfoDetail.getTcc().getParkCode(); // 终点站-停车场code
-            this.zdzName = ttInfoDetail.getTcc().getParkName(); // 终点站-停车场name
-        } else { // 其他班次
-            this.qdz = ttInfoDetail.getQdz().getId(); // 起点站id
-            this.qdzCode = ttInfoDetail.getQdz().getStationCod(); // 起点站code
-            this.qdzName = ttInfoDetail.getQdz().getStationName(); // 起点站name
-            this.zdz = ttInfoDetail.getZdz().getId(); // 终点站id
-            this.zdzCode = ttInfoDetail.getZdz().getStationCod(); // 终点站code
-            this.zdzName = ttInfoDetail.getZdz().getStationName(); // 终点站name
-        }
+        this.qdzCode = ttInfoDetail.getQdzCode(); // 起点站code
+        this.qdzName = ttInfoDetail.getQdzName(); // 起点站name
+        this.zdzCode = ttInfoDetail.getZdzCode(); // 终点站code
+        this.zdzName = ttInfoDetail.getZdzName(); // 终点站name
  
         this.fcsj = ttInfoDetail.getFcsj(); // 发车时间
         this.fcno = ttInfoDetail.getFcno(); // 发车顺序号
@@ -269,12 +262,15 @@ public class SchedulePlanInfo {
         // 使用的时刻表名字
         this.ttInfoName = ttInfoDetail.getTtinfo().getName();
  
+        // 备注信息
+        this.remark = ttInfoDetail.getRemark();
+
         // 使用车辆配置的停车场信息
         String pzType = carConfigInfo.getPzType(); // 配置类型
         if (pzType != null && !pzType.equals("BSY")) {
             if ("ZW".equals(pzType)) { // 只看早晚进出场
                 if (isFirstBc) { // 第一个班次是出场
-                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
+//                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
                     this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
                     this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
  
@@ -282,7 +278,7 @@ public class SchedulePlanInfo {
                     this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
  
                 } else if (isLastBc) { // 最后一个班次是进场
-                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
+//                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
                     this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
                     this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
  
@@ -292,7 +288,7 @@ public class SchedulePlanInfo {
  
             } else if ("FS".equals(pzType)) { // 所有进出场
                 if ("out".equals(this.bcType)) { // 出场班次
-                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
+//                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
                     this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
                     this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
  
@@ -300,7 +296,7 @@ public class SchedulePlanInfo {
                     this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
  
                 } else if ("in".equals(this.bcType)) {
-                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
+//                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
                     this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
                     this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
  
@@ -312,13 +308,61 @@ public class SchedulePlanInfo {
  
     }
  
-
-    public Integer getS() {
-        return s;
-    }
-
-    public void setS(Integer s) {
-        this.s = s;
+    public static String generateInsertSql() {
+        String sql = "insert into bsth_c_s_sp_info " +
+                " (schedule_date, gs_name, gs_bm, fgs_name, fgs_bm, ccno, " +
+                "xl, xl_name, xl_bm, lp, lp_name, cl, cl_zbh, bd_time, cc_time, " +
+                "j, j_gh, j_name, s, s_gh, s_name, " +
+                "xl_dir, qdz_code, qdz_name, zdz_code, zdz_name, " +
+                "fcsj, fcno, bcs, jhlc, bcsj, bc_type, " +
+                "tt_info, tt_info_name, remark, schedule_plan, " +
+                "create_by, update_by, create_date, update_date) " +
+                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," +
+                "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+        return sql;
+    }
+
+    public void preparedStatementSet(PreparedStatement ps) throws SQLException {
+        if (this.scheduleDate != null) ps.setDate(1, new java.sql.Date(this.scheduleDate.getTime())); else ps.setNull(1, Types.DATE);
+        if (this.gsName != null) ps.setString(2, this.gsName); else ps.setNull(2, Types.VARCHAR);
+        if (this.gsBm != null) ps.setString(3, this.gsBm); else ps.setNull(3, Types.VARCHAR);
+        if (this.fgsName != null) ps.setString(4, this.fgsName); else ps.setNull(4, Types.VARCHAR);
+        if (this.fgsBm != null) ps.setString(5, this.fgsBm); else ps.setNull(5, Types.VARCHAR);
+        if (this.ccno != null) ps.setInt(6, this.ccno); else ps.setNull(6, Types.INTEGER);
+        if (this.xl != null) ps.setInt(7, this.xl); else ps.setNull(7, Types.INTEGER);
+        if (this.xlName != null) ps.setString(8, this.xlName); else ps.setNull(8, Types.VARCHAR);
+        if (this.xlBm != null) ps.setString(9, this.xlBm); else ps.setNull(9, Types.VARCHAR);
+        if (this.lp != null) ps.setLong(10, this.lp); else ps.setNull(10, Types.BIGINT);
+        if (this.lpName != null) ps.setString(11, this.lpName); else ps.setNull(11, Types.VARCHAR);
+        if (this.cl != null) ps.setInt(12, this.cl); else ps.setNull(12, Types.INTEGER);
+        if (this.clZbh != null) ps.setString(13, this.clZbh); else ps.setNull(13, Types.VARCHAR);
+        if (this.bdTime != null) ps.setString(14, this.bdTime); else ps.setNull(14, Types.VARCHAR);
+        if (this.ccTime != null) ps.setString(15, this.ccTime); else ps.setNull(15, Types.VARCHAR);
+        if (this.j != null) ps.setInt(16, this.j); else ps.setNull(16, Types.INTEGER);
+        if (this.jGh != null) ps.setString(17, this.jGh); else ps.setNull(17, Types.VARCHAR);
+        if (this.jName != null) ps.setString(18, this.jName); else ps.setNull(18, Types.VARCHAR);
+        if (this.s != null) ps.setInt(19, this.s); else ps.setNull(19, Types.INTEGER);
+        if (this.sGh != null) ps.setString(20, this.sGh); else ps.setNull(20, Types.VARCHAR);
+        if (this.sName != null) ps.setString(21, this.sName); else ps.setNull(21, Types.VARCHAR);
+        if (this.xlDir != null) ps.setString(22, this.xlDir); else ps.setNull(22, Types.VARCHAR);
+        if (this.qdzCode != null) ps.setString(23, this.qdzCode); else ps.setNull(23, Types.VARCHAR);
+        if (this.qdzName != null) ps.setString(24, this.qdzName); else ps.setNull(24, Types.VARCHAR);
+        if (this.zdzCode != null) ps.setString(25, this.zdzCode); else ps.setNull(25, Types.VARCHAR);
+        if (this.zdzName != null) ps.setString(26, this.zdzName); else ps.setNull(26, Types.VARCHAR);
+        if (this.fcsj != null) ps.setString(27, this.fcsj); else ps.setNull(27, Types.VARCHAR);
+        if (this.fcno != null) ps.setInt(28, this.fcno); else ps.setNull(28, Types.INTEGER);
+        if (this.bcs != null) ps.setInt(29, this.bcs); else ps.setNull(29, Types.INTEGER);
+        if (this.jhlc != null) ps.setDouble(30, this.jhlc); else ps.setNull(30, Types.DOUBLE);
+        if (this.bcsj != null) ps.setInt(31, this.bcsj); else ps.setNull(31, Types.INTEGER);
+        if (this.bcType != null) ps.setString(32, this.bcType); else ps.setNull(32, Types.VARCHAR);
+        if (this.ttInfo != null) ps.setLong(33, this.ttInfo); else ps.setNull(33, Types.BIGINT);
+        if (this.ttInfoName != null) ps.setString(34, this.ttInfoName); else ps.setNull(34, Types.VARCHAR);
+        if (this.remark != null) ps.setString(35, this.remark); else ps.setNull(35, Types.VARCHAR);
+        if (this.schedulePlan != null) ps.setLong(36, this.schedulePlan.getId()); else ps.setNull(36, Types.BIGINT);
+        if (this.createBy != null) ps.setInt(37, this.createBy.getId()); else ps.setNull(37, Types.INTEGER);
+        if (this.updateBy != null) ps.setInt(38, this.updateBy.getId()); else ps.setNull(38, Types.INTEGER);
+        if (this.createDate != null) ps.setTimestamp(39, new java.sql.Timestamp(this.createDate.getTime())); else ps.setNull(39, Types.TIMESTAMP);
+        if (this.updateDate != null) ps.setTimestamp(40, new java.sql.Timestamp(this.updateDate.getTime())); else ps.setNull(40, Types.TIMESTAMP);
     }
  
     public Long getId() {
@@ -337,6 +381,46 @@ public class SchedulePlanInfo {
         this.scheduleDate = scheduleDate;
     }
  
+    public String getGsName() {
+        return gsName;
+    }
+
+    public void setGsName(String gsName) {
+        this.gsName = gsName;
+    }
+
+    public String getGsBm() {
+        return gsBm;
+    }
+
+    public void setGsBm(String gsBm) {
+        this.gsBm = gsBm;
+    }
+
+    public String getFgsName() {
+        return fgsName;
+    }
+
+    public void setFgsName(String fgsName) {
+        this.fgsName = fgsName;
+    }
+
+    public String getFgsBm() {
+        return fgsBm;
+    }
+
+    public void setFgsBm(String fgsBm) {
+        this.fgsBm = fgsBm;
+    }
+
+    public Integer getCcno() {
+        return ccno;
+    }
+
+    public void setCcno(Integer ccno) {
+        this.ccno = ccno;
+    }
+
     public Integer getXl() {
         return xl;
     }
@@ -433,6 +517,14 @@ public class SchedulePlanInfo {
         this.jName = jName;
     }
  
+    public Integer getS() {
+        return s;
+    }
+
+    public void setS(Integer s) {
+        this.s = s;
+    }
+
     public String getsGh() {
         return sGh;
     }
@@ -457,12 +549,12 @@ public class SchedulePlanInfo {
         this.xlDir = xlDir;
     }
  
-    public Integer getQdz() {
-        return qdz;
+    public String getQdzCode() {
+        return qdzCode;
     }
  
-    public void setQdz(Integer qdz) {
-        this.qdz = qdz;
+    public void setQdzCode(String qdzCode) {
+        this.qdzCode = qdzCode;
     }
  
     public String getQdzName() {
@@ -473,12 +565,12 @@ public class SchedulePlanInfo {
         this.qdzName = qdzName;
     }
  
-    public Integer getZdz() {
-        return zdz;
+    public String getZdzCode() {
+        return zdzCode;
     }
  
-    public void setZdz(Integer zdz) {
-        this.zdz = zdz;
+    public void setZdzCode(String zdzCode) {
+        this.zdzCode = zdzCode;
     }
  
     public String getZdzName() {
@@ -537,6 +629,30 @@ public class SchedulePlanInfo {
         this.bcType = bcType;
     }
  
+    public Long getTtInfo() {
+        return ttInfo;
+    }
+
+    public void setTtInfo(Long ttInfo) {
+        this.ttInfo = ttInfo;
+    }
+
+    public String getTtInfoName() {
+        return ttInfoName;
+    }
+
+    public void setTtInfoName(String ttInfoName) {
+        this.ttInfoName = ttInfoName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public SysUser getCreateBy() {
         return createBy;
     }
@@ -569,62 +685,6 @@ public class SchedulePlanInfo {
         this.updateDate = updateDate;
     }
  
-    public String getQdzCode() {
-        return qdzCode;
-    }
-
-    public void setQdzCode(String qdzCode) {
-        this.qdzCode = qdzCode;
-    }
-
-    public String getZdzCode() {
-        return zdzCode;
-    }
-
-    public void setZdzCode(String zdzCode) {
-        this.zdzCode = zdzCode;
-    }
-
-    public String getGsName() {
-        return gsName;
-    }
-
-    public void setGsName(String gsName) {
-        this.gsName = gsName;
-    }
-
-    public String getGsBm() {
-        return gsBm;
-    }
-
-    public void setGsBm(String gsBm) {
-        this.gsBm = gsBm;
-    }
-
-    public String getFgsName() {
-        return fgsName;
-    }
-
-    public void setFgsName(String fgsName) {
-        this.fgsName = fgsName;
-    }
-
-    public String getFgsBm() {
-        return fgsBm;
-    }
-
-    public void setFgsBm(String fgsBm) {
-        this.fgsBm = fgsBm;
-    }
-
-    public Integer getCcno() {
-        return ccno;
-    }
-
-    public void setCcno(Integer ccno) {
-        this.ccno = ccno;
-    }
-
     public SchedulePlan getSchedulePlan() {
         return schedulePlan;
     }
@@ -632,20 +692,4 @@ public class SchedulePlanInfo {
     public void setSchedulePlan(SchedulePlan schedulePlan) {
         this.schedulePlan = schedulePlan;
     }
-
-    public Long getTtInfo() {
-        return ttInfo;
-    }
-
-    public void setTtInfo(Long ttInfo) {
-        this.ttInfo = ttInfo;
-    }
-
-    public String getTtInfoName() {
-        return ttInfoName;
-    }
-
-    public void setTtInfoName(String ttInfoName) {
-        this.ttInfoName = ttInfoName;
-    }
 }
@@ -47,16 +47,28 @@ public class TTInfoDetail extends BEntity {
     /** 线路方向（TODO：上下行，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */
     @Column(nullable = false)
     private String xlDir;
-    /** 起点站关联 */
+
+    /** 起点站关联（以后不用了，暂时留着） */
     @ManyToOne(cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
     private Station qdz;
-    /** 终点站关联 */
+    /** 终点站关联（以后不用了，暂时留着） */
     @ManyToOne(cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
     private Station zdz;
-    /** 停车场关联（出场，进场班次会关联停车场） */
+    /** 停车场关联（出场，进场班次会关联停车场）（以后不用了，暂时留着） */
     @ManyToOne(cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
     private CarPark tcc;
  
+    // 站点包括普通站点和停车场（站点编码不同，使用站点编码区分）
+    // 以后不需要再区分是站点还是停车场了
+    /** 起站点代码（bsth_c_station，bsth_c_car_park 里的编码） */
+    private String qdzCode;
+    /** 起站点名字（bsth_c_stationroute，bsth_c_car_park里的名字） */
+    private String qdzName;
+    /** 终点站代码（bsth_c_station，bsth_c_car_park 里的编码） */
+    private String zdzCode;
+    /** 终点站名字（bsth_c_stationroute，bsth_c_car_park里的名字） */
+    private String zdzName;
+
     /** 发车时间（格式 HH:mm） */
     @Column(nullable = false, length = 5)
     private String fcsj;
@@ -236,4 +248,36 @@ public class TTInfoDetail extends BEntity {
     public void setIsFB(Boolean isFB) {
         this.isFB = isFB;
     }
+
+    public String getQdzCode() {
+        return qdzCode;
+    }
+
+    public void setQdzCode(String qdzCode) {
+        this.qdzCode = qdzCode;
+    }
+
+    public String getQdzName() {
+        return qdzName;
+    }
+
+    public void setQdzName(String qdzName) {
+        this.qdzName = qdzName;
+    }
+
+    public String getZdzCode() {
+        return zdzCode;
+    }
+
+    public void setZdzCode(String zdzCode) {
+        this.zdzCode = zdzCode;
+    }
+
+    public String getZdzName() {
+        return zdzName;
+    }
+
+    public void setZdzName(String zdzName) {
+        this.zdzName = zdzName;
+    }
 }
@@ -53,6 +53,8 @@ public class RerunRule extends BEntity {
     private GuideboardInfo rerunLp;
     /** 套跑班次（时刻表明细ids，使用逗号连接） */
     private String rerunTtinfodetailIds;
+    /** 套跑班次（对应具体班次的发车时间，使用逗号连接） */
+    private String rerunTtinfodetailFcsjs;
  
  
     /** 套跑类型（dylp；对应路牌，dybc：对应班车） */
@@ -167,4 +169,11 @@ public class RerunRule extends BEntity {
         this.isCancel = isCancel;
     }
  
+    public String getRerunTtinfodetailFcsjs() {
+        return rerunTtinfodetailFcsjs;
+    }
+
+    public void setRerunTtinfodetailFcsjs(String rerunTtinfodetailFcsjs) {
+        this.rerunTtinfodetailFcsjs = rerunTtinfodetailFcsjs;
+    }
 }
@@ -57,6 +57,7 @@ public class ScheduleRule1Flat extends BEntity {
     private String lpNames;
     /** 对应的路牌ids（用逗号隔开） */
     @NotNull
+    @Column(length = 1000)
     private String lpIds;
     /** 起始路牌（从0开始） */
     @NotNull
@@ -66,6 +67,7 @@ public class ScheduleRule1Flat extends BEntity {
     private String ryDbbms;
     /** 对应的人员配置ids（用逗号隔开，如果分班，就先-隔开再逗号隔开） */
     @NotNull
+    @Column(length = 1000)
     private String ryConfigIds;
     /** 起始人员（从0开始） */
     @NotNull
@@ -2,10 +2,7 @@ package com.bsth.entity.schedule.temp;
  
 import com.bsth.entity.schedule.SchedulePlan;
  
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.util.Date;
  
 /**
@@ -13,6 +10,7 @@ import java.util.Date;
  */
 @Entity
 @Table(name = "bsth_c_s_sp_rule_rst")
+// TODO：此表以后考虑表分区
 public class SchedulePlanRuleResult {
     /** 主键Id */
     @Id
@@ -20,7 +18,8 @@ public class SchedulePlanRuleResult {
     private Long id;
  
     /** 线路id */
-    private String xlId;
+    // 这里要建一个索引 tt1 normal btree
+    private Integer xlId;
     /** 线路名字 */
     private String xlName;
  
@@ -32,12 +31,14 @@ public class SchedulePlanRuleResult {
     private String ccZbh;
  
     /** 路牌id列表字符串 */
+    @Column(length = 1000)
     private String gids;
     /** 路牌名字列表字符串 */
     private String gnames;
     /** 翻到哪个路牌索引 */
     private String gidindex;
     /** 人员配置id列表字符串 */
+    @Column(length = 1000)
     private String ecids;
     /** 人员配置搭班编码列表字符串 */
     private String ecdbbms;
@@ -50,6 +51,7 @@ public class SchedulePlanRuleResult {
     private String ttinfoName;
  
     /** 排班日期 */
+    // 这里要建一个索引 tt2 normal btree
     private Date scheduleDate;
  
     /** 操作人员id */
@@ -57,6 +59,7 @@ public class SchedulePlanRuleResult {
     /** 操作人员姓名 */
     private String sysuserName;
     /** 操作时间 */
+    // 这里要建一个索引 tt3 normal btree
     private Date createDate;
  
     public SchedulePlanRuleResult() {
@@ -77,6 +80,22 @@ public class SchedulePlanRuleResult {
         this.id = id;
     }
  
+    public Integer getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(Integer xlId) {
+        this.xlId = xlId;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
     public String getRuleId() {
         return ruleId;
     }
@@ -149,6 +168,22 @@ public class SchedulePlanRuleResult {
         this.ecindex = ecindex;
     }
  
+    public String getTtinfoId() {
+        return ttinfoId;
+    }
+
+    public void setTtinfoId(String ttinfoId) {
+        this.ttinfoId = ttinfoId;
+    }
+
+    public String getTtinfoName() {
+        return ttinfoName;
+    }
+
+    public void setTtinfoName(String ttinfoName) {
+        this.ttinfoName = ttinfoName;
+    }
+
     public Date getScheduleDate() {
         return scheduleDate;
     }
@@ -180,36 +215,4 @@ public class SchedulePlanRuleResult {
     public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
-
-    public String getXlId() {
-        return xlId;
-    }
-
-    public void setXlId(String xlId) {
-        this.xlId = xlId;
-    }
-
-    public String getXlName() {
-        return xlName;
-    }
-
-    public void setXlName(String xlName) {
-        this.xlName = xlName;
-    }
-
-    public String getTtinfoId() {
-        return ttinfoId;
-    }
-
-    public void setTtinfoId(String ttinfoId) {
-        this.ttinfoId = ttinfoId;
-    }
-
-    public String getTtinfoName() {
-        return ttinfoName;
-    }
-
-    public void setTtinfoName(String ttinfoName) {
-        this.ttinfoName = ttinfoName;
-    }
 }
 package com.bsth.repository;
  
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
  
 import com.bsth.entity.Business;
@@ -28,5 +29,7 @@ public interface BusinessRepository extends BaseRepository&lt;Business, Integer&gt; {
     List<Business> findByBusinessCode(String code);
  
     List<Business> findByUpCodeAndBusinessCode(String c1, String c2);
-
+    
+    @Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_business) k" , nativeQuery=true)
+	long getMaxId();
 }
@@ -72,7 +72,6 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
  
 						   String descriptions, int versions,int id);
  
-	
 	/**
 	 * @Description :TODO(编辑线路走向)
 	 * 
@@ -113,5 +112,4 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 							  Double speedLimit,String descriptions,Integer version,Integer createBy,String createDate,
  
 							  Integer updateBy,String updateDate);
-	
 }