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

娄高锋
2 parents 68257dd4 609c1137
Showing 65 changed files with 3034 additions and 460 deletions
pom.xml
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/arrival/AnalyseData.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/analyse/CircleQueue.java
src/main/java/com/bsth/data/gpsdata/analyse/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/analyse/GpsAnalyse.java
src/main/java/com/bsth/data/gpsdata/analyse/StationRoute.java
src/main/java/com/bsth/data/gpsdata/analyse/StationRouteComp.java
src/main/java/com/bsth/data/gpsdata/analyse/components/GpsArrival.java
src/main/java/com/bsth/data/gpsdata/analyse/components/GpsStateCorrective.java
src/main/java/com/bsth/data/gpsdata/analyse/util/GeoUtils.java
@@ -225,6 +225,12 @@
 			<artifactId>spring-boot-devtools</artifactId>
 			<optional>true</optional>
 		</dependency>-->
+		<dependency>
+			<groupId>com.vividsolutions</groupId>
+			<artifactId>jts</artifactId>
+			<version>1.13</version>
+		</dependency>
+
 	</dependencies>
     <dependencyManagement>
@@ -65,10 +65,12 @@ public class ExportController {
 			i++;
 		}
+		
+		
 		try {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepassengerflow.xls",
+			ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepasswengerflow.xls",
 					path + "export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -189,7 +191,7 @@ public class ExportController {
 			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(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -203,8 +205,8 @@ public class ExportController {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
-		List<Vehicleloading> vehicleloading = formsService.vehicleloading(/*map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),*/map.get("line").toString(),
-				map.get("date").toString());
+		List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),map.get("line").toString(),
+				map.get("data").toString());
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		int i = 1;
 		for (Vehicleloading l : vehicleloading) {
@@ -214,8 +216,8 @@ public class ExportController {
 			m.put("gS", l.getgS());
 			m.put("xL", l.getxL());
 			m.put("clzbh", l.getClzbh());
-			m.put("hyl", l.getHyl());
 			m.put("jzl", l.getJzl());
+			m.put("hyl", l.getHyl());
 			m.put("ls", l.getLs());
 			m.put("jhlc", l.getJhlc());
 			m.put("unyyyl", l.getUnyyyl());
@@ -229,7 +231,7 @@ public class ExportController {
 			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("date").toString())) + ".xls");
+					path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("dat").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -417,5 +419,9 @@ public class ExportController {
 		}
 		return resList;
 	}
+	
+	
+	
+	
 }
