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

sgz
2 parents cac7e0c0 2dc63700
Showing 58 changed files with 1552 additions and 1334 deletions
pom.xml
src/main/java/com/bsth/controller/BusinessController.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/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/DataManagerController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/OfflineSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.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,27 +237,33 @@
 			<version>1.13</version>
 		</dependency>
-        <dependency>
-            <groupId>org.dbunit</groupId>
-            <artifactId>dbunit</artifactId>
-            <version>2.4.9</version>
-            <scope>test</scope>
+		<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>
+			<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>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>
 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();
+	}
 }
@@ -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);
-		
 	}
 	/**
@@ -57,7 +57,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);
 	}
@@ -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(查询树站点与路段数据)
 	 * 
@@ -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
@@ -167,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<?>>();
@@ -213,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;
@@ -252,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<?>>();
@@ -558,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());
@@ -576,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);
@@ -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);
@@ -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());
-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);
-    }
-}
+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);
+    }
+}
@@ -186,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
@@ -207,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;
-	}
 	/**
 	 * 
@@ -243,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 
@@ -269,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);
 	}
@@ -447,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");
@@ -543,4 +515,25 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		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.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")
@@ -31,12 +34,142 @@ public class ReportController {
 			@RequestParam String date,@RequestParam String fcsj,@RequestParam String ddsj){
 		return service.queryListZdxx(line,date,clzbh,fcsj,ddsj);
 	}
+	
+	@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;
+    }
     /**
      * 时刻表明细批量插入
@@ -332,7 +332,8 @@ public class BasicData implements CommandLineRunner {
                 }
                 perTempMap.put(jobCode, p);
-                allPersonMap.put(jobCode, p.getPersonnelName());
+                
+                allPersonMap.put(jobCode.substring(jobCode.indexOf("-")+1), p.getPersonnelName());
             }
             jsyMap = jsyTempMap;
@@ -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;
@@ -145,6 +146,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             //持久化
             dayOfSchedule.save(sch);
+            //清理应发未发标记
+            LateAdjustHandle.remove(sch);
+
             if(sch.getBcType().equals("out")){
                 //出场时，切换成营运状态
                 directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
@@ -242,23 +246,35 @@ public class InOutStationSignalHandle extends SignalHandle{
             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, "到站@系统");
@@ -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("W9G-013"))
+            /*if(nbbm.equals("W7C-001"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
@@ -150,8 +150,6 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 CircleQueue<GpsEntity> prevs;
                 boolean task;
                 for (GpsEntity gps : list) {
-                    /*if(gps.getTimestamp() > 1491951840000L)
-                        System.out.print("");*/
                     //是否有任务
@@ -88,7 +88,7 @@ public class SafeDrivDataLoadThread extends Thread{
             httpClient.close();
             response.close();
         } catch (Exception e) {
-            logger.error("", e);
+            logger.error(e.getMessage());
         }
     }
 }
@@ -11,7 +11,10 @@ import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
-import com.bsth.data.schedule.thread.*;
+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;
@@ -20,7 +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.Collections2;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -56,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;
     // 排序器
@@ -99,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<>();
@@ -146,7 +152,7 @@ public class DayOfSchedule implements CommandLineRunner {
         //入库
 //        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();
@@ -154,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);
@@ -230,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);
             }
@@ -255,7 +265,7 @@ public class DayOfSchedule implements CommandLineRunner {
     /**
      * @Title: searchAllCars
      * @Description: TODO(搜索班次集合中的车辆)
-     */
+    */
     private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
         Set<String> cars = new HashSet<>();
         for (ScheduleRealInfo sch : list)
@@ -264,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);
@@ -309,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);
     }
@@ -493,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();
@@ -528,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)
@@ -567,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;
             }
@@ -623,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())
@@ -640,13 +692,24 @@ public class DayOfSchedule implements CommandLineRunner {
         nbbmScheduleMap.remove(sch.getClZbh(), sch);
         id2SchedulMap.remove(sch.getId());
+        lpScheduleMap.remove(sch.getXlBm() + "_" + sch.getLpName(), sch);
         //return sch;
     }
-    public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm) {
+/*    public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm) {
         Collections.sort(nbbmScheduleMap.get(nbbm), schFCSJComparator);
         return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
+    }*/
+
+    public List<ScheduleRealInfo> updateQdzTimePlan(String lpName) {
+        List<ScheduleRealInfo> list = lpScheduleMap.get(lpName);
+        Collections.sort(list, schFCSJComparator);
+        return schAttrCalculator.updateQdzTimePlan(list);
+    }
+
+    public List<ScheduleRealInfo> updateQdzTimePlan(ScheduleRealInfo sch) {
+        return updateQdzTimePlan(sch.getXlBm() + "_" + sch.getLpName());
     }
     /**
@@ -807,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;*/
         //变更相关映射信息
@@ -817,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);
@@ -839,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));
     }
     /**
@@ -939,4 +1002,15 @@ public class DayOfSchedule implements CommandLineRunner {
         //重新计算班次应到时间
         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.entity.realcontrol.ScheduleRealInfo;
-
-import java.util.Map;
-
-/**
- * 误点调整处理程序
- * Created by panzhao on 2017/4/16.
- */
-public class LateAdjustHandle {
-
-    /**
-     * 误点的车辆 和 班次
-     */
-    private static Map<String, ScheduleRealInfo> lateSchMap;
-
-
-    /**
-     * 误点的班次ID 和 停靠时间（秒）
-     */
-    private static Map<Long, Integer> stopTimeMap;
-
-
-    /**
-     * 班次误点（考虑停靠时间）
-     * @param sch
-     */
-    public static void schLate(ScheduleRealInfo sch){
-
-    }
-}
+
+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.late_adjust;
-
-
-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.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 
- *
- */
-@Component
-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){
-				//应发未发
-				sch.setLate(true);
-				//通知客户端
-				sendUtils.refreshSch(sch);
-			}
-		}
-	}
-}
+package com.bsth.data.schedule.late_adjust;
+
+
+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
+ *
+ */
+@Component
+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())
+				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);
+				//通知客户端
+				sendUtils.refreshSch(sch);
+			}
+		}
+	}
+}
 \ No newline at end of file
@@ -57,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;
 	// 描述
@@ -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;
+	}
 }
@@ -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;
+	}
+	
@@ -82,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;
@@ -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,10 +139,17 @@ public class ScheduleRealInfo {
 	/** 是否是临加班次 */
 	private boolean sflj;
-	/** 是否误点*/
+	/** 是否误点  （应发未发）*/
 	@Transient
 	private boolean late;
+	/** 是否误点 （应发未到） */
+	@Transient
+	private boolean late2;
+	/** 误点停靠时间 */
+	@Transient
+	private float lateMinute;
+
 	/** 备注*/
 	private String remarks;
@@ -772,6 +779,8 @@ public class ScheduleRealInfo {
 	public void destroy(){
 		this.jhlc = 0.0;
+		if(this.isSflj())
+			this.jhlcOrig = 0.0;
 		this.status = -1;
 		this.clearFcsjActual();
 	}
@@ -887,4 +896,20 @@ public class ScheduleRealInfo {
 	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;
     /** 终点站名字 */
@@ -146,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() {}
@@ -238,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(); // 发车顺序号
@@ -280,7 +270,7 @@ public class SchedulePlanInfo {
         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
@@ -288,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
@@ -298,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
@@ -306,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
@@ -318,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() {
@@ -343,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;
     }
@@ -439,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;
     }
@@ -463,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() {
@@ -479,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() {
@@ -543,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;
     }
@@ -575,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;
     }
@@ -638,28 +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;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
 }
@@ -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;
+    }
 }
@@ -10,6 +10,7 @@ import java.util.Date;
  */
 @Entity
 @Table(name = "bsth_c_s_sp_rule_rst")
+// TODO：此表以后考虑表分区
 public class SchedulePlanRuleResult {
     /** 主键Id */
     @Id
@@ -17,7 +18,8 @@ public class SchedulePlanRuleResult {
     private Long id;
     /** 线路id */
-    private String xlId;
+    // 这里要建一个索引 tt1 normal btree
+    private Integer xlId;
     /** 线路名字 */
     private String xlName;
@@ -49,6 +51,7 @@ public class SchedulePlanRuleResult {
     private String ttinfoName;
     /** 排班日期 */
+    // 这里要建一个索引 tt2 normal btree
     private Date scheduleDate;
     /** 操作人员id */
@@ -56,6 +59,7 @@ public class SchedulePlanRuleResult {
     /** 操作人员姓名 */
     private String sysuserName;
     /** 操作时间 */
+    // 这里要建一个索引 tt3 normal btree
     private Date createDate;
     public SchedulePlanRuleResult() {
@@ -76,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;
     }
@@ -148,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;
     }
@@ -179,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(编辑线路走向)
 	 * 
@@ -121,7 +121,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 			"b.create_date AS sectionCreateDate," +
 			"b.update_by AS sectionUpdateBy," +
 			"b.update_date AS sectionUpdateDate," +
-			"b.versions AS sectionVersion FROM (" +
+			"b.versions AS sectionVersion , a.isRoadeSpeed  FROM (" +
 			" SELECT s.id AS sectionRouteId," +
 			"s.line_code AS sectionRouteLineCode," +
 			"s.sectionroute_code AS sectionRouteCode," +
@@ -134,7 +134,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 			"s.update_by AS sectionRouteUpdateBy," +
 			"s.update_date AS sectionRouteUpdateDate," +
 			"s.versions AS sectionRouteVersions," +
-			"s.destroy AS sectionRouteDestroy" +
+			"s.destroy AS sectionRouteDestroy,  s.is_roade_speed AS isRoadeSpeed " +
 			" FROM  bsth_c_sectionroute s where s.id =?1) a " +
 			" LEFT JOIN bsth_c_section b on a.sectionRouteSection = b.id", nativeQuery=true)
 	List<Object[]> findSectionRouteInfoFormId(int id);
@@ -171,6 +171,10 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	@Query(value="UPDATE bsth_c_sectionroute set is_roade_speed = ?1  where line= ?2 and directions=?3 ",nativeQuery = true)
 	void isRoadSpeedUpd(Integer isR,Integer line,Integer directions);
+	@Modifying
+	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+10) where line = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
+	public void sectionUpdSectionRouteCode(Integer line,Integer dir,Integer routeCod);
+	
     @Modifying
     @Query(value="update bsth_c_sectionroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1   ", nativeQuery=true)
 	public void sectionRouteDir(Integer line);
@@ -37,7 +37,7 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
 			, nativeQuery=true)
 	long stationMaxId();
