Merge branch 'pudong' into jiading

# Conflicts: # src/main/java/com/bsth/XDApplication.java # src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java # src/main/java/com/bsth/entity/Cars.java # src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java # src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java # src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java # src/main/resources/application-prod.properties # src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html # src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html

Merge branch 'pudong' into jiading
# Conflicts: # src/main/java/com/bsth/XDApplication.java # src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java # src/main/java/com/bsth/entity/Cars.java # src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java # src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java # src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java # src/main/resources/application-prod.properties # src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html # src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
王通
2 parents e7c4fc40 8be72ebe
Showing 54 changed files with 3002 additions and 531 deletions
README.md
pom.xml
src/main/java/com/bsth/WebAppConfiguration.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/calc/CalcExportController.java
src/main/java/com/bsth/controller/calc/CalcLbStatuAnalyController.java
src/main/java/com/bsth/controller/calc/CalcMixController.java
src/main/java/com/bsth/controller/calc/CalcWaybillController.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/LsylbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
@@ -447,9 +447,5 @@
 | direction | float | 角度0-359 |
 | inTemp | int | 车内温度 |
 | serviceState | long | 设备状态字 |
-<<<<<<< HEAD
-| daysYear | int | 对应年中的天数 为分区字段 查询一定要用此字段过滤 |
-=======
 | daysYear | int | 对应年中的天数 为分区字段 查询一定要用此字段过滤 |
->>>>>>> af8ec3bedc8644f5813e9adab12a163e93cc7f50
@@ -295,6 +295,13 @@
 			<artifactId>jpinyin</artifactId>
 			<version>1.1.8</version>
 		</dependency>
+
+        <!-- plan common工程依赖 -->
+        <dependency>
+            <groupId>com.bsth.control_v2</groupId>
+            <artifactId>plan_module-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 	</dependencies>
 	<dependencyManagement>
@@ -76,17 +76,4 @@ public class WebAppConfiguration extends WebMvcConfigurerAdapter implements WebS
 		registry.addHandler(new RealControlSocketHandler(), "/sockjs/realcontrol","/freeLogin/sockjs/realcontrol").addInterceptors(new WebSocketHandshakeInterceptor())
         	.withSockJS();
 	}
-
-	/**
-	 * 增加websocket的输出缓冲区
-	 * @return
-	 */
-	@Bean
-	public ServletServerContainerFactoryBean createServletServerContainerFactoryBean() {
-		ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean();
-		container.setMaxTextMessageBufferSize(52768);
-		container.setMaxBinaryMessageBufferSize(52768);
-		logger.info("Websocket factory returned");
-		return container;
-	}
 }
@@ -14,6 +14,7 @@ import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.bsth.data.safe_driv.SafeDrivDataLoadThread;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.auto_exec.AutoExecScanThread;
+import com.bsth.data.schedule.e_state_check.thread.FixedCheckStationCodeThread;
 import com.bsth.data.schedule.edit_logs.SeiPstThread;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
 import com.bsth.data.schedule.signal.SchSiginUpdateDBThread;
@@ -83,6 +84,9 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     SafeDrivDataLoadThread safeDrivDataLoadThread;
+    @Autowired
+    FixedCheckStationCodeThread fixedCheckStationCodeThread;
+
     private static long timeDiff;
     private static long timeDiffTraffic;
@@ -129,8 +133,11 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(gpsDataLoader, 60, 4, TimeUnit.SECONDS);
         //实际排班更新线程
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 30, TimeUnit.SECONDS);//检查班次误点
         //sexec.scheduleWithFixedDelay(autoExecScanThread, 100, 50, TimeUnit.SECONDS);//班次自动执行
         //WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
+
+        //sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 50, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
         //实际排班延迟入库线程
         //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
         //班次修正日志延迟入库
@@ -154,9 +161,10 @@ public class XDApplication implements CommandLineRunner {
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
-        sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 30, TimeUnit.SECONDS);//检查班次误点
-        gpsDataLoader.setFlag(-1);
-        sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 3, TimeUnit.SECONDS);//抓取GPS数据
+        sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
+		gpsDataLoader.setFlag(-1);
+        sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
+        sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
         sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程
@@ -164,7 +172,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库
         sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
-        sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新
+        sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新
         sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行
         DirectivePushQueue.start();//消息队列 -指令，系统下发的
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
 package com.bsth.controller;
-import java.util.List;
-import java.util.Map;
-
+import com.bsth.entity.LineVersions;
+import com.bsth.repository.LineRepository;
+import com.bsth.service.LineVersionsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.bsth.entity.LineVersions;
-import com.bsth.repository.LineRepository;
-import com.bsth.service.LineVersionsService;
+import java.util.List;
+import java.util.Map;
 /**
  * 
@@ -75,7 +74,11 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 	public Map<String, Object> add(@RequestParam Map<String, Object> map) {
 		return service.add(map);
 	}
-	
+	@RequestMapping(value = "delete", method = RequestMethod.POST)
+	public Map<String, Object> delete(@RequestParam (defaultValue = "id") int id) {
+		return service.delete(id);
+	}
+
 	/**
 	 * 根据线路id获取当前版本号
 	 * 
@@ -142,7 +142,7 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	 *
 	 * @return int <sectionCode路段编码>
 	 */
-	@RequestMapping(value="doubleName" , method = RequestMethod.GET)
+	@RequestMapping(value="doubleName" , method = RequestMethod.POST)
 	public Map<String, Object> doubleName(@RequestParam Map<String, Object> map) {
 		return service.doubleName(map);
 	}
 package com.bsth.controller;
-import java.util.Map;
-
+import com.bsth.entity.Station;
+import com.bsth.service.StationService;
+import com.bsth.util.GetUIDAndCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.bsth.entity.Station;
-import com.bsth.service.StationService;
-import com.bsth.util.GetUIDAndCode;
+import java.util.Map;
 /**
  * 
@@ -34,6 +35,9 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	@Autowired
 	private StationService service;
+
+	/** 日志记录器 */
+	private static final Logger LOGGER = LoggerFactory.getLogger(StationController.class);
 	/**
 	 * @Description :TODO(根据坐标点匹配数据库中的站点)
@@ -153,10 +157,13 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	 */
 	@RequestMapping(value="updateStationAndSectionCode" , method = RequestMethod.GET)
 	public int updateStationAndSectionCode(@RequestParam Integer stationCount, Integer sectionCount) {
+		System.out.println(stationCount+" _ "+ sectionCount );
 		for(int i = 0; i <  stationCount; i++) {
+			System.out.println(i);
 			GetUIDAndCode.getStationId();
 		}
-		for(int i = 0; i <  sectionCount; i++) {
+		for(int j = 0; j <  sectionCount; j++) {
+			System.out.println(j);
 			GetUIDAndCode.getSectionId();
 		}
 		return 1;
 package com.bsth.controller;
-import com.bsth.entity.Station;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.StationRouteCache;
 import com.bsth.repository.StationRouteCacheRepository;
@@ -12,11 +11,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * 
  * @ClassName: StationRouteController(站点路由控制器)
@@ -72,11 +70,11 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	}
     /**
-     * @param String
+     * @param map
      * @throws
      * @Description: TODO(批量撤销站点)
      */
-    @RequestMapping(value = "/batchDestroy", method = RequestMethod.GET)
+    @RequestMapping(value = "/batchDestroy", method = RequestMethod.POST)
     public Map<String, Object> updateBatch(@RequestParam Map<String, Object> map) {
     	return service.updateStationRouteInfoFormId(map);
     }
+package com.bsth.controller.calc;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.entity.mcy_forms.Waybillday;
+import com.bsth.service.calc.CalcLbStatuAnalyService;
+import com.bsth.service.calc.CalcMixService;
+import com.bsth.service.calc.CalcWaybillService;
+import com.bsth.util.ReportUtils;
+
+@RestController
+@RequestMapping("calc_export")
+public class CalcExportController {
+	
+	@Autowired
+	CalcWaybillService service;
+	
+	@Autowired
+	CalcLbStatuAnalyService lbService;
+
+	@Autowired
+	CalcMixService clacMixService;
+
+	@RequestMapping(value = "/waybilldayExport", method = RequestMethod.GET)
+	public Map<String, Object> calcjsyspyExport(@RequestParam Map<String, Object> map) {
+		
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String lineName="";
+		if(map.get("lineName")!=null){
+			lineName=map.get("lineName").toString().trim();
+		}
+		String startDate="";
+		if(map.get("startDate")!=null){
+			startDate=map.get("startDate").toString().trim();
+		}
+		String endDate="";
+		if(map.get("endDate")!=null){
+			endDate=map.get("endDate").toString().trim();
+		}
+		String cont="";
+		if(map.get("cont")!=null){
+			cont=map.get("cont").toString().trim();
+		}
+		String empnames="";
+		if(map.get("empnames")!=null){
+			empnames=map.get("empnames").toString().trim();
+		}
+		String gsdmManth="";
+		if(map.get("gsdmManth")!=null){
+			gsdmManth=map.get("gsdmManth").toString().trim();
+		}
+		String fgsdmManth="";
+		if(map.get("fgsdmManth")!=null){
+			fgsdmManth=map.get("fgsdmManth").toString().trim();
+		}
+
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> list = clacMixService.calcjsyspy(line, startDate, endDate, empnames, cont, gsdmManth, fgsdmManth);
+		
+		Map<String, Object> temp = new HashMap<String, Object>();
+		temp.put("i", "序号");
+		temp.put("jName", empnames);
+		temp.put("jhyybc", "计划营运班次");
+		temp.put("jhfyybc", "计划空驶班次");
+		temp.put("sjyybc", "实际营运班次");
+		temp.put("sjfyybc", "实际空驶班次");
+		temp.put("lbbc", "烂班班次");
+		temp.put("ljbc", "临加班次");
+		temp.put("jhzlc", "计划总里程");
+		temp.put("jhyylc", "计划营运里程");
+		temp.put("jhfyylc", "计划空驶里程");
+		temp.put("sjzlc", "实际总里程");
+		temp.put("sjyylc", "实际营运里程");
+		temp.put("sjfyylc", "实际空驶里程");
+		temp.put("lblc", "烂班里程");
+		temp.put("ljyylc", "临加营运里程");
+		temp.put("ljfyylc", "临加空驶里程");
+		resList.add(temp);
+		for(int i = 0; i < list.size(); i++){
+			temp = list.get(i);
+			temp.put("i", i+1);
+			resList.add(temp);
+		}
+		
+		String date = startDate.replaceAll("-", "");
+		if(!startDate.equals(endDate)){
+			date = startDate.replaceAll("-", "") + "-" + endDate.replaceAll("-", "");
+		}
+		
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String,Object> mm = new HashMap<String, Object>();
+		ReportUtils ee = new ReportUtils();
+		
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcjsyspy.xls",
+					path+"export/"+date+"-"+lineName+"-人车班次公里统计.xls");
+			resMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			e.printStackTrace();
+			resMap.put("status", ResponseCode.ERROR);
+		}
+		return resMap;
+	}
+
+	@RequestMapping(value = "/singledataExportTj", method = RequestMethod.GET)
+	public Map<String, Object> singledataExportTj(@RequestParam Map<String, Object> map) {
+		
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String lineName="";
+		if(map.get("lineName")!=null){
+			lineName=map.get("lineName").toString().trim();
+		}
+		String startDate="";
+		if(map.get("startDate")!=null){
+			startDate=map.get("startDate").toString().trim();
+		}
+		String endDate="";
+		if(map.get("endDate")!=null){
+			endDate=map.get("endDate").toString().trim();
+		}
+		String tjtype="";
+		if(map.get("tjtype")!=null){
+			tjtype=map.get("tjtype").toString().trim();
+		}
+		String cont="";
+		if(map.get("cont")!=null){
+			cont=map.get("cont").toString().trim();
+		}
+		String gsdmSing="";
+		if(map.get("gsdmSing")!=null){
+			gsdmSing=map.get("gsdmSing").toString().trim();
+		}
+		String fgsdmSing="";
+		if(map.get("fgsdmSing")!=null){
+			fgsdmSing=map.get("fgsdmSing").toString().trim();
+		}
+
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> list = clacMixService.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing);
+		
+		Map<String, Object> temp = new HashMap<String, Object>();
+		temp.put("i", "序号");
+		temp.put("gS", "所属公司");
+		temp.put("xlName", "线路");
+		temp.put("jName", tjtype);
+		temp.put("jhzlc", "计划公里");
+		temp.put("sjzlc", "行驶里程(包括空放)");
+		temp.put("sjfyylc", "空驶里程");
+		temp.put("hyl", "耗油量");
+		temp.put("jzl", "加注量");
+		temp.put("sh", "非营业用油");
+		
+		resList.add(temp);
+		for(int i = 0; i < list.size(); i++){
+			temp = list.get(i);
+			temp.put("i", i+1);
+			if(temp.get("xlName") == null){
+				temp.put("xlName", "");
+			}
+			resList.add(temp);
+		}
+		
+		String date = startDate.replaceAll("-", "");
+		if(!startDate.equals(endDate)){
+			date = startDate.replaceAll("-", "") + "-" + endDate.replaceAll("-", "");
+		}
+		
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String,Object> mm = new HashMap<String, Object>();
+		ReportUtils ee = new ReportUtils();
+		
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcsingledata.xls",
+					path+"export/"+date+"-"+lineName+"-路单数据(统计).xls");
+			resMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			e.printStackTrace();
+			resMap.put("status", ResponseCode.ERROR);
+		}
+		return resMap;
+	}
+
+	@RequestMapping(value = "/lbStatuAnalyExport", method = RequestMethod.GET)
+	public Map<String, Object> lbStatuAnalyExport(@RequestParam Map<String, Object> map) {
+		
+		String gsdm="";
+		if(map.get("company")!=null){
+			gsdm=map.get("company").toString().trim();
+		}
+		String fgsdm="";
+		if(map.get("subCompany")!=null){
+			fgsdm=map.get("subCompany").toString().trim();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String lineName="";
+		if(map.get("lineName")!=null){
+			lineName=map.get("lineName").toString().trim();
+		}
+		String date="";
+		if(map.get("startDate")!=null){
+			date=map.get("startDate").toString().trim();
+		}
+		String date2="";
+		if(map.get("endDate")!=null){
+			date2=map.get("endDate").toString().trim();
+		}
+		String sfyy="";
+		if(map.get("sfyy")!=null){
+			sfyy=map.get("sfyy").toString().trim();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> list = lbService.lbStatuAnaly(gsdm, fgsdm, line, date, date2, sfyy, type);
+		
+		for(int i = 0; i < list.size(); i++){
+			Map<String, Object> temp = list.get(i);
+			temp.put("i", i+1);
+			if(!temp.containsKey("date") || temp.get("date") == null){
+				temp.put("date", "");
+			}
+			if(!temp.containsKey("company") || temp.get("company") == null){
+				temp.put("company", "");
+			}
+			if(!temp.containsKey("subCompany") || temp.get("subCompany") == null){
+				temp.put("subCompany", "");
+			}
+			resList.add(temp);
+		}
+		
+		String Data = date.replaceAll("-", "");
+		if(!date.equals(date2)){
+			Data = date.replaceAll("-", "") + "-" + date2.replaceAll("-", "");
+		}
+		
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String,Object> mm = new HashMap<String, Object>();
+		ReportUtils ee = new ReportUtils();
+		
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcLbStatuAnaly.xls",
+					path+"export/"+Data+"-"+lineName+"-烂班情况分析表(统计).xls");
+			resMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			e.printStackTrace();
+			resMap.put("status", ResponseCode.ERROR);
+		}
+		return resMap;
+	}
+	
+}
+package com.bsth.controller.calc;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.calc.CalcLbStatuAnaly;
+import com.bsth.service.calc.CalcLbStatuAnalyService;
+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;
+
+/**
+ * Created by 19/03/18.
+ */
+@RestController
+@RequestMapping("calcLbStatuAnaly")
+public class CalcLbStatuAnalyController extends BaseController<CalcLbStatuAnaly, Integer> {
+	
+	@Autowired
+	private CalcLbStatuAnalyService service;
+	
+
+	@RequestMapping(value="/lbStatuAnaly")
+	public List<Map<String,Object>> lbStatuAnaly(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("company")!=null){
+			gsdm=map.get("company").toString().trim();
+		}
+		String fgsdm="";
+		if(map.get("subCompany")!=null){
+			fgsdm=map.get("subCompany").toString().trim();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String date="";
+		if(map.get("startDate")!=null){
+			date=map.get("startDate").toString().trim();
+		}
+		String date2="";
+		if(map.get("endDate")!=null){
+			date2=map.get("endDate").toString().trim();
+		}
+		String sfyy="";
+		if(map.get("sfyy")!=null){
+			sfyy=map.get("sfyy").toString().trim();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+		return service.lbStatuAnaly(gsdm,fgsdm,line,date,date2,sfyy,type);
+	}
+	
+}
+package com.bsth.controller.calc;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.service.calc.CalcMixService;
+
+@RestController
+@RequestMapping("calc_mix")
+public class CalcMixController {
+	
+	@Autowired
+	CalcMixService service;
+
+	@RequestMapping(value="/calcjsyspy")
+	public List<Map<String, Object>> calcjsyspy(@RequestParam Map<String, Object> map){
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String startDate="";
+		if(map.get("startDate")!=null){
+			startDate=map.get("startDate").toString().trim();
+		}
+		String endDate="";
+		if(map.get("endDate")!=null){
+			endDate=map.get("endDate").toString().trim();
+		}
+		String empnames="";
+		if(map.get("empnames")!=null){
+			empnames=map.get("empnames").toString().trim();
+		}
+		String cont="";
+		if(map.get("cont")!=null){
+			cont=map.get("cont").toString().trim();
+		}
+		String gsdmManth="";
+		if(map.get("gsdmManth")!=null){
+			gsdmManth=map.get("gsdmManth").toString().trim();
+		}
+		String fgsdmManth="";
+		if(map.get("fgsdmManth")!=null){
+			fgsdmManth=map.get("fgsdmManth").toString().trim();
+		}
+		return service.calcjsyspy(line, startDate, endDate, empnames, cont, gsdmManth, fgsdmManth);
+	}
+
+	@RequestMapping(value = "/singledatatj", method = RequestMethod.GET)
+	public List<Map<String, Object>> singledatatj(@RequestParam Map<String, Object> map) {
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String startDate="";
+		if(map.get("startDate")!=null){
+			startDate=map.get("startDate").toString().trim();
+		}
+		String endDate="";
+		if(map.get("endDate")!=null){
+			endDate=map.get("endDate").toString().trim();
+		}
+		String tjtype="";
+		if(map.get("tjtype")!=null){
+			tjtype=map.get("tjtype").toString().trim();
+		}
+		String cont="";
+		if(map.get("cont")!=null){
+			cont=map.get("cont").toString().trim();
+		}
+		String gsdmSing="";
+		if(map.get("gsdmSing")!=null){
+			gsdmSing=map.get("gsdmSing").toString().trim();
+		}
+		String fgsdmSing="";
+		if(map.get("fgsdmSing")!=null){
+			fgsdmSing=map.get("fgsdmSing").toString().trim();
+		}
+		return service.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing);
+	}
+	
+}
 package com.bsth.controller.calc;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