@@ -80,9 +80,9 @@ public class MCY_FormsController {
 	// 车辆加注
 	@RequestMapping(value = "/vehicleloading", method = RequestMethod.POST)
-	public List<Vehicleloading> vehicleloading(/*@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,*/
+	public List<Vehicleloading> vehicleloading(@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,
 			@RequestParam String line, @RequestParam String data) {
-		return formsService.vehicleloading(/*gsdmVehic, fgsdmVehic, */line, data);
+		return formsService.vehicleloading(gsdmVehic, fgsdmVehic, line, data);
 	}
 	// 运营服务阶段报表
 package com.bsth.controller.gps;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.service.gps.GpsService;
 import com.google.common.base.Splitter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
 @RestController
 @RequestMapping("gps")
@@ -70,7 +69,7 @@ public class GpsController {
 		return gpsService.history(nbbmArray, st, et);
 	}
-	/*@RequestMapping(value = "/arrival/ram")
+	/*@RequestMapping(value = "/analyse/ram")
 	public List<ArrivalInfo> ramData(@RequestParam String nbbm) {
 		return ArrivalDataBuffer.allMap.get(nbbm);
 	}*/
@@ -84,4 +83,9 @@ public class GpsController {
 	public Map<String, Object> findBuffAeraByCode(@RequestParam String code,@RequestParam String type){
 		return gpsService.findBuffAeraByCode(code, type);
 	}
+
+	@RequestMapping(value = "/findRoadSpeed")
+	public Map<String, Object> findRoadSpeed(@RequestParam String lineCode){
+		return gpsService.findRoadSpeed(lineCode);
+	}
 }
@@ -3,7 +3,9 @@ package com.bsth.controller.oil;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -107,8 +109,16 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		try {
 		String rq=map.get("rq").toString();
 		if(!(rq=="")){
+			
 			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-			map.put("rq_eq", sdf.parse(rq));
+			  Calendar   calendar   =   new   GregorianCalendar(); 
+			  calendar.setTime(sdf.parse(rq)); 
+			  calendar.add(calendar.DATE,1);
+			  Date date=calendar.getTime();
+			map.put("rq_ge", rq);
+			map.put("rq_le", sdf.format(date));
+			System.out.println(rq);
+			System.out.println(sdf.format(date));
 		}
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
@@ -292,8 +292,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	@RequestMapping(value = "/queryUserInfo")
-	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line, @RequestParam String date) {
-		return scheduleRealInfoService.queryUserInfo(line, date);
+	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
+			@RequestParam String date,@RequestParam String state) {
+		return scheduleRealInfoService.queryUserInfo(line, date,state);
 	}
 	@RequestMapping(value = "/exportWaybill")
@@ -50,23 +50,28 @@ public class ReportController {
 	}
 	@RequestMapping(value = "/tbodyTime1", method = RequestMethod.GET)
-	public Map<String, Object> tbodyTime1(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime1(line, date);
+	public Map<String, Object> tbodyTime1(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime1(line, ttinfo);
 	}
 	@RequestMapping(value = "/tbodyTime2", method = RequestMethod.GET)
-	public Map<String, Object> tbodyTime2(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime2(line, date);
+	public Map<String, Object> tbodyTime2(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime2(line, ttinfo);
 	}
 	@RequestMapping(value = "/tbodyTime3", method = RequestMethod.GET)
-	public List<Map<String, Object>> tbodyTime3(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime3(line, date);
+	public List<Map<String, Object>> tbodyTime3(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime3(line, ttinfo);
 	}
 	@RequestMapping(value = "/tbodyTime5", method = RequestMethod.GET)
-	public List<Map<String, Object>> tbodyTime5(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime5(line, date);
+	public List<Map<String, Object>> tbodyTime5(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime5(line, ttinfo);
+	}
+	
+	@RequestMapping(value="/getTtinfo", method = RequestMethod.GET)
+	public List<Map<String,Object>> getTtinfo(@RequestParam Map<String, Object> map){
+		return service.getTtinfo(map);
 	}
 }
 package com.bsth.data;
 import com.bsth.Application;
+import com.bsth.data.gpsdata.analyse.GeoCacheData;
 import com.bsth.entity.*;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.*;
@@ -57,7 +58,7 @@ public class BasicData implements CommandLineRunner {
     public static Map<String, String> lineCode2NameMap;
     //线路编码_站点编码 == 0|1  上下行
-    public static Map<String, Integer> lineStationUpDownMap;
+    //public static Map<String, Integer> lineStationUpDownMap;
     //停车场
     public static List<String> parkCodeList;
@@ -86,7 +87,7 @@ public class BasicData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(dataLoader, 0, 1, TimeUnit.HOURS);
+        Application.mainServices.scheduleWithFixedDelay(dataLoader, 2, 2, TimeUnit.HOURS);
     }
@@ -117,6 +118,9 @@ public class BasicData implements CommandLineRunner {
         @Autowired
         BusinessRepository businessRepository;
+        @Autowired
+        GeoCacheData geoCacheData;
+
         @Override
         public void run() {
@@ -138,11 +142,13 @@ public class BasicData implements CommandLineRunner {
                 //车辆和线路映射信息
                 loadNbbm2LineInfo();
                 //站点路由信息
-                loadStationRouteInfo();
+                //loadStationRouteInfo();
                 //人员信息
                 loadPersonnelInfo();
                 //公司信息
                 loadBusinessInfo();
+
+                geoCacheData.loadData();
                 logger.info("加载基础数据成功！，");
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
@@ -151,7 +157,7 @@ public class BasicData implements CommandLineRunner {
         }
-        private void loadStationRouteInfo() {
+/*        private void loadStationRouteInfo() {
             Iterator<StationRoute> iterator = stationRouteRepository.findAllEffective().iterator();
             Map<String, String> sePointMap = new HashMap<>();
@@ -172,7 +178,7 @@ public class BasicData implements CommandLineRunner {
             }
             lineStationUpDownMap = map;
             lineSEPointMap = sePointMap;
-        }
+        }*/
         /**
          * loadBusinessInfo
@@ -280,7 +286,7 @@ public class BasicData implements CommandLineRunner {
                 /**
                  * 加载运管处的站点及序号
                  * 上行从1开始，下行顺序续编
-                 */
+
                 List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
                 if(ygcLines != null && ygcLines.size() > 0){
                     int size = ygcLines.size();
@@ -299,7 +305,7 @@ public class BasicData implements CommandLineRunner {
                         key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
                         tempStationName2YgcNumber.put(key,num++);
                     }
-                }
+                }*/
             }
             lineId2CodeMap = biMap;
 package com.bsth.data.arrival;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import com.bsth.data.BasicData;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 /**
  * 
@@ -98,14 +96,15 @@ public class AnalyseData {
 	}
 	private boolean effective(ArrivalEntity arr){
-		//停车场
+		/*//停车场
 		if(BasicData.parkCodeList.contains(arr.getStopNo())){
 			arr.setTcc(true);
 			return true;
 		}
-		
+
 		Integer upDown = BasicData.lineStationUpDownMap.get(arr.getLineCode() + "_" + arr.getStopNo());
-		
-		return arr.getUpDown() == upDown || BasicData.parkCodeList.contains(arr.getStopNo());
+
+		return arr.getUpDown() == upDown || BasicData.parkCodeList.contains(arr.getStopNo());*/
+		return false;
 	}
 }
@@ -70,7 +70,7 @@ public class ForecastRealServer implements CommandLineRunner {
 /*	public void forecast(String nbbm){
 		logger.info("预测，" + nbbm);
 		//当前执行班次
-		ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+		ScheduleRealInfo sch = dayOfSchedule.execPlanMap().get(nbbm);
 		if(null == sch)
 			return;
@@ -86,7 +86,7 @@ public class ForecastRealServer implements CommandLineRunner {
 			//终点站
 			String eStation = null;
 			//当前执行班次
-			ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+			ScheduleRealInfo sch = dayOfSchedule.execPlanMap().get(nbbm);
 			if(null != sch)
 				eStation = sch.getZdzCode();
 package com.bsth.data.gpsdata;
+import com.bsth.data.gpsdata.analyse.StationRoute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 /**
  * 
  * @ClassName: GpsRealData
@@ -58,21 +61,32 @@ public class GpsEntity {
 	/** 预计到达终点时间 */
 	private Float expectStopTime;
-	/** 设备是否在线 */
+	/** 设备是否在线
 	private boolean online;
-	
+	 */
 	/** 当前执行班次ID */
 	private Long schId;
 	/** 是否异常数据 */
 	private boolean abnormal;
-	
-	private int valid;
+/*
+	private int valid;*/
 	private int version;
-	/** 是否起终点站 */
+	/** 是否起终点站
 	private boolean sEPoint;
+	 */
+
+	/** 站内 */
+	private boolean instation;
+
+	/** 站点信息，站内时有值 */
+	@JsonIgnore
+	private StationRoute station;
+
+	/** 状态 */
+	private String state2;
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -178,14 +192,6 @@ public class GpsEntity {
 		this.stationName = stationName;
 	}
-	public boolean isOnline() {
-		return online;
-	}
-
-	public void setOnline(boolean online) {
-		this.online = online;
-	}
-
 	public long getArrTime() {
 		return arrTime;
 	}
@@ -218,35 +224,44 @@ public class GpsEntity {
 		this.schId = schId;
 	}
-	public boolean isAbnormal() {
-		return abnormal;
+
+	public int getVersion() {
+		return version;
 	}
-	public void setAbnormal(boolean abnormal) {
-		this.abnormal = abnormal;
+	public void setVersion(int version) {
+		this.version = version;
 	}
-	public int getValid() {
-		return valid;
+	public boolean isInstation() {
+		return instation;
 	}
-	public void setValid(int valid) {
-		this.valid = valid;
+	public void setInstation(boolean instation) {
+		this.instation = instation;
 	}
-	public int getVersion() {
-		return version;
+	public StationRoute getStation() {
+		return station;
 	}
-	public void setVersion(int version) {
-		this.version = version;
+	public void setStation(StationRoute station) {
+		this.station = station;
+	}
+
+	public boolean isAbnormal() {
+		return abnormal;
+	}
+
+	public void setAbnormal(boolean abnormal) {
+		this.abnormal = abnormal;
 	}
-	public boolean issEPoint() {
-		return sEPoint;
+	public String getState2() {
+		return state2;
 	}
-	public void setsEPoint(boolean sEPoint) {
-		this.sEPoint = sEPoint;
+	public void setState2(String state2) {
+		this.state2 = state2;
 	}
 }
@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
+import com.bsth.data.gpsdata.analyse.GpsAnalyse;
+import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.util.ConfigUtil;
@@ -55,6 +57,9 @@ public class GpsRealData implements CommandLineRunner{
 	@Autowired
 	ForecastRealServer forecastRealServer;
+
+
+
 	/**
 	 * 构造函数
 	 */
@@ -67,13 +72,17 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 40, 20, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
 		String device = gps.getDeviceId();
 		GpsEntity old = gpsMap.get(device);
+		//分析gps
+		if(isAvailable(gps) && (old == null || old.getTimestamp() != gps.getTimestamp()))
+			GpsAnalyse.start(gps);
+
 		if(!StringUtils.isEmpty(gps.getStopNo())){
 			//定时定距数据附带站点编码改变
 			if(null == old || !gps.getStopNo().equals(old.getStopNo())){
@@ -94,6 +103,11 @@ public class GpsRealData implements CommandLineRunner{
 		return gps;
 	}
+	public boolean isAvailable(GpsEntity gps){
+		return StringUtils.isNotEmpty(gps.getLineId()) &&
+				dayOfSchedule.getCurrSchDate().containsKey(gps.getLineId());
+	}
+
 	/**
 	 *
 	 * @Title: get @Description: TODO(设备号获取GPS)
@@ -118,7 +132,7 @@ public class GpsRealData implements CommandLineRunner{
 			if(gps.isAbnormal())
 				continue;
-			sch = dayOfSchedule.execPlamMap().get(gps.getNbbm());
+			sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
 			if(null != sch)
 				gps.setSchId(sch.getId());
 			rs.add(gps);
@@ -161,6 +175,11 @@ public class GpsRealData implements CommandLineRunner{
 		@Override
 		public void run() {
 			try{
+				//如果正在恢复数据
+				if(GpsDataRecovery.run){
+					return;
+				}
+
 				load();
 			}catch(Exception e){
 				logger.error("", e);
@@ -207,21 +226,7 @@ public class GpsRealData implements CommandLineRunner{
 						gpsRealData.add(gps);
 						//纠正走向
-						correctUpdown(gps);
-						/*if(issEPoint(gps))
-							continue;
-
-						//如果走向未知，尝试根据站点纠正走向
-						if(gps.getUpDown() == -1){
-							updown=stationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-							if(updown != null)
-								gps.setUpDown(updown);
-						}
-						//如果站点编码和走向相反（即上行站点ID，走向为下行），尝试根据站点纠正走向
-						updown=stationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-						if(updown != null && !gps.getUpDown().equals(updown)){
-							gps.setUpDown(updown);
-						}*/
+						//correctUpdown(gps);
 					}
 				} else
 					logger.error("result is null");
@@ -240,7 +245,7 @@ public class GpsRealData implements CommandLineRunner{
 		 * 是否是起终点
 		 * @param gps
 		 * @return
-		 */
+
 		public boolean isSEPoint(GpsEntity gps){
 			String key = gps.getLineId()+"_"+gps.getUpDown()+"_"
 					,stationCode;
@@ -261,29 +266,19 @@ public class GpsRealData implements CommandLineRunner{
 				}
 			}
 			return false;
-		}
+		}*/
 		/**
 		 * 纠正上下行
 		 * @param gps
-		 */
+
 		public void correctUpdown(GpsEntity gps){
 			Integer updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
 			if(updown != null && !updown.equals(gps.getUpDown()))
 				gps.setUpDown(updown);
-			/*//如果走向未知，尝试根据站点纠正走向
-			if(gps.getUpDown() == -1){
-
-			}*/
 			if(isSEPoint(gps))
 				return;
-
-			/*//如果站点编码和走向相反（即上行站点ID，走向为下行），尝试根据站点纠正走向
-			updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-			if(updown != null && !gps.getUpDown().equals(updown)){
-				gps.setUpDown(updown);
-			}*/
-		}
+		}*/
 	}
-}
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.analyse;
+
+import java.util.Arrays;
+
+/**
+ * 循环队列
+ * Created by panzhao on 2016/12/23.
+ */
+public class CircleQueue<T> {
+
+    /**
+     * (循环队列)数组的容量
+     */
+    public int capacity;
+
+    /**
+     * 数组：保存循环队列的元素
+     */
+    public Object[] elementData;
+
+    /**
+     * 队头(先进先出)
+     */
+    public int head = 0;
+
+    /**
+     * 队尾
+     */
+    public int tail = 0;
+
+    /**
+     * 以指定长度的数组来创建循环队列
+     *
+     * @param initSize
+     */
+    public CircleQueue(final int initSize) {
+        capacity = initSize;
+        elementData = new Object[capacity];
+    }
+
+    /**
+     * 获取循环队列的大小(包含元素的个数)
+     */
+    public int size() {
+        if (isEmpty()) {
+            return 0;
+        } else if (isFull()) {
+            return capacity;
+        } else {
+            return tail + 1;
+        }
+    }
+
+    /**
+     * 插入队尾一个元素
+     */
+    public void add(final T element) {
+        if (isEmpty()) {
+            elementData[0] = element;
+        } else if (isFull()) {
+            elementData[head] = element;
+            head++;
+            tail++;
+            head = head == capacity ? 0 : head;
+            tail = tail == capacity ? 0 : tail;
+        } else {
+            elementData[tail + 1] = element;
+            tail++;
+        }
+    }
+
+    public boolean isEmpty() {
+        return tail == head && tail == 0 && elementData[tail] == null;
+    }
+
+    public boolean isFull() {
+        return head != 0 && head - tail == 1 || head == 0 && tail == capacity - 1;
+    }
+
+    public void clear() {
+        Arrays.fill(elementData, null);
+        head = 0;
+        tail = 0;
+    }
+
+    /**
+     * @return 取 循环队列里的值（先进的index=0）
+     */
+    public Object[] getQueue() {
+        final Object[] elementDataSort = new Object[capacity];
+        final Object[] elementDataCopy = elementData.clone();
+        if (isEmpty()) {
+        } else if (isFull()) {
+            int indexMax = capacity;
+            int indexSort = 0;
+            for (int i = head; i < indexMax;) {
+                elementDataSort[indexSort] = elementDataCopy[i];
+                indexSort++;
+                i++;
+                if (i == capacity) {
+                    i = 0;
+                    indexMax = head;
+                }
+            }
+        } else {
+            for (int i = 0; i < tail; i++) {
+                elementDataSort[i] = elementDataCopy[i];
+            }
+        }
+        return elementDataSort;
+    }
+
+    public T getTail(){
+        return elementData[tail] == null?null:(T)elementData[tail];
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.analyse;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.google.common.collect.ArrayListMultimap;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Polygon;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Component;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+@Component
+public class GeoCacheData {
+
+    static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
+
+    //每辆车缓存最后200条gps
+    private static final int CACHE_SIZE = 200;
+    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
+
+    //线路路段走向
+    private static ArrayListMultimap<String, LineString> sectionCacheMap;
+
+    //线路站点路由
+    private static ArrayListMultimap<String, StationRoute> stationCacheMap;
+
+    //停车场
+    public static Map<String, Polygon> tccMap;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    public static CircleQueue<GpsEntity> getGps(String nbbm) {
+        return gpsCacheMap.get(nbbm);
+    }
+
+    public static void putGps(GpsEntity gps) {
+        CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getNbbm());
+        if (queue == null) {
+            //第一个点从站内开始
+            if(!gps.isInstation())
+                return;
+
+            queue = new CircleQueue<>(CACHE_SIZE);
+            gpsCacheMap.put(gps.getNbbm(), queue);
+        }
+        queue.add(gps);
+    }
+
+    public static List<StationRoute> getStationRoute(String lineCode, int directions) {
+        return stationCacheMap.get(lineCode + "_" + directions);
+    }
+
+    public static StationRoute getStation(String lineCode, int directions, String code) {
+        List<StationRoute> list = getStationRoute(lineCode, directions);
+
+        for (StationRoute sr : list) {
+            if (sr.getCode().equals(code)) {
+                return sr;
+            }
+        }
+        return null;
+    }
+
+    public static Polygon getTccPolygon(String code){
+        return tccMap.get(code);
+    }
+
+    public void loadData() {
+        final GeometryFactory geometryFactory = new GeometryFactory();
+        //加载站点路由
+        String sql = "select r.LINE_CODE,r.DIRECTIONS,r.STATION_CODE,r.STATION_MARK,s.SHAPES_TYPE,s.G_LONX,s.G_LATY,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID,s.RADIUS, r.STATION_ROUTE_CODE from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id where r.destroy=0 order by r.station_route_code";
+        List<StationRoute> routeList = jdbcTemplate.query(sql, new RowMapper<StationRoute>() {
+            @Override
+            public StationRoute mapRow(ResultSet rs, int rowNum) throws SQLException {
+                StationRoute sRoute = new StationRoute();
+                sRoute.setCode(rs.getString("STATION_CODE"));
+                sRoute.setLineCode(rs.getString("LINE_CODE"));
+                sRoute.setDirections(rs.getInt("DIRECTIONS"));
+                sRoute.setPoint(geometryFactory.createPoint(new Coordinate(rs.getFloat("G_LATY"), rs.getFloat("G_LONX"))));
+                sRoute.setRadius(rs.getFloat("RADIUS"));
+                sRoute.setRouteSort(rs.getInt("STATION_ROUTE_CODE"));
+                sRoute.setMark(rs.getString("STATION_MARK"));
+
+                String shapesType = rs.getString("SHAPES_TYPE");
+                //多边形电子围栏
+                if (StringUtils.isNotEmpty(shapesType) && shapesType.equals("d")) {
+                    geometryFactory.createPolygon(parsePolygon(rs.getString("G_POLYGON_GRID")));
+                }
+                return sRoute;
+            }
+        });
+        //按线路和走向分组
+        if (routeList.size() > 0) {
+            ArrayListMultimap<String, StationRoute> tempMap = ArrayListMultimap.create();
+            for (StationRoute sr : routeList) {
+                tempMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
+            }
+
+            StationRouteComp srCom = new StationRouteComp();
+            //连接路由
+            Set<String> set = tempMap.keySet();
+            for (String key : set) {
+                Collections.sort(tempMap.get(key), srCom);
+                connectStationRoute(tempMap.get(key));
+            }
+
+            stationCacheMap = tempMap;
+        }
+
+        //加载停车场数据
+        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";
+        List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
+        Map<String, Polygon> tccTempMap = new HashMap<>();
+
+        Polygon polygon;
+        for (Map<String, Object> tMap : tccList) {
+
+            try {
+                polygon = geometryFactory.createPolygon(parsePolygon(tMap.get("G_PARK_POINT").toString()));
+                tccTempMap.put(tMap.get("PARK_CODE").toString()
+                        , polygon);
+            } catch (Exception e) {
+                logger.error("停车场：" + tMap.get("PARK_CODE") , e);
+            }
+        }
+
+        if(tccTempMap.size() > 0)
+            tccMap = tccTempMap;
+    }
+
+    private void connectStationRoute(List<StationRoute> list) {
+        int size = list.size();
+        StationRoute sr = null;
+        for (int i = 0; i < size; i++) {
+            sr = list.get(i);
+            //上一个
+            if (i > 0)
+                sr.setPrve(list.get(i - 1));
+            //下一个
+            if (i < size - 1)
+                sr.setNext(list.get(i + 1));
+        }
+    }
+
+    public Coordinate[] parsePolygon(String polygonStr) {
+        String[] coords = polygonStr.substring(9, polygonStr.length() - 2).split(","), temps;
+
+        Coordinate[] cds = new Coordinate[coords.length];
+        int len = coords.length;
+        for (int i = 0; i < len; i++) {
+            temps = coords[i].split(" ");
+            cds[i] = new Coordinate(Float.parseFloat(temps[1]), Float.parseFloat(temps[0]));
+        }
+        return cds;
+    }
+
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.analyse;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.analyse.components.GpsArrival;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * 分析gps状态信息
+ * Created by panzhao on 2016/12/23.
+ */
+public class GpsAnalyse {
+
+    static Logger logger = LoggerFactory.getLogger(GpsAnalyse.class);
+
+    //线程池
+    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
+
+    public static void start(GpsEntity gps) {
+        threadPool.execute(new ArrivalMatchThread(gps));
+    }
+
+    public static class ArrivalMatchThread implements Runnable {
+
+        private GpsEntity gps;
+
+        public ArrivalMatchThread(GpsEntity gps) {
+            this.gps = gps;
+        }
+
+        @Override
+        public void run() {
+            GpsArrival.arrival(gps);
+        }
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.analyse;
+
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+public class StationRoute {
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 上下行
+     */
+    private int directions;
+
+    /**
+     * 站点编码
+     */
+    private String code;
+
+    /**
+     * 路由顺序
+     */
+    private int routeSort;
+
+    /**
+     * 站点位置
+     */
+    private Point point;
+
+    /**
+     * 圆形半径
+     */
+    private Float radius;
+
+    /**
+     * 多边形电子围栏
+     */
+    private Polygon polygon;
+
+    /**
+     * 站点标记
+     */
+    private String mark;
+
+    /**
+     * 下一站
+     */
+    private StationRoute next;
+
+    /**
+     * 上一站
+     */
+    private StationRoute prve;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public int getRouteSort() {
+        return routeSort;
+    }
+
+    public void setRouteSort(int routeSort) {
+        this.routeSort = routeSort;
+    }
+
+    public Point getPoint() {
+        return point;
+    }
+
+    public void setPoint(Point point) {
+        this.point = point;
+    }
+
+    public Float getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Float radius) {
+        this.radius = radius;
+    }
+
+    public Polygon getPolygon() {
+        return polygon;
+    }
+
+    public void setPolygon(Polygon polygon) {
+        this.polygon = polygon;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getDirections() {
+        return directions;
+    }
+
+    public void setDirections(int directions) {
+        this.directions = directions;
+    }
+
+    public StationRoute getNext() {
+        return next;
+    }
+
+    public void setNext(StationRoute next) {
+        this.next = next;
+    }
+
+    public StationRoute getPrve() {
+        return prve;
+    }
+
+    public void setPrve(StationRoute prve) {
+        this.prve = prve;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public void setMark(String mark) {
+        this.mark = mark;
+    }
+}
+
+package com.bsth.data.gpsdata.analyse;
+
+import java.util.Comparator;
+
+/**
+ * Created by panzhao on 2016/12/24.
+ */
+public class StationRouteComp implements Comparator<StationRoute>{
+    @Override
+    public int compare(StationRoute s1, StationRoute s2) {
+        return s1.getRouteSort() - s2.getRouteSort();
+    }
+}
+package com.bsth.data.gpsdata.analyse.components;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.analyse.CircleQueue;
+import com.bsth.data.gpsdata.analyse.GeoCacheData;
+import com.bsth.data.gpsdata.analyse.StationRoute;
+import com.bsth.data.gpsdata.analyse.util.GeoUtils;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * gps 到离站判断
+ * Created by panzhao on 2016/12/24.
+ */
+@Component
+public class GpsArrival implements ApplicationContextAware {
+
+    static Logger logger = LoggerFactory.getLogger(GpsArrival.class);
+
+    static DayOfSchedule dayOfSchedule;
+
+    static LineConfigData lineConfigData;
+
+    public static void arrival(GpsEntity gps) {
+
+        if (gps.getLat() == 0 || gps.getLon() == 0) {
+            //logger.error("无效的gps");
+            return;
+        }
+
+        Object task = DayOfSchedule.executeCurr(gps.getNbbm());
+        if (task == null)
+            return;
+        if (task.getClass().isAssignableFrom(ScheduleRealInfo.class)) {
+            ScheduleRealInfo sch = (ScheduleRealInfo) task;
+            //和班次同步走向
+            gps.setUpDown(Integer.parseInt(sch.getXlDir()));
+
+            //出场
+            if (sch.getBcType().equals("out")) {
+                outCarpark(gps, sch);
+            }
+            else if (sch.getBcType().equals("normal"))
+                normalInOut(gps, sch);
+            else if(sch.getBcType().equals("in")){
+                inCarpark(gps, sch);
+            }
+        }
+
+        GeoCacheData.putGps(gps);
+    }
+
+    /**
+     * 正常班次
+     *
+     * @param gps
+     * @param sch
+     */
+    private static void normalInOut(GpsEntity gps, ScheduleRealInfo sch) {
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        GpsEntity prev = null;
+        if (queue != null)
+            prev = queue.getTail();
+
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), gps.getUpDown());
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+
+        if (station != null) {
+            //站内
+            gps.setStopNo(station.getCode());
+            gps.setInstation(true);
+            stationInside(gps, prev, sch);
+        } else {
+            //站外
+            stationOutside(gps, prev, sch);
+        }
+    }
+
+    /**
+     * GPS在站点内
+     *
+     * @param gps
+     * @param prev
+     * @param sch
+     */
+    private static void stationInside(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch) {
+        if(prev == null)
+            return;
+
+        if (gps.getStopNo().equals(sch.getZdzCode()) && sch.getZdsjActual() == null) {
+            //到终点站
+            arriveEnd(sch, gps);
+            return;
+        }
+
+        //上一个点在站外
+        if(!prev.isInstation())
+            return;
+        //超过 （待发时间 + 90%的单程运送时间），还在起点站。默认烂一圈
+        if (prev.getStopNo().equals(gps.getStopNo())){
+            if(gps.getStopNo().equals(sch.getQdzCode())
+                    && gps.getTimestamp() > sch.getDfsjT() + (sch.getBcsj() * 60 * 1000 * 0.9)){
+
+                ScheduleRealInfo next = dayOfSchedule.next(dayOfSchedule.next(sch));
+                dayOfSchedule.addExecPlan(next);
+            }
+            return;
+        }
+
+        //发车
+        if (prev.getStopNo().equals(sch.getQdzCode())) {
+            busWillDepart(sch, gps);
+            return;
+        }
+
+        //中途站
+        StationRoute prevStation = GeoCacheData.getStation(prev.getLineId(), prev.getUpDown(), prev.getStopNo());
+        StationRoute currStation = GeoCacheData.getStation(gps.getLineId(), gps.getUpDown(), gps.getStopNo());
+        if (currStation.getRouteSort() < prevStation.getRouteSort()) {
+            //开始下一个班次
+            finishPlan(sch);
+
+            logger.info("路由反向。。。。。。:" + gps.getTimestamp());
+            //为班次补上实际时间
+
+        }
+    }
+
+    /**
+     * GPS在站点外
+     *
+     * @param gps
+     * @param prev
+     * @param sch
+     */
+    private static void stationOutside(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch) {
+        if(prev == null)
+            return;
+
+        gps.setStopNo(prev.getStopNo());
+        if (prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
+            //发车
+            busWillDepart(sch, gps);
+            return;
+        }
+    }
+
+    /**
+     * 公交车起点发出
+     */
+    final static long DRIFT_VAL_TIME = 1000 * 60 * 10;
+    //班次最大差值1小时
+    final static long MAX_DIFF = 1000 * 60 * 60;
+    private static void busWillDepart(ScheduleRealInfo sch, GpsEntity gps) {
+        //实发时间不覆盖
+        if (sch.getFcsjActual() == null && Math.abs(gps.getTimestamp() - sch.getDfsjT()) < MAX_DIFF) {
+
+            //提前10分钟以上发出，判断一下是否是漂移
+            if(sch.getDfsjT() - gps.getTimestamp() > DRIFT_VAL_TIME){
+                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+                if(schPrev != null && schPrev.getZdsjActual() != null){
+                    //计划停站时间
+                    long stopTimeJH = sch.getDfsjT() - schPrev.getZdsjT();
+                    //实际停站时间
+                    long actualStopTime = gps.getTimestamp() - schPrev.getZdsjActualTime();
+                    /*
+                        没停够计划百分之60的，算漂移
+                        （这里出现的误判，由程序在车辆到中途站的时候进行补偿）
+                     */
+                    if(stopTimeJH * 0.6 < actualStopTime){
+                        logger.info("漂移.... 车辆：" + gps.getNbbm() + " ts: " + gps.getTimestamp());
+                        return;
+                    }
+                }
+            }
+
+            LineConfig config = lineConfigData.get(sch.getXlBm());
+            if(config != null && config.getOutConfig() == 2){
+                //出站既出场
+                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+                if(schPrev.getBcType().equals("out")){
+                    schPrev.setFcsjActualAll(schPrev.getDfsjT());
+                    schPrev.setZdsjActualAll(schPrev.getZdsjT());
+                }
+            }
+
+            sch.setFcsjActualAll(gps.getTimestamp());
+            logger.info("（站外）班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
+        }
+    }
+
+    /**
+     * 公交车到达终点
+     *
+     * @param sch
+     * @param gps
+     */
+    private static void arriveEnd(ScheduleRealInfo sch, GpsEntity gps) {
+        sch.setZdsjActualAll(gps.getTimestamp());
+        ScheduleRealInfo next = finishPlan(sch);
+        logger.info("班次：" + sch.getDfsj() + "到达终点， 时间：" + sch.getZdsjActual());
+
+        if (next == null)
+            return;
+
+        //将gps转换为下一个班次走向的站内信号
+        int updown = Integer.parseInt(next.getXlDir());
+        List<StationRoute> srs = GeoCacheData.getStationRoute(next.getXlBm(), updown);
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+        if (station != null) {
+            gps.setUpDown(updown);
+            gps.setStopNo(station.getCode());
+        }
+    }
+
+    /**
+     * 出场班次
+     *
+     * @param gps
+     * @param sch
+     */
+    private static void outCarpark(GpsEntity gps, ScheduleRealInfo sch) {
+        String carpark = GeoUtils.gpsInCarpark(gps);
+        if (carpark != null) {
+            gps.setInstation(true);
+            gps.setStopNo(carpark);
+            return; // 还在场内
+        }
+
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        if (queue == null)
+            return;
+        //上一个gps
+        GpsEntity prev = queue.getTail();
+
+        if (carpark == null && prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
+            gps.setStopNo(prev.getStopNo());
+            //停车场发出
+            busWillDepart(sch, gps);
+            return;
+        }
+
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), gps.getUpDown());
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+
+        if (station != null && station.getCode().equals(sch.getZdzCode())) {
+            gps.setStopNo(station.getCode());
+            //到达终点
+            arriveEnd(sch, gps);
+        }
+    }
+
+
+    /**
+     * 进场班次
+     * @param gps
+     * @param sch
+     */
+    private static void inCarpark(GpsEntity gps, ScheduleRealInfo sch) {
+        String carpark = GeoUtils.gpsInCarpark(gps);
+        if (carpark != null && carpark.equals(sch.getZdzCode())) {
+            //进场班次取第一个实际进场时间
+            if(sch.getZdsjActual() != null)
+                return;
+
+            //进场
+            arriveEnd(sch, gps);
+            return;
+        }
+
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        if (queue == null)
+            return;
+        //上一个gps
+        GpsEntity prev = queue.getTail();
+
+        if (carpark == null && prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
+            gps.setStopNo(prev.getStopNo());
+            //进场班次发出
+            busWillDepart(sch, gps);
+            return;
+        }
+    }
+
+    /**
+     * 完成班次 -返回下一个班次
+     *
+     * @param sch
+     */
+    private static ScheduleRealInfo finishPlan(ScheduleRealInfo sch) {
+        ScheduleRealInfo next = dayOfSchedule.next(sch);
+        if (next != null) {
+            next.setQdzArrDatesj(sch.getZdsjActual());
+            dayOfSchedule.addExecPlan(next);
+        }
+        return next;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        dayOfSchedule = applicationContext.getBean(DayOfSchedule.class);
+        lineConfigData = applicationContext.getBean(LineConfigData.class);
+    }
+}
+package com.bsth.data.gpsdata.analyse.components;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * GPS状态纠正
+ * Created by panzhao on 2016/12/23.
+ */
+@Component
+public class GpsStateCorrective implements ApplicationContextAware {
+
+    static Logger logger = LoggerFactory.getLogger(GpsStateCorrective.class);
+
+    static DayOfSchedule dayOfSchedule;
+
+    private static GeometryFactory geometryFactory = new GeometryFactory();
+
+    public static void correct(GpsEntity gps, ScheduleRealInfo sch){
+/*        int upDown = Integer.parseInt(sch.getXlDir());
+        gps.setUpDown(upDown);
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), upDown);
+
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        //之前的点位
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        GpsEntity prev = null;
+        if(queue != null)
+            prev = queue.getTail();
+
+        //线路上，站点间
+        StationRoute station = GeoUtils.pointInStation(point, srs);
+        //在站内
+        if(station != null){
+            gps.setStopNo(station.getCode());
+            gps.setInstation(true);
+            gps.setStation(station);
+
+            if(prev != null && prev.getUpDown() == upDown){
+                StationRoute prevStation = GeoCacheData.getStation(prev.getLineId(), upDown, prev.getStopNo());
+
+                //倒着开？？
+                if(prevStation.getRouteSort() > station.getRouteSort()){
+                    reversalHandle(gps, prev, sch);
+                }
+            }
+        }
+        else{
+            if(prev != null)
+                gps.setStopNo(prev.getStopNo());
+        }
+
+        //是否在停车场内
+        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
+        Set<String> codes = carparkMap.keySet();
+        Polygon p;
+        for(String code : codes){
+            p = carparkMap.get(code);
+            //场内
+            if(p.contains(point)){
+                gps.setCarparkNo(code);
+                if(sch.getBcType().equals("out")){
+                    gps.setInstation(true);
+                    gps.setStopNo(code);
+                }
+            }
+        }*/
+    }
+
+    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("HH:mm");
+
+    private static void reversalHandle(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch){
+        /*if(sch.getBcType().equals("out") && gps.getTimestamp() < sch.getZdsjT())
+            return;
+
+        //先假设没到终点，直接开始了下一个班次
+        ScheduleRealInfo next = dayOfSchedule.next(sch);
+        String log = "倒着开？？？ nbbm: " + gps.getNbbm() + " 当前：" + gps.getStopNo() + " 上一站：" + prev.getStopNo() + " 当前班次：" + sch.getDfsj();
+        if(next != null){
+            dayOfSchedule.addExecPlan(next);
+
+            log += (" 下一个班次：" + next.getDfsj());
+        }
+
+        log += (" GPS时间：" + fmt.print(gps.getTimestamp()));
+
+        logger.info(log);*/
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        dayOfSchedule = applicationContext.getBean(DayOfSchedule.class);
+    }
+}
+package com.bsth.data.gpsdata.analyse.util;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.analyse.GeoCacheData;
+import com.bsth.data.gpsdata.analyse.StationRoute;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+public class GeoUtils {
+
+    private final static double EARTHRADIUS = 6378137;
+
+    private static GeometryFactory geometryFactory = new GeometryFactory();
+    /**
+     * gps是否在路由上的某个站内
+     *
+     * @param gps
+     * @param srs
+     * @return
+     */
+    public static StationRoute gpsInStation(GpsEntity gps, List<StationRoute> srs) {
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+        double min = -1, distance, distance2;
+        StationRoute stationRoute = null;
+
+        for (StationRoute sr : srs) {
+            if (sr.getPolygon() == null) {
+                //圆形
+                distance = getDistance(sr.getPoint(), point);//sr.getPoint().distance(point);
+
+                if (distance > sr.getRadius())
+                    continue;
+
+                if (min > distance || min == -1) {
+                    min = distance;
+                    stationRoute = sr;
+                }
+            } else {
+                //多边形
+                if (sr.getPolygon().contains(point)) {
+                    stationRoute = sr;
+                    break;
+                }
+            }
+        }
+        return stationRoute;
+    }
+
+    public static double getDistance(Point p1, Point p2) {
+        double lng1 = getLoop(p1.getY(), -180, 180), lat1 = getRange(
+                p1.getX(), -74, 74);
+        double lng2 = getLoop(p2.getY(), -180, 180), lat2 = getRange(
+                p2.getX(), -74, 74);
+
+        double x1, x2, y1, y2;
+        x1 = degreeToRad(lng1);
+        y1 = degreeToRad(lat1);
+        x2 = degreeToRad(lng2);
+        y2 = degreeToRad(lat2);
+        return EARTHRADIUS
+                * Math.acos((Math.sin(y1) * Math.sin(y2) + Math.cos(y1)
+                * Math.cos(y2) * Math.cos(x2 - x1)));
+    }
+
+    private static double getLoop(double v, double a, double b) {
+        while (v > b) {
+            v -= b - a;
+        }
+        while (v < a) {
+            v += b - a;
+        }
+        return v;
+    }
+
+    private static double getRange(double v, double a, double b) {
+        v = Math.min(Math.max(v, a), b);
+        return v;
+    }
+
+    private static double degreeToRad(double degree) {
+        return Math.PI * degree / 180;
+    }
+
+
+    /**
+     * gps 是否在某个停车场内
+     * @param gps
+     * @return
+     */
+    public static String gpsInCarpark(GpsEntity gps){
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
+        Set<String> codes = carparkMap.keySet();
+        Polygon polygon;
+        for(String code : codes){
+            polygon = carparkMap.get(code);
+            if(point.within(polygon)){
+                return code;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 是否是有效的连续点
+     * @param prevGps
+     * @param gps
+     * @return
+     */
+    public static boolean overdue(GpsEntity prevGps, GpsEntity gps) {
+        return gps.getTimestamp() - prevGps.getTimestamp() < 120000;
+    }
+}
+package com.bsth.data.gpsdata.recovery;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.analyse.components.GpsArrival;
+import com.bsth.util.db.DBUtils_MS;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * 数据恢复
+ * Created by panzhao on 2016/12/24.
+ */
+public class GpsDataRecovery {
+
+    static Logger logger = LoggerFactory.getLogger(GpsDataRecovery.class);
+
+    public static boolean run;
+
+    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
+
+    private static CountDownLatch count;
+
+    public static void recovery() {
+        List<GpsEntity> list = loadData();
+
+        //按车辆分组数据
+        ArrayListMultimap<String, GpsEntity> listMap = ArrayListMultimap.create();
+        for (GpsEntity gps : list) {
+            if(gps.getNbbm() != null)
+                listMap.put(gps.getNbbm(), gps);
+        }
+
+        count = new CountDownLatch(listMap.keySet().size());
+
+        Set<String> keys = listMap.keySet();
+        for (String nbbm : keys) {
+            threadPool.execute(new RecoveryDataThread(listMap.get(nbbm), count));
+            /*if(nbbm.equals("W9A-250"))
+                new RecoveryDataThread(listMap.get(nbbm), count).run();*/
+        }
+        try {
+            //等待子线程结束
+            count.await();
+            logger.info("GPS 数据恢复完成....");
+        } catch (InterruptedException e) {
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 加载当天的gps数据
+     *
+     * @return
+     */
+    public static List<GpsEntity> loadData() {
+        Calendar calendar = Calendar.getInstance();
+        int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
+
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from BSTH_C_GPS_INFO where days_year=" + dayOfYear;
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
+
+        List<GpsEntity> list =
+                jdbcTemplate.query(sql, new RowMapper<GpsEntity>() {
+                    @Override
+                    public GpsEntity mapRow(ResultSet rs, int rowNum) throws SQLException {
+                        GpsEntity gps = new GpsEntity();
+
+                        gps.setDeviceId(rs.getString("DEVICE_ID"));
+                        gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
+                        gps.setSpeed(rs.getFloat("SPEED_GPS"));
+                        gps.setLat(rs.getFloat("LAT"));
+                        gps.setLon(rs.getFloat("LON"));
+                        gps.setLineId(rs.getString("LINE_ID"));
+                        gps.setTimestamp(rs.getLong("TS"));
+                        gps.setUpDown(getUpOrDown(rs.getLong("SERVICE_STATE")));
+                        return gps;
+                    }
+                });
+        return list;
+    }
+
+    /**
+     * 王通 2016/6/29 9:23:24 获取车辆线路上下行
+     *
+     * @return -1无效 0上行 1下行
+     */
+    public static int getUpOrDown(long serviceState) {
+        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+                || (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
+            return -1;
+        return (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
+    }
+
+    public static class RecoveryDataThread implements Runnable {
+
+        List<GpsEntity> list;
+        CountDownLatch count;
+
+        public RecoveryDataThread(List<GpsEntity> list, CountDownLatch count) {
+            this.list = list;
+            this.count = count;
+        }
+
+        @Override
+        public void run() {
+            try {
+                //排序
+                Collections.sort(list, new GpsComp());
+                //依次跑完gps
+                //int i = 0;
+                for(GpsEntity gps : list){
+                   /* i++;
+                    if(i == 383){
+                        System.out.println("aaa");
+                    }*/
+                    GpsArrival.arrival(gps);
+                }
+            } catch (Exception e) {
+                logger.error("", e);
+            } finally {
+                count.countDown();
+            }
+        }
+    }
+
+    public static class GpsComp implements Comparator<GpsEntity>{
+
+        @Override
+        public int compare(GpsEntity g1, GpsEntity g2) {
+            return (int) (g1.getTimestamp() - g2.getTimestamp());
+        }
+    }
+}
@@ -3,9 +3,11 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.FirstScheduleCheckThread;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.thread.ScheduleLateThread;
 import com.bsth.data.schedule.thread.SchedulePstThread;
 import com.bsth.data.schedule.thread.ScheduleRefreshThread;
@@ -111,19 +113,30 @@ public class DayOfSchedule implements CommandLineRunner {
 	@Autowired
 	SubmitToTrafficManage submitToTrafficManage;
+	@Autowired
+	LineConfigData lineConfigs;
+
+	@Autowired
+	BasicData.BasicDataLoader dataLoader;
+
 	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
 				,fmtHHmm = DateTimeFormat.forPattern("HH:mm");
 	@Override
 	public void run(String... arg0) throws Exception {
+		//加载基础数据
+		dataLoader.loadAllData();
+		//从数据库恢复排班
+		//dataRecovery();
+
 		//翻班线程
 		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
 		//入库
-//		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
 		//首班出场指令补发器
 //		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
 		//班次误点扫描
-//		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
 		//每天凌晨2点20提交数据到运管处
 		long diff = (DateUtils.getTimestamp() + 1000*60*140) - System.currentTimeMillis();
@@ -134,6 +147,23 @@ public class DayOfSchedule implements CommandLineRunner {
 		//Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
 	}
+	//数据恢复
+	private void dataRecovery() {
+		GpsDataRecovery.run = true;
+
+		Collection<LineConfig> confs = lineConfigs.getAll();
+		String lineCode, currSchDate;
+		for(LineConfig conf : confs){
+			lineCode = conf.getLine().getLineCode();
+			currSchDate = calcSchDate(lineCode);
+			//加载班次数据
+			reloadSch(lineCode, currSchDate, false);
+		}
+
+		//恢复gps数据
+		GpsDataRecovery.recovery();
+	}
+
 	public Map<String, String> getCurrSchDate() {
 		return currSchDateMap;
 	}
@@ -189,17 +219,20 @@ public class DayOfSchedule implements CommandLineRunner {
 			putAll(list);
 			Set<String> cars = searchAllCars(list);
-			//计算“起点站应到”时间
-			for(String nbbm : cars)
+			for(String nbbm : cars){
+				//计算“起点站应到”时间
 				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
-			
+				//车辆 ——> 要执行的班次对照
+				carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(nbbmScheduleMap.get(nbbm)));
+			}
+
 			//是否是出站即出场
 			LineConfig conf = lineConfigData.get(lineCode);
 			if(conf.getOutConfig() == 2){
 				for(String nbbm : cars)
 					schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
 			}
-			
+
 			// 页面 翻班通知
 			sendUtils.shiftSchedule(lineCode);
 		} catch (Exception e) {
@@ -451,6 +484,10 @@ public class DayOfSchedule implements CommandLineRunner {
 	public ScheduleRealInfo next(ScheduleRealInfo sch) {
 		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		int outConfig = -1;
+		LineConfig config = lineConfigData.get(sch.getXlBm());
+		if(config != null)
+			outConfig = config.getOutConfig();
 		boolean flag = false;
 		ScheduleRealInfo next = null;
@@ -462,6 +499,10 @@ public class DayOfSchedule implements CommandLineRunner {
 			//忽略烂班
 			if(temp.isDestroy())
 				continue;
+
+			//出站既出场，忽略出场班次
+			if(outConfig == 2 && temp.getBcType().equals("out"))
+				continue;
 			if(flag){
 				next = temp;
@@ -471,6 +512,30 @@ public class DayOfSchedule implements CommandLineRunner {
 		return next;
 	}
+	/**
+	 * 上一个班次
+	 * @param sch
+	 * @return
+	 */
+	public ScheduleRealInfo prev(ScheduleRealInfo sch){
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+
+		//boolean flag = false;
+		ScheduleRealInfo prev = null;
+		int size = list.size();
+
+		for(int i = 0; i < size; i ++){
+			if(list.get(i).isDestroy())
+				continue;
+
+			if(list.get(i).getId().equals(sch.getId())){
+				return prev;
+			}
+			prev = list.get(i);
+		}
+		return prev;
+	}
+
 	public void put(ScheduleRealInfo sch) {
 		schAttrCalculator
 			.calcRealDate(sch)
@@ -666,9 +731,18 @@ public class DayOfSchedule implements CommandLineRunner {
 		carExecutePlanMap.remove(clzbh);
 	}
-	public Map<String, ScheduleRealInfo> execPlamMap(){
+	public Map<String, ScheduleRealInfo> execPlanMap(){
 		return carExecutePlanMap;
 	}
+
+	/**
+	 * 车辆当前执行的班次
+	 * @param nbbm
+	 * @return
+	 */
+	public static ScheduleRealInfo executeCurr(String nbbm){
+		return carExecutePlanMap.get(nbbm);
+	}
 	/**
 	 * @Title: changeCar 
@@ -215,4 +215,30 @@ public class SchAttrCalculator {
 		if(sch.getZdsjActualTime() == null && sch.getZdsjActual() != null)
 			sch.setZdsjActualAll(sch.getZdsjActual());
 	}
+
+	/**
+	 * 计算当前要执行的班次
+	 * @param list
+	 * @return
+	 */
+	public ScheduleRealInfo calcCurrentExecSch(List<ScheduleRealInfo> list){
+		String lineCode = list.get(0).getXlBm();
+		LineConfig conf = lineConfigData.get(lineCode);
+		int outConfig = -1;
+		if(conf != null)
+			outConfig = conf.getOutConfig();
+
+		for(ScheduleRealInfo sch : list){
+			//如果是出站既出场，忽略出场班次
+			if(outConfig == 2 && sch.getBcType().equals("out"))
+				continue;
+
+			//已执行
+			if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+				continue;
+
+			return sch;
+		}
+		return null;
+	}
 }
 package com.bsth.data.schedule.thread;
-import java.util.Collection;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.arrival.ArrivalData_GPS;
@@ -15,6 +7,13 @@ import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.LineConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.Set;
 /**
  * 
@@ -57,6 +56,7 @@ public class ScheduleRefreshThread extends Thread{
 				currSchDate = dayOfSchedule.calcSchDate(lineCode);
 				if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
+
 					logger.info(lineCode + "开始翻班， " + currSchDate);
 					//清除进出站数据
 					arrivalData.clearRAMData(lineCode);
 package com.bsth.entity.mcy_forms;
-import java.util.Date;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+package com.bsth.entity.realcontrol;
+
+/**
+ * 班次类型
+ * Created by panzhao on 2016/12/23.
+ */
+public enum ScheduleType {
+
+    normal, //正常班次
+    out,    //出场
+    in,     //进场
+    region, //区间
+    venting,//直放
+    major   //放站
+}
@@ -24,6 +24,9 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
+	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
+	List<ScheduleRealInfo> queryUserInfo3(String line,String date);
+	
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
 	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
@@ -30,7 +30,7 @@ public interface FormsService {
 	public List<Singledata> singledata(Map<String, Object> map);
-	public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line,String data);
+	public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line,String data);
 	public List<Operationservice> operationservice(Map<String, Object> map);
@@ -26,6 +26,7 @@ import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
 import com.bsth.entity.mcy_forms.Executionrate;
+import com.bsth.service.forms.CommonService;
 import com.bsth.service.forms.FormsService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
@@ -38,20 +39,32 @@ public class FormsServiceImpl implements FormsService {
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
+	@Autowired
+	CommonService commonService;
+
 	// 行车路单日报表
 	@Override
 	public List<Waybillday> waybillday(Map<String, Object> map) {
+		
 		String sql ="select x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name "
 				+ " from bsth_c_s_sp_info_real x  INNER join "
 				+ " ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH,c.personnel_name from"
 				+ " bsth_c_ylb y LEFT JOIN bsth_c_personnel c  ON c.job_code=y.JSY   " 
-				+ " where to_days(y.RQ)=to_days('"+map.get("date").toString() + "')  and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) "
-				+ " z on x.cl_zbh=z.nbbm  where  to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"')  "
-				+ " and x.xl_bm='"+map.get("line").toString()+"'"
-				/*+ " and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'"
-				+ " and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"'"*/
-				+ " GROUP BY x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name";
-		//x.cl_zbh,j_gh 
+				+ " where 1=1  ";
+		if(map.get("date").toString()!=""){
+			sql+=" and to_days(y.RQ)=to_days('"+map.get("date").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) ";
+		}
+			sql+= " z on x.cl_zbh=z.nbbm  where  to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"') ";
+		if(map.get("gsdmWaybillday").toString()!=""){
+			sql+=" and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'";
+		}
+		if(map.get("fgsdmWaybillday").toString()!=""){
+			sql+=" and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"'";
+		}	
+			sql	+= " GROUP BY x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name ";
 		List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
 			@Override
 			public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -60,21 +73,16 @@ public class FormsServiceImpl implements FormsService {
 				wbd.setJzl(arg0.getString("JZL"));
 				wbd.setYh(arg0.getString("YH"));
 				wbd.setjName(arg0.getString("personnel_name"));
-				// wbd.setZlc(arg0.getInt("zlc"));
-				// System.out.println(arg0.getObject("yl"));
-				// wbd.setYl(arg0.getString("yl"));
-				// wbd.setNbbm(arg0.getString("nbbm"));
 				wbd.setRq(arg0.getString("schedule_date"));
 				wbd.setJgh(arg0.getString("j_gh"));
 				return wbd;
-
 			}
 		});
 		for(int i=0;i<list.size();i++){
 			Waybillday w=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC2(w.getJgh(), w.getCarPlate(),
+			maps = commonService.findKMBC2(w.getJgh(), w.getCarPlate(),
 					w.getRq());
 			w.setJzl1(maps.get("ksgl").toString());
 			w.setZlc(maps.get("realMileage").toString());
@@ -86,18 +94,25 @@ public class FormsServiceImpl implements FormsService {
 	// 线路客流量报表
 	@Override
 	public List<Linepasswengerflow> linepasswengerflow(Map<String, Object> map) {
-		String sql = " SELECT s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name"
+		String sql = " SELECT r.schedule_date,s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name"
 				+ " from bsth_c_stationroute s "
 				+ " LEFT JOIN bsth_c_line l on s.line_code=l.line_code "
 				+ " LEFT JOIN bsth_c_s_sp_info_real r on r.xl_bm=l.line_code" 
-				+ " where to_days(l.create_date)=to_days('"+map.get("date").toString() + "') " 
-				+ " and l.line_code=" + map.get("line").toString() 
-				+ " AND r.gs_bm is not null"
-				/*+ " and r.gs_bm='"+map.get("gsdmLine").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmLine").toString()+"'"*/
-				+ " GROUP BY s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
-
-		//s.station_name
+		        + " where 1=1  ";
+		if(map.get("date").toString()!=""){
+			sql+="and  to_days(r.schedule_date)=to_days('"+map.get("date").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and l.line_code=" + map.get("line").toString();
+		}
+			sql+= " AND r.gs_bm is not null";
+		if(map.get("gsdmLine").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmLine").toString()+"' ";
+		}
+		if(map.get("fgsdmLine").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmLine").toString()+"'";
+		}	
+			sql	+= " GROUP BY s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
 		List<Linepasswengerflow> list = jdbcTemplate.query(sql, new RowMapper<Linepasswengerflow>() {
 			@Override
@@ -109,8 +124,6 @@ public class FormsServiceImpl implements FormsService {
 			}
 		});
-		
-		
 		return list;
 	}
@@ -122,16 +135,26 @@ public class FormsServiceImpl implements FormsService {
 	public List<Shiftuehiclemanth> shiftuehiclemanth(Map<String, Object> map) {
 		String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
 		        + " from bsth_c_s_sp_info_real r "
-				+ " where  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') "
-				+ " and  to_days('" + map.get("endDate").toString() + "') " 
-				+ " and r.xl_bm='"+ map.get("line").toString() + "'" 
-				+ " AND r.gs_bm is not null"
-				+ " and r.bc_type not in('in','out')"
-			/*	+ " and r.gs_bm='"+map.get("gsdmManth").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmManth").toString()+"'"*/
-				+ " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name" 
-				+ " ORDER BY r.j_name";
-		//r.j_name 
+		    	+ " where 1=1  ";
+		if(map.get("startDate").toString()!=""){
+			sql+=" and  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
+		}
+		
+		if(map.get("endDate").toString()!=""){
+			sql+=" and  to_days('" + map.get("endDate").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and r.xl_bm='"+ map.get("line").toString() + "' ";
+		}
+			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
+		if(map.get("gsdmManth").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmManth").toString()+"' ";
+		}
+		if(map.get("fgsdmManth").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmManth").toString()+"' ";
+		}	
+			sql	+= " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type ";
+			
 		startDate = map.get("startDate").toString();
 		endDate = map.get("endDate").toString();
 		List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
@@ -150,7 +173,7 @@ public class FormsServiceImpl implements FormsService {
 			Shiftuehiclemanth s=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC1(s.getjName(),s.getZbh(), startDate,
+			maps = commonService.findKMBC1(s.getjName(),s.getZbh(), startDate,
 					endDate);
 			s.setJhlc(maps.get("jhlc").toString());
@@ -172,13 +195,22 @@ public class FormsServiceImpl implements FormsService {
 		String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,"
 				+ " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type   "
 				+ " FROM bsth_c_s_sp_info_real r " 
-				+ " where to_days(r.schedule_date)=to_days('"
-				+  map.get("date").toString() + "') and r.xl_bm=" + map.get("line").toString()
-				+ " and r.bc_type not in('in','out')"
-				/*+ " and r.gs_bm='"+map.get("gsdmShif").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'"*/
-				+ " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
-				+ " ORDER BY  r.lp_name asc";
+				+ " where 1=1  ";
+		if(map.get("date").toString()!=""){
+			sql+=" and to_days(r.schedule_date)=to_days('"+  map.get("date").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and r.xl_bm=" + map.get("line").toString();
+		}
+			sql+= " and r.bc_type not in('in','out')";
+		if(map.get("gsdmShif").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmShif").toString()+"'";
+		}
+		if(map.get("fgsdmShif").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'";
+		}	
+			sql	+= " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
+				+ "  ORDER BY  r.lp_name asc";
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
@@ -200,7 +232,7 @@ public class FormsServiceImpl implements FormsService {
 		for(int i=0;i<list.size();i++){
 			Shifday shi=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC2(shi.getJgh(), shi.getCarPlate(),
+			maps = commonService.findKMBC2(shi.getJgh(), shi.getCarPlate(),
 					shi.getRq());
 			shi.setJhlc(maps.get("jhlc").toString());// 计划里程
 			//shifday.setSjjhlc(map.get("remMileage").toString());//实际计划里程
@@ -261,7 +293,6 @@ public class FormsServiceImpl implements FormsService {
 			@Override
 			public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Changetochange chan = new Changetochange();
-
 				chan.setRq(rq);
 				chan.setGs(arg0.getString("gs"));
 				chan.setFgs(arg0.getString("fgs"));
@@ -302,18 +333,22 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
-		String sql = " SELECT r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
+		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
 		          + "  FROM bsth_c_s_sp_info_real r "
-		          + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
-		          + "  where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"
-		          + "  and y.XLBM= '" + map.get("line").toString() + "' GROUP BY y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH)  y on r.cl_zbh=y.nbbm "
+		          + "  left join bsth_c_ylb y"
+		          + " ON r.cl_zbh = y.nbbm   "
 				  + "  where r.schedule_date_str BETWEEN '" + map.get("startDate").toString() + "'"
 		          + "  and '"+ map.get("endDate").toString() + "'" 
 				  + "  and r.xl_bm='" + map.get("line").toString() + "'"
-				  + " AND r.gs_bm is not null"
-				/*  + " and r.gs_bm='"+map.get("gsdmSing").toString()+"'"
-				  + " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'"*/
-				  + "  GROUP BY r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
+				  + "  AND r.gs_bm is not null";
+				  
+			if(map.get("gsdmSing").toString()!=""){
+				sql+=" and r.gs_bm='"+map.get("gsdmSing").toString()+"'";
+			}
+			if(map.get("fgsdmSing").toString()!=""){
+				sql+=" and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'";
+			}
+				 sql += "  GROUP BY r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
 		startDate = map.get("startDate").toString();
 		endDate = map.get("endDate").toString();
@@ -324,7 +359,7 @@ public class FormsServiceImpl implements FormsService {
 				Singledata sin = new Singledata();
 				sin.setrQ(rq);
 				sin.setgS(arg0.getString("gs_name"));
-				sin.setxL(arg0.getString("xl_bm"));
+				sin.setxL(arg0.getString("xl_name"));
 				sin.setClzbh(arg0.getString("cl_zbh"));
 				sin.setJsy(arg0.getString("j_gh"));
 				sin.setjName(arg0.getString("j_name"));
@@ -339,7 +374,7 @@ public class FormsServiceImpl implements FormsService {
 			for(int i=0;i<list.size();i++){
 				Singledata si=list.get(i);
 				Map<String, Object> maps = new HashMap<>();
-				maps = scheduleRealInfoService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
+				maps = commonService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
 						endDate);
 				//sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString());
 				si.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString());
@@ -356,24 +391,30 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Operationservice> operationservice(Map<String, Object> map) {
-		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
+		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
 		        + "  FROM bsth_c_s_sp_info_real r "
 		       // + "LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM"
-		        + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
-		        + "  where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"
-		        + "  and y.XLBM= '" + map.get("line").toString() + "' GROUP BY y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH)  y on r.cl_zbh=y.nbbm "
-				+ "  where r.schedule_date_str BETWEEN '"+ map.get("startDate").toString() 
-		        + "'" + "  and '" + map.get("endDate").toString() + "'"
-				+ "  and r.xl_bm='" + map.get("line").toString() + "'" 
-				+ " and r.bc_type not in('in','out')"
-			   /* + " and r.gs_bm='"+map.get("gsdmOperat").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'"*/
-				+ "  AND r.gs_bm is not null"
-				+ "  GROUP BY r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name";
+		        + "  left join bsth_c_ylb y ON r.cl_zbh = y.nbbm "
+				+ "  where 1=1 ";
+		if(map.get("startDate").toString()!=""){
+			sql+=" and  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
+		}
-		//r.j_name
-		startDate = map.get("startDate").toString();
-		endDate = map.get("endDate").toString();
+		if(map.get("endDate").toString()!=""){
+			sql+=" and  to_days('" + map.get("endDate").toString() + "') ";
+		}
+			sql+="  and r.xl_bm='" + map.get("line").toString() + "'" ;
+			sql+="  and r.bc_type not in('in','out')";
+		if(map.get("gsdmOperat").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmOperat").toString()+"'";
+		}
+		if(map.get("fgsdmOperat").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'";
+		}
+			sql	+= "  AND r.gs_bm is not null";
+			sql	+= "  GROUP BY r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name";
+			startDate = map.get("startDate").toString();
+			endDate = map.get("endDate").toString();
 		List<Operationservice> list = jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
 			@Override
@@ -392,9 +433,9 @@ public class FormsServiceImpl implements FormsService {
 		for(int i=0;i<list.size();i++){
 			Operationservice o=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC1(o.getJname(), o.getClzbh(), startDate,
+			maps = commonService.findKMBC1(o.getJname(), o.getClzbh(), startDate,
 					endDate);
-			o.setXsgl(maps.get("yygl").toString() == null ? "" : maps.get("yygl").toString());
+			o.setXsgl(maps.get("jhlc").toString() == null ? "" : maps.get("jhlc").toString());
 			o.setEmptMileage(maps.get("ksgl").toString() == null ? "" : maps.get("ksgl").toString());
 			o.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());
 		}
@@ -404,7 +445,7 @@ public class FormsServiceImpl implements FormsService {
 	// 车辆加注
 	@Override
-	public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line, String date) {
+	public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line, String date) {
 		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type  " 
 		        + "  FROM bsth_c_s_sp_info_real r "
@@ -414,13 +455,14 @@ public class FormsServiceImpl implements FormsService {
 				+ "  where to_days(r.schedule_date_str)=to_days('" + date + "')" 
 		        + "  and r.xl_bm='" + line + "' "
 		        + " AND r.gs_bm is not null"
-		        + " and r.bc_type not in('in','out')"
-		        /* + " and r.gs_bm='"+gsdmVehic +"'"
-				+ " and r.fgs_bm='"+fgsdmVehic +"'"*/
-				+ "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
-
-		
-		//r.cl_zbh
+		        + " and r.bc_type not in('in','out')";
+		if(gsdmVehic.toString()!=""){
+			sql+=" and r.gs_bm='"+gsdmVehic+"'";
+		}
+		if(fgsdmVehic.toString()!=""){
+			sql+=" and r.fgs_bm='"+fgsdmVehic +"'";
+		}
+			sql	+= "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
 		List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() {
 			@Override
 			public Vehicleloading mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -429,8 +471,8 @@ public class FormsServiceImpl implements FormsService {
 				ve.setgS(arg0.getString("gs_name"));
 				ve.setxL(arg0.getString("xl_name"));
 				ve.setClzbh(arg0.getString("cl_zbh"));
-				ve.setHyl(arg0.getString("YH"));
 				ve.setJzl(arg0.getString("JZL"));
+				ve.setHyl(arg0.getString("YH"));
 				// ve.setLs(arg0.getString("").toString());//尿素
 				ve.setJgh(arg0.getString("j_gh").toString());
 				return ve;
@@ -440,9 +482,9 @@ public class FormsServiceImpl implements FormsService {
 		for(int i=0;i<list.size();i++){
 			Vehicleloading v=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC2(v.getJgh(), line,
-					date);
-			v.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
+			maps = commonService.findKMBC2(v.getJgh(), v.getClzbh(),
+					v.getrQ());
+			v.setJhlc(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
 			v.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次
 			v.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次
 		}
@@ -476,8 +518,8 @@ public class FormsServiceImpl implements FormsService {
 				+ " and '" + map.get("endDate").toString() + "'  and xl_bm='"+ map.get("line").toString() + "' "
 				+ " AND gs_bm is not null "
 				+ " AND bc_type NOT IN ('in', 'out')"
-				/*+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"*/
+				+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
+				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"
 				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
 				+ " SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car   "
 				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
@@ -510,7 +552,7 @@ public class FormsServiceImpl implements FormsService {
 				tu.setBcjh(arg0.getString("jbc").toString());
 				tu.setBcsj(arg0.getString("sbc").toString());
 				tu.setBbzxl(result2 + "%");// 班次执行率
-				// tu.setSm(arg0.getString("gs_name").toString());
+				tu.setSm(arg0.getString("gs_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
@@ -547,8 +589,8 @@ public class FormsServiceImpl implements FormsService {
 				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
-				/*+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"*/
+				+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
+				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"
 				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
 				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl  "
 				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
@@ -618,8 +660,8 @@ public class FormsServiceImpl implements FormsService {
 				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out') "
-				/*+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"*/
+				+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
+				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"
 				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
 				+ "SELECT  COUNT(*"
 				+ ") as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b."
@@ -655,18 +697,13 @@ public class FormsServiceImpl implements FormsService {
 				tu.setBcsj(arg0.getString("sbc").toString());
 				tu.setBbzxl(result2 + "%");// 班次执行率
-				// tu.setSm(arg0.getString("xl_name").toString());
+			    tu.setSm(arg0.getString("xl_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
-			}
-
-			
+			}			
 		});
-
-		
-		
 		return list;
 	}
 }
@@ -14,4 +14,6 @@ public interface GpsService {
 	Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction);
     Map<String,Object> removeRealGps(String device);
+
+    Map<String,Object> findRoadSpeed(String lineCode);
 }
 package com.bsth.service.gps;
-import java.lang.reflect.Field;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-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.Service;
-
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.arrival.ArrivalEntity;
@@ -31,6 +11,19 @@ import com.bsth.util.DateUtils;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.*;
 @Service
 public class GpsServiceImpl implements GpsService {
@@ -51,6 +44,9 @@ public class GpsServiceImpl implements GpsService {
     @Autowired
     GpsRealData gpsRealData;
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
     // 历史gps查询
     @Override
     public List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions) {
@@ -199,9 +195,9 @@ public class GpsServiceImpl implements GpsService {
         inv = inv.substring(0, inv.length() - 1);
         // 查询到离站数据
-        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, st, et, inv);
+        //Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, st, et, inv);
-        String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO from bsth_c_gps_info where days_year=? and device_id in ("
+        String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO,DIRECTION,LINE_ID,SPEED_GPS from bsth_c_gps_info where days_year=? and device_id in ("
                 + inv + ") and ts > ? and ts < ?";
         try {
             conn = DBUtils_MS.getConnection();
@@ -235,15 +231,19 @@ public class GpsServiceImpl implements GpsService {
                 map.put("ts", rs.getLong("TS"));
                 map.put("timestamp", rs.getLong("TS"));
                 map.put("stopNo", rs.getString("STOP_NO"));
+                map.put("direction", rs.getFloat("DIRECTION"));
+
+                map.put("lineId", rs.getString("LINE_ID"));
+                map.put("speed", rs.getFloat("SPEED_GPS"));
                 inOutStop = rs.getInt("INOUT_STOP");
                 map.put("inout_stop", inOutStop);
-                arrival = arrivalMap.get(rs.getString("DEVICE_ID") + "_" + rs.getLong("TS"));
-                if (arrival != null) {
-                    map.put("inout_stop_info", arrival);
-                    map.put("inout_stop", arrival.getInOut());
-                }
+                /*analyse = arrivalMap.get(rs.getString("DEVICE_ID") + "_" + rs.getLong("TS"));
+                if (analyse != null) {
+                    map.put("inout_stop_info", analyse);
+                    map.put("inout_stop", analyse.getInOut());
+                }*/
                 map.put("nbbm", BasicData.deviceId2NbbmMap.get(rs.getString("DEVICE_ID")));
                 map.put("state", 0);
                 // 上下行
@@ -388,6 +388,22 @@ public class GpsServiceImpl implements GpsService {
         return rs;
     }
+    @Override
+    public Map<String, Object> findRoadSpeed(String lineCode) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try {
+            String sql = "select ID, ST_AsText(GROAD_VECTOR) as GROAD_VECTOR,ROAD_CODE,ROAD_NAME,SPEED from bsth_c_road where road_code in(select section_code from bsth_c_sectionroute where line_code=? and destroy=0)";
+            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, lineCode);
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("roads", list);
+        } catch (DataAccessException e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
     private void sortGpsList(final Field f, List<GpsEntity> rs) {
         Collections.sort(rs, new Comparator<GpsEntity>() {
@@ -131,6 +131,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
 				t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 				t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
+				t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
 				t.setRq(dBefore);
 				repository.save(t);
 				result = "success";
@@ -216,6 +217,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
 				t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 				t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
+				t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
 				t.setRq(sdf.parse(rq));
 				repository.save(t);
 				newMap.put("status", ResponseCode.SUCCESS);
@@ -59,7 +59,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	 */
 	void adjustConductor(ScheduleRealInfo schedule, String conductor, String conductorName);
-	List<ScheduleRealInfo> queryUserInfo(String line,String date);
+	List<ScheduleRealInfo> queryUserInfo(String line,String date,String state);
 	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date);
@@ -459,8 +459,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	}
 	@Override
-	public List<ScheduleRealInfo> queryUserInfo(String line, String date) {
-		return scheduleRealInfoRepository.queryUserInfo2(line, date);
+	public List<ScheduleRealInfo> queryUserInfo(String line, String date,String state) {
+		if(state.equals("2")){
+			return scheduleRealInfoRepository.queryUserInfo2(line, date);
+		}else{
+			return scheduleRealInfoRepository.queryUserInfo3(line, date);
+		}
+		
 	}
 	/**
 	 * 
@@ -613,13 +618,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<Object[]> historyMessage(String line, String date, String code) {
-		
-		String sql="select t.car_code,d.sender,d.txt_content,d.timestamp from  ("
-				+ "  select equipment_code,car_code  from bsth_c_cars where id in("
-				+ " select cl from bsth_c_s_ccinfo where  xl in ( "
-				+ " select id from bsth_c_line where line_code=?1 ))) t"
-				+ " left join bsth_v_directive_60 d on t.equipment_code=d.device_id "
-				+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.car_code like '%?4%'";
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		long d= 0;
 		long t=0;
@@ -1182,7 +1180,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					while(it.hasNext()){
 						ChildTaskPlan childTaskPlan = it.next();
 						if(childTaskPlan.getMileageType().equals("empty")){
-							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							if(childTaskPlan.isDestroy()){
+								remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							}else{
+								ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							}
 						}else{
 							if(childTaskPlan.isDestroy()){
 								remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
@@ -1240,11 +1242,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
 			String lpName,String date,String type) {
+		List <ScheduleRealInfo> list=null;
 		if(type.equals("qp")){
-			return scheduleRealInfoRepository.queryListWaybill2(jName,clZbh,lpName,date);
+			list= scheduleRealInfoRepository.queryListWaybill2(jName,clZbh,lpName,date);
 		}else{
-			return scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date);
+			list= scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date);
 		}
+		for (int i = 0; i < list.size(); i++) {
+			ScheduleRealInfo s=list.get(i);
+			String remarks="";
+			if(s.getRemarks()!=null){
+				remarks +=s.getRemarks();
+			}
+			Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+			if(!childTaskPlans.isEmpty()){
+				Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+				while(it.hasNext()){
+					ChildTaskPlan c = it.next();
+					if(c.getRemarks()!=null && c.getRemarks().length()>0){
+						remarks += c.getRemarks();
+					}
+					
+				}
+			}
+			s.setRemarks(remarks);
+		}
+		
+		return list;
 	}
 	@Override
@@ -1325,11 +1349,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 							}else{
 								ssgl_other += tempJhlc;
 							}
-							
-							
-						}else{
-							ssgl += tempJhlc;
-							ssgl_other += tempJhlc;
 						}
 					}else{
 						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
@@ -1570,6 +1589,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						//根据线路代码获取公司
 						Line li = lineRepository.findByLineCode(scheduleRealInfo.getXlBm());
 						yesterdayDataList.get(i).put("company", li.getCompany());
+						yesterdayDataList.get(i).put("bCompany", li.getBrancheCompany());
 						//计算总公里
 						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 						//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
@@ -19,11 +19,13 @@ public interface ReportService {
 	List<Object[]> historyMessageCount(String line, String date, String code);
-	Map<String, Object> tbodyTime1(String line ,String date);
+	Map<String, Object> tbodyTime1(String line ,String ttinfo);
-	Map<String, Object> tbodyTime2(String line ,String date);
+	Map<String, Object> tbodyTime2(String line ,String ttinfo);
-	List<Map<String, Object>> tbodyTime3(String line ,String date);
-	List<Map<String, Object>> tbodyTime5(String line ,String date);
+	List<Map<String, Object>> tbodyTime3(String line ,String ttinfo);
+	List<Map<String, Object>> tbodyTime5(String line ,String ttinfo);
+	
+	 List<Map<String, Object>> getTtinfo(Map<String, Object> map);
  }
@@ -257,16 +257,18 @@ public class ReportServiceImpl implements ReportService{
 		return list;
 	}
 	@Override
-	public Map<String, Object> tbodyTime1(String line, String date) {
+	public Map<String, Object> tbodyTime1(String line, String ttinfo) {
 		DecimalFormat df = new DecimalFormat("#0.00");
 		// TODO Auto-generated method stub
 		//查询配车
-		String sqlPc=" SELECT cl_zbh FROM bsth_c_s_sp_info "
-					+" where DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' "
-					+ " and xl_bm='"+line+"' and bc_type='normal' "
-					+ " group by cl_zbh ";
+		String sqlPc="  select count(*) from bsth_c_cars where id in("
+				+ " select cl from bsth_c_s_ccinfo where  xl in ( "
+				+ " select id from bsth_c_line where line_code='"+line+"' )"
+						+ " group by equipment_code ) ";
+				
 		Map<String, Object> map=new HashMap<String,Object>();
-		List<Map<String, Object>> listPc= jdbcTemplate.query(sqlPc,
+		
+		/*List<Map<String, Object>> listPc= jdbcTemplate.query(sqlPc,
 				 new RowMapper<Map<String, Object>>(){
 			 @Override
 			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
@@ -274,13 +276,12 @@ public class ReportServiceImpl implements ReportService{
 				 m.put("zbh", rs.getString("cl_zbh"));
 				 return m;
 			 }
-		});
+		});*/
 		//配车
-		int pcs=listPc.size();
-	
-				
-		String sqlPlan="select jhlc, bc_type ,fcsj from  bsth_c_s_sp_info "
-				+ "where  DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' and xl_bm='"+line+"'";
+		int pcs=jdbcTemplate.queryForObject(sqlPc, Integer.class);
+		
+		String sqlPlan=" SELECT jhlc,bc_type,fcsj FROM bsth_c_s_ttinfo_detail "
+				+" where ttinfo ='"+ttinfo+"' ";
 		//班次
 		int zgf_0 = 6*60+31,zgf_1 = 8*60+30,wgf_0 = 16*60+1,wgf_1 = 18*60;
@@ -306,17 +307,10 @@ public class ReportServiceImpl implements ReportService{
 			String fcsjs[]=m.get("fcsj").toString().split(":");
 			zlc +=jhlc;
-			if(bcType.equals("normal")){
-				qcBc ++;
-				if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > zgf_0 
-						&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < zgf_1){
-					zqcBc++;
-				}else if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > wgf_0 
-				&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < wgf_1){
-					wqcBc++;
-				}
-				yylc +=jhlc;
-			}else if(bcType.equals("region")){
+			if(bcType.equals("in") || bcType.equals("out")){
+				kslc+=jhlc;
+			}
+			else if(bcType.equals("region")){
 				qjBc++;
 				if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > zgf_0 
 						&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < zgf_1){
@@ -328,7 +322,15 @@ public class ReportServiceImpl implements ReportService{
 				yylc+=jhlc;
 			}else{
-				kslc+=jhlc;
+				qcBc ++;
+				if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > zgf_0 
+						&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < zgf_1){
+					zqcBc++;
+				}else if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > wgf_0 
+				&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < wgf_1){
+					wqcBc++;
+				}
+				yylc +=jhlc;
 			}
 		}
@@ -346,30 +348,91 @@ public class ReportServiceImpl implements ReportService{
 		return map;
 	}
 	@Override
-	public Map<String, Object> tbodyTime2(String line, String date) {
+	public Map<String, Object> tbodyTime2(String line, String ttinfo) {
 		DecimalFormat df = new DecimalFormat("#0.00");
 		// TODO Auto-generated method stub
-		//查询配车
-		String sqlPc=" SELECT sum(bcsj) as yysj ,sum(jhlc) as yygl FROM bsth_c_s_sp_info "
-					+" where DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' "
-					+ " and xl_bm='"+line+"' and  bc_type in ('normal' ,'region' )";
+		//最早营运时间 区分夜宵线
+		String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
+		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		String[] minSjs = minfcsj.split(":");
+		int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
+		//查询时间里程
+		String sqlPc=" (SELECT jhlc,fcsj,bc_type,lp,2 as xh FROM bsth_c_s_ttinfo_detail "
+				    + " where ttinfo ='"+ttinfo+"' and fcsj <='"+minfcsj+"' ) "
+				    + " union "
+				    + " (SELECT jhlc,fcsj,bc_type,lp,1 as xh FROM bsth_c_s_ttinfo_detail "
+				    + " where ttinfo ='"+ttinfo+"' and fcsj > '"+minfcsj+"') order by  lp,xh,fcsj";
+				
 		Map<String, Object> map=new HashMap<String,Object>();
 		List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
 				 new RowMapper<Map<String, Object>>(){
 			 @Override
 			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
 				 Map<String, Object> m=new HashMap<String,Object>();
-				 m.put("yysj", rs.getInt("yysj"));
-				 m.put("yygl", rs.getString("yygl")==null?"0":rs.getString("yygl"));
+				 m.put("fcsj", rs.getString("fcsj"));
+				 m.put("yygl", rs.getString("jhlc")==null?"0":rs.getString("jhlc"));
+				 m.put("bcType", rs.getString("bc_type"));
+				 m.put("lp", rs.getString("lp"));
 				 return m;
 			 }
 		});
 		int yysj=0 ;
 		double yycs=0 ,yygl=0;
-		if(list.size()>0){
-			Map<String, Object> m=list.get(0);
-			yysj=Integer.parseInt((m.get("yysj").toString()));
-			yygl=Double.parseDouble(m.get("yygl").toString());
+		String lp ="0";
+		int sj=0;
+		
+		for(int i=0;i<list.size();i++){
+			Map<String, Object> m=list.get(i);
+			String time=m.get("fcsj").toString();
+			String[] times = time.split(":");
+			if(lp.equals(m.get("lp").toString())){
+				if(Integer.parseInt(times[0])*60+Integer.parseInt(times[1]) <=minSj){
+					if(m.get("bcType").equals("in") || m.get("bcType").equals("out")){
+						if(m.get("bcType").equals("in")){
+							if(sj!=0){
+								yysj +=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1])-sj;
+							}
+							sj=0;
+						}
+					}else{
+						yygl += Double.parseDouble(m.get("yygl").toString());
+						
+						if(sj==0){
+							sj=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1]);
+						}else{
+							yysj +=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1])-sj;
+							sj=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1]);
+						}
+					}
+				}else{
+					if(m.get("bcType").equals("in") || m.get("bcType").equals("out")){
+						if(m.get("bcType").equals("in")){
+							if(sj!=0){
+								yysj +=Integer.parseInt(times[0])*60+Integer.parseInt(times[1])-sj;
+							}
+							sj=0;
+						}
+					}else{
+						yygl += Double.parseDouble(m.get("yygl").toString());
+						
+						if(sj==0){
+							sj=Integer.parseInt(times[0])*60+Integer.parseInt(times[1]);
+						}else{
+							yysj +=Integer.parseInt(times[0])*60+Integer.parseInt(times[1])-sj;
+							sj=Integer.parseInt(times[0])*60+Integer.parseInt(times[1]);
+						}
+					}
+				}
+			}else{
+				if( !(m.get("bcType").equals("in") || m.get("bcType").equals("out"))){
+					yygl += Double.parseDouble(m.get("yygl").toString());
+					sj =Integer.parseInt(times[0])*60+Integer.parseInt(times[1]);
+				}else{
+					sj=0;
+				}
+				lp=m.get("lp").toString();
+				
+			}
 		}
 		if(yysj>0){
 			yycs =yygl/(yysj*1.0/60);
@@ -767,4 +830,34 @@ public class ReportServiceImpl implements ReportService{
 		newList.add(newmap5);
 		return newList;
 	}
+	@Override
+	public List<Map<String, Object>> getTtinfo(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+		String line = map.get("line").toString();
+		try {
+			String sql = "select tt.id, tt.name from bsth_c_s_ttinfo tt "
+					+ "left join bsth_c_line cl on cl.id = tt.xl "
+					+ " where tt.is_cancel = 0 and tt.is_enable_dis_template = 1";
+			if(line.length() != 0){
+				sql += " and  cl.line_code = '"+line+"'";
+			}
+			sql += " order by tt.create_date desc";
+			
+			list = jdbcTemplate.query(sql,
+					new RowMapper<Map<String, Object>>(){
+				@Override
+				public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+					Map<String, Object> map = new HashMap<String, Object>();
+					map.put("id", rs.getString("id"));
+					map.put("name", rs.getString("name"));
+					return map;
+				}
+			});
+		}catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return list;
+	}
 }
@@ -404,8 +404,8 @@ $(function(){
 			var f = arguments.callee
 				,item = lsData[i];
-			//$.get('/realMap/findRouteByLine', {lineCode: item.lineCode}, function(rs){
-				$.get('/realSchedule/findRouteByLine', {lineCode: item.lineCode}, function(rs){
+			$.get('/realMap/findRouteByLine', {lineCode: item.lineCode}, function(rs){
+				//$.get('/realSchedule/findRouteByLine', {lineCode: item.lineCode}, function(rs){
 				if(rs && rs.lineId){
 					cacheData[item.lineCode] = rs;
 					i ++;
@@ -43,14 +43,18 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_allline">
-						<span class="item-label" style="width: 80px;">公司: </span>
-						<select class="form-control" name="company" id="gsdmAllline" style="width: 140px;"></select>
-					</div> 
-					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_allline">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdmAllline" style="width: 140px;"></select>
-					</div> -->
+					<div style="display: inline-block; margin-left: 33px;"
+						id="gsdmDiv_allline">
+						<span class="item-label" style="width: 80px;">公司: </span> <select
+							class="form-control" name="company" id="gsdmAllline"
+							style="width: 140px;"></select>
+					</div>
+					<div style="display: inline-block; margin-left: 24px;"
+						id="fgsdmDiv_allline">
+						<span class="item-label" style="width: 80px;">分公司: </span> <select
+							class="form-control" name="subCompany" id="fgsdmAllline"
+							style="width: 140px;"></select>
+					</div>
 					<div style="display: inline-block;">
 						<span class="item-label" style="width: 80px;">线路: </span> <select
 							class="form-control" name="line" id="line" style="width: 120px;"></select>
@@ -188,15 +192,20 @@
 		var endDate;
 		var gsdmAllline;
 		var fgsdmAllline;
-		$("#query").on("click",function() {
+		$("#query")
+				.on(
+						"click",
+						function() {
 							line = $("#line").val();
 							startDate1 = $("#startDate").val();
 							endDate1 = $("#endDate").val();
 							gsdmAllline = $("#gsdmAllline").val();
 							fgsdmAllline = $("#fgsdmAllline").val();
 							if (startDate1 != '' && endDate1 != '') {
-								$post('/mcy_forms/allline',{
-									/* gsdmAllline:gsdmAllline,fgsdmAllline:fgsdmAllline, */
+								$post(
+										'/mcy_forms/allline',
+										{
+										    gsdmAllline:gsdmAllline,fgsdmAllline:fgsdmAllline, 
 											line : line,
 											startDate : $("#startDate").val(),
 											endDate : $("#endDate").val(),
@@ -285,7 +294,14 @@
 		$("#export").on(
 				"click",
 				function() {
+					line = $("#line").val();
+					startDate1 = $("#startDate").val();
+					endDate1 = $("#endDate").val();
+					gsdmAllline = $("#gsdmAllline").val();
+					fgsdmAllline = $("#fgsdmAllline").val();
 					$post('/mcy_export/alllineExport', {
+						gsdmAllline : gsdmAllline,
+						fgsdmAllline : fgsdmAllline,
 						line : line,
 						startDate : startDate,
 						endDate : endDate,
@@ -43,18 +43,22 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-					 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_change">
-						<span class="item-label" style="width: 80px;">公司: </span>
-						<select class="form-control" name="company" id="gsdmChange" style="width: 140px;"></select>
-					</div> 
-					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_change">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdmChange" style="width: 140px;"></select>
-					</div> 
+					<div style="display: inline-block; margin-left: 33px;"
+						id="gsdmDiv_change">
+						<span class="item-label" style="width: 80px;">公司: </span> <select
+							class="form-control" name="company" id="gsdmChange"
+							style="width: 140px;"></select>
+					</div>
+					<div style="display: inline-block; margin-left: 24px;"
+						id="fgsdmDiv_change">
+						<span class="item-label" style="width: 80px;">分公司: </span> <select
+							class="form-control" name="subCompany" id="fgsdmChange"
+							style="width: 140px;"></select>
+					</div>
 					<div style="display: inline-block;">
-                        <span class="item-label" style="width: 80px;">线路: </span>
-                        <select class="form-control" name="line" id="line" style="width: 180px;"></select>
-                    </div>
+						<span class="item-label" style="width: 80px;">线路: </span> <select
+							class="form-control" name="line" id="line" style="width: 180px;"></select>
+					</div>
 					<div style="display: inline-block; margin-left: 15px;">
 						<span class="item-label" style="width: 80px;">开始时间: </span> <input
 							class="form-control" type="text" id="startDate"
@@ -139,51 +143,55 @@
 			locale : 'zh-cn'
 		});
-		
 		var obj = [];
-		$.get('/user/companyData', function(result){
+		$.get('/user/companyData', function(result) {
 			obj = result;
 			var options = '';
-			for(var i = 0; i < obj.length; i++){
-				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			for (var i = 0; i < obj.length; i++) {
+				options += '<option value="'+obj[i].companyCode+'">'
+						+ obj[i].companyName + '</option>';
 			}
-			if(obj.length ==0){
-				 $("#gsdmDiv_change").css('display','none');
-				 $('#fgsdmDiv_change').css('display','none');
-			}else if(obj.length ==1){
-				 $("#gsdmDiv_change").css('display','none');
-				if(obj[0].children.length == 1  || obj[0].children.length ==0)
-					$('#fgsdmDiv_change').css('display','none');
+			if (obj.length == 0) {
+				$("#gsdmDiv_change").css('display', 'none');
+				$('#fgsdmDiv_change').css('display', 'none');
+			} else if (obj.length == 1) {
+				$("#gsdmDiv_change").css('display', 'none');
+				if (obj[0].children.length == 1 || obj[0].children.length == 0)
+					$('#fgsdmDiv_change').css('display', 'none');
 			}
 			$('#gsdmChange').html(options);
 			updateCompany();
 		});
-		$("#gsdmChange").on("change",updateCompany);
-		function updateCompany(){
+		$("#gsdmChange").on("change", updateCompany);
+		function updateCompany() {
 			var company = $('#gsdmChange').val();
 			var options = '';
-			for(var i = 0; i < obj.length; i++){
-				if(obj[i].companyCode == company){
+			for (var i = 0; i < obj.length; i++) {
+				if (obj[i].companyCode == company) {
 					var children = obj[i].children;
-					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					for (var j = 0; j < children.length; j++) {
+						options += '<option value="'+children[j].code+'">'
+								+ children[j].name + '</option>';
 					}
 				}
 			}
 			$('#fgsdmChange').html(options);
-		} 
+		}
+
+		$.get('/basic/lineCode2Name', function(result) {
+			var data = [];
-		$.get('/basic/lineCode2Name',function(result){
-			var data=[];
-			
-			for(var code in result){
-				data.push({id: code, text: result[code]});
+			for ( var code in result) {
+				data.push({
+					id : code,
+					text : result[code]
+				});
 			}
-			initPinYinSelect2('#line',data,'');
-			
+			initPinYinSelect2('#line', data, '');
+
 		})
-		
+
 		var line;
 		var startDate;
 		var endDate;
@@ -194,7 +202,8 @@
 					sel = $("#sel").val();
 					var startDate1 = $("#startDate").val();
 					var endDate1 = $("#endDate").val();
-
+					var gsdmChange= $("#gsdmChange").val();
+				    var fgsdmChange= $("#fgsdmChange").val();
 					if (startDate1 != '' && endDate1 != '') {
 						$post('/mcy_forms/changetochange', {
 							sel : sel,
@@ -235,7 +244,17 @@
 		$("#export").on(
 				"click",
 				function() {
+					var sel = $("#sel").val();
+					 var startDate = $("#startDate").val();
+					    var endDate = $("#endDate").val();
+					    var lpName = $("#lpName").val(); 
+					    var gsdmChange= $("#gsdmChange").val();
+					    var fgsdmChange= $("#fgsdmChange").val();
 					$post('/mcy_export/changetochangeExport', {
+						sel:sel,
+						line:line,
+						gsdmChange:gsdmChange,
+						fgsdmChange:fgsdmChange,
 						startDate : startDate,
 						endDate : endDate,
 						type : 'export'
@@ -226,8 +226,8 @@
                 // 把渲染好的模版html文本追加到表格中
                 $('#forms .list_correctForm').html(list_correctForm);
-                var list_correctForm_statistics = template('list_correctForm_statistics',temp);
-                $('#forms .list_correctForm_statistics').html(list_correctForm_statistics);
+                /* var list_correctForm_statistics = template('list_correctForm_statistics',temp);
+                $('#forms .list_correctForm_statistics').html(list_correctForm_statistics); */
 		    });
 		});
 	});
@@ -37,14 +37,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_ececut">
+			  <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_ececut">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmEcecut" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_ececut">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmEcecut" style="width: 140px;"></select>
-					</div> -->
+					</div> 
 				<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 120px;"></select>
@@ -71,7 +71,7 @@
 								<th colspan="11">班次执行率统计表</th>
 							</tr>
 							<tr>
-								<td  rowspan="2" style=" padding-top: 20px;">日期</td> 
+								<td rowspan="2" style=" padding-top: 20px;">日期</td> 
 								<td rowspan="2" style=" padding-top: 20px;">公司</td>
 								<td rowspan="2" style=" padding-top: 20px;">直属公司</td>
 								<td rowspan="2" style=" padding-top: 20px;">线路条数</td>
@@ -181,15 +181,15 @@
 	   	  gsdmEcecut=$("#gsdmEcecut").val();
 	   	  fgsdmEcecut=$("#fgsdmEcecut").val();
 			 if(startDate1!=''&&endDate1!=''){
-				 $post('/mcy_forms/executionrate',{/* gsdmEcecut:gsdmEcecut,fgsdmEcecut:fgsdmEcecut, */line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
+				 $post('/mcy_forms/executionrate',{ gsdmEcecut:gsdmEcecut,fgsdmEcecut:fgsdmEcecut, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
 					 // 把数据填充到模版中
 						var tbodyHtml = template('executionrate',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 						$('#tbody').html(tbodyHtml);
-					  line = $("#line").val();
+					    line = $("#line").val();
-					  startDate = $("#startDate").val();
-					   endDate = $("#endDate").val();
+					    startDate = $("#startDate").val();
+					    endDate = $("#endDate").val();
 					    $("#sDate").text(startDate);
 				        $("#eDate").text(endDate);
@@ -240,7 +240,12 @@
 	});
 	$("#export").on("click",function(){
-		$post('/mcy_export/executionrateExport',{line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+		  line = $("#line").val();
+		  startDate=$("#startDate").val();
+	   	  endDate=$("#endDate").val();
+	   	  gsdmEcecut=$("#gsdmEcecut").val();
+	   	  fgsdmEcecut=$("#fgsdmEcecut").val();
+		$post('/mcy_export/executionrateExport',{gsdmEcecut:gsdmEcecut,fgsdmEcecut:fgsdmEcecut,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
 			window.open("/downloadFile/download?fileName=班次执行率统计表"+moment(startDate).format("YYYYMMDD"));
 		});
 	});
@@ -27,14 +27,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_line">
+				<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_line">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmLine" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_line">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmLine" style="width: 140px;"></select>
-					</div> -->
+					</div> 
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -140,7 +140,7 @@
 			var date = $("#date").val();
 			var gsdmLine = $("#gsdmLine").val();
 			var fgsdmLine = $("#fgsdmLine").val();
-		    $post('/mcy_forms/linepasswengerflow',{/* gsdmLine:gsdmLine,fgsdmLine:fgsdmLine, */line:line,date:date,type:'query'},function(result){
+		    $post('/mcy_forms/linepasswengerflow',{ gsdmLine:gsdmLine,fgsdmLine:fgsdmLine,line:line,date:date,type:'query'},function(result){
 				$.each(result, function(i, obj) {
 					obj.requestType = reqCodeMap[obj.requestType];
                 }); 
@@ -150,6 +150,16 @@
 				$('#forms tbody').html(tbodyHtml);
 			});	
 		}); 
+		
+		$("#export").on("click",function(){
+			var line = $("#line").val();
+			var date = $("#date").val();
+			var gsdmLine = $("#gsdmLine").val();
+			var fgsdmLine = $("#fgsdmLine").val();
+			$post('/mcy_export/linepasswengerflowExport',{gsdmLine:gsdmLine,fgsdmLine:fgsdmLine,line:line,date:date,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=线路客流量报表"+moment(date).format("YYYYMMDD"));
+			});
+		});
 	});
 </script>
 <script type="text/html" id="list_linepasswengerflow">
@@ -30,7 +30,7 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-					<!--<div style="display: inline-block; margin-left: 33px;"
+					 <div style="display: inline-block; margin-left: 33px;"
 						id="gsdmDiv_operat">
 						 <span class="item-label" style="width: 80px;">公司: </span> <select
 							class="form-control" name="company" id="gsdmOperat"
@@ -41,7 +41,7 @@
 						<span class="item-label" style="width: 80px;">分公司: </span> <select
 							class="form-control" name="subCompany" id="fgsdmOperat"
 							style="width: 140px;"></select>
-					</div> -->
+					</div>  
 					<div style="display: inline-block;">
 						<span class="item-label" style="width: 80px;">线路: </span> <select
 							class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -173,11 +173,11 @@
 					var startDate = $("#startDate").val();
 					var endDate = $("#endDate").val();
 					var lpName = $("#lpName").val();
-					/* var gsdmOperat = $("#gsdmOperat").val();
-					var fgsdmOperat = $("#fgsdmOperat").val(); */
+					var gsdmOperat = $("#gsdmOperat").val();
+					var fgsdmOperat = $("#fgsdmOperat").val(); 
 					$post("/mcy_forms/operationservice", {
-						/* gsdmOperat : gsdmOperat,
-						fgsdmOperat : fgsdmOperat, */
+						gsdmOperat : gsdmOperat,
+						fgsdmOperat : fgsdmOperat, 
 						line : line,
 						startDate : startDate,
 						endDate : endDate,
@@ -206,6 +206,18 @@
 					});
 				});
+		$("#export").on("click",function(){
+			  line = $("#line").val();
+			  startDate=$("#startDate").val();
+		   	  endDate=$("#endDate").val();
+		   	gsdmOperat=$("#gsdmOperat").val();
+		   	  fgsdmOperat=$("#fgsdmOperat").val();
+			$post('/mcy_export/operationserviceExport',{gsdmOperat:gsdmOperat,fgsdmOperat:fgsdmOperat,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=运营服务阶段报表"+moment(startDate).format("YYYYMMDD"));
+			});
+		});
+		
+		
 	});
 </script>
 <script type="text/html" id="operationservice">
@@ -42,7 +42,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;height: 400px">
 					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>调度工作日报表</h1>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form id="history" class="form-inline" action="">
+					<div style="display: inline-block; margin-left: 10px;" id="company1">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="company" style="width: 160px;"></select>
+					</div>
+					<div style="display: inline-block; margin-left: 10px;" id="subCompany1">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;"></select>
+					</div>
+					<div style="display: inline-block; margin-left: 10px;">
+						<span class="item-label" style="width: 80px;">线路: </span>
+						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+					</div>
+					<div style="display: inline-block;margin-left: 10px;">
+						<span class="item-label" style="width: 80px;">时间: </span>
+						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+					</div>
+					<div class="form-group">
+						<input class="btn btn-default" type="button" id="query" value="筛选"/>
+						<input class="btn btn-default" type="button" id="export" value="导出"/>
+					</div>
+				</form>
+			</div>
+			<div class="portlet-body" >
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 506px;height: 400px">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr >
+								<th style="text-align:center;vertical-align:middle;" rowspan="3">路牌</th>
+								<th style="text-align:center;vertical-align:middle;"
+								 rowspan="2" colspan="2">车号</th>
+								<th rowspan="3">班别</th>
+								<th  colspan="3"  style="text-align:center;vertical-align:middle;">驾驶员</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">售票员</th>
+								<th rowspan="3" style="text-align:center;vertical-align:middle;">路牌</th>
+								<th rowspan="3" style="text-align:center;vertical-align:middle;">记录项目</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">1</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">2</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">3</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">4</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">5</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">6</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">7</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">8</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">9</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">10</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">11</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">12</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">13</th>
+								
+							</tr>
+							<tr>
+								
+								<th rowspan="2">职号</th>
+								<th colspan="2">接班时间</th>
+								<th rowspan="2">职号</th>
+								<th colspan="2">接班时间</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+							</tr>
+							<tr>
+							<th>出场</th>
+								<th>调换</th>
+								<th>1</th>
+								<th>2</th>
+								<th>1</th>
+								<th>2</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr >
+							<td></td>
+							<td>
+							</td>
+							<td></td>
+							<td></td>
+							<td></td>
+								<td colspan="46">
+									<div>
+										
+									</div>
+								</td>
+							</tr>
+							
+						</tbody>
+					</table>
+					<div style="text-align: right;">
+						<ul id="pagination" class="pagination"></ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+		
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#date").val(year + "-" + month + "-" + day);
+		
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			data.push({id: " ", text: "全部线路"});
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			initPinYinSelect2('#line',data,'');
+		})
+		
+		var obj = [];
+		$.get('/user/companyData', function(result){
+			obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			if(obj.length == 1){
+				$('#company1').hide();
+				if(obj[0].children.length == 1)
+					$('#subCompany1').hide();
+			}
+			$('#company').html(options);
+			updateCompany();
+		});
+		$("#company").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#company').val();
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#subCompany').html(options);
+		}
+		
+		
+		$("#query").on("click",jsDoQuery);
+		
+		var line = $("#line").val();
+		var date = $("#date").val();
+		var company = $("#company").val();
+		var subCompany = $("#subCompany").val();
+		function jsDoQuery(pagination){
+			var params = {};
+			line = $("#line").val();
+			date = $("#date").val();
+			company = $("#company").val();
+			subCompany = $("#subCompany").val();
+			if(line == " ")
+				line = "";
+			params['line'] = line;
+			params['date'] = date;
+			params['type'] = "query";
+			params['company'] = company;
+			params['subCompany'] = subCompany;
+			$(".hidden").removeClass("hidden");
+			/* $get('/pcpc/workDaily', params, function(result){
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_workDaily',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms tbody').html(tbodyHtml);
+
+			}); */		
+		}
+		
+		$("#export").on("click",function(){
+			$get('/pcpc/workDaily',{line:line,date:date,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=营运服务日报表"+moment(date).format("YYYYMMDD"));
+			});
+		});
+		
+		
+	});
+	
+</script>
+<script type="text/html" id="list_workDaily">
+	{{each list as obj i}}
+		<tr>
+			<td>{{obj.date}}</td>
+			<td>{{obj.line}}</td>
+			<td>{{obj.jhbc}}</td>
+			<td>{{obj.dftz}}</td>
+			<td>{{obj.dftzl}}</td>
+			<td>{{obj.ccl}}</td>
+			<td>{{obj.upfk}}</td>
+			<td>{{obj.updk}}</td>
+			<td>{{obj.dnfk}}</td>
+			<td>{{obj.dndk}}</td>
+			<td>{{obj.upfm}}</td>
+			<td>{{obj.updm}}</td>
+			<td>{{obj.dnfm}}</td>
+			<td>{{obj.dndm}}</td>
+			<td>{{obj.wdzs}}</td>
+			<td>{{obj.smbzdl}}</td>
+			<td>{{obj.gfbczxl}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="17"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
@@ -28,14 +28,14 @@
 		<div class="portlet light porttlet-fit bordered">
 		   <div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-					<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_shif">
+				<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_shif">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmShif" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_shif">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmShif" style="width: 140px;"></select>
-					</div> -->
+					</div>  
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -154,9 +154,9 @@ $(function(){
 		$("#query").on("click",function(){
 		   		var line = $("#line").val();
 				var date = $("#date").val();
-				/* var gsdmShif = $("#gsdmShif").val();
-				var fgsdmShif = $("#fgsdmShif").val(); */
-				$post('/mcy_forms/shifday',{/* gsdmShif:gsdmShif,fgsdmShif:fgsdmShif, */line:line,date:date},function(result){
+				var gsdmShif = $("#gsdmShif").val();
+				var fgsdmShif = $("#fgsdmShif").val(); 
+				$post('/mcy_forms/shifday',{gsdmShif:gsdmShif,fgsdmShif:fgsdmShif, line:line,date:date},function(result){
 					 $.each(result, function(i, obj) {
 						obj.requestType = reqCodeMap[obj.requestType];
 	                }); 
@@ -166,6 +166,16 @@ $(function(){
 					$('#forms tbody').html(tbodyHtml);
 				});
 		});
+	
+	$("#export").on("click",function(){
+		var line = $("#line").val();
+		var date = $("#date").val();
+		var gsdmShif = $("#gsdmShif").val();
+		var fgsdmShif = $("#fgsdmShif").val();
+		$post('/mcy_export/shifdayExport',{gsdmShif:gsdmShif,fgsdmShif:fgsdmShif,line:line,date:date,type:'export'},function(result){
+			window.open("/downloadFile/download?fileName=班次车辆人员日报表"+moment(date).format("YYYYMMDD"));
+		});
+	});
 });
 </script>
 <script type="text/html" id="shifday">
@@ -175,7 +185,6 @@ $(function(){
 			<td>{{obj.sName}}</td>
  			<td>{{obj.lpName}}</td>
 			<td>{{obj.carPlate}}</td>
-
    			<td>{{obj.jhlc}}</td>
 			<td>{{obj.sjjhlc}}</td>
 			<td>{{obj.yygl}}</td>
@@ -28,14 +28,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-					<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_manth">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_manth">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmManth" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_manth">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmManth" style="width: 140px;"></select>
-					</div> -->
+					</div>  
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 136px;"></select>
@@ -183,9 +183,9 @@
 		    var startDate = $("#startDate").val();
 		    var endDate = $("#endDate").val();
 		    var lpName = $("#lpName").val(); 
-		    /* var gsdmManth= $("#gsdmManth").val();
-		    var fgsdmManth= $("#fgsdmManth").val(); */
-		   	$post("/mcy_forms/shiftuehiclemanth",{/* gsdmManth:gsdmManth,fgsdmManth:fgsdmManth, */line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){		        
+		    var gsdmManth= $("#gsdmManth").val();
+		    var fgsdmManth= $("#fgsdmManth").val(); 
+		   	$post("/mcy_forms/shiftuehiclemanth",{gsdmManth:gsdmManth,fgsdmManth:fgsdmManth, line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){		        
 		   		$("#sDate").text(startDate);
 		        $("#eDate").text(endDate);
 		        var temp = {};
@@ -203,7 +203,20 @@
 		        $('#forms tbody').html(list_shiftuehiclemanth);
 		    }); 
-		});
+		});
+		
+		$("#export").on("click",function(){
+			 var line = $("#line").val();
+			    var startDate = $("#startDate").val();
+			    var endDate = $("#endDate").val();
+			    var lpName = $("#lpName").val(); 
+			    var gsdmManth= $("#gsdmManth").val();
+			    var fgsdmManth= $("#fgsdmManth").val(); 
+			$post('/mcy_export/shiftuehiclemanthExport',{gsdmManth:gsdmManth,fgsdmManth:fgsdmManth,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=班次车辆人员月报表"+moment(startDate).format("YYYYMMDD"));
+			});
+		});
+		
 	});
 </script>
 <script type="text/html" id="list_shiftuehiclemanth">
@@ -28,14 +28,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-					<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_sing">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_sing">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmSing" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_sing">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmSing" style="width: 140px;"></select>
-					</div> -->
+					</div> 
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 136px;"></select>
@@ -152,9 +152,9 @@
 		    var startDate = $("#startDate").val();
 		    var endDate = $("#endDate").val();
 		    var lpName = $("#lpName").val(); 
-		    /* var gsdmSing = $("#gsdmSing").val();
-		    var fgsdmSing = $("#fgsdmSing").val(); */
-		   	$post("/mcy_forms/singledata",{/* gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, */line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){		        
+		    var gsdmSing = $("#gsdmSing").val();
+		    var fgsdmSing = $("#fgsdmSing").val(); 
+		   	$post("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){		        
 		   		$("#sDate").text(startDate);
 		        $("#eDate").text(endDate);
 		        var temp = {};
@@ -172,6 +172,18 @@
 		    }); 
 		});
+		
+		$("#export").on("click",function(){
+			 var line = $("#line").val();
+			    var startDate = $("#startDate").val();
+			    var endDate = $("#endDate").val();
+			    var lpName = $("#lpName").val(); 
+			    var gsdmSing = $("#gsdmSing").val();
+			    var fgsdmSing = $("#fgsdmSing").val(); 
+			$post('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
+			});
+		});
 	});
 </script>
 <script type="text/html" id="singledata">
@@ -37,14 +37,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_turn">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_turn">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmTurn" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_turn">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmTurn" style="width: 140px;"></select>
-					</div> -->
+					</div>  
 				<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 120px;"></select>
@@ -183,7 +183,7 @@
 	   	  gsdmTurn=$("#gsdmTurn").val();
 	   	  fgsdmTurn=$("#fgsdmTurn").val();
 			 if(startDate1!=''&&endDate1!=''){
-				 $post('/mcy_forms/turnoutrate',{/* gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, */line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
+				 $post('/mcy_forms/turnoutrate',{ gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
 					 // 把数据填充到模版中
 						var tbodyHtml = template('turnoutrate',{list:result});
 						// 把渲染好的模版html文本追加到表格中
@@ -243,7 +243,12 @@
 	});
 	$("#export").on("click",function(){
-		$post('/mcy_export/turnoutrateExport',{line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+		line = $("#line").val();
+		  startDate=$("#startDate").val();
+	   	  endDate=$("#endDate").val();
+	   	  gsdmTurn=$("#gsdmTurn").val();
+	   	  fgsdmTurn=$("#fgsdmTurn").val();
+		$post('/mcy_export/turnoutrateExport',{gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
 			window.open("/downloadFile/download?fileName=营运线路出车率统计表"+moment(startDate).format("YYYYMMDD"));
 		});
 	});
@@ -19,7 +19,7 @@
 <div class="page-head">
 	<div class="page-title">
-		<h1>车辆加注/消耗量</h1>
+		<h1>车辆加注</h1>
 	</div>
 </div>
@@ -28,14 +28,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_vehic">
+			       <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_vehic">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmVehic" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_vehic">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmVehic" style="width: 140px;"></select>
-					</div> -->
+					</div>
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -135,18 +135,32 @@
 		})
+		var line ;
+		var date ;
+	    var gsdmVehic ;
+		var fgsdmVehic ;
 		$("#query").on("click",function(){
-			var line = $("#line").val();
-			var date = $("#date").val();
-			/* var gsdmVehic = $("#gsdmVehic").val();
-			var fgsdmVehic = $("#fgsdmVehic").val(); */
-			$post('/mcy_forms/vehicleloading',{line:line,data:date},function(result){
+			line = $("#line").val();
+			date = $("#date").val();
+		    gsdmVehic = $("#gsdmVehic").val();
+			fgsdmVehic = $("#fgsdmVehic").val(); 
+			$post('/mcy_forms/vehicleloading',{line:line,data:date, gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic},function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('vehicleloading',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
 		   	});
-		});
+		});
+		
+		$("#export").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+		    gsdmVehic = $("#gsdmVehic").val();
+			fgsdmVehic = $("#fgsdmVehic").val();
+			$post('/mcy_export/vehicleloadingExport',{line:line,data:date,gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=车辆加注"+moment(date).format("YYYYMMDD"));
+			});
+		});
 	});
 </script>
 <script type="text/html" id="vehicleloading">
@@ -157,8 +171,8 @@
 			<td>{{obj.gS}}</td>
  			<td>{{obj.xL}}</td>
 			<td>{{obj.clzbh}}</td>
+            <td>{{obj.jzl}}</td>
 			<td>{{obj.hyl}}</td>
-			<td>{{obj.jzl}}</td>
 			<td>  </td>
 			<td>{{obj.jhlc}}</td>
 			<td>  </td>
@@ -152,7 +152,7 @@
 			var line = $("#line").val();
 			date = $("#date").val();
 			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
+			$get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_info',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -152,7 +152,7 @@
 			var line = $("#line").val();
 			date = $("#date").val();
 			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
+			$get('/realSchedule/queryUserInfo',{line:line,date:date,state:3},function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_info',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -28,14 +28,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_waybillday">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_waybillday">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmWaybillday" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_waybillday">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmWaybillday" style="width: 140px;"></select>
-					</div> -->
+					</div>
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -142,7 +142,7 @@
 			gsdmWaybillday=$("#gsdmWaybillday").val();
 			fgsdmWaybillday = $("#fgsdmWaybillday").val();
-			$post('/mcy_forms/waybillday',{/* gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday, */line:line,date:$("#date").val(),type:'query'},function(result){
+			$post('/mcy_forms/waybillday',{gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday, line:line,date:$("#date").val(),type:'query'},function(result){
 				 $.each(result, function(i, obj) {
 					obj.requestType = reqCodeMap[obj.requestType];
                 }); 
@@ -154,7 +154,11 @@
 		});
 		$("#export").on("click",function(){
-			$post('/mcy_export/waybilldayExport',{line:line,date:date,type:'export'},function(result){
+			line = $("#line").val();
+			date = $("#date").val();
+			gsdmWaybillday=$("#gsdmWaybillday").val();
+			fgsdmWaybillday = $("#fgsdmWaybillday").val();
+			$post('/mcy_export/waybilldayExport',{gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday,line:line,date:date,type:'export'},function(result){
 				window.open("/downloadFile/download?fileName=行车路单日报表"+moment(date).format("YYYYMMDD"));
 			});
 		});
@@ -57,37 +57,39 @@ var baiduMap = (function(){
 			map.clearOverlays();
 			linePolyline = [];
-			//从localStorage里读取路由信息
 			var upLineOps = {strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
 				,downLineOps = {strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
-			var upPos = [], downPos = [], tempArray;
 			var route = opts.route;
-			//上行
+			var pos,temps, polyline;
 			if(route.up){
-				$.each(route.up.split(','), function(){
-					tempArray = this.split(' ');
-					upPos.push(new BMap.Point(tempArray[0], tempArray[1]));
+				$.each(route.up_bd, function (i, item) {
+					pos = [];
+					$.each(item.split(','), function () {
+						temps = this.split(' ');
+						pos.push(new BMap.Point(temps[0], temps[1]));
+					});
+					polyline = new BMap.Polyline(pos, upLineOps);
+					map.addOverlay(polyline);
+
+					linePolyline.push(polyline);
 				});
-				var upLine = new BMap.Polyline(upPos, upLineOps);
-				map.addOverlay(upLine);
-
-				linePolyline.push(upLine);
-
-				map.panTo(upPos[parseInt(upPos.length / 2)]);
+				map.panTo(pos[parseInt(pos.length / 2)]);
 			}
-			//下行
+
 			if(route.down){
-				$.each(route.down.split(','), function(){
-					tempArray = this.split(' ');
-					downPos.push(new BMap.Point(tempArray[0], tempArray[1]));
+				$.each(route.down_bd, function (i, item) {
+					pos = [];
+					$.each(item.split(','), function () {
+						temps = this.split(' ');
+						pos.push(new BMap.Point(temps[0], temps[1]));
+					});
+					polyline = new BMap.Polyline(pos, downLineOps);
+					map.addOverlay(polyline);
+
+					linePolyline.push(polyline);
 				});
-
-				var downLine = new BMap.Polyline(downPos, downLineOps);
-				map.addOverlay(downLine);
-
-				linePolyline.push(downLine);
 			}
 		},
 		//绘制GPS信号
@@ -77,11 +77,43 @@ var gaodeMap = (function() {
 			map.clearMap();
-			var upArr = [], downArr = [];
-			var upLineOps = {path: upArr, strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
-				,downLineOps = {path: downArr, strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
+			//var upArr = [], downArr = [];
+			var upLineOps = {strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
+				,downLineOps = {strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
 			var route = opts.route;
-			//上行
+
+			var pos,temps;
+			if(route.up){
+				$.each(route.up_gcj, function (i, item) {
+					pos = [];
+					$.each(item.split(','), function () {
+						temps = this.split(' ');
+						pos.push([temps[0], temps[1]]);
+					});
+					upLineOps.path=pos;
+					var polyline = new AMap.Polyline(upLineOps);
+					polyline.setMap(map);
+
+					linePolyline.push(polyline);
+				});
+				map.setCenter(pos[parseInt(pos.length / 2)]);
+			}
+
+			if(route.down){
+				$.each(route.down_gcj, function (i, item) {
+					pos = [];
+					$.each(item.split(','), function () {
+						temps = this.split(' ');
+						pos.push([temps[0], temps[1]]);
+					});
+					downLineOps.path=pos;
+					var polyline = new AMap.Polyline(downLineOps);
+					polyline.setMap(map);
+
+					linePolyline.push(polyline);
+				});
+			}
+			/*//上行
 			if(route.up){
 				$.each(route.up_gcj.split(','), function(){
 					tempArray = this.split(' ');
@@ -104,7 +136,7 @@ var gaodeMap = (function() {
 				 //保存线条引用
 				 linePolyline.push(downLine);
 				 downLine.setMap(map);
-			}
+			}*/
 			//实时路况下不显示
 			if(traffVisible)
 				hideLinePolyline();
@@ -330,7 +330,6 @@
         $('tr.filter .filter-submit').on('click', function () {
         	 var ylbGsdm=$("#ylbListGsdmId").val();
      		var ylbFgsdm=$("#ylbListFgsdmId").val();
-     		console.log();
             if ($("#rq").val() == "" || $("#rq").val() ==null){
             	  layer.msg('请选择日期.');
             }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
+<div class="page-head">
+    <div class="page-title">
+        <h1>进出场存油量</h1>
+    </div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+    <li><span class="active">用油管理</span> <i class="fa fa-circle"></i></li>
+    <li><span class="active">进出场存油量</span></li>
+</ul>
+
+<div class="row" id="ll_oil_list">
+    <div class="col-md-12">
+        <!-- Begin: life time stats -->
+        <div class="portlet light portlet-fit portlet-datatable bordered">
+            <div class="portlet-title">
+                <div class="caption">
+                    <i class="fa fa-fire-extinguisher"></i> <span
+                        class="caption-subject font-dark sbold uppercase">进出场存油量表</span>
+                </div>
+                <div class="actions">
+                    <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
+                    <!-- 					<button type="button" class="btn btn-circle blue"  id="removeButton"><i class="fa fa-trash-o"></i> 删除</button> -->
+                    <button type="button" class="btn btn-circle blue" id="sortButton"><i class="fa fa-minus-square"></i>
+                        拆分/保存
+                    </button>
+                    <!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> 删除用户</button> -->
+                    <div class="btn-group">
+                        <a class="btn red btn-outline btn-circle" href="javascript:;"
+                           data-toggle="dropdown"> <i class="fa fa-share"></i> <span
+                                class="hidden-xs"> 系统工具 </span> <i class="fa fa-angle-down"></i>
+                        </a>
+                        <ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
+                            <li><a href="javascript:;" data-action="0"
+                                   class="tool-action" id="obtain"> <i class="fa fa-hourglass-half"></i> 获取加/存油信息
+                            </a></li>
+                            <li><a href="javascript:;" data-action="1"
+                                   class="tool-action" id="outAndIn"> <i class="fa fa-pencil"></i> 油耗计算（进场=出场）
+                            </a></li>
+                            <li><a href="javascript:;" id="checkYl" data-action="3"
+                                   class="tool-action"> <i class="fa fa-gg-circle"></i>
+                                核对加注量（有加油无里程）
+                            </a></li>
+                            <li class="divider"></li>
+                            <li><a href="javascript:;" data-action="3"
+                                   class="tool-action" id="export"> <i class="fa fa-file-excel-o"></i>
+                                导出Excel
+                            </a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <div class="portlet-body">
+                <div class="table-container" style="margin-top: 10px">
+                    <table
+                            class="table table-striped table-bordered table-hover table-checkable"
+                            id="datatable_ylb">
+                        <thead>
+                        <tr role="row" class="filter">
+                        <td> 公司:</td>
+                            <td colspan="2">
+                              		
+                         <select class="form-control" name="ssgsdm_like" id="ylbListGsdmId" ></select>
+                               
+                            </td>
+                            <td>
+                            	分公司:
+                            </td>
+                            <td colspan="2">
+                               		
+                         <select class="form-control" name="fgsdm_like" id="ylbListFgsdmId" ></select>
+                            </td>
+                       
+                            <td>
+                                	日期:
+                            </td>
+                            <td>
+                                <input type="text" style="width: 80px" name="rq" id="rq"/>
+                            </td>
+                            <td >
+                               	 线路:
+                            </td>
+                            <td colspan="3">
+                                <select class="form-control" name="xlbm_eq" id="xlbm" style="width: 120px;"></select>
+                                &nbsp;
+                            </td>
+                            <td >
+                              	  内部编码:
+                            </td>
+                            <td colspan="3">
+                                <select class="form-control" name="nbbm_eq" id="nbbm" style="width: 120px;"></select>
+                            </td>
+                            <td colspan="4">
+                                <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right:0px">
+                                    <i class="fa fa-search"></i> 搜索
+                                </button>
+
+                                <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px">
+                                    <i class="fa fa-times"></i> 重置
+                                </button>
+
+                            </td>
+                        </tr>
+                        <tr role="row" class="heading">
+                            <th width="2%">#</th>
+                            <th width="8%">日期</th>
+                            <th width="5%">公司</th>
+                            <th width="8%">线路</th>
+                            <th width="5%">自编号</th>
+                            <th width="6%">驾驶员</th>
+                            <th width="4%">加油量</th>
+                            <th width="5%">出场公里</th>
+                            <th width="4%">进场公里</th>
+                            <th width="4%">出场存油</th>
+                            <th width="4%">进场存油</th>
+                            <th width="5%">油耗</th>
+                            <th width="5%">燃油类型</th>
+                            <th width="4%">尿素</th>
+                            <th width="5%">耗损原因</th>
+                            <th width="5%">耗损油量</th>
+                            <th width="5%">当日总里程</th>
+                            <th width="5%">数据类型</th>
+                            <th width="5%">百公里油耗</th>
+                            <!-- 								<th width="5%">操作</th> -->
+                        </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
+                    <div style="text-align: right;">
+                        <ul id="pagination" class="pagination"></ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script id="ylb_list_temp" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td style="vertical-align: middle;">
+            <input type="radio" name="id" class="group-checkable icheck" data-id="{{obj.id}}">
+        </td>
+
+        <td>
+            {{obj.rq}}
+        </td>
+        <td>
+            {{obj.gsname}}
+        </td>
+        <td>
+            {{obj.xlname}}
+        </td>
+        <td>
+            {{obj.nbbm}}
+        </td>
+        <td>
+            {{obj.jsy}}
+        </td>
+        <td>
+            {{obj.jzl}}
+        </td>
+        <td>
+            {{obj.czlc}}
+        </td>
+        <td>
+            {{obj.jzlc}}
+        </td>
+        <td>
+            {{obj.czyl}}
+        </td>
+        <td>
+            <a data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzyl">
+                {{obj.jzyl}}
+            </a>
+        </td>
+        <td>
+            {{obj.yh}}
+        </td>
+        <td>
+            {{obj.rylx}}
+        </td>
+        <td>
+            {{obj.ns}}
+        </td>
+        <td>
+            {{obj.shyy}}
+        </td>
+        <td>
+            {{obj.sh}}
+        </td>
+        <td>
+            {{obj.zlc}}
+        </td>
+        <td>
+            {{obj.yhlx}}
+        </td>
+        <td>
+            {{obj.bglyh}}
+        </td>
+        <td>
+            <!--<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>-->
+        </td>
+    </tr>
+    {{/each}}
+    {{if list.length == 0}}
+    <tr>
+        <td colspan=20><h6 class="muted">没有找到相关数据</h6></td>
+    </tr>
+    {{/if}}
+</script>
+
+<script>
+    $(function () {
+        //var id = 15;
+        //$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list')
+
+        $("#checkYl").on('click', function () {
+            console.log("核对加注量");
+            if ($("#rq").val() != "") {
+                var cells = $('tr.filter')[0].cells
+                        , params = {}
+                        , name;
+                $.each(cells, function (i, cell) {
+                    var items = $('input,select', cell);
+                    for (var j = 0, item; item = items[j++];) {
+                        name = $(item).attr('name');
+                        if (name) {
+                            params[name] = $(item).val();
+                        }
+                    }
+                });
+                $get('/ylb/checkYl', params, function () {
+                    jsDoQuery(null, true);
+                });
+            } else {
+                layer.msg('请选择日期.');
+            }
+        })
+
+        //进场等于出场
+        $("#outAndIn").on('click', function () {
+            console.log("进场油量等于出场油量");
+            if ($("#rq").val() != "") {
+                var cells = $('tr.filter')[0].cells
+                        , params = {}
+                        , name;
+                $.each(cells, function (i, cell) {
+                    var items = $('input,select', cell);
+                    for (var j = 0, item; item = items[j++];) {
+                        name = $(item).attr('name');
+                        if (name) {
+                            params[name] = $(item).val();
+                        }
+                    }
+                });
+                $get('/ylb/outAndIn', params, function () {
+                    jsDoQuery(null, true);
+                });
+            } else {
+                layer.msg('请选择日期.');
+            }
+        })
+        //拆分
+        $("#sortButton").on('click', function () {
+            if ($("#rq").val() != "") {
+                var id = $('input.icheck:checked').data('id');
+               
+                if (typeof(id) == 'undefined') {
+                    layer.msg("请选择一行进行拆分");
+                } else {
+                    //获取输入的进场存油
+                    var jzyl =  $('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').html();
+                   // $("#jzyl" + id).html();
+                   console.log(jzyl);
+                    var params = {};
+                    params['jzyl'] = jzyl;
+                    params['id'] = id;
+                    $get('/ylb/sort', params, function () {
+                        jsDoQuery(null, true);
+                    });
+
+                }
+            } else {
+                layer.msg('请选择日期.');
+            }
+        })
+        //获取加存信息
+        $("#obtain").on('click', function () {
+            console.log("获取加存");
+            if ($("#rq").val() != "") {
+                var cells = $('tr.filter')[0].cells
+                        , params = {}
+                        , name;
+                $.each(cells, function (i, cell) {
+                    var items = $('input,select', cell);
+                    for (var j = 0, item; item = items[j++];) {
+                        name = $(item).attr('name');
+                        if (name) {
+                            params[name] = $(item).val();
+                        }
+                    }
+                });
+                $get('/ylb/obtain', params, function () {
+                    jsDoQuery(params, true);
+                });
+            } else {
+                layer.msg('请选择日期.');
+            }
+
+        })
+        $("#rq").datetimepicker({
+            format: 'YYYY-MM-DD',
+            locale: 'zh-cn'
+        });
+
+        var page = 0, initPagination;
+        var icheckOptions = {
+            radioClass: 'iradio_square-blue icheck',
+            increaseArea: '20%'
+        }
+
+        //重置
+        $('tr.filter .filter-cancel').on('click', function () {
+            $('tr.filter input, select').val('').change();
+        });
+
+        //提交
+        $('tr.filter .filter-submit').on('click', function () {
+        	 var ylbGsdm=$("#ylbListGsdmId").val();
+     		var ylbFgsdm=$("#ylbListFgsdmId").val();
+            if ($("#rq").val() == "" || $("#rq").val() ==null){
+            	  layer.msg('请选择日期.');
+            }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
+            	 layer.msg('请选择公司和分公司.');
+            }else {
+                var cells = $('tr.filter')[0].cells
+                        , params = {}
+                        , name;
+                $.each(cells, function (i, cell) {
+                    var items = $('input,select', cell);
+                    for (var j = 0, item; item = items[j++];) {
+                        name = $(item).attr('name');
+                        if (name) {
+                            params[name] = $(item).val();
+                        }
+                    }
+                });
+                page = 0;
+                jsDoQuery(params, true);
+            } 
+        });
+
+        
+//         var gsqxdm="";
+    
+    	
+    	$.get('/user/companyData', function(result){
+    		obj = result;
+    		var options="";
+// 			= '<option value="">请选择</option>';
+    		for(var i = 0; i < obj.length; i++){
+    			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+//     			setFgsqx(obj[i].companyCode);
+    		}
+    		$('#ylbListGsdmId').html(options);
+    		updateCompany();
+    	});
+    	/* function setFgsqx(gs){
+    		var company =gs
+    		var options = '';
+    		for(var i = 0; i < obj.length; i++){
+    			if(obj[i].companyCode == company){
+    				var children = obj[i].children;
+    				for(var j = 0; j < children.length; j++){
+    					gsqxdm +=company+""+children[j].code+",";
+    				}
+    			}
+    		}
+    	} */
+    	$("#ylbListGsdmId").on("change",updateCompany);
+    	function updateCompany(){
+    		var company = $('#ylbListGsdmId').val();
+    		var options ="";
+//     		= '<option value="">请选择</option>';
+    		for(var i = 0; i < obj.length; i++){
+    			if(obj[i].companyCode == company){
+    				var children = obj[i].children;
+    				for(var j = 0; j < children.length; j++){
+    					options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+    				}
+    			}
+    		}
+    		$('#ylbListFgsdmId').html(options);
+    	}
+        /*
+         * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+         */
+        function jsDoQuery(p, pagination) {
+            var params = {};
+            if (p)
+                params = p;
+            //更新时间排序
+            params['order'] = 'nbbm';
+            params['page'] = page;
+            params['rq'] = $("#rq").val();
+            
+          /*   var ylbGsdm=$("#ylbListGsdmId").val();
+    		var ylbFgsdm=$("#ylbListFgsdmId").val();
+    		if(ylbGsdm==''|| ylbGsdm==null){
+    			params['concat(ssgsdm,fgsdm)_in']=gsqxdm;
+    		}else{
+    			if(ylbFgsdm==''||ylbFgsdm==null){
+    				var fgsqx1='';
+    				for(var i = 0; i < obj.length; i++){
+    					if(obj[i].companyCode == ylbGsdm){
+    						var children = obj[i].children;
+    						for(var j = 0; j < children.length; j++){
+    							fgsqx1 +=children[j].code+",";
+    						}
+    					}
+    				}
+    				params['fgsdm_in']=fgsqx1;
+    			}
+    		} */
+            var i = layer.load(2);
+            $get('/ylb', params, function (data) {
+                $.each(data.content, function (i, obj) {
+                    obj.rq = moment(obj.rq).format("YYYY-MM-DD");
+                });
+                var bodyHtm = template('ylb_list_temp', {list: data.content});
+
+                $('#datatable_ylb tbody').html(bodyHtm)
+                        .find('.icheck').iCheck(icheckOptions)
+                        .on('ifChanged', iCheckChange);
+                if (pagination && data.content.length > 0) {
+                    //重新分页
+                    initPagination = true;
+                    showPagination(data);
+                }
+                layer.close(i);
+
+                startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
+            });
+        }
+
+        //改变状态
+        function startOptJzylLink(es) {
+            es.editable({
+                type: 'text',
+                placement: 'right',
+                width: 100,
+                display: false,
+                validate: function (value) {
+                    if (!value)
+                        return '值不能为空！';
+                    if (isNaN(value))
+                        return '只能为数字！';
+                    if (value < 0)
+                        return '值不能小于0！';
+                },
+                inputclass: 'form-control input-medium input-edtable-sm'
+            })
+                    .on('save', function (e, params) {
+                        $(this).text(params.newValue);
+                    });
+        }
+
+        function iCheckChange() {
+            var tr = $(this).parents('tr');
+            if (this.checked)
+                tr.addClass('row-active');
+            else
+                tr.removeClass('row-active');
+
+            /* if($('#datatable_resource input.icheck:checked').length == 1)
+             $('#removeButton').removeAttr('disabled');
+             else
+             $('#removeButton').attr('disabled', 'disabled');  */
+        }
+
+        function showPagination(data) {
+            //分页
+            $('#pagination').jqPaginator({
+                totalPages: data.totalPages,
+                visiblePages: 6,
+                currentPage: page + 1,
+                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+                onPageChange: function (num, type) {
+                    if (initPagination) {
+                        initPagination = false;
+                        return;
+                    }
+
+                    var cells = $('tr.filter')[0].cells
+                            , params = {}
+                            , name;
+                    $.each(cells, function (i, cell) {
+                        var items = $('input,select', cell);
+                        for (var j = 0, item; item = items[j++];) {
+                            name = $(item).attr('name');
+                            if (name) {
+                                params[name] = $(item).val();
+                            }
+                        }
+                    });
+                    page = num - 1;
+                    jsDoQuery(params, true);
+                }
+            });
+        }
+
+
+        //删除
+        $('#removeButton').on('click', function () {
+            if ($(this).attr('disabled'))
+                return;
+
+            var id = $('input.icheck:checked').data('id');
+            removeConfirm('确定要删除选中的数据？', '/resource/' + id, function () {
+                $('tr.filter .filter-submit').click();
+            });
+        });
+
+        //搜索线路
+       	$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#xlbm',data,'');
+			
+		})
+
+        $('#nbbm').select2({
+            placeholder: '搜索车辆...',
+            ajax: {
+                url: '/realSchedule/sreachVehic',
+                dataType: 'json',
+                delay: 150,
+                data: function (params) {
+                    return {nbbm: params.term};
+                },
+                processResults: function (data) {
+                    return {
+                        results: data
+                    };
+                },
+                cache: true
+            },
+            templateResult: function (repo) {
+                if (repo.loading) return repo.text;
+                var h = '<span>' + repo.text + '</span>';
+                h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
+                return h;
+            },
+            escapeMarkup: function (markup) {
+                return markup;
+            },
+            minimumInputLength: 1,
+            templateSelection: function (repo) {
+                return repo.text;
+            },
+            language: {
+                noResults: function () {
+                    return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+                },
+                inputTooShort: function (e) {
+                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+                },
+                searching: function () {
+                    return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+                }
+            }
+        })
+
+
+//导出
+
+        $("#export").on("click", function () {
+            if ($("#rq").val() != "") {
+                var cells = $('tr.filter')[0].cells
+                        , params = {}
+                        , name;
+                $.each(cells, function (i, cell) {
+                    var items = $('input,select', cell);
+                    for (var j = 0, item; item = items[j++];) {
+                        name = $(item).attr('name');
+                        if (name) {
+                            params[name] = $(item).val();
+                        }
+                    }
+                });
+                console.log(params);
+                $post('/ylb/listExport', params, function (result) {
+                    console.log(result);
+                    window.open("/downloadFile/download?fileName=进出场存油量" + moment($("#rq").val()).format("YYYYMMDD"));
+                });
+            } else {
+                layer.msg('请选择日期.');
+            }
+        });
+
+    });
+</script>
 \ No newline at end of file
@@ -40,8 +40,8 @@
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
                     </div>
                     <div style="display: inline-block;margin-left: 15px;">
-                        <span class="item-label" style="width: 80px;">时间: </span>
-                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                        <span class="item-label" style="width: 80px;">时刻表: </span>
+                        <select class="form-control" name="ttinfo" id="ttinfo" style="width: 180px;"></select>
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
@@ -196,10 +196,6 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		$("#date").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
 		var obj = [];
 		$.get('/user/companyData', function(result){
@@ -246,27 +242,49 @@
 		})
+		
+		var flag = 0;
+		function updateTtinfo(){
+			if(flag == 1)
+				return;
+			flag = 1;
+			var treeData = [];
+			var params = {};
+			params['line'] = $("#line").val();
+			$get('/report/getTtinfo', params, function(result){
+				treeData = createTreeData(result);
+				var options = '<option value="">请选择...</option>';
+				$.each(treeData, function(i, g){
+					options += '<option value="'+g.id+'">'+g.name+'</option>';
+				});
+				$('#ttinfo').html(options)/* .select2() */;
+				flag = 0;
+			});
+		}
+		
+		$("#line").on("change", function(){
+			updateTtinfo();
+		})
+		
 		//查询
 		$("#query").on('click',function(){
-			console.log($("#gsdmTime").val());
-			console.log($("#fgsdmTime").val());
 			var line = $("#line").val();
 			var xlName = $("#select2-line-container").html();
-			var date = $("#date").val();
-			if(date==null|| date==""){
-				layer.msg('请选择日期.');
-			}else if(line==null || line ==""){
+			var ttinfo = $("#ttinfo").val();
+			if(line==null || line ==""){
 				layer.msg('请选择线路.');
+			}else if(ttinfo==null|| ttinfo==""){
+				layer.msg('请选择时刻表.');
 			}else{
-				 $get('/report/tbodyTime1',{line:line,date:date},function(result){
+				 $get('/report/tbodyTime1',{line:line,ttinfo:ttinfo},function(result){
 					var tbodyTime1 = template('tbodyTime1',{map:result});
 					$('#formsTime1 .tbody_time_1').html(tbodyTime1);
 				}); 
-				$.get('/report/tbodyTime2',{line:line,date:date},function(result){
+				 $.get('/report/tbodyTime2',{line:line,ttinfo:ttinfo},function(result){
 					var tbodyTime2 = template('tbodyTime2',{map:result});
 					$('#formsTime2 .tbody_time_2').html(tbodyTime2);
-				});
-				$.get('/report/tbodyTime3',{line:line,date:date},function(result){
+				});/*
+				$.get('/report/tbodyTime3',{line:line,ttinfo:ttinfo},function(result){
 					var tbodyTime3 = template('tbodyTime3',{list:result});
 					$('#formsTime3 .tbody_time_3').html(tbodyTime3);
@@ -274,15 +292,17 @@
 					var divTime2 = window.document.getElementById('formsTime2');
 					console.log(divTime3.offsetHeight);
 					 divTime2.style.height=divTime3.offsetHeight+"px";
-				});/*
+				}); */
+				
+				/*
 				$.get('/report/tbodyTime4',{line:line,date:date},function(result){
 					var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
 					$('#forms .scheduleDaily_3').html(scheduleDaily_3);
 				});*/
-				$.get('/report/tbodyTime5',{line:line,date:date},function(result){
+				/* $.get('/report/tbodyTime5',{line:line,ttinfo:ttinfo},function(result){
 					var tbodyTime5 = template('tbodyTime5',{list:result});
 					$('#formsTime5 .tbody_time_5').html(tbodyTime5);
-				}); 
+				});  */
 			}
@@ -26,7 +26,7 @@
                     <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().equipmentCode_like" placeholder="输入设备编号..."/>
                 </td>
                 <td>
-                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().carCode_like" placeholder="输入车牌号..."/>
+                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().carPlate_like" placeholder="输入车牌号..."/>
                 </td>
                 <td>
                     <div>