-	@Query(value = "SELECT * FROM bsth_c_station s where s.station_name = ?1"
+	@Query(value = "SELECT s.b_jwpoints,s.id FROM bsth_c_station s where s.station_name like  ?1"
 			, nativeQuery=true)
 	List<Object[]> findStationName(String stationName);
@@ -22,7 +22,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> findByLines(List<String> lines);
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and bc_type not in ('in','out') order by (lpName+1),clZbh,realExecDate,fcsj")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and bc_type not in ('in','out') order by (lpName+1),clZbh,realExecDate,dfsj")
 	List<ScheduleRealInfo> scheduleDailyQp(String line,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.id,s.jGh,s.clZbh,s.lpName order by (lpName+1)")
@@ -87,11 +87,11 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,dfsj")
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5  order by realExecDate,fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5  order by realExecDate,dfsj")
 	List<ScheduleRealInfo> queryListWaybillXcld(String jGh,String clZbh,String lpName,String date,String line);
 //	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -104,11 +104,11 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,dfsj")
 	List<ScheduleRealInfo> queryListWaybill2(String clZbh,String date,String line);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh like %?1% and s.clZbh like %?2% and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') and s.gsBm like %?4% and s.fgsBm like %?5%  order by realExecDate,fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh like %?1% and s.clZbh like %?2% and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') and s.gsBm like %?4% and s.fgsBm like %?5%  order by realExecDate,dfsj")
 	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date,String gsbm,String fgsbm);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -133,11 +133,11 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//去掉了 xlBm is not null 
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.realExecDate,s.fcsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.realExecDate,s.dfsj, (s.lpName+1)")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.dfsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -151,18 +151,19 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//按照时间段统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') and gsBm like %?4% and fgsBm like %?5% order by s.xlBm")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3  and gsBm like %?4% and fgsBm like %?5% order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2,String gsdm,String fgsdm);
 	//按照时间段统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj2(String line,String date,String date2);
 		//月报表
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3  order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
+	
 	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%  GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY clZbh,fcsj")
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm);
@@ -24,8 +24,6 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
 	@Query(value = "select s from SchedulePlanInfo s where scheduleDate=?1")
 	List<SchedulePlanInfo> findByDate(Date date);
-    Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate);
-    
     @Query(value = " select " +
             "info.xl as xlId, " +
             "info.xl_name as xlName, " +
@@ -2,24 +2,18 @@ package com.bsth.repository.schedule;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
 import com.bsth.repository.BaseRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
-import java.util.Date;
-import java.util.List;
-
 /**
  * Created by xu on 17/3/29.
  */
 @Repository
 public interface SchedulePlanRuleResultRepository extends BaseRepository<SchedulePlanRuleResult, Long> {
-    @Query("select t from SchedulePlanRuleResult t " +
-            "where not exists (select 1 from SchedulePlanRuleResult " +
-            "where createDate > t.createDate and scheduleDate < ?2 ) " +
-            "and t.xlId = ?1 and t.scheduleDate < ?2")
-    List<SchedulePlanRuleResult> findLastByXl(String xlid, Date from);
+//    @Query("select t from SchedulePlanRuleResult t " +
+//            "where not exists (select 1 from SchedulePlanRuleResult " +
+//            "where createDate > t.createDate and scheduleDate < ?2 ) " +
+//            "and t.xlId = ?1 and t.scheduleDate < ?2")
 //    @Modifying
 //    @Query("delete from SchedulePlanRuleResult t " +
@@ -18,5 +18,5 @@ import com.bsth.entity.Business;
  * 
  */
 public interface BusinessService extends BaseService<Business, Integer> {
-
+	long getCompCode();
 }
@@ -23,6 +23,14 @@ import com.bsth.entity.StationRoute;
 public interface StationRouteService extends BaseService<StationRoute, Integer> {
 	/**
+	 * 
+	 * @Title: list 
+	 * @Description: TODO(多条件查询) 
+	 * @throws
+	 */
+	Iterable<StationRoute> list(Map<String, Object> map);
+	
+	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
 	 * @param map <line.id_eq:线路ID； directions_eq：方向>
@@ -31,7 +31,7 @@ public interface FormsService {
 	public List<Singledata> singledata(Map<String, Object> map);
-	public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line,String data);
+	public List<Vehicleloading> vehicleloading(String line,String data);
 	public List<Operationservice> operationservice(Map<String, Object> map);
@@ -35,12 +35,14 @@ public class ExportServiceImpl implements ExportService{
 			for(Waybillday w : list){
 				Map<String, Object> m = new HashMap<String, Object>();
-				m.put("carPlate", w.getCarPlate());
+				m.put("carPlate", w.getNbbm());
 				m.put("jzl1", w.getJzl1());
 				m.put("jzl", w.getJzl());
 				m.put("yh", w.getYh());
+				m.put("sh", w.getSh());
 				m.put("jName", w.getjName());
 				m.put("zlc", w.getZlc());
+				m.put("jy", "");
 				resList.add(m);
 			}
@@ -48,7 +50,7 @@ public class ExportServiceImpl implements ExportService{
 				listI.add(resList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
 				ee.excelReplace(listI, new Object[] { map }, path+"mould/waybillday.xls",
-						path+"export/行车路单日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+						path+"export/行车路单日报表.xls");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -25,7 +25,9 @@ import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.mcy_forms.Turnoutrate;
 import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
+import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.data.BasicData;
 import com.bsth.entity.mcy_forms.Allline;
@@ -55,52 +57,76 @@ public class FormsServiceImpl implements FormsService {
 	@Autowired
 	CulateMileageService culateMileageService;
+	
+	@Autowired
+	YlbRepository ylbRepository; 
 	// 行车路单日报表
 	@Override
 	public List<Waybillday> waybillday(Map<String, Object> map) {
-		
-		
-		
-		String sql=" select t.*,z.jzl,z.yh from ("
-				+ " select x.j_gh,x.cl_zbh,x.j_name,x.schedule_date,"
-				+ " x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name  from bsth_c_s_sp_info_real x "
-				+ " where  to_days( x.schedule_date)=to_days('"+map.get("date").toString() + "')  "
-				+ " and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"' "
-				+ " and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"' "
-				+ " and xl_bm like '%"+ map.get("line").toString().trim()+"%'"
-				+ " GROUP BY x.j_gh,x.cl_zbh,x.j_name,"
-				+ " x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name ) t"
-				+ " LEFT join  (select  y.rq,y.xlbm,y.nbbm,y.jsy,y.jzl,y.yh from"
-				+ " bsth_c_ylb y   where 1=1   "
-				+ " and to_days(y.RQ)=to_days('"+map.get("date").toString() + "')  "
-				+ " and y.XLBM like '%"+ map.get("line").toString().trim()+"%'"
-				+ " and y.ssgsdm='"+map.get("gsdmWaybillday").toString()+"'"
-				+ " and y.fgsdm='"+map.get("gsdmWaybillday").toString()+"')  z "
-				+ " on t.cl_zbh=z.nbbm ";
+		String line=map.get("line").toString();
+		String date=map.get("date").toString();
+
+		String sql="select "
+				+ " r.cl_zbh,r.j_gh,r.j_name"
+				+ " from bsth_c_s_sp_info_real r where "
+				+ " r.schedule_date_str = '"+date+"'"
+				+ " and r.xl_bm = '"+line+"' "
+				+ " group  by "
+	       		+ " r.cl_zbh,r.j_gh,r.j_name";
 		List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
+			
 			@Override
 			public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Waybillday wbd = new Waybillday();
-				wbd.setCarPlate(arg0.getString("cl_zbh"));
-				wbd.setJzl(arg0.getString("jzl"));
-				wbd.setYh(arg0.getString("yh"));
-				wbd.setjName(arg0.getString("j_name"));
-				wbd.setRq(arg0.getString("schedule_date"));
-				wbd.setJgh(arg0.getString("j_gh"));
-				return wbd;
-			}
+				Waybillday w=new Waybillday();
+				w.setJgh(arg0.getString("j_gh"));
+				w.setjName(arg0.getString("j_name"));
+				w.setNbbm(arg0.getString("cl_zbh"));
+				return w;
+				
+			};
 		});
-		
-		for(int i=0;i<list.size();i++){
+		List<ScheduleRealInfo> realList= scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
+		List<Ylb> listYlb= ylbRepository.obtainYl(date, "", "", line, "", "xlbm");
+		double jzl=0.0,sh=0.0,yh=0.0;
+		for (int i = 0; i < list.size(); i++) {
 			Waybillday w=list.get(i);
-			Map<String, Object> maps = new HashMap<>();
-			maps = commonService.findKMBC2(w.getJgh(), w.getCarPlate(),
-					w.getRq());
-			w.setJzl1(maps.get("ksgl").toString());
-			w.setZlc(maps.get("realMileage").toString());
-
+			List<ScheduleRealInfo> listInfo=new ArrayList<ScheduleRealInfo>();
+			for (int j = 0; j < realList.size(); j++) {
+				ScheduleRealInfo s=realList.get(j);
+				if(w.getNbbm().equals(s.getClZbh()) && w.getJgh().equals(w.getJgh())){
+					listInfo.add(s);
+				}
+			}
+			
+			double sjgl=culateMileageService.culateSjgl(listInfo);
+			double ljgl=culateMileageService.culateLjgl(listInfo);
+			double zyygl=Arith.add(sjgl, ljgl);
+			double jccg=culateMileageService.culateJccgl(listInfo);
+			double ksgl=culateMileageService.culateKsgl(listInfo);
+			double zksgl=Arith.add(jccg, ksgl);
+			
+			w.setJzl1(String.valueOf(zksgl));
+			w.setZlc(String.valueOf(Arith.add(zyygl, zksgl)));
+			
+			
+			jzl=0.0;
+			sh=0.0;
+			yh=0.0;
+			for (int j = 0; j < listYlb.size(); j++) {
+				Ylb y=listYlb.get(j);
+				if(w.getNbbm().equals(y.getNbbm()) && w.getJgh().equals(y.getJsy())){
+					jzl=Arith.add(jzl, y.getJzl());
+					sh=Arith.add(sh, y.getSh());
+					yh=Arith.add(yh, y.getYh());
+				}
+			}
+			
+			w.setJzl(String.valueOf(jzl));
+			w.setYh(String.valueOf(yh));
+			w.setSh(String.valueOf(sh));
+			
 		}
 		return list;
 	}
@@ -417,7 +443,19 @@ public class FormsServiceImpl implements FormsService {
 	// 路单数据
 	@Override
 	public List<Singledata> singledata(Map<String, Object> map) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		
+		String gsdm="";
+		if(map.get("gsdmSing")!=null){
+			gsdm=map.get("gsdmSing").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdmSing")!=null){
+			fgsdm=map.get("fgsdmSing").toString();
+		}
+		
+		String xlbm=map.get("line").toString().trim();
+		
+		/*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
 		Date d = null;
 		Date d1 = null;
@@ -429,60 +467,92 @@ public class FormsServiceImpl implements FormsService {
 			e.printStackTrace();
 		}
 		String rq2 = sdf1.format(d);
-		String rq3 = sdf1.format(d1);
+		String rq3 = sdf1.format(d1);*/
-		rq = rq2 + "-" + rq3;
+//		rq = rq2 + "-" + rq3;
 		startDate = map.get("startDate").toString();
-		endDate = map.get("endDate").toString();
-		String sql = "select t.*,y.yh,y.jzl from ("
-				+ " select r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
-				+ " from bsth_c_s_sp_info_real r  where r.schedule_date_str "
-				+ " BETWEEN '"+startDate+"'  and '"+endDate+"'  and r.xl_bm='"+map.get("line").toString()+"'  "
-				+ " AND r.gs_bm is not null and r.gs_bm='"+map.get("gsdmSing").toString()+"' "
-				+ " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'  "
-				+ " group by r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm) t "
-				+ " LEFT JOIN (select a.nbbm,a.jsy,SUM(a.yh) as yh,SUM(a.jzl) as jzl "
-				+ " from bsth_c_ylb a where  a.rq BETWEEN '"+startDate+"'  and '"+endDate+"'and "
-				+ " a.ssgsdm='"+map.get("gsdmSing").toString()+"' and a.fgsdm='"+map.get("fgsdmSing").toString()+"' "
-				+ "group by  a.nbbm,a.jsy) y"
-				+ " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
+//		endDate = map.get("endDate").toString();
+//		String sql = "select t.*,y.yh,y.jzl from ("
+//				+ " select r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+//				+ " from bsth_c_s_sp_info_real r  where r.schedule_date_str "
+//				+ " BETWEEN '"+startDate+"'  and '"+endDate+"'  and r.xl_bm='"+map.get("line").toString()+"'  "
+//				+ " AND r.gs_bm is not null and r.gs_bm='"+map.get("gsdmSing").toString()+"' "
+//				+ " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'  "
+//				+ " group by r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm) t "
+//				+ " LEFT JOIN (select a.nbbm,a.jsy,SUM(a.yh) as yh,SUM(a.jzl) as jzl "
+//				+ " from bsth_c_ylb a where  a.rq BETWEEN '"+startDate+"'  and '"+endDate+"'and "
+//				+ " a.ssgsdm='"+map.get("gsdmSing").toString()+"' and a.fgsdm='"+map.get("fgsdmSing").toString()+"' "
+//				+ "group by  a.nbbm,a.jsy) y"
+//				+ " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
+		String sql="select r.s_gh,r.s_name, "
+				+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
+		if(xlbm.equals("")){
+			sql +="and r.gs_bm='"+gsdm+"' "
+					+ " and r.fgs_bm='"+fgsdm+"'";
+		}else{
+			sql += " and r.xl_bm = '"+xlbm+"'";
+		}
+	       sql += " group  by  r.s_gh,r.s_name,"
+	       		+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
+	
 		List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 			//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			@Override
 			public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Singledata sin = new Singledata();
-				sin.setrQ(rq);
-				sin.setgS(arg0.getString("gs_bm"));
+				sin.setrQ(startDate);
 				sin.setxL(arg0.getString("xl_name"));
 				sin.setClzbh(arg0.getString("cl_zbh"));
 				sin.setJsy(arg0.getString("j_gh"));
 				sin.setjName(arg0.getString("j_name"));
-				sin.setHyl(arg0.getString("YH"));
-				sin.setJzl(arg0.getString("JZL"));
-				// sin.setJzl(arg0.getString(""));//非营业性用油
-				sin.setJhjl(arg0.getString("JZL"));
+				sin.setSgh(arg0.getString("s_gh"));
+				sin.setsName(arg0.getString("s_name"));
+				sin.setgS(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs_bm")+"_"+arg0.getString("gs_bm")));
 				return sin;
 			}
 		});
-		DecimalFormat df = new DecimalFormat("0.00");
-			for(int i=0;i<list.size();i++){
-				
-				Singledata si=list.get(i);
-				si.setgS(BasicData.businessCodeNameMap.get(si.getgS()));
-				si.setJzl(df.format(Double.parseDouble(si.getJzl())));
-				si.setHyl(df.format(Double.parseDouble(si.getHyl())));
-				Map<String, Object> maps = new HashMap<>();
-				maps = commonService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
-						endDate);
-				//sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString());
-				si.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString());
-				si.setsName(maps.get("s_name") == null ? "" : maps.get("s_name").toString());
-				si.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
-				si.setEmptMileage(maps.get("ksgl") == null ? "" : maps.get("ksgl").toString());
-				si.setJhjl(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
+		List<Ylb> listYlb= ylbRepository.obtainYl(startDate, gsdm, fgsdm, xlbm, "", "xlbm");
+		List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, startDate);
+		for (int i = 0; i < list.size(); i++) {
+			List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+			Singledata sin=list.get(i);
+			String jsy=sin.getJsy();
+			String clzbh=sin.getClzbh();
+			for (int j = 0; j < listReal.size(); j++) {
+				ScheduleRealInfo s=listReal.get(j);
+				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)){
+					newList.add(s);
+				}
+			}
+			
+			double jhgl=culateMileageService.culateJhgl(newList);
+			double yygl=culateMileageService.culateSjgl(newList);
+			double ljgl=culateMileageService.culateLjgl(newList);
+			double ksgl=culateMileageService.culateKsgl(newList);
+			double jcgl=culateMileageService.culateJccgl(newList);
+			double zyygl=Arith.add(yygl, ljgl);
+			double zksgl=Arith.add(ksgl, jcgl);
+			sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
+			sin.setEmptMileage(String.valueOf(zksgl));
+			sin.setJhjl(String.valueOf(jhgl));
+			double yhl=0.0;
+			double jzl=0.0;
+			double fyy=0.0;
+			for (int j = 0; j < listYlb.size(); j++) {
+				Ylb y=listYlb.get(j);
+				if(y.getJsy().equals(jsy) && y.getNbbm().equals(clzbh)){
+					yhl=Arith.add(yhl, y.getYh()==null?0:y.getYh());
+					jzl=Arith.add(jzl, y.getJzl()==null?0:y.getJzl());
+					fyy=Arith.add(fyy, y.getSh()==null?0:y.getSh());
+				}
+			}
+			sin.setHyl(String.valueOf(yhl));
+			sin.setJzl(String.valueOf(jzl));
+			sin.setUnyyyl(String.valueOf(fyy));
 		}
 		return list;
 	}