+import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.service.calc.CalcWaybillService;
-
 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.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Created by 17/10/23.
  */
@@ -26,26 +26,35 @@ public class CalcWaybillController extends BaseController&lt;CalcWaybill, Integer&gt; 
 	@RequestMapping(value="/generateNew")
 	public Map<String, Object> generateNews(@RequestParam Map<String, Object> map) throws Exception{
-		String date = "", line = "";
+		String date = "", line = "", key="";
 		if(map.get("date")!=null){
 			date=map.get("date").toString().trim();
 		}
 		if(map.get("line")!=null){
 			line=map.get("line").toString().trim();
 		}
+		if(map.get("key")!=null){
+			key=map.get("key").toString().trim();
+		}
 		Map<String, Object> m = new HashMap<String, Object>();
+		m.put("date", date);
+		m.put("line", line);
+		m.put("key", key);
 		try {
 			m = calcWaybillService.generateNew(date, line);
+			if(key.length() == 0){
+				m.put("status", calcWaybillService.calcDaily(date, line));
+			}
+			
 		} catch (Exception e) {
 			// TODO: handle exception
 			e.printStackTrace();
 			m.put("status", ResponseCode.ERROR);
 			return m;
 		}
-		
 		return m;
 	}
@@ -82,4 +91,230 @@ public class CalcWaybillController extends BaseController&lt;CalcWaybill, Integer&gt; 
 		return calcWaybillService.statisticsDailyTj(gsdm,fgsdm,line,date,date2,xlName,type);
 	}
+	@RequestMapping(value="/generateDaliy")
+	public Map<String, Object> generateDaliy(@RequestParam Map<String, Object> map) throws Exception{
+		String date = "", line = "";
+		if(map.containsKey("date") && map.get("date")!=null){
+			date=map.get("date").toString().trim();
+		}
+		if(map.containsKey("line") && map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		
+		Map<String, Object> m = new HashMap<String, Object>();
+		m.put("date", date);
+		m.put("line", line);
+		try {
+			
+			m.put("status", calcWaybillService.calcDaily(date, line));
+			
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+			m.put("status", ResponseCode.ERROR);
+			return m;
+		}
+		return m;
+	}
+	
+	@RequestMapping(value="/calcStatisticsDaily")
+	public List<CalcStatistics> calcStatisticsDaily(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString().trim();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString().trim();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString().trim();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString().trim();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString().trim();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		return calcWaybillService.calcStatisticsDaily(gsdm,fgsdm,line,date,date2,xlName,type,nature);
+	}
+	
+	@RequestMapping(value="/calcStatisticsDaily2")
+	public List<Map<String, Object>> calcStatisticsDaily2(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString().trim();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString().trim();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString().trim();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString().trim();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString().trim();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		return calcWaybillService.calcStatisticsDaily2(gsdm,fgsdm,line,date,date2,xlName,type,nature);
+	}
+	
+	@RequestMapping(value="/generateLineMileage")
+	public Map<String, Object> generateLineMileage(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> m = new HashMap<String, Object>();
+		String date = "", line = "";
+		try {
+			
+			if(map.containsKey("date") && map.get("date")!=null){
+				date=map.get("date").toString().trim();
+			}
+			if(map.containsKey("line") && map.get("line")!=null){
+				line=map.get("line").toString().trim();
+			}
+			
+			
+			return calcWaybillService.calcLineMileage(date, line);
+			
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+			m.put("status", ResponseCode.ERROR);
+			m.put("date", date);
+			m.put("line", line);
+			return m;
+		}
+	}
+
+	@RequestMapping(value="/generateBusMileage")
+	public Map<String, Object> generateBusMileage(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> m = new HashMap<String, Object>();
+		String date = "", line = "";
+		try {
+			
+			if(map.containsKey("date") && map.get("date")!=null){
+				date=map.get("date").toString().trim();
+			}
+			if(map.containsKey("line") && map.get("line")!=null){
+				line=map.get("line").toString().trim();
+			}
+			
+			
+			return calcWaybillService.calcBusMileage(date, line);
+			
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+			m.put("status", ResponseCode.ERROR);
+			m.put("date", date);
+			m.put("line", line);
+			return m;
+		}
+	}
+
+	@RequestMapping(value="/getLineMileage")
+	public List<Map<String, Object>> getLineMileage(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString().trim();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString().trim();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString().trim();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString().trim();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString().trim();
+		}
+		String zt="";
+		if(map.get("zt")!=null){
+			zt=map.get("zt").toString();
+		}
+		String by="";
+		if(map.get("by")!=null){
+			by=map.get("by").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+		return calcWaybillService.getLineMileage(gsdm, fgsdm, line, date, date2, xlName, zt, by, type);
+	}
+
+	@RequestMapping(value="/getBusMileage")
+	public List<Map<String, Object>> getBusMileage(@RequestParam Map<String, Object> map){
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString().trim();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString().trim();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString().trim();
+		}
+		String zt="";
+		if(map.get("zt")!=null){
+			zt=map.get("zt").toString();
+		}
+		String by="";
+		if(map.get("by")!=null){
+			by=map.get("by").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+		return calcWaybillService.getBusMileage(line, date, date2, xlName, zt, by, type);
+	}
+
 }