@@ -490,105 +560,174 @@ public class FormsServiceImpl implements FormsService {
 	// 运营服务阶段报表
 	@Override
 	public List<Operationservice> operationservice(Map<String, Object> map) {
-
-		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
-		        + "  FROM bsth_c_s_sp_info_real r "
-		       // + "LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM"
-		        + "  left join bsth_c_ylb y ON r.cl_zbh = y.nbbm "
-				+ "  where 1=1 ";
-		if(map.get("startDate").toString()!=""){
-			sql+=" and  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
-		}
-		if(map.get("endDate").toString()!=""){
-			sql+=" and  to_days('" + map.get("endDate").toString() + "') ";
-		}
-			sql+="  and r.xl_bm='" + map.get("line").toString() + "'" ;
-			sql+="  and r.bc_type not in('in','out')";
-		if(map.get("gsdmOperat").toString()!=""){
-			sql+=" and r.gs_bm='"+map.get("gsdmOperat").toString()+"'";
-		}
-		if(map.get("fgsdmOperat").toString()!=""){
-			sql+=" and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'";
-		}
-			sql	+= "  AND r.gs_bm is not null";
-			sql	+= "  GROUP BY r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name";
-			startDate = map.get("startDate").toString();
-			endDate = map.get("endDate").toString();
-		List<Operationservice> list = jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
-
-			@Override
-			public Operationservice mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Operationservice op = new Operationservice();
-				op.setXlName(arg0.getString("xl_name"));
-				op.setJzl(arg0.getString("JZL"));
-				op.setXhl(arg0.getString("YH"));
-				op.setClzbh(arg0.getString("cl_zbh"));
-				op.setJname(arg0.getString("j_name"));
+		String xlbm=map.get("line").toString().trim();
+		String gsdm="";
+		if(map.get("gsdmOperat")!=null){
+			gsdm=map.get("gsdmOperat").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdmOperat")!=null){
+			fgsdm=map.get("fgsdmOperat").toString();
+		}
+		startDate=map.get("startDate").toString();
+		endDate =map.get("endDate").toString();
+		String sql="select r.xl_bm"
+				+ " from bsth_c_s_sp_info_real r where"
+				+ " r.schedule_date_str BETWEEN  '"+startDate+"' and '"+endDate+"'";
+		if(xlbm.equals("")){
+			sql +="and r.gs_bm='"+gsdm+"' "
+					+ " and r.fgs_bm='"+fgsdm+"'";
+		}else{
+			sql += " and r.xl_bm = '"+xlbm+"'";
+		}
+	       sql += " group  by  r.xl_bm";
+		
+	       
+	       List<Operationservice> list= jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
+				@Override
+				public Operationservice mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Operationservice ve = new Operationservice();
+					ve.setXlBm(arg0.getString("xl_bm"));
+					return ve;
+				}
+			});
+	       
+	       String ylbSql=" select * from bsth_c_ylb where rq BETWEEN '"+startDate+"' and '"+endDate+"'";
+	       if(xlbm.equals("")){
+	    	   ylbSql +="and ssgsdm='"+gsdm+"' "
+						+ " and fgsdm='"+fgsdm+"'";
+			}else{
+				ylbSql += " and xlbm = '"+xlbm+"'";
+			}
+	       List<Ylb> ylbList= jdbcTemplate.query(ylbSql, new RowMapper<Ylb>() {
+				@Override
+				public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Ylb y = new Ylb();
+					y.setXlbm(arg0.getString("xlbm"));
+					y.setJzl(arg0.getDouble("jzl"));
+					y.setYh(arg0.getDouble("yh"));
+					return y;
+				}
+			});
+			List<ScheduleRealInfo> listReal;
+			if(xlbm.equals("")){
+				listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj(xlbm, startDate, endDate, gsdm, fgsdm);
+			}else{
+				listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj2(xlbm, startDate, endDate);
+			}
+			
+			for (int i = 0; i < list.size(); i++) {
+				Operationservice o=list.get(i);
+				String line=o.getXlBm();
+				String xlname=BasicData.lineCode2NameMap.get(line);
+				o.setXlName(xlname);
+				
+				List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
+				for (int j = 0; j < listReal.size(); j++) {
+					ScheduleRealInfo s=listReal.get(j);
+					if(s.getXlBm().equals(line)){
+						newList.add(s);
+					}
+				}
+				
+				int sjbc=culateMileageService.culateSjbc(newList,"");
+				int ljbc=culateMileageService.culateLjbc(newList,"");
+				double ksgl=culateMileageService.culateKsgl(newList);
+				double jccgl=culateMileageService.culateJccgl(newList);
+						
+			    double sjgl=culateMileageService.culateSjgl(newList);
+				double ljgl=culateMileageService.culateLjgl(newList);
+				
+				o.setEmptMileage(String.valueOf(Arith.add(ksgl, jccgl)));
+				o.setXsgl(String.valueOf(Arith.add(sjgl, ljgl)));
+				o.setSjbc(String.valueOf(sjbc+ljbc));
-				return op;
+				double jzl=0.0;
+				double xhl=0.0;
+				for (int j = 0; j < ylbList.size(); j++) {
+					Ylb t=ylbList.get(j);
+					if(t.getXlbm().equals(line)){
+						jzl=Arith.add(jzl, t.getJzl());
+						xhl=Arith.add(xhl, t.getYh());
+					}
+				}
+				
+				o.setJzl(String.valueOf(jzl));
+				o.setXhl(String.valueOf(xhl));
 			}
-		});
-		
-		for(int i=0;i<list.size();i++){
-			Operationservice o=list.get(i);
-			Map<String, Object> maps = new HashMap<>();
-			maps = commonService.findKMBC1(o.getJname(), o.getClzbh(), startDate,
-					endDate);
-			o.setXsgl(maps.get("jhlc").toString() == null ? "" : maps.get("jhlc").toString());
-			o.setEmptMileage(maps.get("ksgl").toString() == null ? "" : maps.get("ksgl").toString());
-			o.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());
-		}
 		return list;
 	}
 	// 车辆加注
 	@Override
-	public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line, String date) {
-
-		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type  " 
-		        + "  FROM bsth_c_s_sp_info_real r "
-		        + " INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y "
-		        + " where to_days(y.RQ)=to_days('" + date + "')  and y.XLBM= '" + line + "'  GROUP BY  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH) y "
-		        + " on r.cl_zbh=y.nbbm "
-				+ "  where to_days(r.schedule_date_str)=to_days('" + date + "')" 
-		        + "  and r.xl_bm='" + line + "' "
-		        + " AND r.gs_bm is not null"
-		        + " and r.bc_type not in('in','out')";
-		if(gsdmVehic.toString()!=""){
-			sql+=" and r.gs_bm='"+gsdmVehic+"'";
-		}
-		if(fgsdmVehic.toString()!=""){
-			sql+=" and r.fgs_bm='"+fgsdmVehic +"'";
-		}
-			sql	+= "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
+	public List<Vehicleloading> vehicleloading(String line, String date) {
+
+		String sql="select r.s_gh,r.s_name, "
+				+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+date+"' "
+						+ " and r.xl_bm = '"+line+"' group  by  r.s_gh,r.s_name,"
+	       		+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
+	
 		List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() {
 			@Override
 			public Vehicleloading mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Vehicleloading ve = new Vehicleloading();
-				ve.setrQ(arg0.getString("schedule_date_str"));
-				ve.setgS(arg0.getString("gs_name"));
+				ve.setgS(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs_bm")+"_"+arg0.getString("gs_bm")));
 				ve.setxL(arg0.getString("xl_name"));
 				ve.setClzbh(arg0.getString("cl_zbh"));
-				ve.setJzl(arg0.getString("JZL"));
-				ve.setHyl(arg0.getString("YH"));
-				// ve.setLs(arg0.getString("").toString());//尿素
 				ve.setJgh(arg0.getString("j_gh").toString());
 				return ve;
 			}
 		});
-		for(int i=0;i<list.size();i++){
-			Vehicleloading v=list.get(i);
-			Map<String, Object> maps = new HashMap<>();
-			maps = commonService.findKMBC2(v.getJgh(), v.getClzbh(),
-					v.getrQ());
-			v.setJhlc(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
-			v.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次
-			v.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次
-		}
+		List<Ylb> listYlb= ylbRepository.obtainYl(startDate, "", "", line, "", "xlbm");
+		List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
+		for (int i = 0; i < list.size(); i++) {
+			List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+			Vehicleloading sin=list.get(i);
+			sin.setrQ(date);
+			String jsy=sin.getJgh();
+			String clzbh=sin.getClzbh();
+			for (int j = 0; j < listReal.size(); j++) {
+				ScheduleRealInfo s=listReal.get(j);
+				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)){
+					newList.add(s);
+				}
+			}
+			
+			int jhbc=culateMileageService.culateJhbc(newList, "");
+			int sjbc=culateMileageService.culateSjbc(newList, "");
+			int ljbc=culateMileageService.culateLjbc(newList, "");
+			double yygl=culateMileageService.culateSjgl(newList);
+			double ljgl=culateMileageService.culateLjgl(newList);
+			double ksgl=culateMileageService.culateKsgl(newList);
+			double jcgl=culateMileageService.culateJccgl(newList);
+			double zyygl=Arith.add(yygl, ljgl);
+			double zksgl=Arith.add(ksgl, jcgl);
+			sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
+			sin.setJhbc(String.valueOf(jhbc));
+			sin.setSjbc(String.valueOf(sjbc+ljbc));
+			double yhl=0.0;
+			double jzl=0.0;
+			double fyy=0.0;
+			double ns=0.0;
+			for (int j = 0; j < listYlb.size(); j++) {
+				Ylb y=listYlb.get(j);
+				if(y.getJsy().equals(jsy) && y.getNbbm().equals(clzbh)){
+					yhl=Arith.add(yhl, y.getYh()==null?0:y.getYh());
+					jzl=Arith.add(jzl, y.getJzl()==null?0:y.getJzl());
+					fyy=Arith.add(fyy, y.getSh()==null?0:y.getSh());
+					ns =Arith.add(ns, y.getNs()==null?0:y.getNs());
+				}
+			}
+			sin.setHyl(String.valueOf(yhl));
+			sin.setJzl(String.valueOf(jzl));
+			sin.setUnyyyl(String.valueOf(fyy));
+			sin.setLs(String.valueOf(ns));
+		}
 		return list;
 	}
@@ -816,7 +955,7 @@ public class FormsServiceImpl implements FormsService {
 		}
 		String fgsbm="";
-		if(map.get("fgsdmDaily").toString()!=null){
+		if(map.get("fgsdmDaily")!=null){
 			fgsbm=map.get("fgsdmDaily").toString();
 		}
@@ -853,6 +992,12 @@ public class FormsServiceImpl implements FormsService {
 		for(int i=0;i<list.size();i++){
 			sList =new ArrayList<ScheduleRealInfo>();
 			Daily d=list.get(i);
+			if(d.getYh()==null){
+				d.setYh("0");
+			}else{
+				if(d.getYh().equals(""))
+					d.setYh("0");
+			}
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
 				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
 package com.bsth.service.impl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bsth.entity.Business;
+import com.bsth.repository.BusinessRepository;
 import com.bsth.service.BusinessService;
 /**
@@ -23,5 +25,12 @@ import com.bsth.service.BusinessService;
 @Service
 public class BusinessServiceImpl extends BaseServiceImpl<Business, Integer> implements BusinessService{
+	@Autowired
+	private BusinessRepository businessRepository;
+	@Override
+	public long getCompCode() {
+		// TODO Auto-generated method stub
+		return businessRepository.getMaxId();
+	}
 }
@@ -16,6 +16,7 @@ import com.bsth.repository.LineRepository;
 import com.bsth.repository.SectionRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.service.SectionRouteService;
+import com.bsth.util.GetUIDAndCode;
 /**
  * 
@@ -185,6 +186,7 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	    		tempM.put("sectionVersion", objects.get(i)[33]);
+	    		tempM.put("isRoadeSpeed", objects.get(i)[34]);
 	    		resultList.add(tempM);
 	    	}
@@ -203,32 +205,19 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	 */
 	@Override
 	public List<Map<String, Object>> findUpSectionRouteCode(Map<String, Object> map) {
-		
 		Integer lineId = map.get("lineId").equals("") ? null : Integer.parseInt(map.get("lineId").toString());
-		
 		Integer direction = map.get("direction").equals("") ? null : Integer.parseInt(map.get("direction").toString());
-		
 		Integer stationRouteCode = map.get("sectionRouteCode").equals("") ? null : Integer.parseInt(map.get("sectionRouteCode").toString());
-		
 		List<Object[]> reslutList = repository.findUpSectionRouteCode(lineId, direction, stationRouteCode);
-		
 		List<Map<String, Object>> list = new ArrayList<Map<String,Object>>();
-		
 		if(reslutList.get(0)!=null) {
-			
 			for(int i = 0 ; i <reslutList.size() ;i++){
-				
 				Map<String, Object> tempM = new HashMap<String, Object>();
-				
 				System.out.println(reslutList.get(i));
-				
 				tempM.put("sectionrouteCode", reslutList.get(i));
-				
 				list.add(tempM);
-				
 			}
 		}
-		
 		return list;
 	}
@@ -243,8 +232,10 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 				List<Object[]> list = repository.getSectionRoute(line, dir);
 				int src = repository.sectionRouteCodeMaxId();
 				for(int i = 0 ; i<list.size() ; i++) {
-					int sectionId =  Integer.parseInt(String.valueOf(repository2.sectionMaxId())) + 1 ;
-					String sectionCode =  String.valueOf(sectionId);
+					/*int sectionId =  Integer.parseInt(String.valueOf(repository2.sectionMaxId())) + 1 ;*/
+					long sectionMaxId =  GetUIDAndCode.getSectionId();
+					String sectionCode =  String.valueOf(sectionMaxId);
+					int sectionId = (int)sectionMaxId;
 					String sectionName = list.get(i)[9] == null ? null : list.get(i)[9].toString(); 
 					String crosesRoad = list.get(i)[10] == null ? null : list.get(i)[10].toString(); 
 					String endNode = list.get(i)[11] == null ? null : list.get(i)[11].toString(); 
@@ -267,12 +258,12 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 							gsectionVector, bsectionVector, 
 							sectionType, csectionVector, roadCoding, 
 							sectionDistance, sectionTime, dbType, speedLimit, descriptions, versions, sectionId);
-					int sectionRouteId = Integer.parseInt(String.valueOf(repository.sectionRouteMaxId())) + 1 ;
+					// int sectionRouteId = Integer.parseInt(String.valueOf(repository.sectionRouteMaxId())) + 1 ;
 					SectionRoute sr = new SectionRoute();
 					Line lineObject = lineRepository.findOne(line);
 					Section section = repository2.findOne(sectionId);
 					Integer xh = (src ==  0 ? (toDir ==1? (list.size()-i)*10 : (list.size()+i)*10) : toDir==1? (src + (list.size()-i)*10) : (src + (list.size()+i)*10)) ;
-					sr.setId(sectionRouteId);
+					// sr.setId(sectionRouteId);
 					sr.setSectionrouteCode(xh);
 					sr.setLineCode(lineObject.getLineCode());
 					sr.setSectionCode(sectionCode);
@@ -294,5 +285,4 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		}
 		return resultMap;
 	}
-	
-}
+}
 \ No newline at end of file