@@ -46,7 +46,8 @@ public class ExportController {
 	@RequestMapping(value = "/waybilldayExport", method = RequestMethod.POST)
 	public List<Waybillday> waybilldayExport(@RequestParam Map<String, Object> map) {
 		List<Waybillday> waybillday = formsService.waybillday(map);
-		exportService.waybillday(map.get("date").toString(), waybillday);
+		exportService.waybillday(map.get("date").toString(), 
+				map.get("lineName").toString(), waybillday);
 		return waybillday;
 	}
@@ -85,7 +86,8 @@ public class ExportController {
 	// 班次车辆人员日统计
 	@RequestMapping(value = "/shifdayExport", method = RequestMethod.GET)
 	public List<Map<String, Object>> shifdayExport(@RequestParam Map<String, Object> map) {
-		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		Map<String, Object> map2 = new HashMap<String, Object>();
 		ReportUtils ee = new ReportUtils();
@@ -117,10 +119,14 @@ public class ExportController {
 		}
 		try {
+			String lineName = "";
+			if(map.containsKey("lineName"))
+				lineName = map.get("lineName").toString();
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map2 }, path + "mould/shifday.xls",
-					path + "export/班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+					path + "export/" + sdfSimple.format(sdfMonth.parse(map.get("date").toString()))
+					+ "-" + lineName + "-班次车辆人员日报表.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -130,7 +136,8 @@ public class ExportController {
 	// 班次车辆人员月统计
 	@RequestMapping(value = "/shiftuehiclemanthExport", method = RequestMethod.GET)
 	public List<Map<String, Object>> shiftuehiclemanthExport(@RequestParam Map<String, Object> map) {
-		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
 		List<Shiftuehiclemanth> shiftuehiclemanth = formsService.shiftuehiclemanth(map);
@@ -153,7 +160,20 @@ public class ExportController {
 		}
 		try {
-			String	mouldurl = null;
+			String mouldurl = null, lineName = "", dateTime = ""
+					, startDate = "", endDate = "";
+			if(map.containsKey("lineName"))
+				lineName = map.get("lineName").toString();
+			if(map.containsKey("startDate"))
+				startDate = map.get("startDate").toString();
+			if(map.containsKey("endDate"))
+				endDate = map.get("endDate").toString();
+			if(startDate.equals(endDate)){
+				dateTime = sdfSimple.format(sdfMonth.parse(startDate));
+			} else {
+				dateTime = sdfSimple.format(sdfMonth.parse(startDate))
+						+"-"+sdfSimple.format(sdfMonth.parse(endDate));
+			}
 			if(map.get("empnames").equals("驾驶员")){
 			mouldurl="mould/shiftuehiclemanth.xls";
 			}else if(map.get("empnames").equals("售票员")){
@@ -164,7 +184,7 @@ public class ExportController {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map }, path +mouldurl,
-					path + "export/班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+					path + "export/" + dateTime + "-" + lineName + "-班次车辆人员月报表.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -304,7 +324,8 @@ public class ExportController {
 		}
 	@RequestMapping(value = "/singledataExportTj", method = RequestMethod.GET)
 	public List<Map<String, Object>> singledataExportTj(@RequestParam Map<String, Object> map) {
-		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
 		List<Singledata> singledata = formsService.singledatatj(map);
@@ -333,10 +354,16 @@ public class ExportController {
 		}
 		try {
+			String startDate = "", lineName = "";
+			if(map.containsKey("startDate"))
+				startDate = map.get("startDate").toString();
+			if(map.containsKey("lineName"))
+				lineName = map.get("lineName").toString();
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls",
-					path + "export/路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+					path + "export/" + sdfSimple.format(sdfMonth.parse(startDate))
+					+ "-" + lineName + "-路单数据.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -388,7 +415,8 @@ public class ExportController {
 	// 车辆加注
 	@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");
+		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("line").toString(),
@@ -414,10 +442,15 @@ public class ExportController {
 		}
 		try {
+			String date = "", lineName = "";
+			if(map.containsKey("data"))
+				date = map.get("data").toString();
+			if(map.containsKey("lineName"))
+				lineName = map.get("lineName").toString();
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map }, path + "mould/vehicleloading.xls",
-					path + "export/车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("data").toString())) + ".xls");
+					path + "export/" + sdfSimple.format(sdfMonth.parse(date)) + "-" + lineName + "-车辆加注.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -436,21 +469,35 @@ public class ExportController {
 		for (Operationservice l : operationservice) {
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("i", i);
-			m.put("xlName", l.getXlName());
-			m.put("jzl", l.getJzl());
-			m.put("xhl", l.getXhl());
-			m.put("xsgl", l.getXsgl());
-			m.put("emptMileage", l.getEmptMileage());
-			m.put("sjbc", l.getSjbc());
+			m.put("fgs", l.getFgs()!=null?l.getFgs():"");
+			m.put("xlName", l.getXlName()!=null?l.getXlName():"");
+			m.put("jzl", l.getJzl()!=null?l.getJzl():"");
+			m.put("xhl", l.getXhl()!=null?l.getXhl():"");
+			m.put("xsgl", l.getXsgl()!=null?l.getXsgl():"");
+			m.put("emptMileage", l.getEmptMileage()!=null?l.getEmptMileage():"");
+			m.put("sjbc", l.getSjbc()!=null?l.getSjbc():"");
 			resList.add(m);
 			i++;
 		}
 		try {
+			String dateTime = "", startDate = "", endDate = "", lineName = "";
+			if(map.containsKey("startDate"))
+				startDate = map.get("startDate").toString();
+			if(map.containsKey("endDate"))
+				endDate = map.get("endDate").toString();
+			if(map.containsKey("lineName"))
+				lineName = map.get("lineName").toString();
+			if(startDate.equals(endDate)){
+				dateTime = sdfSimple.format(sdfMonth.parse(startDate));
+			} else {
+				dateTime = sdfSimple.format(sdfMonth.parse(startDate))
+						+"-"+sdfSimple.format(sdfMonth.parse(endDate));
+			}
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould/operationservice.xls", path + "export/运营服务阶段报表"
-					+ sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/operationservice.xls", path + "export/"
+					+ dateTime + "-" + lineName + "-运营服务阶段报表.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -460,7 +507,8 @@ public class ExportController {
 	// 换人换车情况日统计
 	@RequestMapping(value = "/changetochangeExport", method = RequestMethod.POST)
 	public List<Map<String, Object>> changetochangeExport(@RequestParam Map<String, Object> map) {
-		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
 		List<Changetochange> changetochange = formsService.changetochange(map);
@@ -484,10 +532,23 @@ public class ExportController {
 		}
 		try {
+			String dateTime = "", startDate = "", endDate = "", lineName = "";
+			if(map.containsKey("startDate"))
+				startDate = map.get("startDate").toString();
+			if(map.containsKey("endDate"))
+				endDate = map.get("endDate").toString();
+			if(map.containsKey("lineName"))
+				lineName = map.get("lineName").toString();
+			if(startDate.equals(endDate)){
+				dateTime = sdfSimple.format(sdfMonth.parse(startDate));
+			} else {
+				dateTime = sdfSimple.format(sdfMonth.parse(startDate))
+						+"-"+sdfSimple.format(sdfMonth.parse(endDate));
+			}
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould/changetochange.xls", path + "export/换人换车情况日统计"
-					+ sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/changetochange.xls", path + "export/"
+					+ dateTime + "-" + lineName + "-换人换车情况日统计.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -497,7 +558,8 @@ public class ExportController {
 	// 营运线路出车率统计表
 	@RequestMapping(value = "/turnoutrateExport", method = RequestMethod.POST)
 	public List<Map<String, Object>> turnoutrateExport(@RequestParam Map<String, Object> map) {
-		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
 		Map<String, Object> map1 = new HashMap<String, Object>();
@@ -517,10 +579,23 @@ public class ExportController {
 		resList.remove(m);
 		try {
+			String dateTime = "", startDate = "", endDate = "", lineName = "";
+			if(map.containsKey("startDate"))
+				startDate = map.get("startDate").toString();
+			if(map.containsKey("endDate"))
+				endDate = map.get("endDate").toString();
+			if(map.containsKey("lineName"))
+				lineName = map.get("lineName").toString();
+			if(startDate.equals(endDate)){
+				dateTime = sdfSimple.format(sdfMonth.parse(startDate));
+			} else {
+				dateTime = sdfSimple.format(sdfMonth.parse(startDate))
+						+"-"+sdfSimple.format(sdfMonth.parse(endDate));
+			}
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			ee.excelReplace(listI, new Object[] { map1 }, path + "mould/turnoutrate.xls", path + "export/营运线路出车率统计表"
-					+ sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+			ee.excelReplace(listI, new Object[] { map1 }, path + "mould/turnoutrate.xls", path + "export/"
+					+ dateTime + "-" + lineName + "-营运线路出车率统计表.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -713,10 +788,13 @@ public class ExportController {
 		m.put("line", BasicData.lineCode2NameMap.get(map.get("line").toString()));
 		m.put("date", map.get("date").toString());
 		try {
+			String lineName = map.get("lineName").toString();
+			String date = map.get("date").toString();
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			ee.excelReplace(listI, new Object[] { m }, path + "mould/daily.xls", path + "export/班次日报表"
-					+ sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+			ee.excelReplace(listI, new Object[] { m }, path + "mould/daily.xls",
+					path + "export/" + sdfSimple.format(sdfMonth.parse(date))
+					+ "-" + lineName + "-班次日报表.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -5,6 +5,8 @@ import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.GpsOverspeed;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
+import com.bsth.data.schedule.e_state_check.ScheduleStationCodeChecker;
+import com.bsth.data.schedule.e_state_check.entity.SCodeInfo;
 import com.bsth.service.gps.GpsService;
 import com.bsth.service.gps.entity.GpsSpeed;
 import com.google.common.base.Splitter;
@@ -56,8 +58,13 @@ public class GpsController {
         //超速信息
         List<GpsOverspeed> overspeedList = overspeedProcess.findByLines(lineArray);
+
+        //班次站点检查信息
+        List<SCodeInfo> scis = ScheduleStationCodeChecker.findByLineIdx(lineArray);
+
         rs.put("gpsList", gpsList);
         rs.put("overspeedList", overspeedList);
+        rs.put("scis", scis);
         return rs;
     }
@@ -164,7 +164,11 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			m.put("rq", y.getRq());
 			m.put("gsname",y.getGsname() );
 			m.put("fgsname", y.getFgsname());
-			m.put("xlname", y.getXlname());
+			if(y.getLinename()==null){
+				m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			}else{
+				m.put("xlname", y.getLinename());
+			}			
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
+package com.bsth.controller.oil;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.oil.Lsylb;
+import com.bsth.entity.oil.Ylb;
+import com.bsth.service.oil.LsylbService;
+import com.bsth.util.Arith;
+import com.bsth.util.ReportUtils;
+
+@RestController
+@RequestMapping("lsylb")
+public class LsylbController extends BaseController<Ylb, Integer>{
+	@Autowired
+	LsylbService lsylbService;
+	
+	@RequestMapping(value = "/lsylbList",method = RequestMethod.GET)
+	public List<Lsylb> lsylbList(@RequestParam Map<String, Object> map){
+		List<Lsylb> ylbList=lsylbService.listYlb(map);
+        return ylbList;
+	}
+	
+	@RequestMapping(value = "/sumLsylb",method = RequestMethod.GET)
+	public Map<String, Object> sumLsylb(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=lsylbService.sumYlb(map);
+		return list;
+	}
+	
+	@RequestMapping(value = "/listExport",method = RequestMethod.POST)
+	public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Lsylb> lsylb= lsylbService.listYlb(map);
+		String nylx=map.get("nylx").toString();
+//		(new CustomerSpecs<Ylb>(map)).iterator();
+		List<Map<String, Object>>  resList = new ArrayList<Map<String, Object>>();
+		for (Lsylb y : lsylb) {
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("rq", sdfMonth.format(y.getRq()));
+			m.put("gsname",y.getGsname() );
+			m.put("fgsname", y.getFgsname());
+			m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			m.put("nbbm", y.getNbbm());
+			m.put("jsy", y.getJsy());
+			m.put("name", y.getName());
+			m.put("czlc", "0");
+			m.put("jzlc", "0");
+			m.put("sh", y.getSh()==null?"0":y.getSh());
+			
+			String shyy ="无";
+			
+			if(nylx.equals("0")){
+				m.put("jzl", y.getJzl()==null?"0":y.getJzl());
+				m.put("czyl", y.getCzyl()==null?"0":y.getCzyl());
+				m.put("jzyl", y.getJzyl()==null?"0":y.getJzyl());
+				m.put("yh", y.getYh()==null?"0":y.getYh());
+				
+				if(y.getShyy()!=null){
+					shyy=y.getShyy();
+					 if(shyy.equals("1")){shyy="票务用油";}
+					 else if(shyy.equals("2")){shyy="保养用油";}
+					 else if(shyy.equals("3")){shyy="报废车用油";}
+					 else if(shyy.equals("4")){shyy="其它用油";}
+					 else if(shyy.equals("5")){shyy="人保部";}
+					 else if(shyy.equals("6")){shyy="车队";}
+					 else if(shyy.equals("7")){shyy="车间(高保)";}
+					 else if(shyy.equals("8")){shyy="车间(小修)";}
+					 else{shyy ="无";}
+				}
+				m.put("zyh", Arith.add(m.get("sh"), m.get("yh")));
+				
+				String rylx="";
+				if(y.getRylx()!=null){
+					if(y.getRylx().equals("0")){rylx="0号柴油";}
+					if(y.getRylx().equals("1")){rylx="负10号柴油";}
+				}
+				m.put("rylx", rylx);
+			}else{
+				m.put("cdl", y.getJzl()==null?"0":y.getJzl());
+				m.put("czcd", y.getCzyl()==null?"0":y.getCzyl());
+				m.put("jzcd", y.getJzyl()==null?"0":y.getJzyl());
+				m.put("hd", y.getYh()==null?"0":y.getYh());
+				if(y.getShyy()!=null){
+					shyy=y.getShyy();
+					 if(shyy.equals("1")){shyy="票务用电";}
+					 else if(shyy.equals("2")){shyy="保养用电";}
+					 else if(shyy.equals("3")){shyy="报废车用电";}
+					 else if(shyy.equals("4")){shyy="其它用电";}
+					 else if(shyy.equals("5")){shyy="人保部";}
+					 else if(shyy.equals("6")){shyy="车队";}
+					 else if(shyy.equals("7")){shyy="车间(高保)";}
+					 else if(shyy.equals("8")){shyy="车间(小修)";}
+					 else{shyy ="无";}
+				}
+				m.put("zyh", Arith.add(m.get("sh"), m.get("hd")));
+				m.put("rdlx", "");
+
+			}
+			m.put("shyy", shyy);
+			m.put("ns", y.getNs()==null?"0":y.getNs());
+			m.put("zlc", y.getZlc()==null?"0":y.getZlc());
+			m.put("bglyh", y.getBglyh());
+			resList.add(m);
+		}
+		try {
+			map.put("sheetName", map.get("rq"));
+			listI.add(resList.iterator());
+			String xls="";
+			String name="";
+
+			if(nylx.equals("0")){
+				xls="list.xls";
+				name="进出场存油量.xls";
+			}else{
+				xls="listDl.xls";
+				name="进出场存电量.xls";
+			}
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould/"+xls,
+				path+"export/"+map.get("rq").toString()+ name);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}	
+			
+		return resList;
+		
+	}
+}
@@ -268,7 +268,11 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("rq", sdfMonth.format(y.getRq()));
 			m.put("gsname",y.getGsname() );
 			m.put("fgsname", y.getFgsname());
-			m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			if(y.getLinename()==null){
+				m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			}else{
+				m.put("xlname", y.getLinename());
+			}
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
-package com.bsth.controller.realcontrol;
-
-import com.bsth.data.directive.DayOfDirectives;
-import com.bsth.data.directive.DirectivesPstThread;
-import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
-import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
-import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
-import com.bsth.data.msg_queue.DirectivePushQueue;
-import com.bsth.data.msg_queue.WebSocketPushQueue;
-import com.bsth.data.pilot80.PilotReport;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.websocket.handler.SendUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/4/14.
- */
-@RestController
-@RequestMapping("adminUtils")
-public class AdminUtilsController {
-
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Autowired
-    GeoCacheData geoCacheData;
-
-    @Autowired
-    DayOfDirectives dayOfDirectives;
-
-    @Autowired
-    SendUtils sendUtils;
-
-    @Autowired
-    PilotReport pilotReport;
-
-    /**
-     * 出现重复班次的车辆
-     * @param
-
-     @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
-     public void schRepeat(@RequestParam String nbbm){
-     logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
-     List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
-     logger.info("检测前，车辆班次数量：" + list.size());
-
-     Map<Long, ScheduleRealInfo> map = new HashMap<>();
-     for(ScheduleRealInfo sch : list){
-     if(map.containsKey(sch.getId())){
-     logger.info("检测到重复ID： " + sch.getId());
-     }
-     map.put(sch.getId(), sch);
-     }
-
-     logger.info("检测后，车辆班次数量：" + list.size());
-     if(map.values().size() > 0){
-     dayOfSchedule.replaceByNbbm(nbbm, map.values());
-     }
-     }*/
-
-/*    @RequestMapping(value = "/directivePushQueue")
-    public void directivePushQueue(){
-        DirectivePushQueue.start();
-    }*/
-
-    @RequestMapping(value = "/directiveQueueSize")
-    public void directiveQueueSize(){
-        DirectivePushQueue.size();
-    }
-
-    /*@RequestMapping(value = "/webSocketPushQueue")
-    public void webSocketPushQueue(){
-        WebSocketPushQueue.start();
-    }*/
-
-    @RequestMapping(value = "/webSocketQueueSize")
-    public void webSocketQueueSize(){
-        WebSocketPushQueue.size();
-    }
-
-    @RequestMapping(value = "/setHttpFlag")
-    public void setHttpFlag(@RequestParam int flag){
-        if(flag != 0 && flag != -1)
-            return;
-        GpsDataLoaderThread.setFlag(flag);
-    }
-
-    @RequestMapping(value = "/updateCacheBuff")
-    public void updateCacheBuff(){
-        geoCacheData.loadData();
-    }
-
-    @RequestMapping(value = "/reCalcLpSch")
-    public void reCalcLpSch(){
-        dayOfSchedule._test_reCalcLpSch();
-    }
-
-    @RequestMapping(value = "/findSchByLpName")
-    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
-        return dayOfSchedule.getLpScheduleMap().get(lpName);
-    }
-
-    @RequestMapping(value = "/findSchByNbbm")
-    public List<ScheduleRealInfo> findSchByNbbm(@RequestParam String nbbm){
-        return dayOfSchedule.findByNbbm(nbbm);
-    }
-
-    @RequestMapping(value = "/removeExecPlan")
-    public int removeExecPlan(@RequestParam String nbbm){
-        dayOfSchedule.removeExecPlan(nbbm);
-        return 1;
-    }
-
-    @RequestMapping(value = "/sch_re_calc_id_maps")
-    public int reCalcIdMaps(){
-        return dayOfSchedule.reCalcIdMaps();
-    }
-
-    @RequestMapping(value = "/sch_size_string")
-    public String schSizeString(){
-        return dayOfSchedule.sizeString();
-    }
-
-    @RequestMapping(value = "/containerSize")
-    public Map<String, Integer> containerSize(){
-        Map<String, Integer> rs = new HashMap<>();
-        rs.put("60_size", dayOfDirectives.all60().size());
-        rs.put("80_size", pilotReport.findAll().size());
-        rs.put("nbbm_sch_size", dayOfSchedule.findAll().size());
-        rs.put("lp_sch_size", dayOfSchedule.findAllByLpContainer().size());
-        rs.put("id_sch_size", dayOfSchedule.findAllByIdContainer().size());
-        rs.put("pst_sch_size", dayOfSchedule.getPstSize());
-        rs.put("speeds_size", OverspeedProcess.size());
-        return rs;
-    }
-
-    @RequestMapping(value = "/websocketRadioText")
-    public int radioText(String t, String lineCode){
-        sendUtils.sendRadioText(t, lineCode);
-        return 0;
-    }
-
-    @Autowired
-    DirectivesPstThread directivesPstThread;
-
-    @RequestMapping(value = "/_sd_60_pst")
-    public void sd_60_pst(){
-        logger.info("手动入库指令....");
-        directivesPstThread.run();
-    }
+package com.bsth.controller.realcontrol;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.data.directive.DayOfDirectives;
+import com.bsth.data.directive.DirectivesPstThread;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
+import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.bsth.data.pilot80.PilotReport;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.LoggerContext;
+
+/**
+ * Created by panzhao on 2017/4/14.
+ */
+@RestController
+@RequestMapping("adminUtils")
+public class AdminUtilsController {
+
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    GeoCacheData geoCacheData;
+
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    PilotReport pilotReport;
+
+    /**
+     * 出现重复班次的车辆
+     *
+     * @param
+     * @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
+     * public void schRepeat(@RequestParam String nbbm){
+     * logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
+     * List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+     * logger.info("检测前，车辆班次数量：" + list.size());
+     * <p>
+     * Map<Long, ScheduleRealInfo> map = new HashMap<>();
+     * for(ScheduleRealInfo sch : list){
+     * if(map.containsKey(sch.getId())){
+     * logger.info("检测到重复ID： " + sch.getId());
+     * }
+     * map.put(sch.getId(), sch);
+     * }
+     * <p>
+     * logger.info("检测后，车辆班次数量：" + list.size());
+     * if(map.values().size() > 0){
+     * dayOfSchedule.replaceByNbbm(nbbm, map.values());
+     * }
+     * }
+     */
+
+/*    @RequestMapping(value = "/directivePushQueue")
+    public void directivePushQueue(){
+        DirectivePushQueue.start();
+    }*/
+    @RequestMapping(value = "/directiveQueueSize")
+    public void directiveQueueSize() {
+        DirectivePushQueue.size();
+    }
+
+    /*@RequestMapping(value = "/webSocketPushQueue")
+    public void webSocketPushQueue(){
+        WebSocketPushQueue.start();
+    }*/
+
+    @RequestMapping(value = "/webSocketQueueSize")
+    public void webSocketQueueSize() {
+        WebSocketPushQueue.size();
+    }
+
+    @RequestMapping(value = "/setHttpFlag")
+    public void setHttpFlag(@RequestParam int flag) {
+        if (flag != 0 && flag != -1)
+            return;
+        GpsDataLoaderThread.setFlag(flag);
+    }
+
+    @RequestMapping(value = "/updateCacheBuff")
+    public void updateCacheBuff() {
+        geoCacheData.loadData();
+    }
+
+    @RequestMapping(value = "/reCalcLpSch")
+    public void reCalcLpSch() {
+        dayOfSchedule._test_reCalcLpSch();
+    }
+
+    @RequestMapping(value = "/findSchByLpName")
+    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName) {
+        return dayOfSchedule.getLpScheduleMap().get(lpName);
+    }
+
+    @RequestMapping(value = "/findSchByNbbm")
+    public List<ScheduleRealInfo> findSchByNbbm(@RequestParam String nbbm) {
+        return dayOfSchedule.findByNbbm(nbbm);
+    }
+
+    @RequestMapping(value = "/removeExecPlan")
+    public int removeExecPlan(@RequestParam String nbbm) {
+        dayOfSchedule.removeExecPlan(nbbm);
+        return 1;
+    }
+
+    @RequestMapping(value = "/sch_re_calc_id_maps")
+    public int reCalcIdMaps() {
+        return dayOfSchedule.reCalcIdMaps();
+    }
+
+    @RequestMapping(value = "/sch_size_string")
+    public String schSizeString() {
+        return dayOfSchedule.sizeString();
+    }
+
+    @RequestMapping(value = "/containerSize")
+    public Map<String, Integer> containerSize() {
+        Map<String, Integer> rs = new HashMap<>();
+        rs.put("60_size", dayOfDirectives.all60().size());
+        rs.put("80_size", pilotReport.findAll().size());
+        rs.put("nbbm_sch_size", dayOfSchedule.findAll().size());
+        rs.put("lp_sch_size", dayOfSchedule.findAllByLpContainer().size());
+        rs.put("id_sch_size", dayOfSchedule.findAllByIdContainer().size());
+        rs.put("pst_sch_size", dayOfSchedule.getPstSize());
+        rs.put("speeds_size", OverspeedProcess.size());
+        return rs;
+    }
+
+    @RequestMapping(value = "/websocketRadioText")
+    public int radioText(String t, String lineCode) {
+        sendUtils.sendRadioText(t, lineCode);
+        return 0;
+    }
+
+    @Autowired
+    DirectivesPstThread directivesPstThread;
+
+    @RequestMapping(value = "/_sd_60_pst")
+    public void sd_60_pst() {
+        logger.info("手动入库指令....");
+        directivesPstThread.run();
+    }
+
+    /**
+     * 删除班次，删除内存中未清理掉的非当天的班次
+     * @createDate 2019.05.13
+     * @author zhangxianzhou
+     * @param id 线路id
+     * @return 被删除的班次信息
+     */
+    @RequestMapping("/deleteSchduleBC")
+    public Map deleteSchduleBC(Long id) {
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+        ScheduleRealInfo sch = null;
+        try {
+            sch = dayOfSchedule.get(id);
+            if (sch == null) {
+                rs.put("msg", "无效的id号");
+                return rs;
+            }
+            Date date=new Date();
+            SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+            String dateStr=sdf.format(date);
+            if (sch.getScheduleDateStr().equals(dateStr)){
+                rs.put("msg", "不能删除当日排班");
+                return rs;
+            }
+            //内存中删除
+            dayOfSchedule.deleteBC(sch);
+            rs.put("delete", sch);
+            rs.put("status", ResponseCode.SUCCESS);
+
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("msg", e.getMessage());
+            sch.setDeleted(false);
+        }
+
+        return rs;
+    }
+    
+    @RequestMapping("/changeLogLevel")
+    public Map<String, Object> changeLogLevel(@RequestParam String level) {
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("errCode", 1);
+        LoggerContext context = (LoggerContext)LoggerFactory.getILoggerFactory();
+        context.getLogger("root").setLevel(Level.toLevel(level));
+        rs.put("errCode", 0);
+        rs.put("errMsg", "成功");
+
+        return rs;
+    }
 }
 \ No newline at end of file
@@ -49,6 +49,12 @@ public class RealMapController {
         return realMapService.findRouteByLine(idx);
     }
+
+    @RequestMapping(value = "/findRouteAndVersionByLine")
+    public Map<String, Object> findRouteByLineAndVersion(@RequestParam String idx) {
+        return realMapService.findRouteAndVersionByLine(idx);
+    }
+
     @RequestMapping(value = "/multiRouteByLine")
     public Map<String, Object> multiRouteByLine(@RequestParam String codeStr) {
         return realMapService.multiRouteByLine(codeStr);
 package com.bsth.controller.realcontrol;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+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 com.alibaba.fastjson.JSONArray;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
@@ -10,14 +33,11 @@ import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
+import com.bsth.util.ConfigUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
 @RestController
 @RequestMapping("/realSchedule")
@@ -29,6 +49,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@Autowired
 	DayOfSchedule dayOfSchedule;
+	@RequestMapping(value = "check_fgs_ascription", method = RequestMethod.POST)
+	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId, String jGh, String sGh, String nbbm){
+		return scheduleRealInfoService.checkPCFgsAscription(schId, jGh, sGh, nbbm);
+	}
+
 	@RequestMapping(value = "/lines")
 	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
 		return scheduleRealInfoService.findByLines(lines);
@@ -48,7 +73,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
 										   @RequestParam String dfsj,String bcType,
 										   @RequestParam(defaultValue = "") String opType) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType);
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType, null);
 	}
 	/**
@@ -59,7 +84,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> destroy(@RequestParam String idsStr
 			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
 									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
-		return scheduleRealInfoService.destroy(idsStr/*, spaceAdjust*/, remarks, adjustExps/*, spaceNum*/);
+		return scheduleRealInfoService.destroy(idsStr, remarks, adjustExps, null);
 	}
 	/**
@@ -412,7 +437,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		if(map.get("type")!=null){
 			type=map.get("type").toString();
 		}
-		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type,nature);
 	}
 	/*
@@ -506,6 +535,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.realScheduleList(line,date);
 	}
+	@RequestMapping(value="/realScheduleList_zrw")
+	public List<ScheduleRealInfo> realScheduleList_zrw(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_zrw(line,date);
+	}
+	
 	@RequestMapping(value="/realScheduleList_mh_2")
 	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
@@ -520,7 +554,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
 		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
 		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
-		return scheduleRealInfoService.multi_tzrc(cpcs);
+		return scheduleRealInfoService.multi_tzrc(cpcs, null);
 	}
 	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
@@ -630,6 +664,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		}
 		int code = dayOfSchedule.reloadSch(lineCode);
+
+		//重新按公司编码索引数据
+		dayOfSchedule.groupByGsbm();
 		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
 		return rs;
 	}
@@ -674,4 +711,81 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
 		return scheduleRealInfoService.deleteToHistory(id);
 	}
+
+    @RequestMapping(value = "isCircleQdz", method = RequestMethod.POST)
+    public Map<String, Object> isCircleQdz(@RequestParam String line,  String nbbm, String ts, String qdzCode){
+        Map<String, Object> map =new HashMap<>();
+        map.put("isExist",scheduleRealInfoService.isCircleQdz(nbbm, ts, line, qdzCode));
+	    return map;
+    }
+	
+	/**
+	 * 从历史库里删除临加班次
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
+	public Map<String, Object> deleteToHistory(@RequestParam Map<String, Object> param){
+		SysUser user = SecurityUtils.getCurrentUser();
+		String uname = user.getUserName();
+		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url"));
+		url.append("?nbbm=").append(param.get("nbbm")).append("&bxy=").append(uname).append("&bxbm=").append(param.get("bxType"));
+		// 分公司保存格式 分公司编码_公司编码
+		String val = BasicData.nbbm2FgsCompanyCodeMap.get(param.get("nbbm"));
+		String[] arr = val.split("_");
+		if (!"22".equals(arr[1])) {
+			Map<String, Object> res = new HashMap<String, Object>();
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "除金高公司外暂未开通此功能");
+			
+			return res;
+		}
+		url.append("&fgs=").append(arr[0]);
+		
+		return request(url.toString());
+	}
+	
+	@SuppressWarnings("unchecked")
+	private static Map<String, Object> request(String url) {
+		Map<String, Object> res = new HashMap<String, Object>();
+		res.put("status", ResponseCode.SUCCESS);
+		InputStream in = null;
+		HttpURLConnection con = null;
+		try {
+			con = (HttpURLConnection)new URL(url).openConnection();
+			con.setRequestMethod("POST");
+			con.setRequestProperty("keep-alive", "true");
+			con.setRequestProperty("accept", "application/json");
+			con.setRequestProperty("content-type", "application/json");
+			con.setDoInput(true);
+			con.setReadTimeout(2500);
+			con.setConnectTimeout(2500);
+			
+			con.connect();
+			if (con.getResponseCode() == 200) {
+				in = con.getInputStream();
+				ByteArrayOutputStream bout = new ByteArrayOutputStream();
+				IOUtils.copy(in, bout); bout.close();
+				Map<String, Object> response = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+				if (!"报修成功".equals(response.get("msg"))) {
+					res.put("status", ResponseCode.ERROR);
+					res.putAll(response);
+				}
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "调用上报接口异常");
+		} finally {
+			try {
+				if (in != null) in.close();
+				if (con != null) con.disconnect();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		return res;
+	}
 }
 package com.bsth.controller.realcontrol;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.controller.realcontrol.dto.ChangePersonCar;
+import com.bsth.controller.realcontrol.dto.DftzAndDestroy;
 import com.bsth.data.BasicData;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.directive.DirectiveCreator;
@@ -8,10 +12,12 @@ import com.bsth.data.directive.GatewayHttpUtils;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.external.TccExternalService;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D60Repository;
 import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,12 +50,16 @@ public class ServiceDataInterface {
     @Autowired
     GpsRealData gpsRealData;
+    @Autowired
+    TccExternalService tccExternalService;
+
     /**
      * 获取车辆 和 当前执行班次对照信息
+     *
      * @return
      */
     @RequestMapping("/execSchList")
-    public List<Map<String, Object>> execSchList(@RequestParam String secretKey){
+    public List<Map<String, Object>> execSchList(@RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -57,15 +67,15 @@ public class ServiceDataInterface {
         Collection<ScheduleRealInfo> list = dayOfSchedule.execPlanMap().values();
         Map<String, Object> map;
-        for(ScheduleRealInfo sch : list){
-            if(null == sch)
+        for (ScheduleRealInfo sch : list) {
+            if (null == sch)
                 continue;
             map = new HashMap<>();
             map.put("clZbh", sch.getClZbh());
             map.put("jGh", sch.getjGh());
             map.put("jName", sch.getjName());
             map.put("sGh", sch.getsGh());
-            map.put("sName", sch.getsGh());
+            map.put("sName", sch.getsName());
             map.put("lpName", sch.getLpName());
             map.put("xlBm", sch.getXlBm());
             map.put("xlName", sch.getXlName());
@@ -79,6 +89,8 @@ public class ServiceDataInterface {
             map.put("remarks", sch.getRemark());
             map.put("status", sch.getStatus());
+            //放站班次，放到的站点
+            map.put("majorStationName", sch.getMajorStationName());
             rs.add(map);
         }
         return rs;
@@ -93,7 +105,7 @@ public class ServiceDataInterface {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
-        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findByGsbm(companyId)), rs = new ArrayList<>();
         for (ScheduleRealInfo sch : all) {
             if (sch.getGsBm() != null
                     && sch.getGsBm().equals(companyId)
@@ -105,7 +117,7 @@ public class ServiceDataInterface {
     }
     @RequestMapping("/returnCCInfo")
-    public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+    public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -123,7 +135,7 @@ public class ServiceDataInterface {
     }
     @RequestMapping("/returnJCInfo")
-    public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+    public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -141,10 +153,11 @@ public class ServiceDataInterface {
     /**
      * 获取全量的进出场数据， 仅供接口项目调用。 由接口项目负责对外所有场站输出
+     *
      * @return
      */
     @RequestMapping("/findCurrInAndOut")
-    public List<ScheduleRealInfo> findCurrInAndOut(@RequestParam String secretKey){
+    public List<ScheduleRealInfo> findCurrInAndOut(@RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -161,30 +174,29 @@ public class ServiceDataInterface {
     /**
      * 向指定的车辆下发消息短语
-     * @param nbbm
-     * @param txt
+     *
      * @return
      */
     @RequestMapping(value = "/send60Phrase", method = RequestMethod.POST)
-    public int send60Phrase(@RequestBody Map<String, String> map,@RequestParam String secretKey){
-        try{
+    public int send60Phrase(@RequestBody Map<String, String> map, @RequestParam String secretKey) {
+        try {
             String nbbm = map.get("nbbm");
             String txt = map.get("txt");
             String sender = map.get("sender");
-            if(txt.length() > 50)
+            if (txt.length() > 50)
                 txt = txt.substring(0, 50);
             if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
                 return -500;
             //车辆和设备号对照
             String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-            if(StringUtils.isEmpty(deviceId))
+            if (StringUtils.isEmpty(deviceId))
                 return -404;
             //检查设备是否在线
             long t = System.currentTimeMillis();
             GpsEntity gps = gpsRealData.get(deviceId);
-            if(null == gps ||  (t - gps.getServerTimestamp()) > 1000 * 60 * 5)
+            if (null == gps || (t - gps.getServerTimestamp()) > 1000 * 60 * 5)
                 return -405;
             Short dispatchInstruct = 0;//消息短语
@@ -199,7 +211,7 @@ public class ServiceDataInterface {
             dayOfDirectives.put60(d60);
             return d60.getMsgId();
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
             return -500;
         }
@@ -207,23 +219,24 @@ public class ServiceDataInterface {
     /**
      * 根据msg id 查询指令响应情况
-     * @param msgIDs
+     *
+     * @param msgIds
      * @return
      */
     @RequestMapping("/findD60Reply")
-    public List<Map<String, Object>> findD60Reply(@RequestParam String msgIds){
+    public List<Map<String, Object>> findD60Reply(@RequestParam String msgIds) {
         List<Map<String, Object>> rs = new ArrayList<>();
-        try{
+        try {
             Map<String, Object> map = new HashMap();
             List<String> ids = Splitter.on(",").splitToList(msgIds);
             D60 d60;
-            for(String id : ids){
-                if(StringUtils.isEmpty(id))
+            for (String id : ids) {
+                if (StringUtils.isEmpty(id))
                     continue;
                 d60 = dayOfDirectives.get(Integer.parseInt(id));
-                if(null == d60)
+                if (null == d60)
                     continue;
                 map.put("msgId", d60.getMsgId());
@@ -231,9 +244,60 @@ public class ServiceDataInterface {
                 map.put("jsyReplyTime", d60.getReply47Time());
                 rs.add(map);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
         }
         return rs;
     }
+
+    /**
+     * 获取路牌下所有班次
+     *
+     * @param lineCode
+     * @param lpName
+     * @return
+     */
+    @RequestMapping("/findByLpName")
+    public List<ScheduleRealInfo> findByLpName(@RequestParam String lineCode, @RequestParam String lpName, @RequestParam String secretKey) {
+        try {
+            if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+                return null;
+
+            List<ScheduleRealInfo> list = dayOfSchedule.getLpScheduleMap().get(lineCode + "_" + lpName);
+            return list;
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return null;
+    }
+
+    /**
+     * 调整出场班次待发，并烂掉后续班次（调派用）
+     *
+     * @param dad
+     * @return
+     */
+    @RequestMapping(value = "/dftzAndDestroy", method = RequestMethod.POST)
+    public Map<String, Object> dftzAndDestroy(@RequestBody DftzAndDestroy dad, @RequestParam String secretKey) {
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+        return tccExternalService.dftz(dad);
+    }
+
+    /**
+     * 换人换车，（调派用）
+     * @return
+     */
+    @RequestMapping(value = "/tccHrhc", method = RequestMethod.POST)
+    public Map<String, Object> hrhc(@RequestBody String jsonStr, @RequestParam String secretKey){
+
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+        jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
+        JSONObject rootObj = JSON.parseObject(jsonStr);
+
+        List<ChangePersonCar> cpcs = JSONArray.parseArray(rootObj.getString("cpcs"), ChangePersonCar.class);
+        return tccExternalService.hrhc(cpcs, rootObj.getString("tccCode"), rootObj.getString("userId"));
+    }
 }
+package com.bsth.controller.realcontrol.dto;
+
+/**
+ * Created by panzhao on 2018/3/22.
+ */
+public class DftzAndDestroy {
+
+    /**
+     * 要调整待发的出场班次ID
+     */
+    private Long dftzId;
+
+    /**
+     * 要设置的待发时间
+     */
+    private String newTimeStr;
+
+    /**
+     * 要烂掉的班次的 班次id ,号分割多个
+     */
+    private String destroyIdx;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    private String reason;
+
+    /**
+     * 调派工号
+     */
+    private String userId;
+
+    public String getNewTimeStr() {
+        return newTimeStr;
+    }
+
+    public void setNewTimeStr(String newTimeStr) {
+        this.newTimeStr = newTimeStr;
+    }
+
+    public String getDestroyIdx() {
+        return destroyIdx;
+    }
+
+    public void setDestroyIdx(String destroyIdx) {
+        this.destroyIdx = destroyIdx;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Long getDftzId() {
+        return dftzId;
+    }
+
+    public void setDftzId(Long dftzId) {
+        this.dftzId = dftzId;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+}
+package com.bsth.controller.report;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.bsth.controller.BaseController;
+import com.bsth.entity.sheet.CalcSheet;
+import com.bsth.entity.sheet.Sheet;
+import com.bsth.service.report.CalcSheetService;
+
+@RestController
+@RequestMapping("calcSheet")
+public class CalcSheetController  extends BaseController<CalcSheet, Integer>{
+	@Autowired
+	CalcSheetService calcSheetService;
+	//发车到站准点率统计
+	@RequestMapping(value = "/countList",method = RequestMethod.GET)
+	public List<CalcSheet> countList(@RequestParam Map<String, Object> map){
+		List<CalcSheet> list=calcSheetService.countListCalcSheet(map);
+		return list;
+	}
+	//发车到站准点率列表
+	@RequestMapping(value = "/calcListSheet",method = RequestMethod.GET)
+	public List<CalcSheet> calcListSheet(@RequestParam Map<String, Object> map){
+		List<CalcSheet> list=calcSheetService.calcListSheet(map);
+		return list;
+	}
+	//发车站点准点率详细
+	@RequestMapping(value = "/calcSheet",method = RequestMethod.GET)
+	public List<Sheet> calcSheet(@RequestParam Map<String, Object> map){
+		List<Sheet> list=calcSheetService.calcSheet(map);
+		return list;
+	}
+	
+	//营运线路出车率统计
+	@RequestMapping(value = "/calcTurnoutrate",method = RequestMethod.GET)
+	public List<Map<String, Object>> calcTurnoutrate(@RequestParam Map<String, Object> map){
+		List<Map<String, Object>> list=calcSheetService.calcTurnoutrate(map);
+		return list;
+	}
+	
+	
+	@RequestMapping(value = "/calcTurnoutrateZgf",method = RequestMethod.GET)
+	public List<Map<String, Object>> calcTurnoutrateZgf(@RequestParam Map<String, Object> map){
+		List<Map<String, Object>> list=calcSheetService.calcTurnoutrateZgf(map);
+		return list;
+	}
+}
 package com.bsth.controller.report;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -15,8 +16,10 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
+import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.report.ReportService;
 import com.bsth.util.ReportUtils;
@@ -51,6 +54,7 @@ public class ReportController {
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("i", i);
 			m.put("nbbm", a.getNbbm());
+			m.put("pzh", a.getPzh());
 			m.put("stopName", a.getStopName());
 			m.put("jzsj", a.getJzsj());
 			m.put("czsj", a.getCzsj());
@@ -65,13 +69,15 @@ public class ReportController {
 			resList.add(m);
 			i++;
 		}
-		
 		try {
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
 			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");
+					path + "export/"+sdfSimple.format(sdfMonth.parse(date))
+					+"-"+clzbh+"-班次到离站.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -138,11 +144,23 @@ public class ReportController {
 		}
 		try {
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			String lineName = BasicData.lineCode2NameMap.get(line);
+			String dateTime = "", startDate = "", endDate = "";
+			startDate = fcsj.substring(0, 10);
+			endDate = ddsj.substring(0, 10);
+			if(startDate.equals(endDate)){
+				dateTime = sdfSimple.format(sdfMonth.parse(startDate));
+			} else {
+				dateTime = sdfSimple.format(sdfMonth.parse(startDate))
+						+"-"+sdfSimple.format(sdfMonth.parse(endDate));
+			}
 			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");
+					path + "export/"+dateTime+"-"+lineName+"-班次到离站.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -186,11 +204,14 @@ public class ReportController {
 			lgqlList.add(newMap);
 		}
 		try {
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
 			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");
+					path + "export/"+sdfSimple.format(sdfMonth.parse(date))
+					+"-"+lineName+"-调度员工作汇总日报.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -337,10 +358,17 @@ public class ReportController {
 		return lMap;
 	}
-	
-	
 	@RequestMapping(value="/online")
 	public Map<String, Object> online(@RequestParam Map<String, Object> map){
 		return service.online(map);
 	}
+	
+	
+	
+	@RequestMapping(value = "/singledatatj", method = RequestMethod.GET)
+	public List<Singledata> singledatatj(@RequestParam Map<String, Object> map) {
+
+		return service.singledatatj(map);
+	}
+	
 }
 package com.bsth.controller.schedule.core;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.service.schedule.CarConfigInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
@@ -12,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,4 +62,84 @@ public class CarConfigInfoController extends BController&lt;CarConfigInfo, Long&gt; {
         return rtn;
     }
+
+    @RequestMapping(value = "/validate_cars_2", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars(@RequestParam Integer xlId, @RequestParam Integer clId) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            carConfigInfoService.validate_cars(xlId, clId);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_cars_gs", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars_gs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars_gs(carConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_cars_fgs", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars_fgs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars_fgs(carConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_cars_config", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars_config(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars_config(carConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
 }
 package com.bsth.controller.schedule.core;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,6 +74,75 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
         return rtn;
     }
+    @RequestMapping(value = "/validate_jsy_config", method = RequestMethod.GET)
+    public Map<String, Object> validate_jsy_config(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("jsy.id_eq"),
+                    null
+            );
+            employeeConfigInfoService.validate_jsy_config(employeeConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_jsy_gs", method = RequestMethod.GET)
+    public Map<String, Object> validate_jsy_gs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("jsy.id_eq"),
+                    null
+            );
+            employeeConfigInfoService.validate_jsy_gs(employeeConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_jsy_fgs", method = RequestMethod.GET)
+    public Map<String, Object> validate_jsy_fgs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("jsy.id_eq"),
+                    null
+            );
+            employeeConfigInfoService.validate_jsy_fgs(employeeConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
     @RequestMapping(value = "/validate_spy", method = RequestMethod.GET)
     public Map<String, Object> validate_spy(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
@@ -89,4 +162,70 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
         }
         return rtn;
     }
+
+    @RequestMapping(value = "/validate_spy_config", method = RequestMethod.GET)
+    public Map<String, Object> validate_spy_config(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    null,
+                    param.get("spy.id_eq")
+            );
+            employeeConfigInfoService.validate_spy_config(employeeConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_spy_gs", method = RequestMethod.GET)
+    public Map<String, Object> validate_spy_gs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    null,
+                    param.get("spy.id_eq")
+            );
+            employeeConfigInfoService.validate_spy_gs(employeeConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_spy_fgs", method = RequestMethod.GET)
+    public Map<String, Object> validate_spy_fgs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    null,
+                    param.get("spy.id_eq")
+            );
+            employeeConfigInfoService.validate_spy_fgs(employeeConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
 }
@@ -57,4 +57,21 @@ public class SchedulePlanController extends BController&lt;SchedulePlan, Long&gt; {
         return rtn;
     }
+    /**
+     * 验证排班计划时间范围内规则的正确性。
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/valttrule/{xlid}/{from}/{to}", method = RequestMethod.GET)
+    public Map<String, Object> validateRule(
+            @PathVariable(value = "xlid") Integer xlid,
+            @PathVariable(value = "from") Date from,
+            @PathVariable(value = "to") Date to
+    ) throws Exception {
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("status", ResponseCode.SUCCESS);
+        rtn.put("data", schedulePlanService.validateRule(xlid, from, to));
+        return rtn;
+    }
+
 }
@@ -6,7 +6,9 @@ import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import com.bsth.service.schedule.datatools.TTinfoDetailDynamicData;
+import com.bsth.service.schedule.timetable.ExcelFormatType;
 import com.bsth.service.schedule.utils.DataToolsFile;
+import com.bsth.service.schedule.utils.DataToolsFileType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -41,13 +43,14 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
      */
     @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST)
     public Map<String, Object> validate_sheet(
-            String filename, String sheetname, Integer lineid, String linename, Integer lineversion) {
+            String filename, String sheetname, Integer lineid, String linename, Integer lineversion, String excelFormatType) {
         Map<String, Object> rtn = new HashMap<>();
         try {
             if (lineversion == null) {
                 throw new Exception("线路版本未知");
             }
-            ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, lineversion);
+            ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, lineversion,
+                    ExcelFormatType.getEnum(excelFormatType));
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -126,11 +129,19 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
     }
-    @RequestMapping(value = "/exportDTDFile", method = RequestMethod.POST)
+    @RequestMapping(value = "/exportDTDFile/{type}", method = RequestMethod.POST)
     public void exportFile(
-            @RequestBody TTinfoDetailDynamicData.DTInfos dtInfos,
+            @RequestBody TTinfoDetailDynamicData.DTInfos dtInfos, @PathVariable("type") String type,
             HttpServletResponse response) throws Exception {
-        DataToolsFile dataToolsFile = ttInfoDetailService.exportDynamicTTinfo(dtInfos);
+        DataToolsFile dataToolsFile = null;
+        if ("xls".equals(type)) {
+            dataToolsFile = ttInfoDetailService.exportDynamicTTinfo(dtInfos, DataToolsFileType.XLS);
+        } else if ("xlsx".equals(type)) {
+            dataToolsFile = ttInfoDetailService.exportDynamicTTinfo(dtInfos, DataToolsFileType.XLSX);
+        } else {
+            throw new Exception("未知的导出格式==>" + type);
+        }
+
         // 流输出导出文件
         response.setHeader("content-type", "application/octet-stream");
         response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName());
@@ -28,7 +28,7 @@ public class BasicData {
     //公司代码和公司名对照(K: 公司编码，V:公司名)
     public static Map<String, String> businessCodeNameMap;
-    //分公司公司代码和分公司公司名对照(K: 公司编码_分公司编码，V:分公司公司名)
+    //分公司公司代码和分公司公司名对照(K: 分公司编码_公司编码，V:分公司公司名)
     public static Map<String, String> businessFgsCodeNameMap;
     //设备号和车辆自编号 （K: 设备编码 ，V：车辆自编号）
@@ -36,6 +36,9 @@ public class BasicData {
     //车辆自编号和公司代码对照 （K: 车辆自编号 ，V：公司代码）
     public static Map<String, String> nbbm2CompanyCodeMap;
+
+    //车辆自编号和分公司代码对照 （K: 车辆自编号 ，V：分公司编码_公司编码）
+    public static Map<String, String> nbbm2FgsCompanyCodeMap;
     //车辆自编号和牌照号对照 （K: 车辆自编号 ，V：牌照号）
     public static Map<String, String> nbbmCompanyPlateMap;
@@ -52,6 +55,7 @@ public class BasicData {
     //线路编码和名称对照
     public static Map<String, String> lineCode2NameMap;
+    public static Map<String, String> lineCodeAllNameMap;
     //停车场
     public static List<String> parkCodeList;
@@ -141,6 +145,7 @@ public class BasicData {
          */
         public int loadAllData() {
             try {
+                logger.info("开始加载基础数据..，");
                 //设备信息
                 loadDeviceInfo();
                 //站点信息
@@ -154,6 +159,7 @@ public class BasicData {
                 //公司信息
                 loadBusinessInfo();
+                logger.info("load geo cache..，");
                 geoCacheData.loadData();
                 station2ParkBuffer.saveAll();
                 logger.info("加载基础数据成功！，");
@@ -189,6 +195,8 @@ public class BasicData {
             BiMap<String, String> deviceId2Nbbm = HashBiMap.create();
             //车辆和公司代码对照
             Map<String, String> nbbm2CompanyCode = new HashMap<>();
+            //车辆和分公司代码对照
+            Map<String, String> nbbm2FgsCompanyCode = new HashMap<>();
             //车辆自编号和拍照号对照
             Map<String, String> nbbmCompanyPlate = new HashMap<>();
@@ -199,11 +207,13 @@ public class BasicData {
                 car = carIterator.next();
                 deviceId2Nbbm.put(car.getEquipmentCode(), car.getInsideCode());
                 nbbm2CompanyCode.put(car.getInsideCode(), car.getBusinessCode());
+                nbbm2FgsCompanyCode.put(car.getInsideCode(), car.getBrancheCompanyCode() + "_" + car.getBusinessCode() );
                 nbbmCompanyPlate.put(car.getInsideCode(), car.getCarPlate());
             }
             deviceId2NbbmMap = deviceId2Nbbm;
             nbbm2CompanyCodeMap = nbbm2CompanyCode;
+            nbbm2FgsCompanyCodeMap = nbbm2FgsCompanyCode;
             nbbmCompanyPlateMap =nbbmCompanyPlate;
         }
@@ -247,6 +257,8 @@ public class BasicData {
             CarConfigInfo cci;
             while (allIterator.hasNext()) {
                 cci = allIterator.next();
+                if(cci.getIsCancel())
+                    continue;//排除已经报废的
                 ccMap.put(cci.getCl().getInsideCode(), cci.getXl());
             }
             nbbm2LineMap = ccMap;
@@ -304,6 +316,14 @@ public class BasicData {
             lineId2ShangHaiCodeMap = id2SHcode;
             lineCode2ShangHaiCodeMap = code2SHcode;
             stationName2YgcNumber = tempStationName2YgcNumber;
+            
+            Map<String, String> code2nameAll = new HashMap<>();
+            Iterator<Line> iteratorAll = lineRepository.findAll().iterator();
+            while (iteratorAll.hasNext()) {
+                line = iteratorAll.next();
+                code2nameAll.put(line.getLineCode(), line.getName());
+            }
+            lineCodeAllNameMap=code2nameAll;
         }
         /**
@@ -50,6 +50,8 @@ public class Station2ParkBuffer implements CommandLineRunner {
     public static StationToPark get(String lineCode, String sName, String eName) {
         List<StationToPark> list = get(lineCode);
+        if(null == list)
+            return null;
         StationToPark stp = null;
         for (StationToPark s : list) {
             if (s.getStationName().equals(sName) && s.getParkName().equals(eName)) {
@@ -74,7 +74,6 @@ public class CarOutInfoHandler {
             save(pstList);
             pstList.clear();
             xlMaps.clear();
-            //logger.info("更新发车信息表！！");
         }catch (Exception e){
             logger.error("", e);
         }
@@ -142,7 +142,7 @@ public class DirectivesPstThread extends Thread {
             tran.commit(status);
-            logger.info("64 入库成功: " + d64s.size());
+            //logger.info("64 入库成功: " + d64s.size());
         }catch (Exception e){
             tran.rollback(status);
             logger.error("", e);
@@ -129,8 +129,11 @@ public class GpsRealData {
         Set<String> nbbmSet = dayOfSchedule.findCarByLineCode(lineCode);//计划用车
         Map<String, String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
+        String deviceId;
         for(String nbbm : nbbmSet){
-            set.add(nbbm2deviceMap.get(nbbm));
+            deviceId = nbbm2deviceMap.get(nbbm);
+            if(StringUtils.isNotEmpty(deviceId))
+                set.add(deviceId);
         }
         List<GpsEntity> rs = new ArrayList<>();
@@ -21,6 +21,8 @@ import org.springframework.stereotype.Component;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 /**
  * 空间数据缓存
@@ -38,7 +40,7 @@ public class GeoCacheData {
     /**
      * 路段编码和名称对照
      */
-    private static Map<String, String> sectionCode2Name;
+    private static ConcurrentMap<String, String> sectionCode2Name;
     /**
      * 线路站点路由
      */
@@ -50,15 +52,15 @@ public class GeoCacheData {
     /**
      * 线路_上下行_站点编码 ——> 站点
      */
-    private static Map<String, StationRoute> routeCodeMap;
+    private static ConcurrentMap<String, StationRoute> routeCodeMap;
     /**
      * 停车场
      */
-    public static Map<String, Polygon> tccMap;
+    public static ConcurrentMap<String, Polygon> tccMap;
     /**
      * 线路限速信息
      */
-    private static Map<String, Double> speedLimitMap;
+    private static ConcurrentMap<String, Double> speedLimitMap;
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -118,7 +120,7 @@ public class GeoCacheData {
         //按线路和走向分组
         if (routeList.size() > 0) {
             ArrayListMultimap<String, StationRoute> tempMap = ArrayListMultimap.create();
-            Map<String, StationRoute> codeMap = new HashMap<>(routeList.size());
+            ConcurrentMap<String, StationRoute> codeMap = new ConcurrentHashMap<>(routeList.size());
             for (StationRoute sr : routeList) {
                 tempMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
                 //站点编码 ——> 和路由顺序对照
@@ -141,7 +143,7 @@ public class GeoCacheData {
         //加载停车场数据
         String sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null and destroy=0";
         List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
-        Map<String, Polygon> tccTempMap = new HashMap<>();
+        ConcurrentMap<String, Polygon> tccTempMap = new ConcurrentHashMap<>();
         Polygon polygon;
         for (Map<String, Object> tMap : tccList) {
@@ -163,7 +165,7 @@ public class GeoCacheData {
         //加载线路限速信息
         String sql = "select l.LINE_CODE,i.SPEEDING from bsth_c_line_information i left join bsth_c_line l on i.line=l.id where i.speed_limit is not null";
         List<Map<String, Object>> speedMap = jdbcTemplate.queryForList(sql);
-        Map<String, Double> speedTempMap = new HashMap<>();
+        ConcurrentMap<String, Double> speedTempMap = new ConcurrentHashMap();
         for (Map<String, Object> tMap : speedMap) {
             try {
                 speedTempMap.put(tMap.get("LINE_CODE").toString(), Double.parseDouble(tMap.get("SPEEDING").toString()));
@@ -208,7 +210,7 @@ public class GeoCacheData {
         if(sectionCacheTempMap.size() > 0)
             sectionCacheMap = sectionCacheTempMap;
-        Map<String, String> sectionCode2NameTemp = new HashMap<>();
+        ConcurrentMap<String, String> sectionCode2NameTemp = new ConcurrentHashMap<>();
         //加载全量路段编码和名称对照
         sql = "select SECTION_CODE,SECTION_NAME,CROSES_ROAD from bsth_c_section";
@@ -81,10 +81,15 @@ public class InStationProcess {
      * @param prev
      */
     private void inStation(GpsEntity gps, GpsEntity prev) {
+    	logger.info("进站记录(到达时间:" + gps.getArrTime() + " 进出站状态:" + gps.getInstation() + " 站点编号:" + gps.getStopNo() + " deviceId:" + gps.getDeviceId() + " nbbm:" + gps.getNbbm() + ")");
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         boolean flow = true;
         //要经过2个中途站才能进
         int count = GpsCacheData.lastInTrailsSize(gps);
+        if (null != sch)
+            logger.info("班次id: -" + sch.getId() + " count:" + count+" sch.getZdzCode(): "+sch.getZdzCode()+" sch.getZdzCode(): "+sch.getZdzCode()+" gps.getCarparkNo() :"+gps.getCarparkNo());
+        else
+        logger.info("sch is null....");
         List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
         if (null != sch && isNormalSch(sch) && gps.getInstation() == 1 && routes.size() > 4
                 && count < 2) {
@@ -120,7 +125,7 @@ public class InStationProcess {
     private void inEndStation(ScheduleRealInfo sch, GpsEntity gps) {
         String nbbm = sch.getClZbh();
         //校验进站前置约束
-        if (!validInPremise(gps))
+        if (!validInPremise(gps) && isNormalSch(sch))
             return;
         //实达时间不覆盖
@@ -132,8 +137,6 @@ public class InStationProcess {
         sch.setZdsjActualAll(rsT);
         sch.setSiginCompate(2);
-        //通知误点停靠程序，有车辆到站
-        LateAdjustHandle.carArrive(gps);
         //持久化
         dayOfSchedule.save(sch);
@@ -147,6 +150,10 @@ public class InStationProcess {
         else
             dayOfSchedule.removeExecPlan(nbbm);
+        //通知误点停靠程序，有车辆到站
+        LateAdjustHandle.carArrive(gps, next);
+        //LateAdjustHandle.carArrive(gps);
+
         //路牌的下一个班次，页面显示起点实际到达时间
         ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch);
         if (lpNext != null) {
@@ -158,7 +165,7 @@ public class InStationProcess {
         //webSocket
         sendUtils.sendZdsj(sch, lpNext, doneSum);
-        logger.info("车辆：" + nbbm + " 班次：" + sch.getDfsj() + "到终点， 时间：" + sch.getZdsjActual());
+        logger.info("车辆：" + nbbm + " 班次：" + sch.getDfsj() + "到终点， 时间：" + sch.getZdsjActual() + " -stopNo: " + gps.getStopNo());
         //清除车辆误点调整监听
         LateAdjustHandle.remove(sch);
@@ -220,12 +227,12 @@ public class InStationProcess {
     private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next) {
         LineConfig config = lineConfigData.get(sch.getXlBm());
         //限定出站既出场的停车场
-        String park = config.getTwinsPark();
-        boolean limitPark = StringUtils.isNotEmpty(park);
+        List<String> parks = config.findTwinsParkList();
+        boolean limitPark = null != parks && parks.size() > 0;
         if (next.getBcType().equals("in") && config.getOutConfig() == 2 && isEmptyMileage(next)
-                && (!limitPark || park.equals(next.getZdzCode()))) {
+                && (!limitPark || parks.contains(next.getZdzCode()))) {
             endSch(next, sch.getZdsjActualTime());
@@ -16,6 +16,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import java.util.List;
+
 /**
  * 车辆出站处理程序
  * Created by panzhao on 2017/11/16.
@@ -72,8 +74,13 @@ public class OutStationProcess {
      * @param gps
      */
     private void outStation(GpsEntity gps, GpsEntity prev) {
+    	logger.info("出站记录(到达时间:" + gps.getArrTime() + " 进出站状态:" + gps.getInstation() + " 站点编号:" + gps.getStopNo() + " deviceId:" + gps.getDeviceId() + " nbbm:" + gps.getNbbm() + ")");
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+        if (null != sch)
+            logger.info("班次id: " + sch.getId() + " sch.getQdzCode():" + sch.getQdzCode() + " prev.getStopNo():" + prev.getStopNo() + " prev.getStopNo():" + prev.getStopNo() + " sch.getQdzCode():" + sch.getQdzCode() +" prev.getCarparkNo() :"+prev.getCarparkNo()+" diff :"+((int) (sch.getDfsjT() - gps.getTimestamp()))+" dayOfSchedule.isFirstOut(sch) && diff"+(dayOfSchedule.isFirstOut(sch))+" sch.getFcsjActual():"+sch.getFcsjActual()+" StringUtils.isNotEmpty(sch.getFcsjActual())&& !outManyFit(gps, sch) :"+(StringUtils.isNotEmpty(sch.getFcsjActual())&& !outManyFit(gps, sch))+ ")");
+        else
+            logger.info("sch is null....");
         //起点发车
         if (null != sch &&
                 ((sch.getQdzCode().equals(prev.getStopNo())
@@ -159,14 +166,14 @@ public class OutStationProcess {
         try {
             LineConfig config = lineConfigData.get(sch.getXlBm());
             //限定出站既出场的停车场
-            String park = config.getTwinsPark();
-            boolean limitPark = StringUtils.isNotEmpty(park);
+            List<String> parks = config.findTwinsParkList();
+            boolean limitPark = null != parks && parks.size() > 0;
             if (config != null && config.getOutConfig() == 2) {
                 //出站既出场
                 ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
                 if (isOut(schPrev) && isEmptyMileage(schPrev)
-                        && (!limitPark || park.equals(schPrev.getQdzCode()))) {
+                        && (!limitPark || parks.contains(schPrev.getQdzCode()))) {
                     endSch(schPrev, sch.getFcsjActualTime());
@@ -20,12 +20,12 @@ import java.util.List;
  * Created by panzhao on 2017/4/6.
  */
 @Component
-public class SafeDrivDataLoadThread extends Thread{
+public class SafeDrivDataLoadThread extends Thread {
     Logger logger = LoggerFactory.getLogger(this.getClass());
     static String url;
-    static CloseableHttpClient httpClient = null;
+    static CloseableHttpClient httpClient;
     static HttpGet get;
     static RequestConfig requestConfig;
     static CloseableHttpResponse response;
@@ -33,12 +33,12 @@ public class SafeDrivDataLoadThread extends Thread{
     static BufferedReader br;
     static {
-        url = "http://180.166.5.82:9007/bsth-safedriving/Crlcxb/realtimeInterface.do";
+        url = "http://211.95.61.66:9007/bsth-safedriving/Crlcxb/realtimeInterface.do";
         httpClient = HttpClients.createDefault();
         get = new HttpGet(url);
         requestConfig = RequestConfig.custom()
-                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
-                .setSocketTimeout(2500).build();
+                .setConnectTimeout(5500).setConnectionRequestTimeout(5000)
+                .setSocketTimeout(5500).build();
         get.setConfig(requestConfig);
     }
@@ -51,9 +51,7 @@ public class SafeDrivDataLoadThread extends Thread{
             int statusCode = response.getStatusLine().getStatusCode();
             if(statusCode != 200){
-                get.abort();
                 logger.error("http client status code: " + statusCode);
-                return;
             }
             entity = response.getEntity();
@@ -67,7 +65,7 @@ public class SafeDrivDataLoadThread extends Thread{
                 list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class);
-                for(SafeDriv sd : list){
+                for (SafeDriv sd : list) {
                     SafeDrivCenter.put(sd);
                 }
             }
@@ -75,7 +73,7 @@ public class SafeDrivDataLoadThread extends Thread{
             if (null != response)
                 response.close();
         } catch (Exception e) {
-            logger.error("安全驾驶接口报错了" , e.getMessage());
+            logger.error("安全驾驶接口报错了", e);
         }
     }
 }
@@ -16,6 +16,8 @@ import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimaps;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -38,6 +40,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
 /**
  * @author PanZhao
@@ -53,20 +56,23 @@ public class DayOfSchedule {
     //按线路分组的 “原始计划” 排班数据
     public static Map<String, List<SchedulePlanInfo>> schedulePlanMap;
-    // 按车辆分组的班次数据
-    private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
+    // 按车辆索引的班次数据
+    private static ListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
-    //按线路分组计划用车
+    // 按营运公司索引的班次数据
+    private static ListMultimap<String, ScheduleRealInfo> gsBmScheduleMap;
+
+    //按线路索引计划用车
     private static HashMultimap<String, String> lineNbbmsMap;
-    //按路牌分组的班次数据 线路编码_路牌名称 ——> 班次list
+    //按路牌索引班次数据 线路编码_路牌名称 ——> 班次list
     private static ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap;
     // 班次主键映射
-    private static Map<Long, ScheduleRealInfo> id2SchedulMap;
+    private static ConcurrentMap<Long, ScheduleRealInfo> id2SchedulMap;
     //车辆 ——> 当前执行班次
-    private static Map<String, ScheduleRealInfo> carExecutePlanMap;
+    private static ConcurrentMap<String, ScheduleRealInfo> carExecutePlanMap;
     // 持久化
     public static ConcurrentLinkedQueue<ScheduleRealInfo> pstBuffer;
@@ -103,6 +109,9 @@ public class DayOfSchedule {
     static {
         nbbmScheduleMap = ArrayListMultimap.create();
+        nbbmScheduleMap = Multimaps.synchronizedListMultimap(nbbmScheduleMap);
+
+        gsBmScheduleMap = ArrayListMultimap.create();
         lpScheduleMap = ArrayListMultimap.create();
         lineNbbmsMap = HashMultimap.create();
@@ -324,7 +333,7 @@ public class DayOfSchedule {
      * @Description: TODO(从计划排班表加载数据)
      */
     public List<ScheduleRealInfo> loadPlanSch(String lineCode, String schDate) {
-        logger.info("从计划排班表恢复排班，lineCode: " + lineCode + ", schDate: " + schDate);
+        //logger.info("从计划排班表恢复排班，lineCode: " + lineCode + ", schDate: " + schDate);
         List<ScheduleRealInfo> realList = new ArrayList<>();
         try {
@@ -340,6 +349,7 @@ public class DayOfSchedule {
             // 转换为实际排班
             realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
+            logger.info("从计划排班表恢复排班，lineCode: " + lineCode + ", schDate: " + schDate + ", size:" + realList.size());
             Date d = new Date();
             SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
@@ -610,8 +620,8 @@ public class DayOfSchedule {
             outConfig = config.getOutConfig();
         //限定出站既出场的停车场
-        String park = config.getTwinsPark();
-        boolean limitPark = StringUtils.isNotEmpty(park);
+        List<String> parks = config.findTwinsParkList();
+        boolean limitPark = null != parks && parks.size() > 0;
         boolean flag = false;
         ScheduleRealInfo next = null;
         for (ScheduleRealInfo temp : list) {
@@ -624,8 +634,8 @@ public class DayOfSchedule {
                 continue;
             //出站既出场，忽略出场班次
-            if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
-                    && (!limitPark || park.equals(temp.getQdzCode())))
+            if (outConfig == 2 && temp.getBcType().equals("out") && isEmptyMileage(temp)
+                    && (!limitPark || parks.contains(temp.getQdzCode())))
                 continue;
             if (flag) {
@@ -636,6 +646,10 @@ public class DayOfSchedule {
         return next;
     }
+    private boolean isEmptyMileage(ScheduleRealInfo sch) {
+        return sch.getBcsj() == 0 || sch.getJhlcOrig().intValue() == 0;
+    }
+
     /**
      * 下一个班次
      *
@@ -672,8 +686,8 @@ public class DayOfSchedule {
             outConfig = config.getOutConfig();
         //限定出站既出场的停车场
-        String park = config.getTwinsPark();
-        boolean limitPark = StringUtils.isNotEmpty(park);
+        List<String> parks = config.findTwinsParkList();
+        boolean limitPark = null != parks && parks.size() > 0;
         boolean flag = false;
         ScheduleRealInfo next = null;
         for (ScheduleRealInfo temp : list) {
@@ -683,8 +697,8 @@ public class DayOfSchedule {
             }
             //出站既出场，忽略出场班次
-            if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
-                    && (!limitPark || park.equals(temp.getQdzCode())))
+            if (outConfig == 2 && temp.getBcType().equals("out") && isEmptyMileage(temp)
+                    && (!limitPark || parks.contains(temp.getQdzCode())))
                 continue;
             if (flag) {
@@ -979,18 +993,21 @@ public class DayOfSchedule {
             String rq = currSchDateMap.get(lineCode);
             if (StringUtils.isNotEmpty(rq)) {
                 List<ScheduleRealInfo> all = findByLineCode(lineCode);
-                //解除gps 和班次之间的关联
-                List<ScheduleRealInfo> unions = calcUnion(all, carExecutePlanMap.values());
-                for (ScheduleRealInfo sch : unions) {
-                    removeExecPlan(sch.getClZbh());
-                }
-                //解除调度指令和班次的外键约束
-                StringBuilder inStr = new StringBuilder("(");
-                for (ScheduleRealInfo sch : all) {
-                    inStr.append(sch.getId() + ",");
+
+                if(null != all && all.size() > 0){
+                    //解除gps 和班次之间的关联
+                    List<ScheduleRealInfo> unions = calcUnion(all, carExecutePlanMap.values());
+                    for (ScheduleRealInfo sch : unions) {
+                        removeExecPlan(sch.getClZbh());
+                    }
+                    //解除调度指令和班次的外键约束
+                    StringBuilder inStr = new StringBuilder("(");
+                    for (ScheduleRealInfo sch : all) {
+                        inStr.append(sch.getId() + ",");
+                    }
+                    inStr.deleteCharAt(inStr.length() - 1).append(")");
+                    jdbcTemplate.update(Constants.MULTI_REMOVE_DIRECTIVE_SCH_FK + " " + inStr.toString());
                 }
-                inStr.deleteCharAt(inStr.length() - 1).append(")");
-                jdbcTemplate.update(Constants.MULTI_REMOVE_DIRECTIVE_SCH_FK + " " + inStr.toString());
                 //删除班次数据
                 removeRealSch(lineCode, rq);
@@ -1095,7 +1112,7 @@ public class DayOfSchedule {
      */
     public int reCalcIdMaps(){
         Collection<ScheduleRealInfo> all = findAll();
-        Map<Long, ScheduleRealInfo> id2SchedulMapCopy = new ConcurrentHashMap<>();
+        ConcurrentMap<Long, ScheduleRealInfo> id2SchedulMapCopy = new ConcurrentHashMap<>();
         for(ScheduleRealInfo sch : all){
             id2SchedulMapCopy.put(sch.getId(), sch);
@@ -1123,4 +1140,42 @@ public class DayOfSchedule {
     public String sizeString(){
         return id2SchedulMap.size() + "/" + nbbmScheduleMap.size();
     }
+
+
+    /**
+     * 按公司编码分组数据
+     */
+    public void groupByGsbm(){
+        Collection<ScheduleRealInfo> all = findAll();
+        ListMultimap<String, ScheduleRealInfo> gsBmMaps = ArrayListMultimap.create();
+
+        for(ScheduleRealInfo sch : all){
+            gsBmMaps.put(sch.getGsBm(), sch);
+        }
+
+        if(gsBmMaps.size() > 0){
+            gsBmScheduleMap = null;
+            gsBmScheduleMap = gsBmMaps;
+        }
+    }
+
+    public Collection<ScheduleRealInfo> findByGsbm(String gsbm){
+        return gsBmScheduleMap.get(gsbm);
+    }
+    /**
+     * 删除班次，删除内存中未清理掉的非当天的班次
+     * @createDate 2019.05.13
+     * @author zhangxianzhou
+     * @param sch
+     */
+    public void deleteBC(ScheduleRealInfo sch) {
+        nbbmScheduleMap.remove(sch.getClZbh(), sch);
+        id2SchedulMap.remove(sch.getId());
+        lpScheduleMap.remove(sch.getXlBm() + "_" + sch.getLpName(), sch);
+        //如果正在执行该班次
+        if (carExecutePlanMap.get(sch.getClZbh()) == sch) {
+            //重新计算车辆当前执行班次
+            reCalcExecPlan(sch.getClZbh());
+        }
+    }
 }
 \ No newline at end of file
@@ -213,12 +213,12 @@ public class SchAttrCalculator {
         int outConfig = -1;
         //限定出站既出场的停车场
-        String park = null;
+        List<String> parks = null;
         if (conf != null) {
             outConfig = conf.getOutConfig();
-            park = conf.getTwinsPark();
+            parks = conf.findTwinsParkList();
         }
-        boolean limitPark = StringUtils.isNotEmpty(park);
+        boolean limitPark = null != parks && parks.size() > 0;
         ScheduleRealInfo sch, prev = null;
         for(int i = list.size() - 1; i >= 0; i --){
@@ -226,7 +226,7 @@ public class SchAttrCalculator {
             //如果是出站既出场，忽略出场班次
             if (outConfig == 2 && sch.getBcType().equals("out")
-                    && (!limitPark || park.equals(sch.getQdzCode()))
+                    && (!limitPark || parks.contains(sch.getQdzCode()))
                     && (sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0))
                 continue;
@@ -9,12 +9,10 @@ import java.util.HashMap;
 import java.util.Map;
 /**
- * 
- * @ClassName: ScheduleComparator 
- * @Description: TODO(实际班次排序器) 
  * @author PanZhao
- * @date 2016年8月15日 下午1:53:28 
- *
+ * @ClassName: ScheduleComparator
+ * @Description: TODO(实际班次排序器)
+ * @date 2016年8月15日 下午1:53:28
  */
 public class ScheduleComparator {
@@ -26,71 +24,62 @@ public class ScheduleComparator {
 	}*/
-	static Map<String, Integer> bcTypeOrderMap = new HashMap<>();
+    static Map<String, Integer> bcTypeOrderMap = new HashMap<>();
-	static{
-		bcTypeOrderMap.put("out", 0);
-		bcTypeOrderMap.put("normal", 1);
-		bcTypeOrderMap.put("region", 2);
-		bcTypeOrderMap.put("major", 3);
-		bcTypeOrderMap.put("venting", 4);
-		bcTypeOrderMap.put("ldks", 5);
-		bcTypeOrderMap.put("in", 6);
-	}
-	
-	public static class FCSJ  implements Comparator<ScheduleRealInfo>{
+    static {
+        bcTypeOrderMap.put("out", 0);
+        bcTypeOrderMap.put("normal", 1);
+        bcTypeOrderMap.put("region", 2);
+        bcTypeOrderMap.put("major", 3);
+        bcTypeOrderMap.put("venting", 4);
+        bcTypeOrderMap.put("ldks", 5);
+        bcTypeOrderMap.put("in", 6);
+    }
-		@Override
-		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			int diff = (int) (s1.getFcsjT() - s2.getFcsjT());
-			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
-		}
-	}
+    public static class FCSJ implements Comparator<ScheduleRealInfo> {
-	private static int typeOrder(String bcType){
-		return bcTypeOrderMap.get(bcType)!=null?bcTypeOrderMap.get(bcType):0;
-	}
+        @Override
+        public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
+            int diff = (int) (s1.getFcsjT() - s2.getFcsjT());
+            return diff != 0 ? diff : typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+        }
+    }
+
+    private static int typeOrder(String bcType) {
+        return bcTypeOrderMap.get(bcType) != null ? bcTypeOrderMap.get(bcType) : 0;
+    }
-	public static class DFSJ  implements Comparator<ScheduleRealInfo>{
+    public static class DFSJ implements Comparator<ScheduleRealInfo> {
         static Logger logger = LoggerFactory.getLogger(DFSJ.class);
-		@Override
-		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-            try{
+        @Override
+        public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
+            try {
+                int diff;
+                if (!s2.isSflj() && !s1.isSflj()) {
+                    diff = (int) (s1.getFcsjT() - s2.getFcsjT());
-                if(!s1.getXlBm().equals(s2.getXlBm()) || !s1.getLpName().equals(s2.getLpName())){
-                    int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
-                    return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
-                }
-                else{
-                    /**
-                     * 按时刻表发车顺序号
-                     */
-                    Integer fc1 = s1.getFcno();
-                    Integer fc2 = s2.getFcno();
-                    if(null != fc1 && null != fc2){
-                        return fc1.intValue()==fc2.intValue()?0:fc1.intValue()-fc2.intValue();
-                    }
-                    else{
-                        int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
-                        return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
-                    }
+                } else {
+                    diff = (int) (s1.getDfsjT() - s2.getDfsjT());
                 }
-            }catch (Exception e){
+
+                return diff != 0 ? diff : typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+
+            } catch (Exception e) {
                 logger.error("排序异常", e);
-                return s1.getDfsjT() - s2.getDfsjT() > 0?1:-1;
+                return s1.getDfsjT() - s2.getDfsjT() > 0 ? 1 : -1;
             }
-		}
-	}
+        }
+    }
-    public static class DFSJ2  implements Comparator<ScheduleRealInfo>{
+    public static class DFSJ2 implements Comparator<ScheduleRealInfo> {
         @Override
         public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
             int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
-            return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+            return diff != 0 ? diff : typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
         }
     }
 }
+package com.bsth.data.schedule.e_state_check;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.e_state_check.entity.SCodeInfo;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+/**
+ * 检查班次站点编码和路由编码是否相符合
+ * Created by panzhao on 2018/4/2.
+ */
+@Component
+public class ScheduleStationCodeChecker {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    private static ArrayListMultimap<String, SCodeInfo> multimap;
+
+    static {
+        multimap = ArrayListMultimap.create();
+    }
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    static Logger logger = LoggerFactory.getLogger(ScheduleStationCodeChecker.class);
+
+    public static List<SCodeInfo> findByLineIdx(List<String> lineArray){
+        List<SCodeInfo> rs = new ArrayList<>();
+
+        try{
+            for(String coed : lineArray){
+                rs.addAll(multimap.get(coed));
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        return rs;
+    }
+
+    public void checkAll() {
+        try {
+            logger.info("start....");
+            List<ScheduleRealInfo> all = new ArrayList(dayOfSchedule.findAll());
+
+            //按线路站点分组数据（上行）
+            Map<String, ScheduleRealInfo> ups = new HashMap<>();
+            //按线路站点分组数据（下行）
+            Map<String, ScheduleRealInfo> downs = new HashMap();
+
+            String key;
+            for (ScheduleRealInfo sch : all) {
+                if (sch.getBcType().equals("out")
+                        || sch.getBcType().equals("in"))
+                    continue;
+
+                key = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+
+                ups.put(key + sch.getQdzCode(), sch);
+                downs.put(key + sch.getZdzCode(), sch);
+            }
+
+            //获取全部实际的站点编码
+            Map<String, SCodeInfo> realMap = allRealCodeInfo();
+
+            List<SCodeInfo> rs = new ArrayList<>();
+            rs.addAll(checkCode(ups.values(), realMap, "qd"));
+            rs.addAll(checkCode(downs.values(), realMap, "zd"));
+
+            //按线路分组
+            ArrayListMultimap<String, SCodeInfo> mList = ArrayListMultimap.create();
+            for (SCodeInfo sci : rs) {
+                mList.put(sci.getLineCode(), sci);
+            }
+
+            multimap = mList;
+            logger.info("站点检查 end.... idx: " + (multimap.keySet().size() > 0 ? JSON.toJSONString(multimap.keySet()):"无"));
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    private List<SCodeInfo> checkCode(Collection<ScheduleRealInfo> list, Map<String, SCodeInfo> realMap, String qdOrZd) {
+        List<SCodeInfo> rs = new ArrayList<>();
+        String k;
+        SCodeInfo sci;
+        for(ScheduleRealInfo sch : list){
+            k = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+
+            sci = realMap.get(k + getName(sch, qdOrZd));//名称和编码都不存在
+            if(null == sci && !realMap.containsKey(k + getCode(sch, qdOrZd))){
+                sci = SCodeInfo.getInstance(sch, qdOrZd);
+                rs.add(sci);
+                continue;
+            }
+            else if(null != sci && !codeEq(sci, getCode(sch, qdOrZd))){//名称一致的站点，编码不一致
+                sci.setStationCode(getCode(sch, qdOrZd));
+                rs.add(sci);
+                continue;
+            }
+        }
+        return rs;
+    }
+
+    private boolean codeEq(SCodeInfo sci, String code){
+        return sci.getRealStationCode().equals(code) || sci.getRealStationCode().indexOf(code + "^") != -1;
+    }
+
+    private String getName(ScheduleRealInfo sch, String qdOrZd) {
+        return qdOrZd.equals("qd")?sch.getQdzName():sch.getZdzName();
+    }
+
+    private String getCode(ScheduleRealInfo sch, String qdOrZd) {
+        return qdOrZd.equals("qd")?sch.getQdzCode():sch.getZdzCode();
+    }
+
+
+    private Map<String, SCodeInfo> allRealCodeInfo() {
+        String sql = "select line_code,directions as up_down,station_code as real_station_code,station_name from bsth_c_stationroute where line in (select id from bsth_c_line where destroy=0) and destroy=0";
+        List<SCodeInfo> realList = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SCodeInfo.class));
+        Map<String, SCodeInfo> realMap = new HashMap<>();
+
+        String kName;
+        SCodeInfo old;
+        for (SCodeInfo sci : realList) {
+            kName = sci.getLineCode() + "_" + sci.getUpDown() + "_" + sci.getStationName();
+
+            if(realMap.containsKey(kName)){
+                //环线可能存在同名的站点
+                old = realMap.get(kName);
+                old.setRealStationCode(old.getRealStationCode() + "^" + sci.getRealStationCode() + "^");
+                continue;
+            }
+
+            realMap.put(kName, sci);
+            realMap.put(sci.getLineCode() + "_" + sci.getUpDown() + "_" + sci.getRealStationCode(), sci);
+        }
+
+        return realMap;
+    }
+}
 \ No newline at end of file
+package com.bsth.data.schedule.e_state_check.entity;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+/**
+ * Created by panzhao on 2018/4/2.
+ */
+public class SCodeInfo {
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 上下行
+     */
+    private int upDown;
+
+    /**
+     * 站点编码
+     */
+    private String stationCode;
+
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
+    /**
+     * 实际站点编码
+     */
+    private String realStationCode;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getRealStationCode() {
+        return realStationCode;
+    }
+
+    public void setRealStationCode(String realStationCode) {
+        this.realStationCode = realStationCode;
+    }
+
+    public static SCodeInfo getUpInstance(ScheduleRealInfo sch) {
+        SCodeInfo sci = new SCodeInfo();
+        sci.setLineCode(sch.getXlBm());
+        sci.setUpDown(Integer.parseInt(sch.getXlDir()));
+        sci.setStationName(sch.getQdzName());
+        sci.setStationCode(sch.getQdzCode());
+        return sci;
+    }
+
+    public static SCodeInfo geDownInstance(ScheduleRealInfo sch) {
+        SCodeInfo sci = new SCodeInfo();
+        sci.setLineCode(sch.getXlBm());
+        sci.setUpDown(Integer.parseInt(sch.getXlDir()));
+        sci.setStationName(sch.getZdzName());
+        sci.setStationCode(sch.getZdzCode());
+        return sci;
+    }
+
+    public static SCodeInfo getInstance(ScheduleRealInfo sch, String qdOrZd) {
+        return qdOrZd.equals("qd")?getUpInstance(sch):geDownInstance(sch);
+    }
+}
+package com.bsth.data.schedule.e_state_check.thread;
+
+import com.bsth.data.schedule.e_state_check.ScheduleStationCodeChecker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定时检查班次站点编码线程
+ * Created by panzhao on 2018/4/2.
+ */
+@Component
+public class FixedCheckStationCodeThread extends Thread {
+
+    @Autowired
+    ScheduleStationCodeChecker scheduleStationCodeChecker;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try {
+            scheduleStationCodeChecker.checkAll();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+}
@@ -37,7 +37,7 @@ public class FormLogger {
     /**
      * 换人换车情况表
      */
-    public void saveChangetochange(ScheduleRealInfo sch, ChangePersonCar cpc){
+    public void saveChangetochange(ScheduleRealInfo sch, ChangePersonCar cpc, String userId){
         try {
             String newNbbm = cpc.getClZbh();
             String newJsy = cpc.getJsy();
@@ -51,7 +51,6 @@ public class FormLogger {
                 return;
             Date d = new Date();
-            SysUser user = SecurityUtils.getCurrentUser();
             Changetochange cc = new Changetochange();
             cc.setRq(sch.getScheduleDateStr());
             cc.setGs(sch.getGsBm());
@@ -61,8 +60,13 @@ public class FormLogger {
             cc.setFssj(sch.getFcsj());
             cc.setXgsj(fmtHHmm.print(d.getTime()));
             cc.setsId(sch.getId());
-            if(user != null)
+
+            if(StringUtils.isEmpty(userId)){
+                SysUser user = SecurityUtils.getCurrentUser();
                 cc.setXgr(user.getUserName());
+            }
+            else
+                cc.setXgr(userId);
             cc.setPcch(sch.getClZbh());
             cc.setPcry(oldJsy);
@@ -86,7 +90,7 @@ public class FormLogger {
         ChangePersonCar cpc = new ChangePersonCar();
         cpc.setClZbh(nbbm);
         cpc.setJsy(jsy);
-        saveChangetochange(sch, cpc);
+        saveChangetochange(sch, cpc, null);
     }
     public void saveDb(){
@@ -28,14 +28,14 @@ public class ScheduleModifyLogger {
     /**
      * 待发调整
-     * opType 0: 双击调整、 1：待发调整、2：批量待发调整、3：间隔调整
+     * opType 0: 双击调整、 1：待发调整、2：批量待发调整、3：间隔调整、4：调派系统调整
      */
-    public static void dftz(ScheduleRealInfo sch, String opType, String oldDfsj, String nowDfsj, String remarks) {
+    public static void dftz(ScheduleRealInfo sch, String opType, String oldDfsj, String nowDfsj, String remarks, String userId) {
         try {
             if (oldDfsj.equals(nowDfsj))
                 return;
-            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            SchEditInfo sei = SchEditInfo.getInstance(sch, userId);
             sei.setType(EditType.DFTZ);
             sei.setType2(opType);
             sei.setRemarks(remarks == null ? "" : remarks);
@@ -78,9 +78,9 @@ public class ScheduleModifyLogger {
      *
      * @param remarks
      */
-    public static void jhlb(ScheduleRealInfo sch, String remarks) {
+    public static void jhlb(ScheduleRealInfo sch, String remarks, String userId) {
         try {
-            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            SchEditInfo sei = SchEditInfo.getInstance(sch, userId);
             sei.setRemarks(remarks);
             sei.setType(EditType.JHLB);
@@ -182,7 +182,7 @@ public class ScheduleModifyLogger {
      * @param sch
      * @param cpc
      */
-    public static void tzrc(ScheduleRealInfo sch, ChangePersonCar cpc) {
+    public static void tzrc(ScheduleRealInfo sch, ChangePersonCar cpc, String userId) {
         try {
             String newNbbm = cpc.getClZbh();
             String newJsy = cpc.getJsy();
@@ -218,7 +218,7 @@ public class ScheduleModifyLogger {
             if(jobj.size() == 0)
                 return;
-            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            SchEditInfo sei = SchEditInfo.getInstance(sch, userId);
             sei.setType(EditType.TZRC);
             sei.setJsonArray(jobj.toJSONString());
@@ -160,6 +160,26 @@ public class SchEditInfo {
         return sei;
     }
+    public static SchEditInfo getInstance(ScheduleRealInfo sch, String userId){
+        SchEditInfo sei = new SchEditInfo();
+        long t = System.currentTimeMillis();
+        sei.setTs(t);
+        sei.setTimeStr(fmtHHmm.print(t));
+        if(null != userId)
+            sei.setUser(userId);
+        else{
+            SysUser user = SecurityUtils.getCurrentUser();
+            if(user != null)
+                sei.setUser(user.getUserName());
+        }
+        sei.setRq(sch.getScheduleDateStr());
+        sei.setSchId(sch.getId());
+        sei.setLineCode(sch.getXlBm());
+        sei.setGsbm(sch.getGsBm());
+        sei.setFgsbm(sch.getFgsBm());
+        return sei;
+    }
+
     public String getLineCode() {
         return lineCode;
     }
+package com.bsth.data.schedule.external;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.realcontrol.dto.ChangePersonCar;
+import com.bsth.controller.realcontrol.dto.DftzAndDestroy;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+/**
+ * 对停车场开放的班次调度服务
+ * Created by panzhao on 2018/3/22.
+ */
+@Component
+public class TccExternalService {
+
+    Logger logger = LoggerFactory.getLogger(TccExternalService.class);
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    ScheduleRealInfoService scheduleRealInfoService;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    /**
+     * 待发调整
+     *
+     * @param dad
+     * @return
+     */
+    public Map<String, Object> dftz(DftzAndDestroy dad) {
+        Map<String, Object> rs = new HashMap();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            List<ScheduleRealInfo> updateList = new ArrayList<>();//要刷新的班次
+            ScheduleRealInfo sch = dayOfSchedule.get(dad.getDftzId());
+            if (null == sch) {
+                rs.put("msg", "班次已经不存在了！");
+                return rs;
+            }
+
+            if (!sch.getBcType().equals("out")) {
+                rs.put("msg", "只能操作出场班次！");
+                return rs;
+            }
+
+            //调整待发时间
+            scheduleRealInfoService.outgoAdjust(sch.getId(), dad.getRemarks(), dad.getNewTimeStr(), sch.getBcType(), "4", dad.getUserId());
+            updateList.add(sch);
+
+            //需要烂班的班次
+            if (StringUtils.isNotEmpty(dad.getDestroyIdx())) {
+                Map<String, Object> dMap =
+                        scheduleRealInfoService.destroy(dad.getDestroyIdx(), dad.getRemarks(), dad.getReason(), dad.getUserId());
+
+
+                updateList.addAll((Collection<? extends ScheduleRealInfo>) dMap.get("ts"));
+            }
+
+            //通知调度客户端更新班次信息
+            sendUpdate2Page(updateList);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("t", sch);
+        } catch (Exception e) {
+            rs.put("msg", "内部调度服务接口出现异常！");
+            logger.error("", e);
+        }
+        return rs;
+    }
+
+    /**
+     * 换人换车
+     *
+     * @param cpcs
+     * @return
+     */
+    public Map<String, Object> hrhc(List<ChangePersonCar> cpcs,String tccCode, String userId) {
+        Map<String, Object> rs = new HashMap();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            rs = scheduleRealInfoService.multi_tzrc(cpcs, userId);
+
+            //通知调度客户端更新班次信息
+            sendUpdate2Page(new ArrayList<ScheduleRealInfo>((Set)rs.get("ts")));
+
+            //返回更新结果集中指定停车场的进出场班次
+            Set<ScheduleRealInfo> ts = (Set<ScheduleRealInfo>) rs.get("ts");
+            List<ScheduleRealInfo> list = new ArrayList<>();
+            for(ScheduleRealInfo sch : ts){
+                if((sch.getBcType().equals("out") && sch.getQdzCode().equals(tccCode))
+                        || (sch.getBcType().equals("in") && sch.getZdzCode().equals(tccCode)))
+                    list.add(sch);
+            }
+            rs.put("list", list);
+            rs.remove("ts");
+        } catch (Exception e) {
+            rs.put("msg", "服务器出现异常！");
+            logger.error("", e);
+        }
+        return rs;
+    }
+
+
+    public void sendUpdate2Page(List<ScheduleRealInfo> list) {
+        sendUtils.refreshSch(list);
+    }
+}
 package com.bsth.data.schedule.late_adjust;
-import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.entity.realcontrol.LineConfig;
@@ -16,17 +15,17 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 /**
  * 误点自动调整待发 处理程序
- *
+ * <p>
  * 注意 ：这里的误点是指应发未到
  * Created by panzhao on 2017/4/16.
  */
 @Component
-public class LateAdjustHandle implements ApplicationContextAware{
+public class LateAdjustHandle implements ApplicationContextAware {
     static LineConfigData lineConfigData;
     static SendUtils sendUtils;
@@ -34,61 +33,42 @@ public class LateAdjustHandle implements ApplicationContextAware{
     static Logger logger = LoggerFactory.getLogger(LateAdjustHandle.class);
     /**
-     * 应发未到车辆 和 班次
+     * 应发未到的班次 key : id
      */
-    private static Map<String, ScheduleRealInfo> lateSchMap;
+    private static ConcurrentMap<Long, ScheduleRealInfo> lateSchMap = new ConcurrentHashMap<>();
-    static {
-        lateSchMap = new HashMap<>();
-    }
-
     /**
      * 新增一个误点班次
+     *
      * @param sch
      */
-    public static void putLate(ScheduleRealInfo sch){
+    public static void putLate(ScheduleRealInfo sch) {
         try {
-            //出场班次不需要
-            if(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
+            if (sch.getLateMinute() == 0) {
+                if (!config.isEnableYjtk())
                     return;
-            }
-            if(sch.getDfsj().compareTo(config.getYjtkStart()) > 0
-                    && sch.getDfsj().compareTo(config.getYjtkEnd()) <= 0){
+                sch.setLateMinute(sch.getXlDir().equals("0") ? config.getUpStopMinute() : config.getDownStopMinute());
+            }
-                ScheduleRealInfo cancel = null;
-                //之前存在误点班次没有发出
-                ScheduleRealInfo old = lateSchMap.get(sch.getClZbh());
+            if (sch.getDfsj().compareTo(config.getYjtkStart()) > 0
+                    && sch.getDfsj().compareTo(config.getYjtkEnd()) <= 0) {
-                if(old != null && old.getDfsjT() < sch.getDfsjT()){
-                    //如果之前班次的 待发应到时间已经过了 3 分钟
-                    long t = System.currentTimeMillis();
-                    long dfEndTime = old.getDfsjT() + (old.getBcsj() * 60 * 1000);
-                    if((t - dfEndTime) > 1000 * 60 * 3){
+                //班次压入
+                if (!lateSchMap.containsKey(sch.getId())) {
+                    logger.info("29【应发未到 班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
-                        remove(old);
-                        cancel = old;
-                        logger.info("【应发未到】old 班次 " + old.getId() + " -被覆盖！");
-                    }
+                    sch.setLate2(true);
+                    lateSchMap.put(sch.getId(), sch);
+                    //通知客户端
+                    sendUtils.sendAutoWdtz(sch, null);
                 }
-
-                lateSchMap.put(sch.getClZbh(), sch);
-                //通知客户端
-                sch.setLate2(true);
-                sendUtils.sendAutoWdtz(sch, cancel);
-
-                logger.info("【应发未到】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
             }
-        }catch (Exception e){
+
+        } catch (Exception e) {
             logger.error("", e);
         }
     }
@@ -96,85 +76,78 @@ public class LateAdjustHandle implements ApplicationContextAware{
     /**
      * 获取所有应发未到的班次
+     *
      * @return
      */
-    public static Collection<ScheduleRealInfo> allLateSch(){
+    public static Collection<ScheduleRealInfo> allLateSch() {
         return lateSchMap.values();
     }
-    public static void remove(ScheduleRealInfo sch){
+    public static void remove(ScheduleRealInfo sch) {
         try {
-            if(lateSchMap.get(sch.getClZbh()) == sch){
-                lateSchMap.remove(sch.getClZbh());
+            if (lateSchMap.containsKey(sch.getId())) {
+                lateSchMap.remove(sch.getId());
+
                 sch.setLate2(false);
                 sch.setLateMinute(0);
                 sch.setDfAuto(false);
-                logger.info("移除误点调整 -" + sch.getClZbh());
+                logger.info("移除误点调整 -" + sch.getClZbh() + " -time: " + sch.getDfsj() + " -id: " + sch.getId());
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
         }
     }
-/*    public static void remove(String nbbm){
-        if(lateSchMap.containsKey(nbbm)){
-            ScheduleRealInfo sch = lateSchMap.get(nbbm);
-            sch.setLate2(false);
-            sch.setLateMinute(0);
-            sch.setDfAuto(false);
-
-            lateSchMap.remove(nbbm);
-            logger.info("移除误点调整 nbbm -" + nbbm);
-        }
-    }*/
-
     /**
-     * 车辆到站
+     * 车辆到站 进站 进 的哪个班次，就调该车辆的下一个班次
+     *
      * @param gps
      */
-    public static void carArrive(GpsEntity gps){
-        try{
-            if(gps.getInstation() != 1)
+    public static void carArrive(GpsEntity gps, ScheduleRealInfo sch) {
+        try {
+            if (gps.getInstation() <= 0 || null == sch)
                 return;
-            ScheduleRealInfo sch = lateSchMap.get(gps.getNbbm());
-            if(sch == null)
-                return;
+            if (!lateSchMap.containsKey(sch.getId())) {
+                //班次是否误点（可能处于误点线程扫描的空隙，所以再判定一次）
+                if (sch.getDfsjT() <= gps.getTimestamp()) {
+                    putLate(sch);
+
+                    if (!lateSchMap.containsKey(sch.getId()))
+                        return;
+
+                    logger.info("线程空隙漏掉的误点，id: " + sch.getId());
+                } else
+                    return;
+            }
+
             //可能是延迟信号，gps时间没有误点
-            if(gps.getTimestamp() <= sch.getDfsjT()){
+            if (gps.getTimestamp() <= sch.getDfsjT()) {
                 sch.setLate2(false);
-                lateSchMap.remove(sch.getClZbh());
+                lateSchMap.remove(sch.getId());
                 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));
-
-                //超过2小时最大阈值，放弃 -临时代码，待删除
-                if(Math.abs(dt - sch.getDfsjT()) > 1000 * 60 * 60 * 2){
-                    logger.info(sch.getClZbh() + " 超过误点调整阈值，放弃");
-                }
-                else{
-                    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){
+
+            //自动调整待发 到达时间 + 停靠时间
+            long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
+
+            sch.setDfsjAll(dt);
+            sch.setDfAuto(true);
+            //取消应发未到标记
+            sch.setLate2(false);
+
+            lateSchMap.remove(sch.getId());
+            logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt + " -id:" + sch.getId());
+        } catch (Exception e) {
             e.printStackTrace();
             logger.error("late2 car arrive", e);
         }
     }
+
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         lineConfigData = applicationContext.getBean(LineConfigData.class);
+package com.bsth.data.schedule.taopao;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.taopao.entity.CLTaoPaoInfo;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 实际班次套跑信息
+ */
+@Component
+public class TaoPaoDataBuffer {
+
+    /**
+     * 线路编码 ——> 套跑信息
+     */
+    private static ArrayListMultimap<String, CLTaoPaoInfo> multimap;
+
+    static {
+        multimap = ArrayListMultimap.create();
+    }
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+}
+package com.bsth.data.schedule.taopao.entity;
+
+/**
+ * 车辆套跑 信息
+ */
+public class CLTaoPaoInfo {
+
+    private String lineCode;
+
+    private String nbbm;
+
+    /**
+     * 班次ID , 号分割多个
+     */
+    private String schIdx;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getSchIdx() {
+        return schIdx;
+    }
+
+    public void setSchIdx(String schIdx) {
+        this.schIdx = schIdx;
+    }
+}
+package com.bsth.data.schedule.taopao.entity;
+
+import javax.persistence.Transient;
+
+/**
+ * 精简的班次信息（展示套跑信息用）
+ */
+public class TPCutRealSchedule {
+
+    /** 主键Id */
+    private Long id;
+
+    /** 排班日期字符串 YYYY-MM-DD */
+    private String scheduleDateStr;
+
+    /** 路牌名称 */
+    private String lpName;
+
+    /** 车辆自编号 */
+    private String clZbh;
+
+    /** 驾驶员工号 */
+    private String jGh;
+    /** 驾驶员名字 */
+    private String jName;
+    /** 售票员工号 */
+    private String sGh;
+    /** 售票员名字 */
+    private String sName;
+
+    /** 线路方向 */
+    private String xlDir;
+    /** 起点站名字 */
+    private String qdzName;
+
+    /** 终点站名字 */
+    private String zdzName;
+
+    /** 计划发车时间（格式 HH:mm） */
+    private String fcsj;
+    /** 计划发车时间戳*/
+    @Transient
+    private Long fcsjT;
+
+    /** 计划终点时间（格式 HH:mm） */
+    private String zdsj;
+    /** 计划终点时间戳*/
+    @Transient
+    private Long zdsjT;
+
+    /** 计划里程 */
+    private Double jhlc;
+
+    /** 班次历时 */
+    private Integer bcsj;
+
+    /**
+     * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
+     */
+    private String bcType;
+
+    //放站班次 站点名称
+    private String majorStationName;
+
+    /** 实际发车时间*/
+    private String fcsjActual;
+    /**实际终点时间 */
+    private String zdsjActual;
+
+    /**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
+    private int status;
+
+    private String adjustExps;
+
+    /** 是否是临加班次 */
+    private boolean sflj;
+
+    /** 备注*/
+    private String remarks;
+
+    /**待发时间（格式 HH:mm） */
+    private String dfsj;
+
+    /**待发时间戳 */
+    @Transient
+    private Long dfsjT;
+
+    /** 指令下发状态  60: 已发送， 100： 设备确认收到， 200：驾驶员确认   0：失败 */
+    private Integer directiveState = -1;
+
+    /** 起点站计划到达时间 */
+    @Transient
+    private String qdzArrDatejh;
+
+    /** 起点站实际到达时间 */
+    @Transient
+    private String qdzArrDatesj;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getScheduleDateStr() {
+        return scheduleDateStr;
+    }
+
+    public void setScheduleDateStr(String scheduleDateStr) {
+        this.scheduleDateStr = scheduleDateStr;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getjName() {
+        return jName;
+    }
+
+    public void setjName(String jName) {
+        this.jName = jName;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getsName() {
+        return sName;
+    }
+
+    public void setsName(String sName) {
+        this.sName = sName;
+    }
+
+    public String getXlDir() {
+        return xlDir;
+    }
+
+    public void setXlDir(String xlDir) {
+        this.xlDir = xlDir;
+    }
+
+    public String getQdzName() {
+        return qdzName;
+    }
+
+    public void setQdzName(String qdzName) {
+        this.qdzName = qdzName;
+    }
+
+    public String getZdzName() {
+        return zdzName;
+    }
+
+    public void setZdzName(String zdzName) {
+        this.zdzName = zdzName;
+    }
+
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public Long getFcsjT() {
+        return fcsjT;
+    }
+
+    public void setFcsjT(Long fcsjT) {
+        this.fcsjT = fcsjT;
+    }
+
+    public String getZdsj() {
+        return zdsj;
+    }
+
+    public void setZdsj(String zdsj) {
+        this.zdsj = zdsj;
+    }
+
+    public Long getZdsjT() {
+        return zdsjT;
+    }
+
+    public void setZdsjT(Long zdsjT) {
+        this.zdsjT = zdsjT;
+    }
+
+    public Double getJhlc() {
+        return jhlc;
+    }
+
+    public void setJhlc(Double jhlc) {
+        this.jhlc = jhlc;
+    }
+
+    public Integer getBcsj() {
+        return bcsj;
+    }
+
+    public void setBcsj(Integer bcsj) {
+        this.bcsj = bcsj;
+    }
+
+    public String getBcType() {
+        return bcType;
+    }
+
+    public void setBcType(String bcType) {
+        this.bcType = bcType;
+    }
+
+    public String getMajorStationName() {
+        return majorStationName;
+    }
+
+    public void setMajorStationName(String majorStationName) {
+        this.majorStationName = majorStationName;
+    }
+
+    public String getFcsjActual() {
+        return fcsjActual;
+    }
+
+    public void setFcsjActual(String fcsjActual) {
+        this.fcsjActual = fcsjActual;
+    }
+
+    public String getZdsjActual() {
+        return zdsjActual;
+    }
+
+    public void setZdsjActual(String zdsjActual) {
+        this.zdsjActual = zdsjActual;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getAdjustExps() {
+        return adjustExps;
+    }
+
+    public void setAdjustExps(String adjustExps) {
+        this.adjustExps = adjustExps;
+    }
+
+    public boolean isSflj() {
+        return sflj;
+    }
+
+    public void setSflj(boolean sflj) {
+        this.sflj = sflj;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getDfsj() {
+        return dfsj;
+    }
+
+    public void setDfsj(String dfsj) {
+        this.dfsj = dfsj;
+    }
+
+    public Long getDfsjT() {
+        return dfsjT;
+    }
+
+    public void setDfsjT(Long dfsjT) {
+        this.dfsjT = dfsjT;
+    }
+
+    public Integer getDirectiveState() {
+        return directiveState;
+    }
+
+    public void setDirectiveState(Integer directiveState) {
+        this.directiveState = directiveState;
+    }
+
+    public String getQdzArrDatejh() {
+        return qdzArrDatejh;
+    }
+
+    public void setQdzArrDatejh(String qdzArrDatejh) {
+        this.qdzArrDatejh = qdzArrDatejh;
+    }
+
+    public String getQdzArrDatesj() {
+        return qdzArrDatesj;
+    }
+
+    public void setQdzArrDatesj(String qdzArrDatesj) {
+        this.qdzArrDatesj = qdzArrDatesj;
+    }
+}
@@ -2,8 +2,9 @@ package com.bsth.data.schedule.thread;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
-import com.bsth.data.safe_driv.SafeDrivCenter;
+import com.bsth.service.calc.CalcWaybillService;
 import com.bsth.service.oil.DlbService;
+import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.service.oil.YlbService;
 import com.bsth.service.report.SheetService;
 import org.slf4j.Logger;
@@ -29,6 +30,9 @@ public class CalcOilThread extends Thread{
     @Autowired
     DayOfDirectives dayOfDirectives;
+    
+    @Autowired
+    CalcWaybillService calcWaybillService;
     @Override
     public void run() {
@@ -38,8 +42,15 @@ public class CalcOilThread extends Thread{
             dlbService.obtainDsq();
             logger.info("计算路单里程加注量结束！");
             logger.info("开始计算班次准点率....");
-            sheetService.saveSheetList("");
+            //sheetService.saveSheetList("");
             logger.info("计算班次准点率结束！");
+
+            logger.info("开始保存重新统计数据....");
+            calcWaybillService.autoGenerate("", "");
+            logger.info("重新统计保存结束！");
+            logger.info("开始保存统计日报....");
+            calcWaybillService.calcDaily("", "");
+            logger.info("统计日报保存结束！");
         } catch(Exception e){
             logger.error("计算路单里程加注量失败",e);
         }
@@ -77,6 +77,9 @@ public class ScheduleRefreshThread extends Thread{
 				}
 			}
+			//按公司编码索引数据
+			dayOfSchedule.groupByGsbm();
+
 			//首末班入库（给网关用的数据）
 			FirstAndLastHandler.saveAll();
 		} catch (Exception e) {
@@ -25,36 +25,48 @@ public class SubmitToTrafficManage extends Thread{
     @Override
     public void run() {
         logger.info("开始提交数据到运管处...");
-        
-        try {
-            //路单
-            trafficManageService.setLD();
-        } catch (Exception e) {
-            logger.error("提交路单到运管处失败", e);
+        boolean isContinue = true;
+        // 上传路单，如果接口异常，会自动重传
+        while (isContinue){
+            try {
+                //路单
+                trafficManageService.setLD();
+                isContinue = false;
+            } catch (Exception e) {
+                logger.error("提交路单到运管处失败", e);
+                try {
+                    // 如果出现异常，程序暂停60分钟后再重新执行
+                    Thread.sleep(60 * 60 * 1000);
+                } catch (Exception ex) { }
+            }
         }
-        try {
-            //车辆里程、油耗
-            trafficManageService.setLCYH();
-        } catch (Exception e) {
-            logger.error("提交车辆里程、油耗到运管处失败", e);
-        }
-        try {
-            //线路调度日报
-            trafficManageService.setDDRB();
-        } catch (Exception e) {
-            logger.error("提交线路调度日报到运管处失败", e);
-        }
-        try {
-            //线路计划班次表
-            trafficManageService.setJHBC();
-        } catch (Exception e) {
-            logger.error("提交线路计划班次表到运管处失败", e);
-        }
-        try {
-            // 运管处基础数据更新
-            ygcBasicDataService.updateYgcBasicData();
-        } catch (Exception e) {
-            logger.error("运管处基础数据更新失败", e);
+
+        // 路单上传成功后，再上传其他数据
+        if(!isContinue){
+            try {
+                //车辆里程、油耗
+                trafficManageService.setLCYH();
+            } catch (Exception e) {
+                logger.error("提交车辆里程、油耗到运管处失败", e);
+            }
+            try {
+                //线路调度日报
+                trafficManageService.setDDRB();
+            } catch (Exception e) {
+                logger.error("提交线路调度日报到运管处失败", e);
+            }
+            try {
+                //线路计划班次表
+                trafficManageService.setJHBC();
+            } catch (Exception e) {
+                logger.error("提交线路计划班次表到运管处失败", e);
+            }
+            try {
+                // 运管处基础数据更新
+                ygcBasicDataService.updateYgcBasicData();
+            } catch (Exception e) {
+                logger.error("运管处基础数据更新失败", e);
+            }
         }
         logger.info("提交数据到运管处结束！");
     }