@@ -7,6 +7,7 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.ResponseCode;
@@ -57,210 +58,122 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 	 */
 	@Override
 	public Map<String, Object> sectionUpdate(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String, Object>();
-		
 		try {
-			
 			String bsectionVector = map.get("bsectionVector").equals("") ? "" :map.get("bsectionVector").toString();
-			
 			// 原始线状图形坐标集合
 			String sectionsBpoints = "";
-			
 			// WGS线状图形坐标集合
 			String sectionsWJPpoints = "";
-			
 			if(!bsectionVector.equals("")) {
-				
 				// 转换成JSON数组
 				JSONArray sectionsArray = JSONArray.parseArray(bsectionVector);
-				
 				// 遍历
 				for(int s = 0 ;s<sectionsArray.size();s++) {
-					
 					String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
-					
 					String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
-					
 					/** to WGS坐标 */
 					Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
-					
 					String WGSLngStr = String.valueOf(resultPoint.getLng());
-					
 					String WGSLatStr = String.valueOf(resultPoint.getLat());
-					
 					if(s==0) {
-						
 						sectionsBpoints = pointsLngStr + " " + pointsLatStr;
-						
 						sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
-						
 					}else {
-						
 						sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
-						
 						sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
-						
 					}
-					
-					
 				}
-				
 			}
-			
 			// 原坐标类型
 			String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-			
 			// 说明
 			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
-			
 			// 是否撤销
 			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
-			
 			// 方向
 			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
-			
 			// 线路ID
 			Integer sectionRouteLine = map.get("sectionRouteLine").equals("") ? null : Integer.parseInt(map.get("sectionRouteLine").toString());
-			
 			// 道路编码
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
-			
 			// 路段编码
 			String sectionCode = map.get("sectionCode").equals("") ? "" : map.get("sectionCode").toString();
-			
 			// 路段长度
 			Double sectionDistance = map.get("sectionDistance").equals("") ? null : Double.valueOf(map.get("sectionDistance").toString());
-			
 			// 路段ID
 			Integer sectionId = map.get("sectionId").equals("") ? 0 : Integer.parseInt(map.get("sectionId").toString());
-			
 			// 路段名称
 			String sectionName = map.get("sectionName").equals("") ? "" : map.get("sectionName").toString();
-			
 			// 路段路由Id
 			Integer sectionRouteId = map.get("sectionRouteId").equals("") ? null : Integer.valueOf(map.get("sectionRouteId").toString());
-			
 			// 线路编码
 			String lineCode =map.get("lineCode").equals("") ? "" : map.get("lineCode").toString();
-			
 			// 路段时长
 			Double  sectionTime = map.get("sectionTime").equals("") ? null : Double.valueOf(map.get("sectionTime").toString());
-			
 			// 路段路由
 			Integer sectionrouteCode = map.get("sectionrouteCode").equals("") ? null : Integer.valueOf(map.get("sectionrouteCode").toString());
-			
 			SectionRoute resultS = routeRepository.findOne(sectionRouteId);
-			
 			int old_code = resultS.getSectionrouteCode();
-			
 			if(sectionrouteCode!=null) {
-				
 				int new_code = sectionrouteCode+100;
-				
 				if(new_code==old_code){
-					
 					sectionrouteCode = new_code;
-					
 				}else {
-					
 					sectionrouteCode = new_code-100+1;
-					
 				}
-				
 			 }else {
-				 
 				 sectionrouteCode = old_code;
-				 
 			 }
-			
 			// 限速
 			Double speedLimit = map.get("speedLimit").equals("") ? null : Double.valueOf(map.get("speedLimit").toString());
-			
 			// 版本
 			Integer version = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
-			
 			// WGS坐标点集合
 			String gsectionVector = null;
 			if(!sectionsWJPpoints.equals(""))
 				gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
-			
 			// 原坐标点集合
 			String bsectionVectorS = null;
 			if(!sectionsBpoints.equals(""))
 				 bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
-			
 			Integer createBy = map.get("createBy").equals("") ? null : Integer.valueOf(map.get("createBy").toString());
-			
 			String createDate = map.get("createDate").equals("") ? null : map.get("createDate").toString();
-			
 			Integer updateBy = map.get("updateBy").equals("") ?null : Integer.valueOf(map.get("updateBy").toString());
-			
+			Integer isRoadeSpeed = map.get("isRoadeSpeed").equals("") ? null : Integer.valueOf(map.get("isRoadeSpeed").toString());
 			SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss"); 
-			
 			Date date = new Date();
-			
 			// 修改日期
 			String updateDate = formatter.format(date);
-			
 			String crosesRoad="";
-			
 			String endNode="";
-			
 			String startNode="";
-			
 			String middleNode="";
-			
 			String sectionType="";
-			
-			// String csectionVector="";
-			
 			// 更新
-			/*repository.sectionUpdate(sectionId, gsectionVector, bsectionVectorS, sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, createBy, createDate, updateBy, updateDate);*/
 			repository.sectionUpdate(sectionId, gsectionVector, bsectionVectorS, sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, sectionType, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, createBy, createDate, updateBy, updateDate);
-			
 			SectionRoute route = new SectionRoute();
-			
 			Line line = lineRepository.findOne(sectionRouteLine);
-			
 			Section section = repository.findOne(sectionId);
-			
 			route.setId(sectionRouteId);
-			
 			route.setSectionrouteCode(sectionrouteCode);
-			
 			route.setLineCode(lineCode);
-			
 			route.setSectionCode(sectionCode);
-			
 			route.setDirections(directions);
-			
 			route.setVersions(version);
-			
 			route.setDestroy(destroy);
-			
 			route.setDescriptions(descriptions);
-			
 			route.setCreateBy(createBy);
-			
 			route.setUpdateBy(updateBy);
-			
 			route.setLine(line);
-			
 			route.setSection(section);
-			
+			route.setIsRoadeSpeed(isRoadeSpeed);
 			routeRepository.save(route);
-			
 			resultMap.put("status", ResponseCode.SUCCESS);
-			
 		} catch (Exception e) {
-
 			resultMap.put("status", ResponseCode.ERROR);
-			
 			logger.error("save erro.", e);
-			
 		}
-		
 		return resultMap;
 	}
@@ -294,164 +207,105 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 	 * @return map<SUCCESS：成功；ERROR：异常>
 	 */
 	@Override
+	@Transactional
 	public Map<String, Object> sectionSave(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String, Object>();
-		
 		try {
-			
-			/** 线路ID */
+			// 线路ID.
 			Integer lineId = map.get("lineId").equals("") ? null : Integer.valueOf(map.get("lineId").toString());
-			
-			/** 线路编码 */
+			// 线路编码.
 			String lineCode = map.get("lineCode").equals("") ? "" : map.get("lineCode").toString();
-			
+			// 路段名称.
 			String sectionName = map.get("sectionName").equals("") ? "" : map.get("sectionName").toString();
-			
+			// 路段编码.
 			String sectionCode = map.get("sectionCode").equals("") ? "" : map.get("sectionCode").toString();
-			
+			// 道路编码.
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
-			
+			// 原始坐标类型.
 			String dbType = map.get("dbType").equals("") ? "" :map.get("dbType").toString();
-			
+			// 路段几何图形坐标.
 			String sectionJSON = map.get("bsectionVector").equals("") ? "" : map.get("bsectionVector").toString();
-			
+			// 路段序号
 			String sectionrouteCode = map.get("sectionrouteCode").equals("") ? "" : map.get("sectionrouteCode").toString();
-			
-			Double sectionTime = map.get("sectionTime").equals("") ? null : Double.valueOf(map.get("sectionTime").toString());
-			
-			Double sectionDistance = map.get("sectionDistance").equals("") ? null : Double.valueOf(map.get("sectionDistance").toString());
-			
-			Double speedLimit = map.get("speedLimit").equals("") ? null : Double.valueOf(map.get("speedLimit").toString());
-			
-			Integer versions = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
-			
-			Integer destroy = map.get("destroy").equals("") ? null : Integer.valueOf(map.get("destroy").toString());
-			
-			Integer directions = map.get("directions").equals("") ? null : Integer.valueOf(map.get("directions").toString());
-			
+			// 路段时长.
+			Double sectionTime = map.get("sectionTime").equals("") ? 0.0d : Double.valueOf(map.get("sectionTime").toString());
+			// 路段距离.
+			Double sectionDistance = map.get("sectionDistance").equals("") ? 0.0d : Double.valueOf(map.get("sectionDistance").toString());
+			// 路段限速.
+			Double speedLimit = map.get("speedLimit").equals("") ? 0.0d : Double.valueOf(map.get("speedLimit").toString());
+			// 版本.
+			Integer versions = map.get("versions").equals("") ? 1 : Integer.valueOf(map.get("versions").toString());
+			// 是否撤销.
+			Integer destroy = map.get("destroy").equals("") ? 0 : Integer.valueOf(map.get("destroy").toString());
+			// 路段方向.
+			Integer directions = map.get("directions").equals("") ? 0 : Integer.valueOf(map.get("directions").toString());
+			// 描述与说明.
 			String descriptions = map.get("descriptions").equals("")? "" : map.get("descriptions").toString();
-			
 			// 原始线状图形坐标集合
 			String sectionsBpoints = "";
-			
 			// WGS线状图形坐标集合
 			String sectionsWJPpoints = "";
-			
 			if(!sectionJSON.equals("")) {
-				
 				// 转换成JSON数组
 				JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
-				
 				// 遍历
 				for(int s = 0 ;s<sectionsArray.size();s++) {
-					
 					String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
-					
 					String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
-					
 					String WGSLngStr = "";
-					
 					String WGSLatStr = "";
-					
 					Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
-					
 					WGSLngStr = String.valueOf(resultPoint.getLng());
-					
 					WGSLatStr = String.valueOf(resultPoint.getLat());			
-					
 					if(s==0) {
-						
 						sectionsBpoints = pointsLngStr + " " + pointsLatStr;
-						
 						sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
-						
 					}else {
-						
 						sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
-						
 						sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
-						
 					}
-					
 				}
-				
 			}
-			
 			// WGS坐标点集合
 			String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
-			
 			// 原坐标点集合
 			String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
-			
 			String crosesRoad="";
-			
 			String endNode ="";
-			
 			String startNode="";
-			
 			String middleNode="";
-			
 			String sectionType="";
-			
 			String csectionVector=null;
-			
 			Integer id = Integer.valueOf(sectionCode);
-			
 			repository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVector, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, versions, id);
-			
 			Section section = repository.findOne(id);
-			
 			Line line = lineRepository.findOne(lineId);
-			
 			// 路段路由
 			SectionRoute sectionRoute = new SectionRoute();
-			
 			Integer routeCode = null;
-			
 			if(!sectionrouteCode.equals("")){
-				
 				String sectionrouteCodeArray[] =  sectionrouteCode.split("_");
-				
 				routeCode = Integer.valueOf(sectionrouteCodeArray[0])+1;
-				
 			}else {
-				
 				routeCode = 100;
-				
 			}	
-			
+			routeRepository.sectionUpdSectionRouteCode(lineId, directions,routeCode);
 			sectionRoute.setSectionrouteCode(routeCode);
-			
 			sectionRoute.setLineCode(lineCode);
-			
 			sectionRoute.setSection(section);
-			
 			sectionRoute.setSectionCode(sectionCode);
-			
 			sectionRoute.setDirections(directions);
-			
 			sectionRoute.setDescriptions(descriptions);
-			
 			sectionRoute.setDestroy(destroy);
-			
 			sectionRoute.setVersions(versions);
-			
 			sectionRoute.setLine(line);
-			
+			sectionRoute.setIsRoadeSpeed(0);
 			routeRepository.save(sectionRoute);
-			
 			resultMap.put("status", ResponseCode.SUCCESS);
-			
 		} catch (Exception e) {
-			
 			resultMap.put("status", ResponseCode.ERROR);
-			
 			logger.error("save erro.", e);
-			
 		}
-		
 		return resultMap;
 	}
-
-}
+}
 \ No newline at end of file
@@ -4,6 +4,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
 import com.bsth.entity.StationRoute;
+import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.repository.StationRepository;
@@ -16,6 +17,8 @@ import com.bsth.util.Geo.Point;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -56,6 +59,14 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	@Autowired
 	private StationRepository stationRepository;
+	@Override
+	public Iterable<StationRoute> list(Map<String, Object> map) {
+		List<Sort.Order> orderList = new ArrayList<>();
+		orderList.add(new Sort.Order(Direction.ASC, "directions"));
+		orderList.add(new Sort.Order(Direction.ASC, "stationRouteCode"));
+		return repository.findAll(new CustomerSpecs<StationRoute>(map), new Sort(orderList));
+	}
+	
 	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
@@ -31,6 +31,8 @@ import com.bsth.service.StationService;
 import com.bsth.util.GetUIDAndCode;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
+import com.bsth.util.Geo.GeoUtils;
+import com.bsth.util.Geo.Point;
 /**
  * 
@@ -82,62 +84,41 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	 */
 	@Override
 	public Map<String, Object> systemSaveStations(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String,Object>();
-		
 		try {
-			
 			// 站点信息字符传
 			String stationJSON = map.get("stationJSON").toString().equals("")  ? "" : map.get("stationJSON").toString();
-			
 			// 路段信息字符串
 			String sectionJSON = map.get("sectionJSON").toString().equals("")  ? "" : map.get("sectionJSON").toString();
-			
 			// 方向
 			int directions = Integer.parseInt(map.get("directions").toString());
-			
 			// 是否撤销
 			int destroy = map.get("destroy").equals("") ? 0 : Integer.parseInt(map.get("destroy").toString());
-			
 			// 版本
 			int versions = map.get("versions").equals("") ? 0 : Integer.parseInt(map.get("versions").toString());
-			
 			// 坐标类型
 			String dbType =  map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-			
 			// 限速
 			String speedLimitStr = map.get("speedLimit").equals("") ? "" : map.get("speedLimit").toString();
-			
 			// 线路ID
 			int lineId = map.get("lineId").toString().equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
-			
 			// 半径
 			int radius =  map.get("radius").equals("") ? 0 : Integer.parseInt(map.get("radius").toString());
-			
 			// 图形类型
 			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-			
 			// 路段距离
 			Double sectionDistance = 0.0d;
-			
 			// 路段时长
 			Double sectionDuration = 0.0d;
-			
 			// 里程(上或者下)
 			double sumUpOrDownMileage = 0.0d;
-			
 			// 线路信息
 			Line resultLine = lineRepository.findOne(lineId);
-			
 			Map<String, Object> resultSaveMapm = new HashMap<String,Object>();
-			
 			String baseRes = map.get("baseRes").equals("") ? "" : map.get("baseRes").toString();
-			
 			if(!stationJSON.equals("")) {
-				
 				// 保存站点与站点路由信息
 				resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine,baseRes);
-				
 			}
 			// 路段长度
@@ -259,275 +240,148 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	 * @throws Exception
 	 */
 	public Map<String, Object> savaStationAndStationRouteInfo(String stationJSON,double sectionDistance,double sectionDuration,String dbType,
-			
 			int radius,String shapesType,int destroy,int versions,double sumUpOrDownMileage,int directions,Line resultLine,String baseRes) throws Exception{
-		
 		Map<String, Object> paramsMeleageAndDistncDura = new HashMap<String,Object>();
-		
 		JSONArray stationsArray = JSONArray.parseArray(stationJSON);
-		
 		if(stationsArray.size()>0) {
-			
 			for(int i = 0;i <stationsArray.size();i++) {
-				
 				// 站点名称
 				String stationName = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("name").toString();
-				
 				Double distance = stationsArray.getJSONObject(i).get("distance").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("distance").toString());
-				
 				// 转成公里
 				distance = distance/1000;
-				
 				BigDecimal d = new BigDecimal(distance);
-				
 				distance = d.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-				
 				sectionDistance= distance + sectionDistance;
-				
 				Double duration = stationsArray.getJSONObject(i).get("duration").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("duration").toString());
-				
 				// 转成分钟
 				duration = duration/60;
-				
 				BigDecimal t = new BigDecimal(duration);
-				
 				duration = t.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-				
 				sectionDuration = duration + sectionDuration;
-				
 				// 百度经纬度坐标
 				String bJwpoints = "";
-				
 				// 百度坐标经度
 				String bLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lng").toString();
-				
+				bLonx = bLonx==null || bLonx.equals("") ? "0" : bLonx;
 				// 百度坐标纬度
 				String bLatx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lat").toString();
-				
+				bLatx = bLatx==null || bLatx.equals("") ? "0" : bLatx;
 				List<Object[]> stationNameList = repository.findStationName(stationName);
-				
-				boolean isHave = isHaveStationname(bJwpoints,stationNameList);
-				
+				Map<String, Object> isHaveMap = isHaveStationname(bLonx,bLatx,stationNameList);
 				// 初始化站点对象
 				Station arg0 =  new Station();
-				
-				// 站点编码
-				long stationCode = 0L;
-				
-				if(isHave) {
-					
-					Integer stationId = Integer.parseInt(stationNameList.get(0)[1].toString());
-					
+				if(Boolean.parseBoolean(isHaveMap.get("isHave").toString())) {
+					/*Integer stationId = Integer.parseInt(stationNameList.get(0)[1].toString());*/
+					Integer stationId = Integer.parseInt(isHaveMap.get("id").toString());
 					arg0 = repository.findOne(stationId);
-					
 				}else {
-					
-					stationCode = GetUIDAndCode.getStationId();
-					
+					// 站点编码
+					long stationCode = GetUIDAndCode.getStationId();
 					arg0.setStationCod(String.valueOf(stationCode));
-					
 					arg0.setId((int)stationCode);
-					
 					arg0.setStationName(stationName);
-					
 					// 原坐标类型
 					arg0.setDbType(dbType);
-					
-					
 					String gLonxStr = JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("x").equals("") ? null : JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("x").toString();
-					
 					String gLatyStr = JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("y").equals("") ? null : JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("y").toString();
-					
 					float gLonx = 0.0f;
-					
 					float gLaty = 0.0f;
-					
 					Location resultPoint = null;
-					
 					if(baseRes.equals("No")){
-						
 						/** BD to WGS坐标 */
 						resultPoint = FromBDPointToWGSPoint(bLonx,bLatx);
-						
 						if(gLonxStr==null) 
 							gLonx = (float)resultPoint.getLng();
 						else 
 							gLonx =  Float.valueOf(gLonxStr);
-						
 						if(gLatyStr==null)
 							gLaty = (float)resultPoint.getLat();
 						else 
 							gLaty =  Float.valueOf(gLatyStr);
-						
 						arg0.setgLonx(gLonx);
-						
 						arg0.setgLaty(gLaty);
-						
 						// 百度经纬度
 						bJwpoints = bLonx + " " + bLatx;
-						
 						arg0.setbJwpoints(bJwpoints);
-						
 					}else if(baseRes.equals("GCJ02")){
-						
 						Location bdLoc = TransGPS.LocationMake(Double.valueOf(gLonxStr), Double.valueOf(gLatyStr));
-						
 						Location location = TransGPS.bd_encrypt(bdLoc);
-						
 						String GCJLng = String.valueOf(location.getLng());
-						
 						String GCJLat = String.valueOf(location.getLat());
-						
 						resultPoint = FromBDPointToWGSPoint(GCJLng,GCJLat);
-						
 						bJwpoints = GCJLng + " "  +GCJLat;
-						
 						arg0.setgLonx((float)location.getLng());
-						
 						arg0.setgLaty((float)location.getLat());
-						
 						arg0.setbJwpoints(bJwpoints);
-						
-						
 					}else if(baseRes.equals("BD09")){
-						
 						resultPoint = FromBDPointToWGSPoint(gLonxStr, gLatyStr);
-						
 						bJwpoints = gLonxStr+ " " + gLatyStr;
-						
 						arg0.setgLonx((float)resultPoint.getLng());
-						
 						arg0.setgLaty((float)resultPoint.getLat());
-						
 					}else if(baseRes.equals("WGS84")){
-						
 						Location bdLoc = TransGPS.LocationMake(Double.valueOf(gLonxStr), Double.valueOf(gLatyStr));
-						
 						Location gcjLoc = TransGPS.transformFromWGSToGCJ(bdLoc);
-						
 						Location bdEn = TransGPS.bd_encrypt(gcjLoc);
-						
 						bJwpoints = String.valueOf(bdEn.getLng()) + " " + String.valueOf(bdEn.getLat()); 
-						
 						arg0.setbJwpoints(bJwpoints);
-						
 						arg0.setgLonx(Float.valueOf(gLonxStr));
-						
 						arg0.setgLaty(Float.valueOf(gLatyStr));
-						
 					}
-					
-					
-					
-				/*	if(gLonxStr==null) 
-						gLonx = (float)resultPoint.getLng();
-					else 
-						gLonx =  Float.valueOf(gLonxStr);
-					
-					if(gLatyStr==null)
-						gLaty = (float)resultPoint.getLat();
-					else 
-						gLaty =  Float.valueOf(gLatyStr);
-					
-					arg0.setgLonx(gLonx);
-					
-					arg0.setgLaty(gLaty);*/
-					
- 					// 站点地理位置WGS坐标经度
-					// String gLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lng").toString();
-					// arg0.setgLonx(Float.parseFloat(gLonx));
-					
-					// 站点地理位置WGS坐标纬度
-					// String gLaty = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lat").toString();
-					// arg0.setgLaty(Float.parseFloat(gLaty));
-					
 					arg0.setRadius(radius);
-					
-					
 					arg0.setShapesType(shapesType);
-					
 					// 是否想撤销
 					arg0.setDestroy(destroy);
-					
 					// 版本号
 					arg0.setVersions(versions);
-					
 					/*arg0.setbJwpoints(bJwpoints);*/
-					
 					// 插入站点信息
 					repository.save(arg0);
 				}
-				
 				// 站点路由对象
 				StationRoute route = new StationRoute();
-				
 				// 站点名称
 				route.setStationName(stationName);
-				
 				route.setDistances(distance);
-				
 				sumUpOrDownMileage =  sumUpOrDownMileage + distance;
-				
 				route.setToTime(duration);
-				
-				
 				// 站点编码
 				route.setStationCode(arg0.getStationCod());
-				
 				// 站点序号
 				route.setStationRouteCode((i+1)*100);
-				
 				// 站点类型
 				if(i==0) {
-					
 					// 起始站
 					route.setStationMark("B");
-					
 				}else if(i==stationsArray.size()-1) {
-					
 					// 终点站
 					route.setStationMark("E");
-					
 				}else {
-					
 					// 中途站
 					route.setStationMark("Z");
-					
 				}
-				
 				// 版本号
 				route.setVersions(versions);
-				
 				// 站点ID
 				route.setStation(arg0);
-				
 				// 方向
 				route.setDirections(directions);
-				
 				// 线路ID
 				route.setLine(resultLine);
-				
 				// 线路编码
 				route.setLineCode(resultLine.getLineCode());
-				
 				route.setDestroy(destroy);
-				
 				// 插入站点路由信息 
 				routeRepository.save(route);
 			}
-			
 			paramsMeleageAndDistncDura.put("sumUpOrDownMileage", sumUpOrDownMileage);
-			
 			paramsMeleageAndDistncDura.put("sectionDistance", sectionDistance);
-			
 			paramsMeleageAndDistncDura.put("sectionDuration", sectionDuration);
-			
+			paramsMeleageAndDistncDura.put("stationdata",stationsArray);
 		}
-		
 		return paramsMeleageAndDistncDura;
-		
 	}
 	/**
@@ -784,68 +638,52 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		Section section = sectionRepository.findOne(sectionid);
-		
 		// 路段路由
 		SectionRoute sectionRoute = new SectionRoute();
-		
 		// 路段序号
 		sectionRoute.setSectionrouteCode(100);
-		
 		// 线路编码
 		sectionRoute.setLineCode(resultLine.getLineCode());
-		
 		// 路段ID
 		sectionRoute.setSection(section);
-		
 		sectionRoute.setDestroy(destroy);
-		
 		// 线路ID
 		sectionRoute.setLine(resultLine);
-		
 		// 路段编码
 		sectionRoute.setSectionCode(sectionCode);
-		
 		// 版本
 		sectionRoute.setVersions(versions);
-		
 		// 方向
 		sectionRoute.setDirections(directions);
-		
 		// 路段路由保存
 		sectionRouteRepository.save(sectionRoute);
 	}
-	
-	public boolean isHaveStationname(String bJwpoints,List<Object[]> stationNameList) {
-		
-		boolean temp = true;
-		
+	public Map<String, Object> isHaveStationname(String jd,String wd,List<Object[]> stationNameList) {
+		Map<String, Object> rsM = new HashMap<String ,Object>();
+		boolean temp = false;
 		if(stationNameList.size()>0) {
-			
-			for(int k = 0 ; k <stationNameList.size();k++) {
-				
-				if(bJwpoints.equals(stationNameList.get(k)[0])){
-					
-					return temp; 
-					
-				}else {
-					
-					temp = false;
-					
+			if(jd.equals("0") || wd.equals("0")) {
+				rsM.put("id", stationNameList.get(0)[1]);
+				temp = true;
+			}else{
+				Point p1 =  new Point(Double.parseDouble(jd),Double.parseDouble(wd));
+				for(int k = 0 ; k <stationNameList.size();k++) {
+					String bJwpoints[] = stationNameList.get(k)[0].toString().split(" ");
+					Point p2 = new Point(Double.parseDouble(bJwpoints[0]),Double.parseDouble(bJwpoints[1]));
+					double jl = GeoUtils.getDistance(p1, p2);
+					if(jl<=120d) {
+						rsM.put("id", stationNameList.get(k)[1]);
+						temp = true;
+						break;
+					}
 				}
-				
 			}
-			
-		}else {
-			
-			temp = false;
-		}
-		
-		return temp;
+		} 
+		rsM.put("isHave", temp);
+		return rsM;
 	}
-	 
-	
 	/**
 	 * @Description :TODO(新增站点保存)
 	 * 
@@ -863,246 +701,134 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	 */
 	@Override
 	public Map<String, Object> stationSaveMap(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String, Object>();
-		
 		try {
-			
 			// 站点编码
 			String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
-			
 			// 站点ID
 			int stationId = Integer.valueOf(stationCod);
-			
 			// 站点名称
 			String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
-			
 			// 道路编码
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
-			
 			// 原坐标类型
 			String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-			
 			// 原坐标点
 			String bJwpoints = map.get("bJwpoints").equals("") ? "" : map.get("bJwpoints").toString();
-			
 			String bJwpointsArray[] = null;
-			
 			if(bJwpoints!=null) {
-				
 				bJwpointsArray = bJwpoints.split(" ");
-				
 			}
-			
 			// WGS经纬度
 			Float gLonx = null;
-						
 			// WGS纬度
 			Float gLaty = null;
-			
 			if(bJwpointsArray.length>0) {
-				
 				Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
-				
 				gLonx = (float)resultPoint.getLng();
-				
 				gLaty = (float)resultPoint.getLat();
-				
 			}
-			
-			/*// WGS经纬度
-			String gJwpoints = map.get("gJwpoints").equals("") ? null : map.get("gJwpoints").toString();
-			
-			String gJwpointsArray []= null;
-			
-			if(gJwpoints!=null) {
-				
-				gJwpointsArray = gJwpoints.split(" ");
-				
-			}*/
-			
 			// 方向
 			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
-			
 			// 距离
 			Double distances =  map.get("distances").equals("") ? null : Double.parseDouble(map.get("distances").toString());
-			
 			// 时间
 			Double toTime = map.get("toTime").equals("") ? null : Double.parseDouble(map.get("toTime").toString());
-			
-			/*// WGS经纬度
-			Float gLonx = Float.parseFloat(gJwpointsArray[0]);
-			
-			// WGS纬度
-			Float gLaty = Float.parseFloat(gJwpointsArray[1]);*/
-			
 			// 城建坐标经度
 			Float x = map.get("x").equals("") ?  null : Float.parseFloat(map.get("x").toString());
-			
 			// 城建坐标纬度
 			Float y = map.get("y").equals("") ? null : Float.parseFloat(map.get("y").toString());
-			
-			// 多边形WGS坐标点集合
-			// String gPloygonGrid = map.get("gPolygonGrid").equals("") ? "" : map.get("gPolygonGrid").toString();
-			
 			// 多边形原坐标点集合
 			String bPloygonGrid = map.get("bPolygonGrid").equals("") ? "" : map.get("bPolygonGrid").toString();
-			
 			// 多边形WGS坐标点集合
 			String gPloygonGrid ="";
-			
 			if(!bPloygonGrid.equals("")) {
-				
 				String bPloygonGridArray[] = bPloygonGrid.split(",");
-				
 				int bLen_ = bPloygonGridArray.length;
-				
 				for(int b = 0 ;b<bLen_;b++) {
-					
 					String tempArray[]= bPloygonGridArray[b].split(" ");
-					
 					Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
-					
 					 if(b==0) {
-						
 						 gPloygonGrid = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
-							
 					 }else {
-						
 						 gPloygonGrid = gPloygonGrid +  ',' + String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
-						 
 					 }
-					
 				}
-				
 			}
-			
-		/*	bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
-			
-			gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";*/
-			
 			// 是否撤销
 			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
-			
 			// 圆半径
 			Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
-			
 			// 图形类型
 			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-			
 			// 版本
 			Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
-			
 			// 说明
 			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
-			
 			// 创建人
 			Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
-			
 			// 修改人
 			Integer updateBy = map.get("updateBy").equals("") ?  null : Integer.parseInt(map.get("updateBy").toString());
-			
 			// 线路ID
 			int line = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
-			
 			// 线路信息
 			Line resultLine = lineRepository.findOne(line);
-			
 			// 站点路由序号
 			String stationRouteCodeStr = map.get("stationRouteCode").equals("") ? "" : map.get("stationRouteCode").toString();
-			
 			// 站点类型
 			String stationMark = map.get("stationMark").equals("") ? "" : map.get("stationMark").toString();
-			
 			Integer stationRouteCode = null;
-			
 			if(stationRouteCodeStr!="") {
-				
 				String stationRouteCodeArray [] = stationRouteCodeStr.split("_");
-				
 				stationRouteCode = Integer.parseInt(stationRouteCodeArray[0].toString())+1;
-				
-				
 			}else {
-				
 				stationRouteCode = 100;
-				
 			}
-			
 			if(bPloygonGrid.equals(""))
 				bPloygonGrid = null;
 			else
 				bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
-				
 			if(gPloygonGrid.equals(""))
 				gPloygonGrid = null;
 			else
 				gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
-			
 			// 保存站点
 			repository.stationSave(stationCod, stationName, roadCoding, dbType, bJwpoints, 
-						
 									gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
-								
 									shapesType, versions, descriptions, createBy, updateBy,stationId);
-									
-									
-			
-			
 			Station station = repository.findOne(stationId);
-			
 			StationRoute arg0 = new StationRoute();
-			
 			// 线路
 			arg0.setLine(resultLine);
-			
 			arg0.setLineCode(resultLine.getLineCode());
-			
 			// 站点
 			arg0.setStation(station);
-			
 			// 站点路由名称
 			arg0.setStationName(stationName);
-			
 			// 站点路由编码
 			arg0.setStationCode(stationCod);
-			
 			// 站点路由序号
 			arg0.setStationRouteCode(stationRouteCode);
-			
 			// 站点路由类型
 			arg0.setStationMark(stationMark);
-			
 			// 站点路由站点方向
 			arg0.setDirections(directions);
-			
 			// 站点路由到站距离
 			arg0.setDistances(distances);
-			
 			// 站点路由到站时间
 			arg0.setToTime(toTime);
-			
 			// 站点版本号
 			arg0.setVersions(versions);
-			
 			// 是否撤销
 			arg0.setDestroy(destroy);
-			
 			// 站点路由说明
 			arg0.setDescriptions(descriptions);
-			
 			routeRepository.save(arg0);
-			
 			resultMap.put("status", ResponseCode.SUCCESS);
-			
 		} catch (Exception e) {
-
 			resultMap.put("status", ResponseCode.ERROR);
-			
 			logger.error("save erro.", e);
-			
 		}
-		
 		return resultMap;
 	}
@@ -1373,101 +1099,64 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	@Override
 	public Map<String, Object> manualSave(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String,Object>();
-		
 		try {
-			
 			// 站点信息字符传
 		    String stationJSON = map.get("stationJSON").equals("")  ? "" : map.get("stationJSON").toString();
-						
 		    // 路段信息字符串
 		    String sectionJSON = map.get("sectionJSON").equals("")  ? "" : map.get("sectionJSON").toString();
-		   
 		    // 方向
 		    int directions = Integer.parseInt(map.get("directions").toString());
-					
 		    // 是否撤销
 		    int destroy = map.get("destroy").equals("") ? 0 : Integer.parseInt(map.get("destroy").toString());
-					
 		    // 版本
 		    int versions = map.get("versions").equals("") ? 0 : Integer.parseInt(map.get("versions").toString());
-					
 			// 坐标类型
 			String dbType =  map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-					
 			// 限速
 			String speedLimitStr = map.get("speedLimit").equals("") ? "" : map.get("speedLimit").toString();
-			
 			// 线路ID
 			int lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
-			
 			// 半径
 			int radius =  map.get("radius").equals("") ? 0 : Integer.parseInt(map.get("radius").toString());
-			
 			// 图形类型
 			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-			
 			// 线路信息
 			Line resultLine = lineRepository.findOne(lineId);
-			
 			// 路段距离
 			Double sectionDistance = 0.0d;
-			
 			// 路段时长
 			Double sectionDuration = 0.0d;
-			
 			// 里程(上或者下)
 			double sumUpOrDownMileage = 0.0d;
-			
 			Map<String, Object> resultSaveMapm = new HashMap<String,Object>();
-			
 			String baseRes = map.get("baseRes").equals("") ? "" : map.get("baseRes").toString();
-			
 			if(!stationJSON.equals("")) {
-				
 				// 保存站点与站点路由信息
 				resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine,baseRes);
-				
 			}
-			
 			// 路段长度
 			sectionDistance = Double.valueOf(resultSaveMapm.get("sectionDistance").toString());
-			
 			// 路段时长
 			sectionDuration = Double.valueOf(resultSaveMapm.get("sectionDuration").toString());
-			
 			// 如果路段信息JSON字符串不为空
 			if(!sectionJSON.equals("")) {
-				
 				manualSaveSectionAndSectionRoute(sectionJSON, speedLimitStr, sectionDistance, sectionDuration, dbType, versions, resultLine, destroy, directions);
-				
 			}
-			
 			// 里程
 			sumUpOrDownMileage = Double.valueOf(resultSaveMapm.get("sumUpOrDownMileage").toString());
-			
 			BigDecimal s = new BigDecimal(sumUpOrDownMileage);
-			
 			sumUpOrDownMileage = s.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-			
 			// 更新里程
 			// updateLineInfoUpOrDownMileage( resultLine , directions, sumUpOrDownMileage);
-			
 			if(directions==0) {
-				
 				// lineUpdateStationName(resultLine);
-				
 			}
-			
 			resultMap.put("status", ResponseCode.SUCCESS);
-			
+			resultMap.put("stationData", resultSaveMapm.get("stationdata"));
 		} catch (Exception e) {
-
 			resultMap.put("status", ResponseCode.ERROR);
-			
 			logger.error("save erro.", e);
-			
 		}
 		return resultMap;
@@ -1478,103 +1167,61 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 												 double sectionTime,String dbType,Integer versions,Line resultLine,
 												 Integer destroy,Integer directions) {
-		
 		// 转换成JSON数组
 		JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
-		
 		// 遍历
 		for(int s = 0 ;s<sectionsArray.size();s++) {
-			
 			// 站点名称
 			String sectionName = sectionsArray.getJSONObject(s).equals("") ? "" : sectionsArray.getJSONObject(s).get("sectionName").toString();
-			
 			String pointsStr = sectionsArray.getJSONObject(s).equals("") ? "" : sectionsArray.getJSONObject(s).get("points").toString();
-			
 			// 原始线状图形坐标集合
 			String sectionsBpoints = "";
-			
 			// WGS线状图形坐标集合
 			String sectionsWJPpoints = "";
-			
 			if(!pointsStr.equals("")){
-				
 				JSONArray pointsArray = JSONArray.parseArray(pointsStr);
-				
 				for(int p =0;p<pointsArray.size();p++){
-					
 					String pointsLngStr = pointsArray.getJSONObject(p).get("lng").toString();
-					
 					String pointsLatStr = pointsArray.getJSONObject(p).get("lat").toString();
-					
 					Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
-					
 					String WGSLngStr = String.valueOf(resultPoint.getLng());
-					
 					String WGSLatStr = String.valueOf(resultPoint.getLat());
-					
 					if(p==pointsArray.size()-1){
-						
 						sectionsBpoints = sectionsBpoints + pointsLngStr + " " + pointsLatStr;
-						
 						sectionsWJPpoints =  sectionsWJPpoints + WGSLngStr + " " + WGSLatStr;
-						
 						// sectionsWJPpoints = sectionsWJPpoints + pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lng") + " " +pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lat");
-						
 					}else {
-						
 						sectionsBpoints = sectionsBpoints + pointsArray.getJSONObject(p).get("lng").toString() + " " +pointsArray.getJSONObject(p).get("lat").toString()+",";
-						
 						sectionsWJPpoints =  sectionsWJPpoints + WGSLngStr + " " + WGSLatStr + ",";
-						
 						// sectionsWJPpoints = sectionsWJPpoints + pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lng") + " " +pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lat") +",";
-						
-						
 					}
-					
 				}
-				
 			}
-		 
 			long sectionMaxId = GetUIDAndCode.getSectionId();
-			
 			String sectionCode = String.valueOf(sectionMaxId);
-			
 			int sectionId = (int) (sectionMaxId);
-			
 			// 交出路
 			String crosesRoad = "";
-			
 			// 终止节点
 			String endNode = "";
-			
 			// 开始节点
 			String startNode = "";
-			
 			// 中间节点
 			String middleNode = "";
-			
 			// WGS坐标点集合
 			String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
-			
 			// 原坐标点集合
 			String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
-			
 			// 城建坐标点集合
 			String csectionVector = "";
-			
 			// 路段类型
 			String sectionType = "";
-			
 			// 道路编码
 			String roadCoding = "";
-			
 			// 限速
 			double speedLimit = Double.parseDouble(speedLimitStr);
-			
 			// 说明
 			String descriptions = "";
-			
-			
 			sectionRepository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, 
 										 middleNode, gsectionVector, bsectionVector, sectionType, csectionVector, 
@@ -1582,37 +1229,24 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 										 roadCoding, sectionDistance, sectionTime, dbType, speedLimit, 
 										 descriptions, versions,sectionId);
-										 
-			
-			
 			Section section = sectionRepository.findOne(Integer.parseInt(sectionCode));
-			
 			// 路段路由
 			SectionRoute sectionRoute = new SectionRoute();
-			
 			// 路段序号
 			sectionRoute.setSectionrouteCode((s+1)*100);
-			
 			// 线路编码
 			sectionRoute.setLineCode(resultLine.getLineCode());
-			
 			// 路段ID
 			sectionRoute.setSection(section);
-			
 			// 线路ID
 			sectionRoute.setLine(resultLine);
-			
 			// 路段编码
 			sectionRoute.setSectionCode(sectionCode);
-			
 			// 版本
 			sectionRoute.setVersions(versions);
-			
 			sectionRoute.setDestroy(destroy);
-			
 			// 方向
 			sectionRoute.setDirections(directions);
-			
 			sectionRouteRepository.save(sectionRoute);
 		}
-package com.bsth.service.realcontrol;
-
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/4/18.
- */
-public interface DataManagerService {
-
-    Map<String, Object> carInfos(Integer lineId);
-
-    Map<String,Object> updateDevices(String jsonStr);
-}
+package com.bsth.service.realcontrol;
+
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/4/18.
+ */
+public interface DataManagerService {
+
+    Map<String, Object> carInfos(Integer lineId);
+
+    Map<String,Object> updateDevices(String jsonStr);
+}
@@ -138,7 +138,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     Map<String,Object> changeBcType(Long id, String bcType, String remarks);
-    Map<String,Object> historySave(ScheduleRealInfo sch);
+    //Map<String,Object> historySave(ScheduleRealInfo sch);
     Map<String, Object> MapById(Long id) ;
@@ -161,4 +161,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	void lpChange(ScheduleRealInfo leftSch, ScheduleRealInfo rightSch, int type);
     Map<String,Object> revokeRealArrive(Long id);
+
+    Map<String,Object> lateAdjust(String idx, float minute);
+
+    List<ScheduleRealInfo> allLate2(String idx);
 }