Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents d023be26 3b26722b
Showing 10 changed files with 2327 additions and 1841 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/entity/realcontrol/SvgAttribute.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/repository/realcontrol/SvgAttributeRepository.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
@@ -36,35 +36,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	/**
 	 * 
-	 * 改由通过 websocket 注册监听！！！
-	 * 
-	 * @Title: registerLine @Description: TODO(注册线路，后续才能收到数据推送) @param @param
-	 * lineCodes @throws
-	 * 用GET 防止监控模式下被拦截
-	 
-	@RequestMapping(value = "/registerLine", method = RequestMethod.GET)
-	public int registerLine(@RequestParam String lineCodes) {
-		List<String> list = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(lineCodes);
-		String userName = SecurityUtils.getCurrentUser().getUserName();
-		// 注销之前的绑定
-		for (String line : list)
-			BasicData.lineCode2SocketUserMap.get(line).remove(userName);
-		// 重新绑定
-		for (String line : list)
-			BasicData.lineCode2SocketUserMap.put(line, userName);
-
-		return 0;
-	}*/
-
-	/**
-	 * 
 	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
 	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
 	 */
 	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
 	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
-			@RequestParam String dfsj/*, String clZbh, String jsy, String spy*/) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj/*, clZbh, jsy, spy*/);
+			@RequestParam String dfsj,@RequestParam String bcType) {
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType);
 	}
 	/**
@@ -125,19 +103,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
 		return scheduleRealInfoService.sreachVehic(nbbm);
 	}
-
-	/**
-	 * 
-	 * @Title: adjust @Description: TODO(调整人车) @param @param id
-	 * 班次ID @param @param nbbm 内部编码 @param @param jsy 驾驶员 @param @param spy
-	 * 售票员 @throws
-
-	@RequestMapping(value = "/adjust", method = RequestMethod.POST)
-	public Map<String, Object> adjust(@RequestParam Long id, String nbbm, String jsy,
-			String spy, Integer revertLine, Integer borrowLine, String borrowTimeStr, String revertTimeStr) {
-		return scheduleRealInfoService.adjust(id, nbbm, jsy, spy, revertLine, borrowLine, borrowTimeStr, revertTimeStr);
-	}
-	 */
 	/**
 	 * 
 	 * @Title: realOutAdjust 
@@ -299,10 +264,17 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/exportWaybill")
 	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
-			@RequestParam String lpName,@RequestParam String date) {
-		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date);
+			@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
+	}
+	
+	@RequestMapping(value = "/exportWaybillQp")
+	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
 	}
+	
 	@RequestMapping(value = "/dailyInfo")
 	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
 		return scheduleRealInfoService.dailyInfo(line, date, type);
@@ -321,8 +293,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value="/findKMBC")
 	public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date){
-		return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date);
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date,line);
+	}
+	
+	@RequestMapping(value="/findKMBCQp")
+	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
 	}
 	@RequestMapping(value="/findLpName")
@@ -351,16 +329,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value="/queryListWaybill")
 	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date){
-		String type="fqp";
-		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,type);
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
 	}
 	@RequestMapping(value="/queryListWaybillQp")
-	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date){
-		String type="qp";
-		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,type);
+	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
+			@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
 	}
 	@RequestMapping(value="/statisticsDaily")
@@ -368,6 +344,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.statisticsDaily(line, date,xlName);
 	}
+	@RequestMapping(value="/MapById",method = RequestMethod.GET)
+	public Map<String, Object> MapById(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapById(id);
+	}
+	
 	/**
 	 * @Title: scheduleDaily 
 	 * @Description: TODO(调度日报表) 
@@ -427,4 +408,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		}
 		return rs;
 	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.POST)
+	public Map<String, Object> svgAttr(@RequestParam String jsonStr){
+		return scheduleRealInfoService.svgAttr(jsonStr);
+	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.GET)
+	public Map<String, Object> findSvgAttr(@RequestParam  String idx){
+		return scheduleRealInfoService.findSvgAttr(idx);
+	}
 }
@@ -169,6 +169,10 @@ public class InOutStationSignalHandle extends SignalHandle{
         if(gps.getStopNo().equals(sch.getZdzCode())){
+            //进场最多提前1.2小时
+            if(sch.getBcType().equals("in") && sch.getZdsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+                return;
+
             //实达时间不覆盖
             if(StringUtils.isNotEmpty(sch.getZdsjActual()))
                 return;
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 主页SVG模拟图属性设置
+ * Created by panzhao on 2017/1/6.
+ */
+@Entity
+@Table(name = "bsth_c_svg_attr")
+public class SvgAttribute {
+
+    @Id
+    private String lineCode;
+
+    /**
+     * 要隐藏的站点编码  , 号分割多个
+     */
+    private String hideStations;
+
+    /**
+     * 站点别名 json对象字符串
+     */
+    private String nicknames;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getHideStations() {
+        return hideStations;
+    }
+
+    public void setHideStations(String hideStations) {
+        this.hideStations = hideStations;
+    }
+
+    public String getNicknames() {
+        return nicknames;
+    }
+
+    public void setNicknames(String nicknames) {
+        this.nicknames = nicknames;
+    }
+}
@@ -24,7 +24,7 @@ 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)")
+	@Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.clZbh 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")
@@ -79,13 +79,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " and clZbh like %?5% order by s.fcsj")
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
-	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') order by bcs")
-	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date);
+	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsjActual")
+	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
-	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and bcType='normal' order by bcs")
-	List<ScheduleRealInfo> queryListWaybill2(String jName,String clZbh,String lpName,String date);
+	@Query(value="select s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsjActual")
+	List<ScheduleRealInfo> queryListWaybill2(String clZbh,String date,String line);
-	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by bcs")
+	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsjActual")
 	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d')  order by bcs")
+package com.bsth.repository.realcontrol;
+
+import com.bsth.entity.realcontrol.SvgAttribute;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/1/8.
+ */
+@Repository
+public interface SvgAttributeRepository extends BaseRepository<SvgAttribute, String> {
+    @Query("select s from SvgAttribute s where s.lineCode in ?1")
+    List<SvgAttribute> findSvgAttr(List<String> lineCodes);
+}
@@ -11,6 +11,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -25,6 +26,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.BusIntervalService;
 import com.bsth.service.schedule.PeopleCarPlanService;
+import com.bsth.util.ReportUtils;
 @Service
@@ -514,6 +516,24 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
 		}
+
+		if(type != null && type.length() != 0 && type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(resList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould\\interval.xls",
+						path+"export\\班次间隔统计表" + sdfSimple.format(sdfMonth.parse(startDate)) 
+						+ "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
 		return resList;
 	}
@@ -672,8 +692,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String[] date1 = startDate.split("-");
 		String[] date2 = endDate.split("-");
 		String date = "";
-		startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
-		endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
+//		startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
+//		endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
 		if(startDate.equals(endDate)){
 			date = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
 		} else {
@@ -1044,6 +1064,27 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			modelMap.put("dataList", dataList);
 		}
+		if(type != null && type.length() != 0 && type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			ReportUtils ee = new ReportUtils();
+			if(statu.equals("0"))
+				modelMap.put("lpType", "路牌数量");
+			else if(statu.equals("1"))
+				modelMap.put("lpType", "路牌名");
+			try {
+				listI.add(((List<Map<String, Object>>)modelMap.get("dataList")).iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { modelMap }, path+"mould\\timeAndSpeed.xls",
+						path+"export\\行驶时间及车速统计表" + sdfSimple.format(sdfMonth.parse(startDate)) 
+						+ "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
 		return modelMap;
 	}
 package com.bsth.service.impl;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
@@ -30,7 +13,14 @@ import com.bsth.util.FTPClientUtils;
 import com.bsth.util.PackTarGZUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.*;
 /**
  * 
@@ -985,6 +975,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			List<String> idx = Splitter.on(',').splitToList(lineIds);
 			//路由
 			List<StationRoute> list = new ArrayList<>();
+
+
 			/**
 			 * in 查询符 无法和 @EntityGraph 同时配合使用，这可能是一个bug
 			 * 暂时只能循环单线路查询
@@ -993,9 +985,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			for(String id : idx){
 				list.addAll(repository.findByLineCode(id));
 			}
-			
+
+			for(StationRoute sr : list){
+				sr.setLine(null);
+			}
 			//过滤部分字段
-			String jsonStr = JSON.toJSONString(list, new PropertyFilter() {
+			/*String jsonStr = JSON.toJSONString(list, new PropertyFilter() {
 				@Override
 				public boolean apply(Object object, String name, Object value) {
@@ -1003,10 +998,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 						return false;
 					return true;
 				}
-			});
+			});*/
 			rs.put("status", ResponseCode.SUCCESS);
-			rs.put("list", jsonStr);
+			rs.put("list", list);
 		}catch(Exception e){
 			logger.error("", e);
 			rs.put("status", ResponseCode.ERROR);
@@ -15,7 +15,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Collection<ScheduleRealInfo>> findByLines(String lines);
-	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj/*,String nbbm,String jsy,String spy*/);
+	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType);
 	Map<String, Object> destroy(String idsStr/*, int spaceAdjust*/, String  remarks, String reason/*, int spaceNum*/);
@@ -61,7 +61,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<ScheduleRealInfo> queryUserInfo(String line,String date,String state);
-	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date);
+	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date,String line);
+	
+	List<ScheduleRealInfo> exportWaybillQp(String clZbh,String date,String line);
 	List<Map<String,Object>> dailyInfo(String line,String date,String type);
@@ -87,7 +89,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String,Object> findKMBC1(String jName,String clZbh, String date,String enddate);
-	Map<String,Object> findKMBC(String jName,String clZbh,String lpName,String date);
+	Map<String,Object> findKMBC(String jName,String clZbh,String lpName,String date,String line);
+	
+	Map<String,Object> findKMBCQp(String clZbh,String date,String line);
 	Map<String,Object> findKMBC2(String jName,String clZbh,String date);
@@ -97,8 +101,10 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code, String type);
-	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String type);
+	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
+	List<ScheduleRealInfo> queryListWaybillQp(String clZbh,String date,String line);
+	
 	Map<String, Object> removeChildTask(Long taskId);
 	List<Map<String,Object>> statisticsDaily(String line,String date,String xlName);
@@ -128,4 +134,10 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     Map<String,Object> changeBcType(Long id, String bcType, String remarks);
     Map<String,Object> historySave(ScheduleRealInfo sch);
+  
+    Map<String, Object> MapById(Long id) ;
+		
+    Map<String,Object> svgAttr(String jsonStr);
+
+	Map<String,Object> findSvgAttr(String idx);
 }
@@ -18,13 +18,16 @@ import com.bsth.entity.Personnel;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.realcontrol.SvgAttribute;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.sys.DutyEmployee;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.repository.realcontrol.SvgAttributeRepository;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.repository.schedule.GuideboardInfoRepository;
@@ -32,12 +35,15 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.SectionRouteService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.BiMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -46,7 +52,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -54,431 +59,390 @@ import java.util.*;
 @Service
 public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInfo, Long>
-		implements ScheduleRealInfoService {
+        implements ScheduleRealInfoService {
-	@Autowired
-	ScheduleRealInfoRepository scheduleRealInfoRepository;
+    @Autowired
+    ScheduleRealInfoRepository scheduleRealInfoRepository;
-	@Autowired
-	EmployeeConfigInfoRepository employeeConfigInfoRepository;
+    @Autowired
+    EmployeeConfigInfoRepository employeeConfigInfoRepository;
-	@Autowired
-	CarConfigInfoRepository carConfigInfoRepository;
-	
-	@Autowired
-	SectionRouteService sectionRouteService;
-	
-	/*@Autowired
-	BorrowCenter borrowCenter;*/
-	
-	@Autowired
-	LineRepository lineRepository;
-	
-	@Autowired
-	GuideboardInfoRepository guideboardInfoRepository;
-	
-	@Autowired
-	ChildTaskPlanRepository cTaskPlanRepository;
-	
-	@Autowired
-	SendUtils sendUtils;
-	
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-	
-	@Autowired
-	SchAttrCalculator schAttrCalculator;
-
-	@Autowired
-	LineConfigData lineConfigData;
-	
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-			sdfMinute = new SimpleDateFormat("yyyy-MM-dd HH:mm"), sdfShort = new SimpleDateFormat("HH:mm"),
-			sdfSimple = new SimpleDateFormat("yyyyMMdd");
-
-	@Override
-	public Map<String, Collection<ScheduleRealInfo>> findByLines(String lines) {
-		List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lines));
-
-		Multimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
-
-		for (String lineCode : lineList) {
-			mMap.putAll(lineCode, dayOfSchedule.findByLineCode(lineCode));
-		}
-		return mMap.asMap();
-	}
-
-	private final static long DAY_TIME = 1000 * 60 * 60 * 24L;
-	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
-	@Override
-	public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj/*, String nbbm,String jsy,String spy*/) {
-		Map<String, Object> map = new HashMap<>();
-		try {
-
-			ScheduleRealInfo schedule = dayOfSchedule.get(id);
-
-
-			LineConfig config = lineConfigData.get(schedule.getXlBm());
-			//小于线路开始运营时间，则默认跨过24点
-			if(dfsj.compareTo(config.getStartOpt()) < 0){
-				schedule.setRealExecDate(fmtyyyyMMdd.print(schedule.getScheduleDate().getTime() + DAY_TIME));
-			}
-			else {
-				schedule.setRealExecDate(schedule.getScheduleDateStr());
-			}
-
-			schedule.setDfsjAll(dfsj);
-			schedule.addRemarks(remarks);
-			
-			List<ScheduleRealInfo> ts = new ArrayList<>();
-			ts.add(schedule);
-			//调整终点时间和下一个班次的应到时间
-			schedule.calcEndTime();
-			ScheduleRealInfo nextSch = dayOfSchedule.next(schedule);
-			if(null != nextSch){
-				nextSch.setQdzArrDateJH(schedule.getZdsj());
-				ts.add(nextSch);
-			}
-			
-			// 持久化到数据库
-			dayOfSchedule.save(schedule);
-
-			map.put("status", ResponseCode.SUCCESS);
-			map.put("ts", ts);
-		} catch (Exception e) {
-			logger.error("", e);
-			map.put("status", ResponseCode.ERROR);
-		}
-		return map;
-	}
-
-	@Override
-	public Map<String, Object> destroy(String idsStr, /*int spaceAdjust, */String remarks, String reason/*, int spaceNum*/) {
-
-		Map<String, Object> map = new HashMap<>();
-		List<ScheduleRealInfo> rsList = new ArrayList<>();
-		map.put("ts", rsList);
-		try {
-			List<String> idList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(idsStr));
-
-			ScheduleRealInfo schedule = null;
-			for (String id : idList) {
-				schedule = dayOfSchedule.get(Long.parseLong(id));
-				if(schedule.isDestroy()){
-					map.put("status", ResponseCode.ERROR);
-					map.put("msg", "不必要的重复烂班！");
-					return map;
-				}
-
-				schedule.setAdjustExps(reason);
-				schedule.destroy();
-				schedule.addRemarks(remarks);
-				
-				dayOfSchedule.save(schedule);
-				rsList.add(schedule);
-			}
-
-			map.put("status", ResponseCode.SUCCESS);
-		} catch (Exception e) {
-			logger.error("", e);
-			map.put("status", ResponseCode.ERROR);
-		}
-		return map;
-	}
-
-	// 线路id获取驾驶员
-	@Override
-	public List<Map<String, String>> findDriverByLine(String lineCode) {
-		List<EmployeeConfigInfo> list = employeeConfigInfoRepository.findBylineCode(lineCode);
-
-		List<Map<String, String>> rsList = new ArrayList<>();
-		Map<String, String> map = null;
-		Personnel driver = null;
-		String code = null;
-
-		for (EmployeeConfigInfo employee : list) {
-			driver = employee.getJsy();
-			if (driver != null) {
-				map = new HashMap<>();
-				code = driver.getJobCode();
-				map.put("id", code + "/" + driver.getPersonnelName());
-				map.put("text", code + "/" + driver.getPersonnelName());
-				rsList.add(map);
-			}
-		}
-		return rsList;
-	}
-
-	// 线路id获取售票员
-	@Override
-	public List<Map<String, String>> findConductorByLine(String lineCode) {
-		List<EmployeeConfigInfo> list = employeeConfigInfoRepository.findBylineCode(lineCode);
-
-		List<Map<String, String>> rsList = new ArrayList<>();
-		Map<String, String> map = null;
-		Personnel conductor = null;
-		String code = null;
-
-		for (EmployeeConfigInfo employee : list) {
-			conductor = employee.getSpy();
-			if (conductor != null) {
-				code = conductor.getJobCode();
-				map = new HashMap<>();
-				map.put("id", code + "/" + conductor.getPersonnelName());
-				map.put("text", code + "/" + conductor.getPersonnelName());
-				rsList.add(map);
-			}
-		}
-		return rsList;
-	}
-
-	@Override
-	public List<Map<String, String>> findCarByLine(String lineCode) {
-
-		List<CarConfigInfo> list = carConfigInfoRepository.findBylineCode(lineCode);
-
-		List<Map<String, String>> rsList = new ArrayList<>();
-		Map<String, String> map = null;
-		Cars car = null;
-		String code = null;
-
-		for (CarConfigInfo cci : list) {
-			car = cci.getCl();
-			if (car != null) {
-				code = car.getInsideCode();
-				map = new HashMap<>();
-				map.put("id", code);
-				map.put("text", code);
-				rsList.add(map);
-			}
-		}
-		return rsList;
-	}
-
-	
-	/**
-	 * 临加班次
-	 */
-	@Override
-	public Map<String, Object> save(ScheduleRealInfo t) {
-		Map<String, Object> rs = new HashMap<>();
-		try{
-			SysUser user = SecurityUtils.getCurrentUser();
-			String schDate = DayOfSchedule.currSchDateMap.get(t.getXlBm());
-			
-			SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
-						,sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-			
-			if(StringUtils.isEmpty(t.getjGh())){
-				rs.put("status", ResponseCode.ERROR);
-				rs.put("msg", "驾驶员工号不能为空！");
-				return rs;
-			}
-			//截取工号
-			if(t.getjGh().indexOf("-") != -1){
-				t.setjGh(t.getjGh().split("-")[1]);
-			}
-				
-			t.setScheduleDateStr(schDate);
-			t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
-			t.setRealExecDate(schDate);
-			t.setCreateBy(user);
-			t.setSflj(true);
-			t.setLate(false);
-			t.setDfsj(t.getFcsj());
-			t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
-
-			
-			//班次历时
-			t.setBcsj(DateUtils.calcHHmmDiff(t.getFcsj(), t.getZdsj()) / 1000 / 60);
-			
-			//起终点名称
-			String prefix = t.getXlBm() + "_" + t.getXlDir() + "_";
-			t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix));
-			t.setZdzName(BasicData.getStationNameByCode(t.getZdzCode(), prefix));
-			
-			//计算班次实际时间
-			schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
-			if(t.getZdsjT() < t.getFcsjT()){
-				rs.put("status", ResponseCode.ERROR);
-				rs.put("msg", "起终点时间异常！");
-				return rs;
-			}
-			
-			//实时入库
-			super.save(t);
-			
-			// 加入缓存
-			dayOfSchedule.put(t);
-			
-			//更新起点应到时间
-			List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(t.getClZbh());
-			
-			
-			rs.put("ts", ts);
-			rs.put("t", t);
-		}catch(Exception e){
-			logger.error("", e);
-			rs.put("status", ResponseCode.ERROR);
-		}
-		return rs;
-	}
-	
-	@Override
-	public Map<String, Object> delete(Long id) {
-		Map<String, Object> rs = new HashMap<>();
-		rs.put("status", ResponseCode.ERROR);
-		
-		ScheduleRealInfo sch = dayOfSchedule.get(id);
-		if(sch == null){
-			rs.put("msg", "无效的id号");
-			return rs;
-		}
-		
-		if(!sch.isSflj()){
-			rs.put("msg", "你只能删除临加班次");
-			return rs;
-		}
-		
-		dayOfSchedule.delete(sch);
-		//ScheduleRealInfo sch = dayOfSchedule.delete(id);
-		//数据库删除
-		rs = super.delete(id);
-		//更新起点应到时间
-		List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
-		rs.put("ts", ts);
-		rs.put("delete", sch);
-
-		return rs;
-	}
-
-	@Override
-	public List<Map<String, String>> sreachVehic(String nbbm) {
-		// 转大写
-		nbbm = nbbm.toUpperCase();
-
-		List<Map<String, String>> list = new ArrayList<>();
-		Map<String, String> map;
-		Set<String> allSet = BasicData.nbbm2CompanyCodeMap.keySet();
-
-		Line line;
-		for (String k : allSet) {
-			if (k.indexOf(nbbm) != -1) {
-				// 所属线路
-				map = new HashMap<>();
-				line = BasicData.nbbm2LineMap.get(k);
-				map.put("id", k);
-				map.put("text", k);
-				if (null != line) {
-					map.put("lineName", line.getName());
-					map.put("lineCode", line.getLineCode());
-				}
-
-				list.add(map);
-			}
-
-			if (list.size() > 20)
-				break;
-		}
-		return list;
-	}
-
-/*	@Override
-	public Map<String, Object> adjust(Long id, String nbbm, String jsy, String spy, Integer revertLine, Integer borrowLine, String borrowTimeStr, String revertTimeStr) {
-		// 班次
-		ScheduleRealInfo schedule = dayOfSchedule.get(id);
-		int upDown = Integer.parseInt(schedule.getXlDir());
+    @Autowired
+    CarConfigInfoRepository carConfigInfoRepository;
-		String rq = sdfMonth.format(new Date());
-		// 换车
-		if (!StringUtils.isBlank(nbbm)) {
-			adjustCar(schedule, nbbm);
-		}
-
-		List<String> tempArray;
-		// 换驾驶员
-		if (!StringUtils.isBlank(jsy)) {
-			tempArray = Splitter.on("/").splitToList(jsy);
-			adjustDriver(schedule, tempArray.get(0), tempArray.get(1));
-		}
-
-		// 换售票员
-		if (!StringUtils.isBlank(spy)) {
-			tempArray = Splitter.on("/").splitToList(spy);
-			adjustConductor(schedule, tempArray.get(0), tempArray.get(1));
-		}
-		
-		if(borrowLine != null && borrowTimeStr != null){
-			try {
-				//跨线路借车
-				Long t = sdfMinute.parse(rq + " " + borrowTimeStr).getTime();
-				//borrowCenter.put(nbbm, borrowLine, 0, t, upDown);
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-		}
-		
-		if(revertLine != null && revertTimeStr != null){
-			//定时还车
-			try {
-				Long t = sdfMinute.parse(rq + " " + revertTimeStr).getTime();
-				//还车的时候不用切走向
-				//borrowCenter.put(nbbm, revertLine, 1, t, -1);
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-		}
-
-		scheduleRealInfoRepository.save(schedule);
-		//ScheduleBuffer.persistentList.add(schedule);
-
-		Map<String, Object> map = new HashMap<>();
-		map.put("status", 200);
-		map.put("t", schedule);
-		return map;
-	}*/
-
-	@Override
-	public void adjustCar(ScheduleRealInfo schedule, String car) {
-		schedule.setClZbh(car);
-	}
-
-	@Override
-	public void adjustDriver(ScheduleRealInfo schedule, String driver, String driverName) {
-		if(driver.indexOf("-") != -1)
-			driver = driver.split("-")[1];
-		schedule.setjGh(driver);
-		schedule.setjName(driverName);
-	}
+    @Autowired
+    SectionRouteService sectionRouteService;
-	@Override
-	public void adjustConductor(ScheduleRealInfo schedule, String conductor, String conductorName) {
-		if(conductor.indexOf("-") != -1)
-			conductor = conductor.split("-")[1];
-		schedule.setsGh(conductor);
-		schedule.setsName(conductorName);
-	}
+	/*@Autowired
+	BorrowCenter borrowCenter;*/
-	@Override
-	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);
-		}
-		
-	}
-	/**
-	 * 
-	 */
-	@Override
-	public List<ScheduleRealInfo> exportWaybill(String jName, String clZbh, String lpName,String date) {
+    @Autowired
+    LineRepository lineRepository;
+
+    @Autowired
+    GuideboardInfoRepository guideboardInfoRepository;
+
+    @Autowired
+    ChildTaskPlanRepository cTaskPlanRepository;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    SchAttrCalculator schAttrCalculator;
+
+    @Autowired
+    LineConfigData lineConfigData;
+    
+    @Autowired
+    DutyEmployeeService dutyEmployeeService;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+            sdfMinute = new SimpleDateFormat("yyyy-MM-dd HH:mm"), sdfShort = new SimpleDateFormat("HH:mm"),
+            sdfSimple = new SimpleDateFormat("yyyyMMdd");
+
+    @Override
+    public Map<String, Collection<ScheduleRealInfo>> findByLines(String lines) {
+        List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lines));
+
+        Multimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
+
+        for (String lineCode : lineList) {
+            mMap.putAll(lineCode, dayOfSchedule.findByLineCode(lineCode));
+        }
+        return mMap.asMap();
+    }
+
+    private final static long DAY_TIME = 1000 * 60 * 60 * 24L;
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+
+    @Override
+    public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+
+            ScheduleRealInfo schedule = dayOfSchedule.get(id);
+
+
+            LineConfig config = lineConfigData.get(schedule.getXlBm());
+            //小于线路开始运营时间，则默认跨过24点
+            if (dfsj.compareTo(config.getStartOpt()) < 0) {
+                schedule.setRealExecDate(fmtyyyyMMdd.print(schedule.getScheduleDate().getTime() + DAY_TIME));
+            } else {
+                schedule.setRealExecDate(schedule.getScheduleDateStr());
+            }
+
+            schedule.setDfsjAll(dfsj);
+            schedule.addRemarks(remarks);
+
+            List<ScheduleRealInfo> ts = new ArrayList<>();
+            ts.add(schedule);
+            //调整终点时间和下一个班次的应到时间
+            schedule.calcEndTime();
+            ScheduleRealInfo nextSch = dayOfSchedule.next(schedule);
+            if (null != nextSch) {
+                nextSch.setQdzArrDateJH(schedule.getZdsj());
+                ts.add(nextSch);
+            }
+
+            //调整班次类型
+            if(StringUtils.isNotEmpty(bcType)){
+                schedule.setBcType(bcType);
+            }
+
+            // 持久化到数据库
+            dayOfSchedule.save(schedule);
+
+            map.put("status", ResponseCode.SUCCESS);
+            map.put("ts", ts);
+        } catch (Exception e) {
+            logger.error("", e);
+            map.put("status", ResponseCode.ERROR);
+        }
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> destroy(String idsStr, /*int spaceAdjust, */String remarks, String reason/*, int spaceNum*/) {
+
+        Map<String, Object> map = new HashMap<>();
+        List<ScheduleRealInfo> rsList = new ArrayList<>();
+        map.put("ts", rsList);
+        try {
+            List<String> idList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(idsStr));
+
+            ScheduleRealInfo schedule = null;
+            for (String id : idList) {
+                schedule = dayOfSchedule.get(Long.parseLong(id));
+                if (schedule.isDestroy()) {
+                    map.put("status", ResponseCode.ERROR);
+                    map.put("msg", "不必要的重复烂班！");
+                    return map;
+                }
+
+                schedule.setAdjustExps(reason);
+                schedule.destroy();
+                schedule.addRemarks(remarks);
+
+                dayOfSchedule.save(schedule);
+                rsList.add(schedule);
+            }
+
+            map.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            map.put("status", ResponseCode.ERROR);
+        }
+        return map;
+    }
+
+    // 线路id获取驾驶员
+    @Override
+    public List<Map<String, String>> findDriverByLine(String lineCode) {
+        List<EmployeeConfigInfo> list = employeeConfigInfoRepository.findBylineCode(lineCode);
+
+        List<Map<String, String>> rsList = new ArrayList<>();
+        Map<String, String> map = null;
+        Personnel driver = null;
+        String code = null;
+
+        for (EmployeeConfigInfo employee : list) {
+            driver = employee.getJsy();
+            if (driver != null) {
+                map = new HashMap<>();
+                code = driver.getJobCode();
+                map.put("id", code + "/" + driver.getPersonnelName());
+                map.put("text", code + "/" + driver.getPersonnelName());
+                rsList.add(map);
+            }
+        }
+        return rsList;
+    }
+
+    // 线路id获取售票员
+    @Override
+    public List<Map<String, String>> findConductorByLine(String lineCode) {
+        List<EmployeeConfigInfo> list = employeeConfigInfoRepository.findBylineCode(lineCode);
+
+        List<Map<String, String>> rsList = new ArrayList<>();
+        Map<String, String> map = null;
+        Personnel conductor = null;
+        String code = null;
+
+        for (EmployeeConfigInfo employee : list) {
+            conductor = employee.getSpy();
+            if (conductor != null) {
+                code = conductor.getJobCode();
+                map = new HashMap<>();
+                map.put("id", code + "/" + conductor.getPersonnelName());
+                map.put("text", code + "/" + conductor.getPersonnelName());
+                rsList.add(map);
+            }
+        }
+        return rsList;
+    }
+
+    @Override
+    public List<Map<String, String>> findCarByLine(String lineCode) {
+
+        List<CarConfigInfo> list = carConfigInfoRepository.findBylineCode(lineCode);
+
+        List<Map<String, String>> rsList = new ArrayList<>();
+        Map<String, String> map = null;
+        Cars car = null;
+        String code = null;
+
+        for (CarConfigInfo cci : list) {
+            car = cci.getCl();
+            if (car != null) {
+                code = car.getInsideCode();
+                map = new HashMap<>();
+                map.put("id", code);
+                map.put("text", code);
+                rsList.add(map);
+            }
+        }
+        return rsList;
+    }
+
+
+    /**
+     * 临加班次
+     */
+    @Override
+    public Map<String, Object> save(ScheduleRealInfo t) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            if (BasicData.deviceId2NbbmMap.inverse().get(t.getClZbh()) == null) {
+                rs.put("msg", "车辆 " + t.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
+                rs.put("status", ResponseCode.ERROR);
+                return rs;
+            }
+
+            SysUser user = SecurityUtils.getCurrentUser();
+            String schDate = DayOfSchedule.currSchDateMap.get(t.getXlBm());
+
+            SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd"), sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+
+            if (StringUtils.isEmpty(t.getjGh())) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "驾驶员工号不能为空！");
+                return rs;
+            }
+            //截取工号
+            if (t.getjGh().indexOf("-") != -1) {
+                t.setjGh(t.getjGh().split("-")[1]);
+            }
+
+            t.setScheduleDateStr(schDate);
+            t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
+            t.setRealExecDate(schDate);
+            t.setCreateBy(user);
+            t.setSflj(true);
+            t.setLate(false);
+            t.setDfsj(t.getFcsj());
+            t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
+
+
+            //班次历时
+            t.setBcsj(DateUtils.calcHHmmDiff(t.getFcsj(), t.getZdsj()) / 1000 / 60);
+
+            //起终点名称
+            String prefix = t.getXlBm() + "_" + t.getXlDir() + "_";
+            t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix));
+            t.setZdzName(BasicData.getStationNameByCode(t.getZdzCode(), prefix));
+
+            //计算班次实际时间
+            schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
+            if (t.getZdsjT() < t.getFcsjT()) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "起终点时间异常！");
+                return rs;
+            }
+
+            //实时入库
+            super.save(t);
+
+            // 加入缓存
+            dayOfSchedule.put(t);
+
+            //更新起点应到时间
+            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(t.getClZbh());
+
+
+            rs.put("ts", ts);
+            rs.put("t", t);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> delete(Long id) {
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+
+        ScheduleRealInfo sch = dayOfSchedule.get(id);
+        if (sch == null) {
+            rs.put("msg", "无效的id号");
+            return rs;
+        }
+
+        if (!sch.isSflj()) {
+            rs.put("msg", "你只能删除临加班次");
+            return rs;
+        }
+
+        dayOfSchedule.delete(sch);
+        //ScheduleRealInfo sch = dayOfSchedule.delete(id);
+        //数据库删除
+        rs = super.delete(id);
+        //更新起点应到时间
+        List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
+        rs.put("ts", ts);
+        rs.put("delete", sch);
+
+        return rs;
+    }
+
+    @Override
+    public List<Map<String, String>> sreachVehic(String nbbm) {
+        // 转大写
+        nbbm = nbbm.toUpperCase();
+
+        List<Map<String, String>> list = new ArrayList<>();
+        Map<String, String> map;
+        Set<String> allSet = BasicData.nbbm2CompanyCodeMap.keySet();
+
+        Line line;
+        for (String k : allSet) {
+            if (k.indexOf(nbbm) != -1) {
+                // 所属线路
+                map = new HashMap<>();
+                line = BasicData.nbbm2LineMap.get(k);
+                map.put("id", k);
+                map.put("text", k);
+                if (null != line) {
+                    map.put("lineName", line.getName());
+                    map.put("lineCode", line.getLineCode());
+                }
+
+                list.add(map);
+            }
+
+            if (list.size() > 20)
+                break;
+        }
+        return list;
+    }
+
+    @Override
+    public void adjustCar(ScheduleRealInfo schedule, String car) {
+        schedule.setClZbh(car);
+    }
+
+    @Override
+    public void adjustDriver(ScheduleRealInfo schedule, String driver, String driverName) {
+        if (driver.indexOf("-") != -1)
+            driver = driver.split("-")[1];
+        schedule.setjGh(driver);
+        schedule.setjName(driverName);
+    }
+
+    @Override
+    public void adjustConductor(ScheduleRealInfo schedule, String conductor, String conductorName) {
+        if (conductor.indexOf("-") != -1)
+            conductor = conductor.split("-")[1];
+        schedule.setsGh(conductor);
+        schedule.setsName(conductorName);
+    }
+
+    @Override
+    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);
+        }
+
+    }
+
+    /**
+     *
+     */
+    @Override
+	public List<ScheduleRealInfo> exportWaybill(String jName, String clZbh, String lpName,String date,String line) {
 		ReportUtils ee = new ReportUtils();
 		ReportRelatedUtils rru = new ReportRelatedUtils();
 		List<Iterator<?>> list = new ArrayList<Iterator<?>>();
-		List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName,date);
+		List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName,date,line);
 		List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
 		DecimalFormat format = new DecimalFormat("0.00");
@@ -499,7 +463,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					//计划班次，烂班班次，增加班次
 					tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
 					if(scheduleRealInfo.isSflj()){
-						addMileage += tempJhlc;
 						ljbc++;
 					}else{
 						jhlc += tempJhlc;
@@ -513,7 +476,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					//计算营运里程，空驶里程
 					if(childTaskPlans.isEmpty()){
 						if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-								|| scheduleRealInfo.getBcType().equals("venting")){
+								){
 							ksgl += tempJhlc;
 						}else{
 							yygl += tempJhlc;
@@ -523,8 +486,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						while(it.hasNext()){
 							ChildTaskPlan childTaskPlan = it.next();
 							if(childTaskPlan.getMileageType().equals("empty")){
+								if(scheduleRealInfo.isSflj()){
+									addMileage += tempJhlc;
+								}
 								ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 							}else{
+								if(scheduleRealInfo.isSflj()){
+									addMileage += tempJhlc;
+								}
 								yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 							}
 						}
@@ -573,113 +542,141 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		list.add(listMap.iterator());
 		ee.excelReplace(list, new Object[] { scheduleRealInfos.get(0),map }, path+"mould\\waybill_minhang.xls",
-				path+"export\\" + jName + ".xls");
+				path+"export\\" + date+"-"+jName+"-"+clZbh+"-"+lpName+"-行车路单.xls");
 		return scheduleRealInfos;
 	}
-	@Override
-	public List<Map<String, Object>> dailyInfo(String line, String date,String type) {
-		DecimalFormat format = new DecimalFormat("0.00");
-		ReportUtils ee = new ReportUtils();
-		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-		List<Map<String, Object>> list = scheduleRealInfoRepository.dailyInfo(line, date);
-		
-		double totalZGL = 0,totalKSGL=0,totalYH=0;
-		int totalBCS=0;
-		for(int i = 0;i < list.size();i++){
-			String zgl = format.format(Double.parseDouble(list.get(i).get("zgl")==null?"0":list.get(i).get("zgl").toString()));
-			String ksgl = format.format(Double.parseDouble(list.get(i).get("ksgl")==null?"0":list.get(i).get("ksgl").toString()));
-			if(type.equals("export")){
-				totalZGL += Double.parseDouble(zgl);
-				totalKSGL += Double.parseDouble(ksgl);
-				totalBCS += Integer.parseInt(list.get(i).get("bcs").toString());
-			}
-			list.get(i).put("zgl", zgl);
-			list.get(i).put("ksgl", ksgl);
-		}
-		if(type.equals("export")){
-			Map<String,Object> map = new HashMap<String, Object>();
-			map.put("line", line);
-			map.put("date", date);
-			map.put("totalZGL", totalZGL);
-			map.put("totalKSGL", totalKSGL);
-			map.put("totalYH", totalYH);
-			map.put("totalBCS", totalBCS);
-			
-			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-
-			listI.add(list.iterator());
-			try {
-				ee.excelReplace(listI, new Object[] { map }, path+"mould\\daily.xls",
-						path+"export\\班次日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-		}
-		return list;
-	}
-
-	@Override
-	public List<Object[]> historyMessage(String line, String date, String code, String type) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		long d= 0;
-		long t=0;
-		if(date.length()>0){
-			try {
-				d=sdf.parse(date+" 00:00:00").getTime();
-				t=sdf.parse(date+" 23:59:59").getTime();
-			} catch (ParseException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			
-		}
-		
-		List<Object[]> list = scheduleRealInfoRepository.historyMessage(line,d,t, code);
-		for(Object[] obj:list){
-			if(obj != null){
-				obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
-				obj[4] = BasicData.lineCode2NameMap.get(line);
-			}
-		}
-		
-		if(type != null && type.length() != 0 && type.equals("export")){
-			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-					sdfSimple = new SimpleDateFormat("yyyyMMdd");
-			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-			Map<String,Object> m = new HashMap<String, Object>();
-			ReportUtils ee = new ReportUtils();
-			List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>();
-			for(int i = 0; i < list.size(); i++){
-				Map<String, Object> map = new HashMap<String, Object>();
-				Object[] obj = list.get(i);
-				map.put("num", i + 1);
-				map.put("line", obj[4]);
-				map.put("clZbh", obj[0]);
-				map.put("sender", obj[1]);
-				map.put("date", obj[3]);
-				map.put("text", obj[2]);
-				newList.add(map);
-			}
-			try {
-				listI.add(newList.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould\\historyMessage.xls",
-						path+"export\\调度历史消息" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
-			} catch (Exception e) {
-				// TODO: handle exception
-				e.printStackTrace();
-			}
-		}
-		
-		return list;
-	}
-
-	@Override
-	public Map<Integer, Integer> trustStatus(String lineStr) {
-		List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lineStr));
-
-		Map<Integer, Integer> map = new HashMap<>();
+    @Override
+    public List<Map<String, Object>> dailyInfo(String line, String date, String type) {
+        DecimalFormat format = new DecimalFormat("0.00");
+        ReportUtils ee = new ReportUtils();
+        List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+        List<Map<String, Object>> list = scheduleRealInfoRepository.dailyInfo(line, date);
+
+        double totalZGL = 0, totalKSGL = 0, totalYH = 0;
+        int totalBCS = 0;
+        for (int i = 0; i < list.size(); i++) {
+            String zgl = format.format(Double.parseDouble(list.get(i).get("zgl") == null ? "0" : list.get(i).get("zgl").toString()));
+            String ksgl = format.format(Double.parseDouble(list.get(i).get("ksgl") == null ? "0" : list.get(i).get("ksgl").toString()));
+            if (type.equals("export")) {
+                totalZGL += Double.parseDouble(zgl);
+                totalKSGL += Double.parseDouble(ksgl);
+                totalBCS += Integer.parseInt(list.get(i).get("bcs").toString());
+            }
+            list.get(i).put("zgl", zgl);
+            list.get(i).put("ksgl", ksgl);
+        }
+        if (type.equals("export")) {
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("line", line);
+            map.put("date", date);
+            map.put("totalZGL", totalZGL);
+            map.put("totalKSGL", totalKSGL);
+            map.put("totalYH", totalYH);
+            map.put("totalBCS", totalBCS);
+
+            String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
+
+            listI.add(list.iterator());
+            try {
+                ee.excelReplace(listI, new Object[]{map}, path + "mould\\daily.xls",
+                        path + "export\\班次日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public List<Object[]> historyMessage(String line, String date, String code, String type) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long d = 0;
+        long t = 0;
+        if (date.length() > 0) {
+            try {
+                d = sdf.parse(date + " 00:00:00").getTime();
+                t = sdf.parse(date + " 23:59:59").getTime();
+            } catch (ParseException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+
+        }
+
+        List<Object[]> list = scheduleRealInfoRepository.historyMessage(line, d, t, code);
+        for (Object[] obj : list) {
+            if (obj != null) {
+                obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
+                obj[4] = BasicData.lineCode2NameMap.get(line);
+            }
+        }
+
+        if (type != null && type.length() != 0 && type.equals("export")) {
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            ReportUtils ee = new ReportUtils();
+            List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>();
+            for (int i = 0; i < list.size(); i++) {
+                Map<String, Object> map = new HashMap<String, Object>();
+                Object[] obj = list.get(i);
+                map.put("num", i + 1);
+                map.put("line", obj[4]);
+                map.put("clZbh", obj[0]);
+                map.put("sender", obj[1]);
+                map.put("date", obj[3]);
+                map.put("text", obj[2]);
+                newList.add(map);
+            }
+            try {
+                listI.add(newList.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould\\historyMessage.xls",
+                        path + "export\\调度历史消息" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                e.printStackTrace();
+            }
+        }
+
+        if (type != null && type.length() != 0 && type.equals("export_msg")) {
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            ReportUtils ee = new ReportUtils();
+            List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>();
+            for (int i = 0; i < list.size(); i++) {
+                Map<String, Object> map = new HashMap<String, Object>();
+                Object[] obj = list.get(i);
+                map.put("num", i + 1);
+                map.put("line", obj[4]);
+                map.put("clZbh", obj[0]);
+                map.put("sender", obj[1]);
+                map.put("date", obj[3]);
+                map.put("text", obj[2]);
+                newList.add(map);
+            }
+            try {
+                listI.add(newList.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould\\message.xls",
+                        path + "export\\调度消息分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                e.printStackTrace();
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public Map<Integer, Integer> trustStatus(String lineStr) {
+        List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lineStr));
+
+        Map<Integer, Integer> map = new HashMap<>();
 		/*Integer code;
 		for (String lineCode : lineList) {
 			code = Integer.parseInt(lineCode);
@@ -688,485 +685,1519 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			map.put(code, ScheduleBuffer.trustMap.get(code));
 		}*/
-		return map;
-	}
-
-	@Override
-	public Map<String, Object> realOutAdjust(Long id, String fcsjActual, String remarks) {
-		Map<String, Object> rs = new HashMap<>();
-		List<ScheduleRealInfo> ts = new ArrayList<>();
-		try {
-			ScheduleRealInfo sch = dayOfSchedule.get(id);
-
-			LineConfig config = lineConfigData.get(sch.getXlBm());
-			//小于线路开始运营时间，则默认跨过24点
-			if(fcsjActual.compareTo(config.getStartOpt()) < 0){
-				sch.setRealExecDate(fmtyyyyMMdd.print(sch.getScheduleDate().getTime() + DAY_TIME));
-			}
-			else {
-				sch.setRealExecDate(sch.getScheduleDateStr());
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> realOutAdjust(Long id, String fcsjActual, String remarks) {
+        Map<String, Object> rs = new HashMap<>();
+        List<ScheduleRealInfo> ts = new ArrayList<>();
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(id);
+
+            LineConfig config = lineConfigData.get(sch.getXlBm());
+            //小于线路开始运营时间，则默认跨过24点
+            if (fcsjActual.compareTo(config.getStartOpt()) < 0) {
+                sch.setRealExecDate(fmtyyyyMMdd.print(sch.getScheduleDate().getTime() + DAY_TIME));
+            } else {
+                sch.setRealExecDate(sch.getScheduleDateStr());
+            }
+
+            sch.setFcsjActualAll(fcsjActual);
+            sch.addRemarks(remarks);
+            sch.calcStatus();
+
+            dayOfSchedule.save(sch);
+            //scheduleRealInfoRepository.save(sch);
+
+            ts.add(sch);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("ts", ts);
+
+            //通知页面刷新
+            sendUtils.refreshSch(ts);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> revokeDestroy(Long id) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(id);
+            if (sch.getStatus() != -1) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "未烂班，无法撤销！");
+            } else {
+                sch.setStatus(0);
+                rs.put("status", ResponseCode.SUCCESS);
+                rs.put("t", sch);
+
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> revokeRealOutgo(Long id) {
+        Map<String, Object> rs = new HashMap<>();
+        List<ScheduleRealInfo> ts = new ArrayList<>();
+
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(id);
+            if (sch.getFcsjActual() == null) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "无实发时间，无法撤销！");
+            } else {
+                //将对应的到离站数据标记为不可信
+                List<ArrivalEntity> list = ArrivalData_GPS.findByNbbm(sch.getClZbh());
+                for (ArrivalEntity arr : list) {
+                    if (arr.getInOut() == 1
+                            && arr.getUpDown() == Integer.parseInt(sch.getXlDir())
+                            && arr.getStopNo().equals(sch.getQdzCode())
+                            && Math.abs(arr.getTs() - sch.getFcsjActualTime()) < 1000 * 60) {
+                        arr.setEnable(false);
+                        break;
+                    }
+                }
+
+                sch.clearFcsjActual();
+                rs.put("status", ResponseCode.SUCCESS);
+
+                ts.add(sch);
+                rs.put("ts", ts);
+
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> spaceAdjust(Long[] ids, Integer space) {
+
+        List<ScheduleRealInfo> list = new ArrayList<>(), updateList = new ArrayList<>();
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            ScheduleRealInfo sch, next;
+            for (Long id : ids) {
+                sch = dayOfSchedule.get(id);
+                if (null != sch)
+                    list.add(sch);
+            }
+
+            int size = list.size();
+            if (size == 0) {
+                rs.put("status", ResponseCode.ERROR);
+            } else {
+                // 按发车时间排序
+                Collections.sort(list, new ScheduleComparator.FCSJ());
+
+                // 以第一个实际发车/待发时间为起点，调整间隔
+                sch = list.get(0);
+                Long st = sch.getFcsjActualTime() == null ? sch.getDfsjT() : sch.getFcsjActualTime(), plus = space * 60 * 1000L;
+
+                for (int i = 1; i < size; i++) {
+                    st += plus;
+                    sch = list.get(i);
+                    sch.setDfsjAll(st);
+                    //重新计算终点时间
+                    sch.calcEndTime();
+
+                    dayOfSchedule.save(sch);
+
+                    updateList.add(sch);
+                    next = dayOfSchedule.next(sch);
+                    if (next.getQdzName().equals(sch.getZdzName())) {
+                        next.setQdzArrDateJH(sch.getZdsj());
+                        updateList.add(next);
+                    }
+                }
+
+
+                rs.put("status", ResponseCode.SUCCESS);
+                rs.put("ts", updateList);
+            }
+
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+
+    @Override
+    public Map<String, Object> schInfoFineTune(Map<String, String> map) {
+        Map<String, Object> rs = new HashMap<>();
+        List<ScheduleRealInfo> ts = new ArrayList<>();
+        try {
+            Long id = Long.parseLong(map.get("id"));
+            //班次类型
+            //String bcType = map.get("bcType");
+            //车辆自编号
+            //String clZbh = map.get("clZbh");
+            //计划发车时间
+            //String fcsj = map.get("fcsj");
+            //实际发车时间
+            String fcsjActual = map.get("fcsjActual");
+            //实际终点时间
+            String zdsjActual = map.get("zdsjActual");
+            //备注
+            String remarks = map.get("remarks");
+            ScheduleRealInfo sch = dayOfSchedule.get(id);
+            if (null != sch) {
+                if (StringUtils.isNotBlank(fcsjActual)) {
+                    LineConfig config = lineConfigData.get(sch.getXlBm());
+                    long t = 0L;
+                    //小于线路开始运营时间，则默认跨过24点
+                    if (fcsjActual.compareTo(config.getStartOpt()) < 0)
+                        t = fmtyyyyMMddHHmm.parseMillis(fmtyyyyMMdd.print(sch.getScheduleDate().getTime() + DAY_TIME) + fcsjActual);
+                    else
+                        t = fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + fcsjActual);
+
+                    //调整实发
+                    if (!fcsjActual.equals(sch.getFcsjActual()))
+                        sch.setFcsjActualAll(t);
+                } else {
+                    //撤销实发
+                    if (sch.getFcsjActual() != null)
+                        revokeRealOutgo(sch.getId());
+                }
+                //实达时间
+                if (StringUtils.isNotBlank(zdsjActual)) {
+                    if (!zdsjActual.equals(sch.getZdsjActual())) {
+                        //调整实达
+                        sch.setZdsjActualAll(zdsjActual);
+                        //下一班次起点到达时间
+                        ScheduleRealInfo next = dayOfSchedule.next(sch);
+                        if (null != next) {
+                            next.setQdzArrDateSJ(zdsjActual);
+                            ts.add(next);
+                        }
+
+                        //重新计算车辆执行班次
+                        dayOfSchedule.reCalcExecPlan(sch.getClZbh());
+                    }
+                } else {
+                    //清除实达时间
+                    sch.clearZdsjActual();
+                    //清除下一班次起点到达时间
+                    ScheduleRealInfo next = dayOfSchedule.next(sch);
+                    if (null != next) {
+                        next.setQdzArrDateSJ(null);
+                        ts.add(next);
+                    }
+                }
+                sch.setRemarks(remarks);
+
+                try {
+                    //烂班
+                    if(map.get("status") != null
+                            && Integer.parseInt(map.get("status").toString()) == -1){
+                        destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+                    }
+                } catch (NumberFormatException e) {
+                    logger.error("", e);
+                }
+            }
+
+            String bcType = map.get("bcType");
+            if(StringUtils.isNotEmpty(bcType)){
+                sch.setBcType(bcType);
+            }
+            //班次状态
+            sch.calcStatus();
+            dayOfSchedule.save(sch);
+            //页面需要更新的班次信息
+            ts.add(sch);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("ts", ts);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> outgoAdjustAll(String params) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            JSONArray jsonArray = JSONArray.parseArray(params);
+
+            ScheduleRealInfo schedule = null;
+            JSONObject jsonObj;
+            String dfsj;
+            for (int i = 0; i < jsonArray.size(); i++) {
+                jsonObj = jsonArray.getJSONObject(i);
+                dfsj = jsonObj.getString("t");
+                schedule = dayOfSchedule.get(jsonObj.getLong("id"));
+                //设置待发时间
+                schedule.setDfsjAll(dfsj);
+
+                dayOfSchedule.save(schedule);
+            }
+
+            rs.put("status", ResponseCode.SUCCESS);
+            //将更新的最后一个班次返回
+            rs.put("t", schedule);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> findRouteByLine(String lineCode) {
+        Map<String, Object> map = new HashMap<>();
+        //上行
+        Integer lineId = BasicData.lineId2CodeMap.inverse().get(lineCode);
+        map.put("line.id_eq", lineId);
+        map.put("directions_eq", 0);
+        List<Map<String, Object>> upList = sectionRouteService.getSectionRoute(map);
+
+        //下行
+        map.put("directions_eq", 1);
+        List<Map<String, Object>> downList = sectionRouteService.getSectionRoute(map);
+
+        Map<String, Object> rs = new HashMap<>();
+
+        String upVectors = "", vec;
+        //拼接上行路段
+        for (Map<String, Object> temp : upList) {
+            vec = temp.get("sectionBsectionVector").toString();
+            upVectors += vec.subSequence(11, vec.length() - 2) + " ";
+        }
+
+        //拼接下行路段
+        String downVectors = "";
+        for (Map<String, Object> temp : downList) {//LINESTRING(
+            vec = temp.get("sectionBsectionVector").toString();
+            downVectors += vec.subSequence(11, vec.length() - 2) + " ";
+        }
+
+
+        rs.put("up", upVectors);
+        //上行gcj
+        rs.put("up_gcj", BdToGcjString(upVectors));
+        rs.put("down", downVectors);
+        //下行gcj
+        rs.put("down_gcj", BdToGcjString(downVectors));
+        rs.put("lineId", lineId);
+
+        return rs;
+    }
+
+    /**
+     * @param @param bdStr
+     * @throws
+     * @Title: BdToGcjString
+     * @Description: TODO(将百度路由字符串 转 成GCJ 字符串)
+     */
+    public String BdToGcjString(String bdStr) {
+        String[] array = bdStr.split(","), subArray;
+        if (array.length == 0 || bdStr.length() < 2)
+            return "";
+
+        String gcjStr = "";
+        TransGPS.Location location;
+        for (String crd : array) {
+            subArray = crd.split(" ");
+            if (subArray.length != 2)
+                continue;
+            location = TransGPS.bd_decrypt(TransGPS.LocationMake(Double.parseDouble(subArray[0]), Double.parseDouble(subArray[1])));
+
+            gcjStr += location.getLng() + " " + location.getLat() + ",";
+        }
+
+        return gcjStr.substring(0, gcjStr.length() - 1);
+    }
+
+    public List<Map<String, String>> findLine(String line) {
+        List<Line> listLine = lineRepository.findLine("%" + line + "%");
+        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+        Map<String, String> map;
+        for (Line temp : listLine) {
+            if (temp != null) {
+                String xlName = temp.getName();
+                if (xlName.indexOf(line) != -1) {
+                    map = new HashMap<String, String>();
+                    map.put("id", temp.getLineCode());
+                    map.put("text", xlName);
+                    list.add(map);
+                }
+            }
+        }
+        return list;
+    }
+
+    public List<Map<String, String>> findLpName(String lpName) {
+        List<GuideboardInfo> listLpName = guideboardInfoRepository.findLpName("%" + lpName + "%");
+        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+        Map<String, String> map;
+        for (GuideboardInfo temp : listLpName) {
+            if (temp != null) {
+                String lp = temp.getLpName();
+                if (lp.indexOf(lpName) != -1) {
+                    map = new HashMap<String, String>();
+                    map.put("id", lp);
+                    map.put("text", lp);
+                    list.add(map);
+                }
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public Map<String, Object> findKMBC2(String jName, String clZbh, String date) {
+        List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill3(jName, clZbh, date);
+
+        DecimalFormat format = new DecimalFormat("0.00");
+//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
+//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
+        int jhbc = 0, cjbc = 0, ljbc = 0;
+        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0;
+        float addMileage = 0l, remMileage = 0l;
+        String j_Name = "";
+        Map<String, Object> map = new HashMap<String, Object>();
+        for (ScheduleRealInfo scheduleRealInfo : list) {
+            if (scheduleRealInfo != null) {
+                j_Name = scheduleRealInfo.getjName();
+                //计划里程（主任务过滤掉临加班次），
+                //烂班里程（主任务烂班），
+                //临加里程（主任务临加），
+                //计划班次，烂班班次，增加班次
+                tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+                if (scheduleRealInfo.isSflj()) {
+                    addMileage += tempJhlc;
+                    ljbc++;
+                } else {
+                    jhlc += tempJhlc;
+                    jhbc++;
+                    if (scheduleRealInfo.getStatus() == -1) {
+                        remMileage += tempJhlc;
+                        cjbc++;
+                    }
+                }
+                Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+                //计算营运里程，空驶里程
+                if (childTaskPlans.isEmpty()) {
+                    if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+                            || scheduleRealInfo.getBcType().equals("venting")) {
+                        ksgl += tempJhlc;
+                    } else {
+                        yygl += tempJhlc;
+                    }
+                } else {
+                    Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                    while (it.hasNext()) {
+                        ChildTaskPlan childTaskPlan = it.next();
+                        if (childTaskPlan.getMileageType().equals("empty")) {
+                            ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+                        } else {
+                            yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+                        }
+                    }
+                }
+            }
+        }
+        map.put("j_name", j_Name);
+        map.put("jhlc", format.format(jhlc));
+        map.put("remMileage", format.format(remMileage));
+        map.put("addMileage", format.format(addMileage));
+        map.put("yygl", format.format(yygl));
+        map.put("ksgl", format.format(ksgl));
+        map.put("realMileage", format.format(yygl + ksgl));
+        map.put("jhbc", jhbc);
+        map.put("cjbc", cjbc);
+        map.put("ljbc", ljbc);
+        map.put("sjbc", jhbc - cjbc + ljbc);
+        return map;
+    }
+
+
+
+    @Override
+    public Map<String, Object> findKMBC(String jName, String clZbh,
+                                        String lpName, String date,String line) {
+        List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date,line);
+        DecimalFormat format = new DecimalFormat("0.00");
+//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
+//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
+        int jhbc = 0, cjbc = 0, ljbc = 0;
+        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
+        float addMileage = 0l, remMileage = 0l;
+        Map<String, Object> map = new HashMap<String, Object>();
+        for (ScheduleRealInfo scheduleRealInfo : list) {
+            if (scheduleRealInfo != null) {
+                //计划里程（主任务过滤掉临加班次），
+                //烂班里程（主任务烂班），
+                //临加里程（主任务临加），
+                //计划班次，烂班班次，增加班次
+                tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+                if (scheduleRealInfo.isSflj()) {
+                    addMileage += tempJhlc;
+                    ljbc++;
+                } else {
+                    if (!(scheduleRealInfo.getBcType().equals("in")
+                            || scheduleRealInfo.getBcType().equals("out"))) {
+                        jhbc++;
+                        jhlc += tempJhlc;
+                    }
+
+                    if (scheduleRealInfo.getStatus() == -1) {
+                        remMileage += tempJhlc;
+                        cjbc++;
+                    }
+                }
+                Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+                //计算营运里程，空驶里程
+                if (childTaskPlans.isEmpty()) {
+                    if (scheduleRealInfo.getBcType().equals("in") ||
+                            scheduleRealInfo.getBcType().equals("out")) {
+                        jcclc += tempJhlc;
+                    }
+                    //主任务 放空班次属于营运
+//					else if(scheduleRealInfo.getBcType().equals("venting")){
+//						ksgl += tempJhlc;
+//					}
+                    else {
+                        if (scheduleRealInfo.getStatus() != -1) {
+                            yygl += tempJhlc;
+                        }
+                    }
+                } else {
+                    Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                    while (it.hasNext()) {
+                        ChildTaskPlan childTaskPlan = it.next();
+                        if (childTaskPlan.getMileageType().equals("empty")) {
+                            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();
+//								cjbc++;
+                            } else {
+                                yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        map.put("jhlc", format.format(jhlc));
+        map.put("remMileage", format.format(remMileage));
+        map.put("addMileage", format.format(addMileage));
+        map.put("yygl", format.format(yygl));
+        map.put("ksgl", format.format(ksgl));
+        map.put("realMileage", format.format(yygl + ksgl + jcclc));
+        map.put("jhbc", jhbc);
+        map.put("cjbc", cjbc);
+        map.put("ljbc", ljbc);
+        map.put("sjbc", jhbc - cjbc + ljbc);
+        map.put("jcclc", jcclc);
+        map.put("zkslc", format.format(ksgl + jcclc));
+        return map;
+    }
+
+
+    @Override
+    public List<Map<String, Object>> account(String line, String date,
+                                             String code, String xlName, String type) {
+        List<Object[]> lsitObj = scheduleRealInfoRepository.account(line, date, code);
+        List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
+        Map<String, Object> map;
+        int i = 1;
+        for (Object[] obj : lsitObj) {
+            if (obj != null) {
+                map = new HashMap<String, Object>();
+                map.put("num", i++);
+                map.put("xlName", xlName);
+                map.put("clZbh", obj[3]);
+                map.put("company", obj[0]);
+                map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1] + "")).toUpperCase());
+                map.put("requestTime", obj[2]);
+                listMap.add(map);
+            }
+        }
+
+        if (type != null && type.length() != 0 && type.equals("export")) {
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            ReportUtils ee = new ReportUtils();
+            Map<String, Object> typeMap = new HashMap<String, Object>();
+            typeMap.put("0xA1", "请求恢复运营");
+            typeMap.put("0xA2", "申请调档");
+            typeMap.put("0xA3", "出场请求");
+            typeMap.put("0xA5", "进场请求");
+            typeMap.put("0xA7", "加油请求");
+            typeMap.put("0x50", "车辆故障");
+            typeMap.put("0x70", "路阻报告");
+            typeMap.put("0x60", "事故报告");
+            typeMap.put("0x11", "扣证纠纷");
+            typeMap.put("0x12", "报警");
+            for (Map<String, Object> map1 : listMap) {
+                map1.put("requestText", typeMap.get(map1.get("requestType")));
+            }
+            try {
+                listI.add(listMap.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould\\account.xls",
+                        path + "export\\驾驶员请求台账" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                e.printStackTrace();
+            }
+        }
+
+        return listMap;
+    }
+
+    @Override
+    public List<ScheduleRealInfo> correctForm(String line, String startDate,
+                                              String endDate, String lpName, String code, String type) {
+        List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line, startDate, endDate, lpName, code);
+
+        if (type != null && type.length() != 0 && type.equals("export")) {
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            ReportUtils ee = new ReportUtils();
+            m.put("dates", startDate + " 至 " + endDate);
+            List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            for (ScheduleRealInfo schedule : list) {
+                Map<String, Object> tempMap = new HashMap<String, Object>();
+                tempMap.put("xlName", schedule.getXlName() != null ? schedule.getXlName() : "");
+                tempMap.put("lpName", schedule.getLpName() != null ? schedule.getLpName() : "");
+                tempMap.put("clZbh", schedule.getClZbh() != null ? schedule.getClZbh() : "");
+                tempMap.put("jName", schedule.getjName() != null ? schedule.getjName() : "");
+                tempMap.put("sName", schedule.getsName() != null ? schedule.getsName() : "");
+                tempMap.put("fcsj", schedule.getFcsj() != null ? schedule.getFcsj() : "");
+                tempMap.put("fcsjActual", schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "");
+                tempMap.put("zdsj", schedule.getZdsj() != null ? schedule.getZdsj() : "");
+                tempMap.put("zdsjActual", schedule.getZdsjActual() != null ? schedule.getZdsjActual() : "");
+                if (schedule.getUpdateBy() != null) {
+                    if (schedule.getUpdateBy().getName() != null)
+                        tempMap.put("userName", schedule.getUpdateBy().getName());
+                    else
+                        tempMap.put("userName", "");
+                } else {
+                    tempMap.put("userName", "");
+                }
+                if (schedule.getUpdateDate() != null) {
+                    tempMap.put("updateDate", sdf.format(schedule.getUpdateDate()));
+                } else {
+                    tempMap.put("updateDate", "");
+                }
+                tempMap.put("remarks", schedule.getRemarks() != null ? schedule.getRemarks() : "");
+                tempList.add(tempMap);
+            }
+            try {
+                listI.add(tempList.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould\\correctForm.xls",
+                        path + "export\\修正报表" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                e.printStackTrace();
+            }
+            Map<String, Object> map = tempList.get(tempList.size() - 1);
+            System.out.println("tempMap:" + map);
+        }
+
+        return list;
+    }
+
+    @Override
+    public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
+                                                   String lpName, String date,String line) {
+        List<ScheduleRealInfo> list = null;
+            list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date,line);
+        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
+    public Map<String, Object> removeChildTask(Long taskId) {
+        Map<String, Object> rs = new HashMap<>();
+        ChildTaskPlan chTask = cTaskPlanRepository.findOne(taskId);
+
+        ScheduleRealInfo sch = dayOfSchedule.get(chTask.getSchedule().getId());
+        try {
+
+            sch.getcTasks().remove(chTask);
+            scheduleRealInfoRepository.save(sch);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    @Override
+    public List<Map<String, Object>> statisticsDaily(String line, String date,
+                                                     String xlName) {
+        List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+        List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+        DecimalFormat format = new DecimalFormat("0.00");
+        double jhlc = 0, tempJhlc = 0, childMileage = 0;
+        float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
+        //班次
+        int sj_0 = 6 * 60 + 31, sj_1 = 8 * 60 + 30, sj_2 = 16 * 60 + 1, sj_3 = 18 * 60;
+        int jhbc = 0, jhbc_m = 0, jhbc_a = 0;
+        int sjbc = 0, sjbc_m = 0, sjbc_a = 0;
+        int ljbc = 0, ljbc_m = 0, ljbc_a = 0;
+        int fzbc = 0, fzbc_m = 0, fzbc_a = 0;
+        int dtbc = 0, dtbc_m = 0, dtbc_a = 0;
+        int djg = 0, djg_m = 0, djg_a = 0, djg_time = 0;
+        Map<String, Object> map = new HashMap<String, Object>();
+        for (ScheduleRealInfo scheduleRealInfo : list) {
+            if (scheduleRealInfo != null) {
+
+                if (!(scheduleRealInfo.getBcType().equals("in")
+                        || scheduleRealInfo.getBcType().equals("out"))) {
+                    Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+                    //计算实际里程，少驶里程，计划里程=实际里程+少驶里程
+                    if (childTaskPlans.isEmpty()) {
+                        tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+                        //临加公里
+                        if (scheduleRealInfo.isSflj()) {
+                            ljgl += tempJhlc;
+                        } else {
+                            jhlc += tempJhlc;
+                        }
+                        if (scheduleRealInfo.getStatus() == 2) {
+                            sjgl += tempJhlc;
+                        } else if (scheduleRealInfo.getStatus() == -1) {
+                            ssgl += tempJhlc;
+                            if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) {
+                                ssgl_lz += tempJhlc;
+                            } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1) {
+                                ssgl_dm += tempJhlc;
+                            } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("故障") != -1) {
+                                ssgl_gz += tempJhlc;
+                            } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1) {
+                                ssgl_jf += tempJhlc;
+                            } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("肇事") != -1) {
+                                ssgl_zs += tempJhlc;
+                            } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺人") != -1) {
+                                ssgl_qr += tempJhlc;
+                            } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺车") != -1) {
+                                ssgl_qc += tempJhlc;
+                            } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("客稀") != -1) {
+                                ssgl_kx += tempJhlc;
+                            } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("气候") != -1) {
+                                ssgl_qh += tempJhlc;
+                            } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("援外") != -1) {
+                                ssgl_yw += tempJhlc;
+                            } else {
+                                ssgl_other += tempJhlc;
+                            }
+                        }
+                    } else {
+                        Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                        while (it.hasNext()) {
+                            ChildTaskPlan childTaskPlan = it.next();
+                            childMileage = childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+                            jhlc += childMileage;
+                            if (childTaskPlan.isDestroy()) {
+                                ssgl += childMileage;
+                                if (childTaskPlan.getDestroyReason().equals("路阻")) {
+                                    ssgl_lz += childTaskPlan.getMileage();
+                                } else if (childTaskPlan.getDestroyReason().equals("吊慢")) {
+                                    ssgl_dm += childTaskPlan.getMileage();
+                                } else if (childTaskPlan.getDestroyReason().equals("故障")) {
+                                    ssgl_gz += childTaskPlan.getMileage();
+                                } else if (childTaskPlan.getDestroyReason().equals("纠纷")) {
+                                    ssgl_jf += childTaskPlan.getMileage();
+                                } else if (childTaskPlan.getDestroyReason().equals("肇事")) {
+                                    ssgl_zs += childTaskPlan.getMileage();
+                                } else if (childTaskPlan.getDestroyReason().equals("缺人")) {
+                                    ssgl_qr += childTaskPlan.getMileage();
+                                } else if (childTaskPlan.getDestroyReason().equals("缺车")) {
+                                    ssgl_qc += childTaskPlan.getMileage();
+                                } else if (childTaskPlan.getDestroyReason().equals("客稀")) {
+                                    ssgl_kx += childTaskPlan.getMileage();
+                                } else if (childTaskPlan.getDestroyReason().equals("气候")) {
+                                    ssgl_qh += childTaskPlan.getMileage();
+                                } else if (childTaskPlan.getDestroyReason().equals("援外")) {
+                                    ssgl_yw += childTaskPlan.getMileage();
+                                } else {
+                                    ssgl_other += childTaskPlan.getMileage();
+                                }
+                            } else {
+                                sjgl += childMileage;
+                            }
+                        }
+                    }
+
+                    //班次
+                    jhbc++;
+                    String[] fcsj = scheduleRealInfo.getFcsj().split(":");
+                    String[] fcsjActual = (scheduleRealInfo.getFcsjActual() == null ? "0:00" : scheduleRealInfo.getFcsjActual()).split(":");
+                    if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_1) {
+                        jhbc_m++;
+                    } else if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_3) {
+                        jhbc_a++;
+                    }
+                    if (scheduleRealInfo.getStatus() == 2) {
+                        sjbc++;
+                        if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
+                            sjbc_m++;
+                        } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
+                            sjbc_a++;
+                        }
+                    }
+                    if (scheduleRealInfo.isSflj()) {
+                        ljbc++;
+                        if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
+                            ljbc_m++;
+                        } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
+                            ljbc_a++;
+                        }
+                    }
+                    if (scheduleRealInfo.getBcType().equals("venting")) {
+                        fzbc++;
+                        if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
+                            fzbc_m++;
+                        } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
+                            fzbc_a++;
+                        }
+                    }
+                }
+            }
+        }
+        map.put("xlName", xlName);
+        map.put("jhlc", format.format(jhlc));
+        map.put("sjgl", format.format(sjgl));
+        map.put("ssgl", format.format(ssgl));
+        map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
+        map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
+        map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
+        map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
+        map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
+        map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
+        map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
+        map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
+        map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
+        map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
+        map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
+        map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
+        map.put("jhbc", jhbc);
+        map.put("jhbc_m", jhbc_m);
+        map.put("jhbc_a", jhbc_a);
+        map.put("sjbc", sjbc);
+        map.put("sjbc_m", sjbc_m);
+        map.put("sjbc_a", sjbc_a);
+        map.put("ljbc", ljbc);
+        map.put("ljbc_m", ljbc_m);
+        map.put("ljbc_a", ljbc_a);
+        map.put("fzbc", fzbc);
+        map.put("fzbc_m", fzbc_m);
+        map.put("fzbc_a", fzbc_a);
+        map.put("dtbc", dtbc);
+        map.put("dtbc_m", dtbc_m);
+        map.put("dtbc_a", dtbc_a);
+        map.put("djg", djg);
+        map.put("djg_m", djg_m);
+        map.put("djg_a", djg_a);
+        map.put("djg_time", djg_time);
+        lMap.add(map);
+        return lMap;
+    }
+
+    @Override
+    public Map<String, Object> scheduleDaily(String line, String date) {
+        Map<String, String> tempMap = null;
+        List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+        Map<String, Object> map = new HashMap<String, Object>();
+        Double jhlc = 0.00;
+        Float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
+        int jhbc = 0;
+        for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
+            if (scheduleRealInfo != null) {
+                //计算里程（包括子任务）
+                jhlc += scheduleRealInfo.getJhlc();
+                Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+                if (!childTaskPlans.isEmpty()) {
+                    Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                    while (it.hasNext()) {
+                        ChildTaskPlan childTaskPlan = it.next();
+                        //是否烂班，烂班就是少驶
+                        if (!childTaskPlan.isDestroy()) {
+                            sjgl += childTaskPlan.getMileage();
+                        } else {
+                            ssgl += childTaskPlan.getMileage();
+                            if (childTaskPlan.getDestroyReason().equals("路阻")) {
+                                ssgl_lz += childTaskPlan.getMileage();
+                            } else if (childTaskPlan.getDestroyReason().equals("吊慢")) {
+                                ssgl_dm += childTaskPlan.getMileage();
+                            } else if (childTaskPlan.getDestroyReason().equals("故障")) {
+                                ssgl_gz += childTaskPlan.getMileage();
+                            } else if (childTaskPlan.getDestroyReason().equals("纠纷")) {
+                                ssgl_jf += childTaskPlan.getMileage();
+                            } else if (childTaskPlan.getDestroyReason().equals("肇事")) {
+                                ssgl_zs += childTaskPlan.getMileage();
+                            } else if (childTaskPlan.getDestroyReason().equals("缺人")) {
+                                ssgl_qr += childTaskPlan.getMileage();
+                            } else if (childTaskPlan.getDestroyReason().equals("缺车")) {
+                                ssgl_qc += childTaskPlan.getMileage();
+                            } else if (childTaskPlan.getDestroyReason().equals("客稀")) {
+                                ssgl_kx += childTaskPlan.getMileage();
+                            } else if (childTaskPlan.getDestroyReason().equals("气候")) {
+                                ssgl_qh += childTaskPlan.getMileage();
+                            } else if (childTaskPlan.getDestroyReason().equals("援外")) {
+                                ssgl_yw += childTaskPlan.getMileage();
+                            } else {
+                                ssgl_other += childTaskPlan.getMileage();
+                            }
+                        }
+                        //临加公里
+                        if (childTaskPlan.getType1().equals("临加")) {
+                            ljgl += childTaskPlan.getMileage();
+                        }
+                    }
+                }
+                //班次
+                scheduleRealInfo.getFcsjT();
+                scheduleRealInfo.getFcsjActualTime();
+            }
+        }
+        map.put("jhlc", jhlc);
+        map.put("sjgl", sjgl);
+        map.put("ssgl", ssgl);
+        map.put("ssgl_lz", ssgl_lz);
+        map.put("ssgl_dm", ssgl_dm);
+        map.put("ssgl_gz", ssgl_gz);
+        map.put("ssgl_jf", ssgl_jf);
+        map.put("ssgl_zs", ssgl_zs);
+        map.put("ssgl_qr", ssgl_qr);
+        map.put("ssgl_qc", ssgl_qc);
+        map.put("ssgl_kx", ssgl_kx);
+        map.put("ssgl_qh", ssgl_qh);
+        map.put("ssgl_yw", ssgl_yw);
+        map.put("ssgl_other", ssgl_other);
+        map.put("ljgl", ljgl);
+
+        map.put("jhbc", scheduleRealInfos.size());
+        return null;
+    }
+
+    @Override
+    public int countByLineCodeAndDate(String xlBm, String schDate) {
+        return scheduleRealInfoRepository.countByLineCodeAndDate(xlBm + "", schDate);
+    }
+
+    @Override
+    public List<ScheduleRealInfo> findByLineCodeAndDate(String xlBm, String schDate) {
+        return scheduleRealInfoRepository.findByLineCodeAndDate(xlBm + "", schDate);
+    }
+
+    @Override
+    public void deleteByLineCodeAndDate(String xlBm, String schDate) {
+        scheduleRealInfoRepository.deleteByLineCodeAndDate(xlBm + "", schDate);
+    }
+
+    @Override
+    public Long getMaxId() {
+        return scheduleRealInfoRepository.getMaxId();
+    }
+
+    @Override
+    public List<ScheduleRealInfo> realScheduleList(String line, String date) {
+		/*List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);
+		List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+		for(ScheduleRealInfo info:listInfo){
+			for(ScheduleRealInfo total:listTotal){
+				if(info.getjGh().equals(total.getjGh()) && info.getLpName().equals(total.getLpName()) && info.getClZbh().equals(total.getClZbh())){
+					
+				}
 			}
+		}*/
+        return scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+    }
-			sch.setFcsjActualAll(fcsjActual);
-			sch.addRemarks(remarks);
-			sch.calcStatus();
-
-			dayOfSchedule.save(sch);
-			//scheduleRealInfoRepository.save(sch);
-
-			ts.add(sch);
-
-			rs.put("status", ResponseCode.SUCCESS);
-			rs.put("ts", ts);
-			
-			//通知页面刷新
-			sendUtils.refreshSch(ts);
-		} catch (Exception e) {
-			logger.error("", e);
-			rs.put("status", ResponseCode.ERROR);
-		}
-
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> revokeDestroy(Long id) {
-		Map<String, Object> rs = new HashMap<>();
-		try {
-			ScheduleRealInfo sch = dayOfSchedule.get(id);
-			if (sch.getStatus() != -1) {
-				rs.put("status", ResponseCode.ERROR);
-				rs.put("msg", "未烂班，无法撤销！");
-			} else {
-				sch.setStatus(0);
-				rs.put("status", ResponseCode.SUCCESS);
-				rs.put("t", sch);
-
-			}
-		} catch (Exception e) {
-			logger.error("", e);
-			rs.put("status", ResponseCode.ERROR);
-		}
-		return rs;
-	}
-	@Override
-	public Map<String, Object> revokeRealOutgo(Long id) {
-		Map<String, Object> rs = new HashMap<>();
-		List<ScheduleRealInfo> ts = new ArrayList<>();
+    public List<Map<String, Object>> yesterdayDataList(String line, String date) {
+        //前一天日期
+//		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
+//		String date = "2016-09-20";
+        List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date);
+//		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+        for (int x = 0; x < yesterdayDataList.size(); x++) {
+            String jName = yesterdayDataList.get(x).get("jGh").toString();
+            String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
+            List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jName, clZbh, date);
+            double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
+            float addMileage = 0l, remMileage = 0l;
+            Map<String, Object> map = new HashMap<String, Object>();
+            boolean fage = true;
+            for (ScheduleRealInfo scheduleRealInfo : lists) {
+                if (fage) {
+                    //根据线路代码获取公司
+                    Line li = lineRepository.findByLineCode(scheduleRealInfo.getXlBm());
+                    yesterdayDataList.get(x).put("company", li.getCompany());
+                    yesterdayDataList.get(x).put("bCompany", li.getBrancheCompany());
+                    fage = false;
+                }
+                if (scheduleRealInfo != null) {
+                    //计划里程（主任务过滤掉临加班次），
+                    //烂班里程（主任务烂班），
+                    //临加里程（主任务临加），
+                    //计划班次，烂班班次，增加班次
+                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+                    if (scheduleRealInfo.isSflj()) {
+                        addMileage += tempJhlc;
+                    } else {
+                        if (!(scheduleRealInfo.getBcType().equals("in")
+                                || scheduleRealInfo.getBcType().equals("out"))) {
+                            jhlc += tempJhlc;
+                        }
+
+                        if (scheduleRealInfo.getStatus() == -1) {
+                            remMileage += tempJhlc;
+                        }
+                    }
+                    Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+                    //计算营运里程，空驶里程
+                    if (childTaskPlans.isEmpty()) {
+                        if (scheduleRealInfo.getBcType().equals("in") ||
+                                scheduleRealInfo.getBcType().equals("out")) {
+                            jcclc += tempJhlc;
+                        }
+                        //主任务 放空班次属于营运
+//						else if(scheduleRealInfo.getBcType().equals("venting")){
+//							ksgl += tempJhlc;
+//						}
+                        else {
+                            if (scheduleRealInfo.getStatus() != -1) {
+                                yygl += tempJhlc;
+                            }
+                        }
+                    } else {
+                        Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                        while (it.hasNext()) {
+                            ChildTaskPlan childTaskPlan = it.next();
+                            if (childTaskPlan.getMileageType().equals("empty")) {
+                                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();
+                                } else {
+                                    yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            yesterdayDataList.get(x).put("totalKilometers", yygl + ksgl + jcclc);
+
+        }
-		try {
-			ScheduleRealInfo sch = dayOfSchedule.get(id);
-			if (sch.getFcsjActual() == null) {
-				rs.put("status", ResponseCode.ERROR);
-				rs.put("msg", "无实发时间，无法撤销！");
-			} else {
-				//将对应的到离站数据标记为不可信
-				List<ArrivalEntity> list = ArrivalData_GPS.findByNbbm(sch.getClZbh());
-				for(ArrivalEntity arr : list){
-					if(arr.getInOut() == 1 
-							&& arr.getUpDown() == Integer.parseInt(sch.getXlDir())
-							&& arr.getStopNo().equals(sch.getQdzCode())
-							&& Math.abs(arr.getTs() - sch.getFcsjActualTime()) < 1000 * 60){
-						arr.setEnable(false);
-						break;
-					}
+		/*	for(ScheduleRealInfo scheduleRealInfo:list){
+			if(scheduleRealInfo != null){
+				for(int i=0;i<yesterdayDataList.size();i++){
+					if(scheduleRealInfo.getXlBm().equals(yesterdayDataList.get(i).get("xlBm")) && scheduleRealInfo.getClZbh().equals(yesterdayDataList.get(i).get("clZbh"))
+							&& scheduleRealInfo.getjGh().equals(yesterdayDataList.get(i).get("jGh"))){
+						//根据线路代码获取公司
+						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）;有子任务的，忽略主任务，子任务的烂班
+						if(childTaskPlans.isEmpty()){
+							if(scheduleRealInfo.getStatus() == 2){
+								yesterdayDataList.get(i).put("totalKilometers", scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc()+(double)(yesterdayDataList.get(i).get("totalKilometers")==null?0.0:yesterdayDataList.get(i).get("totalKilometers")));
+							}
+						}else{
+							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+							while(it.hasNext()){
+								ChildTaskPlan childTaskPlan = it.next();
+								if(!childTaskPlan.isDestroy()){
+									yesterdayDataList.get(i).put("totalKilometers", childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage()+(double)(yesterdayDataList.get(i).get("totalKilometers")==null?0.0:yesterdayDataList.get(i).get("totalKilometers")));
+								}
+							}
+						}
+					}	
 				}
-				
-				sch.clearFcsjActual();
-				rs.put("status", ResponseCode.SUCCESS);
-				
-				ts.add(sch);
-				rs.put("ts", ts);
-
-			}
-		} catch (Exception e) {
-			logger.error("", e);
-			rs.put("status", ResponseCode.ERROR);
-		}
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> spaceAdjust(Long[] ids, Integer space) {
-
-		List<ScheduleRealInfo> list = new ArrayList<>()
-				,updateList = new ArrayList<>();
-		Map<String, Object> rs = new HashMap<>();
-		try {
-			ScheduleRealInfo sch, next;
-			for (Long id : ids) {
-				sch = dayOfSchedule.get(id);
-				if (null != sch)
-					list.add(sch);
 			}
+		}*/
+        //增加顺序号
+        for (int i = 0; i < yesterdayDataList.size(); i++) {
+            if (i == 0) {
+                yesterdayDataList.get(i).put("seqNumber", 1);
+            } else {
+                if (yesterdayDataList.get(i - 1).get("clZbh").equals(yesterdayDataList.get(i).get("clZbh"))) {
+                    yesterdayDataList.get(i).put("seqNumber", 1 + (int) yesterdayDataList.get(i - 1).get("seqNumber"));
+                } else {
+                    yesterdayDataList.get(i).put("seqNumber", 1);
+                }
+            }
+        }
+        return yesterdayDataList;
+    }
+
+    /**
+     * 批量调整人车
+     */
+    @Override
+    public Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs) {
+        Map<String, Object> rs = new HashMap<>();
+        Set<ScheduleRealInfo> set = new HashSet<>();
+
+        ScheduleRealInfo sch;
+        BiMap<String, String> map = BasicData.deviceId2NbbmMap.inverse();
+
+        for (ChangePersonCar cpc : cpcs) {
+
+            if (map.get(cpc.getClZbh()) == null) {
+                rs.put("msg", "车辆 " + cpc.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
+                rs.put("status", ResponseCode.ERROR);
+                return rs;
+            }
+
+            sch = dayOfSchedule.get(cpc.getSchId());
+            if (sch == null)
+                continue;
+
+            if (StringUtils.isNotEmpty(cpc.getJsy())) {
+                //换驾驶员
+                persoChange(sch, cpc.getJsy().split("/")[0]);
+            }
+
+            //换售票员
+            if (StringUtils.isNotEmpty(cpc.getSpy())) {
+                persoChangeSPY(sch, cpc.getSpy().split("/")[0]);
+            }
+
+            //换车
+            if (StringUtils.isNotEmpty(cpc.getClZbh())) {
+                set.add(sch);
+                set.addAll(dayOfSchedule.changeCar(sch, cpc.getClZbh()));
+            }
+
+        }
+        rs.put("ts", set);
+        rs.put("status", ResponseCode.SUCCESS);
+        return rs;
+    }
+
+    /**
+     * @Title: persoChange
+     * @Description: TODO(班次换驾驶员)
+     */
+    public void persoChange(ScheduleRealInfo sch, String jGh) {
+        if (sch.getjGh().equals(jGh))
+            return;
+        String jName = BasicData.allPerson.get(jGh);
+        if (StringUtils.isNotEmpty(jName)) {
+            sch.setjGh(jGh);
+            sch.setjName(jName);
+        }
+    }
+
+    /**
+     * @Title: persoChange
+     * @Description: TODO(班次换售票员)
+     */
+    public void persoChangeSPY(ScheduleRealInfo sch, String sGh) {
+        if (sch.getsGh().equals(sGh))
+            return;
+        String sName = BasicData.allPerson.get(sGh);
+        if (StringUtils.isNotEmpty(sName)) {
+            sch.setsGh(sGh);
+            sch.setsName(sName);
+        }
+    }
+
+    /**
+     * 批量待发调整
+     */
+    @Override
+    public Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs) {
+        Map<String, Object> rs = new HashMap<>(), tempMap = new HashMap<>();
+        List<ScheduleRealInfo> list = new ArrayList<>();
+
+        ScheduleRealInfo sch, next;
+        for (DfsjChange dc : dfsjcs) {
+            if (StringUtils.isEmpty(dc.getOld_dfsj()) || StringUtils.isEmpty(dc.getNew_dfsj()))
+                continue;
+			
+			/*sch = dayOfSchedule.get(dc.getSchId());
+			if(sch==null)
+				continue;
+			
+			sch.setDfsjAll(dc.getNew_dfsj());
+			//重新计算终点时间
+			sch.calcEndTime();
+			list.add(sch);*/
+            tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null);
-			int size = list.size();
-			if(size == 0){
-				rs.put("status", ResponseCode.ERROR);
-			}
-			else{
-				// 按发车时间排序
-				Collections.sort(list, new ScheduleComparator.FCSJ());
-
-				// 以第一个实际发车/待发时间为起点，调整间隔
-				sch = list.get(0);
-				Long st = sch.getFcsjActualTime()==null?sch.getDfsjT():sch.getFcsjActualTime()
-					,plus = space * 60 * 1000L;
-				
-				for(int i = 1; i < size; i ++){
-					st += plus;
-					sch = list.get(i);
-					sch.setDfsjAll(st);
-					//重新计算终点时间
-					sch.calcEndTime();
-
-					dayOfSchedule.save(sch);
-
-					updateList.add(sch);
-					next=dayOfSchedule.next(sch);
-					if(next.getQdzName().equals(sch.getZdzName())){
-						next.setQdzArrDateJH(sch.getZdsj());
-						updateList.add(next);
-					}
-				}
+            if (tempMap.get("status").equals(ResponseCode.SUCCESS)) {
+                list.addAll((Collection<? extends ScheduleRealInfo>) tempMap.get("ts"));
+            }
+            //next=dayOfSchedule.next(sch);
+			/*if(next.getQdzName().equals(sch.getZdzName())){
+				next.setQdzArrDateJH(sch.getZdsj());
+				list.add(next);
+			}*/
+        }
+        rs.put("status", ResponseCode.SUCCESS);
+        rs.put("ts", list);
+        return rs;
+    }
-				rs.put("status", ResponseCode.SUCCESS);
-				rs.put("ts", updateList);
-			}
-			
-		} catch (Exception e) {
-			logger.error("", e);
-			rs.put("status", ResponseCode.ERROR);
-		}
-		return rs;
-	}
-	private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+    @Override
+    public Map<String, Object> findKMBC1(String jName, String clZbh,
+                                         String date, String enddate) {
+        List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill4(jName, clZbh, date, enddate);
+        DecimalFormat format = new DecimalFormat("0.00");
+//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
+//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
+        int jhbc = 0, cjbc = 0, ljbc = 0;
+        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0;
+        float addMileage = 0l, remMileage = 0l;
+        Map<String, Object> map = new HashMap<String, Object>();
+        for (ScheduleRealInfo scheduleRealInfo : list) {
+            if (scheduleRealInfo != null) {
+                //计划里程（主任务过滤掉临加班次），
+                //烂班里程（主任务烂班），
+                //临加里程（主任务临加），
+                //计划班次，烂班班次，增加班次
+                tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+                if (scheduleRealInfo.isSflj()) {
+                    addMileage += tempJhlc;
+                    ljbc++;
+                } else {
+                    jhlc += tempJhlc;
+                    jhbc++;
+                    if (scheduleRealInfo.getStatus() == -1) {
+                        remMileage += tempJhlc;
+                        cjbc++;
+                    }
+                }
+                Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+                //计算营运里程，空驶里程
+                if (childTaskPlans.isEmpty()) {
+                    if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+                            || scheduleRealInfo.getBcType().equals("venting")) {
+                        ksgl += tempJhlc;
+                    } else {
+                        yygl += tempJhlc;
+                    }
+                } else {
+                    Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                    while (it.hasNext()) {
+                        ChildTaskPlan childTaskPlan = it.next();
+                        if (childTaskPlan.getMileageType().equals("empty")) {
+                            ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+                        } else {
+                            yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+                        }
+                    }
+                }
+            }
+        }
+        map.put("jhlc", format.format(jhlc));
+        map.put("remMileage", format.format(remMileage));
+        map.put("addMileage", format.format(addMileage));
+        map.put("yygl", format.format(yygl));
+        map.put("ksgl", format.format(ksgl));
+        map.put("realMileage", format.format(yygl + ksgl));
+        map.put("jhbc", jhbc);
+        map.put("cjbc", cjbc);
+        map.put("ljbc", ljbc);
+        map.put("sjbc", jhbc - cjbc + ljbc);
+        return map;
+    }
+
+    /**
+     * 调整班次类型
+     *
+     * @param id
+     * @param bcType
+     * @param remarks
+     * @return
+     */
+    @Override
+    public Map<String, Object> changeBcType(Long id, String bcType, String remarks) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(id);
+            if (sch != null) {
+                sch.setBcType(bcType);
+                sch.addRemarks(remarks);
+                //有时间记录一下相关变更数据
+                rs.put("status", ResponseCode.SUCCESS);
+                rs.put("t", sch);
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> historySave(ScheduleRealInfo sch) {
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+
+        ScheduleRealInfo oldSch = super.findById(sch.getId());
+        //修改车辆
+        if (!oldSch.getClZbh().equals(sch.getClZbh())) {
+            Set<String> allCar = BasicData.deviceId2NbbmMap.values();
+            if (!allCar.contains(sch.getClZbh())) {
+                rs.put("msg", "无效的车辆自编号");
+                return rs;
+            } else
+                oldSch.setClZbh(sch.getClZbh());
+        }
+
+        //修改驾驶员
+        if (!oldSch.getjGh().equals(sch.getjGh())) {
+            Map<String, String> allPer = BasicData.allPerson;
+            if (!allPer.containsKey(sch.getjGh())) {
+                rs.put("msg", "无效的驾驶员");
+                return rs;
+            } else {
+                oldSch.setjGh(sch.getjGh());
+                oldSch.setjName(allPer.get(oldSch.getjGh()));
+            }
+        }
+
+        //待发时间
+        oldSch.setDfsj(sch.getDfsj());
+        //实发时间
+        oldSch.setFcsjActual(sch.getFcsjActual());
+        //实际终点
+        oldSch.setZdsjActual(sch.getZdsjActual());
+        //备注
+        oldSch.setRemarks(sch.getRemarks());
+
+        scheduleRealInfoRepository.save(oldSch);
+        rs.put("status", ResponseCode.SUCCESS);
+        return rs;
+    }
+
+    @Autowired
+    SvgAttributeRepository svgAttributeRepository;
+
+    @Override
+    public Map<String, Object> svgAttr(String jsonStr) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try {
+            JSONObject jObj = JSONObject.parseObject(StringEscapeUtils.unescapeHtml4(jsonStr));
+
+            SvgAttribute svgAttribute = new SvgAttribute();
+            svgAttribute.setLineCode(jObj.getString("lineCode"));
+            svgAttribute.setHideStations(jObj.getString("hideStations"));
+            svgAttribute.setNicknames(jObj.getString("nicknames"));
+            svgAttributeRepository.save(svgAttribute);
+
+            rs.put("t", svgAttribute);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> findSvgAttr(String idx) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            List<String> lineCodes = Splitter.on(",").splitToList(idx);
+            List<SvgAttribute> list = svgAttributeRepository.findSvgAttr(lineCodes);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    @Override
+    public List<Map<String, Object>> yesterdayDataList(String line) {
+        // TODO Auto-generated method stub
+        return null;
+    }
 	@Override
-	public Map<String, Object> schInfoFineTune(Map<String, String> map) {
-		Map<String, Object> rs = new HashMap<>();
-		List<ScheduleRealInfo> ts = new ArrayList<>();
-		try {
-			Long id = Long.parseLong(map.get("id"));
-			//班次类型
-			//String bcType = map.get("bcType");
-			//车辆自编号
-			//String clZbh = map.get("clZbh");
-			//计划发车时间
-			//String fcsj = map.get("fcsj");
-			//实际发车时间
-			String fcsjActual = map.get("fcsjActual");
-			
-			//实际终点时间
-			String zdsjActual = map.get("zdsjActual");
-			//备注
-			String remarks = map.get("remarks");
-			
-			ScheduleRealInfo sch = dayOfSchedule.get(id);
-			if(null != sch){
-//				//驾驶员
-//				if(StringUtils.isNotBlank(map.get("jsy"))){
-//					String[] jsy = map.get("jsy").split("/");
-//					sch.setjGh(jsy[0]);
-//					sch.setjName(jsy[1]);
-//				}
-				
-				//售票员
-//				if(StringUtils.isNotBlank(map.get("spy"))){
-//					String[] spy = map.get("spy").split("/");
-//					sch.setsGh(spy[0]);
-//					sch.setsName(spy[1]);
-//				}
-				
-				//sch.setBcType(bcType);
-				//sch.setClZbh(clZbh);
-				//sch.setFcsjAll(fcsj);
-
-				if(StringUtils.isNotBlank(fcsjActual)){
-					LineConfig config = lineConfigData.get(sch.getXlBm());
-					long t=0L;
-					//小于线路开始运营时间，则默认跨过24点
-					if(fcsjActual.compareTo(config.getStartOpt()) < 0)
-						t=fmtyyyyMMddHHmm.parseMillis(fmtyyyyMMdd.print(sch.getScheduleDate().getTime() + DAY_TIME)+fcsjActual);
-					else
-						t=fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+fcsjActual);
-
-					//调整实发
-					if(!fcsjActual.equals(sch.getFcsjActual()))
-						sch.setFcsjActualAll(t);
-				}
-				else{
-					//撤销实发
-					if(sch.getFcsjActual() != null)
-						revokeRealOutgo(sch.getId());
-				}
-				
-				//实达时间
-				if(StringUtils.isNotBlank(zdsjActual)){
-					if(!zdsjActual.equals(sch.getZdsjActual())){
-						//调整实达
-						sch.setZdsjActualAll(zdsjActual);
-						//下一班次起点到达时间
-						ScheduleRealInfo next = dayOfSchedule.next(sch);
-						if(null != next){
-							next.setQdzArrDateSJ(zdsjActual);
-							ts.add(next);
-						}
-
-						//重新计算车辆执行班次
-						dayOfSchedule.reCalcExecPlan(sch.getClZbh());
-					}
-				}
-				else {
-					/*if(sch.getZdsjActual() != null){
-						//将对应的到离站数据标记为不可信
-						List<ArrivalEntity> list = ArrivalData_GPS.findByNbbm(sch.getClZbh());
-						for(ArrivalEntity arr : list){
-							if(arr.getInOut() == 0 
-									&& arr.getUpDown() == Integer.parseInt(sch.getXlDir())
-									&& arr.getStopNo().equals(sch.getZdzCode())
-									&& Math.abs(arr.getTs() - sch.getZdsjActualTime()) < 1000 * 60){
-								arr.setEnable(false);
-								break;
-							}
-						}
-					}*/
-					
-					//清除实达时间
-					sch.clearZdsjActual();
-					//清除下一班次起点到达时间
-					ScheduleRealInfo next = dayOfSchedule.next(sch);
-					if(null != next){
-						next.setQdzArrDateSJ(null);
-						ts.add(next);
-					}
-				}
-				
-				sch.setRemarks(remarks);
-			}
-			
-			//班次状态
-			sch.calcStatus();
-			dayOfSchedule.save(sch);
-			//页面需要更新的班次信息
-			ts.add(sch);
-			
-			rs.put("status", ResponseCode.SUCCESS);
-			rs.put("ts", ts);
-		} catch (Exception e) {
-			logger.error("", e);
-			rs.put("status", ResponseCode.ERROR);
-		}
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> outgoAdjustAll(String params) {
-		Map<String, Object> rs = new HashMap<>();
-		try{
-			JSONArray jsonArray = JSONArray.parseArray(params);
-			
-			ScheduleRealInfo schedule = null;
-			JSONObject jsonObj;
-			String dfsj;
-			for(int i = 0; i < jsonArray.size(); i ++){
-				jsonObj = jsonArray.getJSONObject(i);
-				dfsj = jsonObj.getString("t");
-				schedule = dayOfSchedule.get(jsonObj.getLong("id"));
-				//设置待发时间
-				schedule.setDfsjAll(dfsj);
-				
-				dayOfSchedule.save(schedule);
-			}
-			
-			rs.put("status", ResponseCode.SUCCESS);
-			//将更新的最后一个班次返回
-			rs.put("t", schedule);
-		}catch(Exception e){
-			logger.error("", e);
-			rs.put("status", ResponseCode.ERROR);
-		}
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> findRouteByLine(String lineCode) {
-		Map<String, Object> map = new HashMap<>();
-		//上行
-		Integer lineId = BasicData.lineId2CodeMap.inverse().get(lineCode);
-		map.put("line.id_eq", lineId);
-		map.put("directions_eq", 0);
-		List<Map<String, Object>>  upList = sectionRouteService.getSectionRoute(map);
-		
-		//下行
-		map.put("directions_eq", 1);
-		List<Map<String, Object>>  downList = sectionRouteService.getSectionRoute(map);
-		
-		Map<String, Object> rs = new HashMap<>();
-		
-		String upVectors = "", vec;
-		//拼接上行路段
-		for(Map<String, Object> temp : upList){
-			vec = temp.get("sectionBsectionVector").toString();
-			upVectors += vec.subSequence(11, vec.length() - 2) + " ";
-		}
-		
-		//拼接下行路段
-		String downVectors = "";
-		for(Map<String, Object> temp : downList){//LINESTRING(
-			vec = temp.get("sectionBsectionVector").toString();
-			downVectors += vec.subSequence(11, vec.length() - 2) + " ";
-		}
-		
-		
-		rs.put("up", upVectors);
-		//上行gcj
-		rs.put("up_gcj", BdToGcjString(upVectors));
-		rs.put("down", downVectors);
-		//下行gcj
-		rs.put("down_gcj", BdToGcjString(downVectors));
-		rs.put("lineId", lineId);
-		
-		return rs;
-	}
-	
-	/**
-	 * 
-	 * @Title: BdToGcjString 
-	 * @Description: TODO(将百度路由字符串 转 成GCJ 字符串) 
-	 * @param @param bdStr
-	 * @throws
-	 */
-	public String BdToGcjString(String bdStr){
-		String[] array = bdStr.split(",")
-				,subArray;
-		if(array.length == 0 || bdStr.length() < 2)
-			return "";
-		
-		String gcjStr = "";
-		TransGPS.Location location;
-		for(String crd : array){
-			subArray = crd.split(" ");
-			if(subArray.length != 2)
-				continue;
-			location = TransGPS.bd_decrypt(TransGPS.LocationMake(Double.parseDouble(subArray[0]), Double.parseDouble(subArray[1])));
-			
-			gcjStr += location.getLng() + " " + location.getLat() + ",";
-		}
+	public List<ScheduleRealInfo> exportWaybillQp(String clZbh, String date, String line) {
+		// TODO Auto-generated method stub
+		ReportUtils ee = new ReportUtils();
+		ReportRelatedUtils rru = new ReportRelatedUtils();
+		List<Iterator<?>> list = new ArrayList<Iterator<?>>();
+		List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill2( clZbh,date,line);
+		List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
-		return gcjStr.substring(0, gcjStr.length() - 1);
-	}
-	public List<Map<String, String>> findLine(String line) {
-		List<Line> listLine = lineRepository.findLine("%"+line+"%");
-		List<Map<String,String>> list = new ArrayList<Map<String,String>>();
-		Map<String,String> map;
-		for(Line temp:listLine){
-			if(temp != null){
-				String xlName = temp.getName();
-				if(xlName.indexOf(line) != -1){
-					map = new HashMap<String, String>();
-					map.put("id", temp.getLineCode());
-					map.put("text", xlName);
-					list.add(map);
-				}
-			}
-		}
-		return list;
-	}
-	
-	public List<Map<String, String>> findLpName(String lpName) {
-		List<GuideboardInfo> listLpName = guideboardInfoRepository.findLpName("%"+lpName+"%");
-		List<Map<String,String>> list = new ArrayList<Map<String,String>>();
-		Map<String,String> map;
-		for(GuideboardInfo temp:listLpName){
-			if(temp != null){
-				String lp = temp.getLpName();
-				if(lp.indexOf(lpName) != -1){
-					map = new HashMap<String, String>();
-					map.put("id", lp);
-					map.put("text", lp);
-					list.add(map);
-				}
-			}
-		}
-		return list;
-	}
-
-	@Override
-	public Map<String, Object> findKMBC2(String jName, String clZbh,String date) {
-		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill3(jName, clZbh ,  date);
-
 		DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
 		int jhbc = 0,cjbc = 0,ljbc = 0;
-		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0;
+		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0,jcclc=0;
 		float addMileage = 0l,remMileage = 0l;
-		String j_Name="";
-		Map<String,Object> map = new HashMap<String, Object>();
-		for(ScheduleRealInfo scheduleRealInfo : list){
+		
+		Map<String,Object> map;
+		for(ScheduleRealInfo scheduleRealInfo : scheduleRealInfos){
 			if(scheduleRealInfo != null){
-				j_Name=scheduleRealInfo.getjName();
-				//计划里程（主任务过滤掉临加班次），
-				//烂班里程（主任务烂班），
-				//临加里程（主任务临加），
-				//计划班次，烂班班次，增加班次
-				tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-				if(scheduleRealInfo.isSflj()){
-					addMileage += tempJhlc;
-					ljbc++;
-				}else{
-					jhlc += tempJhlc;
-					jhbc++;
-					if(scheduleRealInfo.getStatus() == -1){
-						remMileage += tempJhlc;
-						cjbc++;
-					}				
-				}
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				//计算营运里程，空驶里程
-				if(childTaskPlans.isEmpty()){
-					if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-							|| scheduleRealInfo.getBcType().equals("venting")){
-						ksgl += tempJhlc;
+				//计算计划里程（主任务过滤掉临加班次），烂班里程，临加里程，计划班次，烂班班次，增加班次
+					//计划里程（主任务过滤掉临加班次），
+					//烂班里程（主任务烂班），
+					//临加里程（主任务临加），
+					//计划班次，烂班班次，增加班次
+					tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+					if(scheduleRealInfo.isSflj()){
+						ljbc++;
 					}else{
-						yygl += tempJhlc;
-					}	
-				}else{
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-					while(it.hasNext()){
-						ChildTaskPlan childTaskPlan = it.next();
-						if(childTaskPlan.getMileageType().equals("empty")){
-							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						jhlc += tempJhlc;
+						jhbc++;
+						if(scheduleRealInfo.getStatus() == -1){
+							remMileage += tempJhlc;
+							cjbc++;
+						}				
+					}
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					//计算营运里程，空驶里程
+					if(childTaskPlans.isEmpty()){
+						if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+								|| scheduleRealInfo.getBcType().equals("venting")){
+							ksgl += tempJhlc;
 						}else{
-							yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							yygl += tempJhlc;
+						}	
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while(it.hasNext()){
+							ChildTaskPlan childTaskPlan = it.next();
+							if(childTaskPlan.getMileageType().equals("empty")){
+								if(scheduleRealInfo.isSflj()){
+									addMileage += tempJhlc;
+								}
+								ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							}else{
+								if(scheduleRealInfo.isSflj()){
+									addMileage += tempJhlc;
+								}
+								yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							}
 						}
 					}
-				}
+					
+					if(!(scheduleRealInfo.getBcType().equals("in")||scheduleRealInfo.getBcType().equals("out"))){
+						map = new HashMap<String, Object>();
+						try {
+							map = rru.getMapValue(scheduleRealInfo);
+							String zdsj = scheduleRealInfo.getZdsj();
+							String zdsjActual = scheduleRealInfo.getZdsjActual();
+							if(zdsj != null && zdsjActual != null &&
+									!zdsj.equals(zdsjActual)){
+								if(zdsj.compareTo(zdsjActual) > 0){
+									map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+									map.put("slow", "");
+								} else {
+									map.put("fast", "");
+									map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+								}
+							} else {
+								map.put("fast", "");
+								map.put("slow", "");
+							}
+						listMap.add(map);
+						} catch (Exception e) {
+							e.printStackTrace();
+						} 
+					}
 			}
 		}
-		map.put("j_name", j_Name);
-		map.put("jhlc", format.format(jhlc));
-		map.put("remMileage", format.format(remMileage));
-		map.put("addMileage", format.format(addMileage));
-		map.put("yygl", format.format(yygl));
+		
+		//计算里程和班次数，并放入Map里
+		map = new HashMap<String, Object>();
+		map.put("jhlc", format.format(jhlc+jcclc));
+		map.put("yygljh", format.format(jhlc));
+		map.put("ssgl", format.format(remMileage));
 		map.put("ksgl", format.format(ksgl));
-		map.put("realMileage", format.format(yygl+ksgl));
+		map.put("yyglsj", format.format(yygl+remMileage));
 		map.put("jhbc", jhbc);
-		map.put("cjbc", cjbc);
-		map.put("ljbc", ljbc);
+		map.put("jcclc", jcclc);
+		
+		map.put("ljgl", format.format(addMileage));
+		map.put("ssbc", cjbc);
+		map.put("ysgl", format.format(yygl));
 		map.put("sjbc", jhbc-cjbc+ljbc);
-		return map;
+		map.put("zgl", format.format(yygl+remMileage+ksgl+jcclc));
+		map.put("ljbc", ljbc);
+		
+		String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+
+		list.add(listMap.iterator());
+		ee.excelReplace(list, new Object[] { scheduleRealInfos.get(0),map }, path+"mould\\waybill_qingpu.xls",
+				path+"export\\" + date+"-"+clZbh+"-行车路单.xls");
+		return scheduleRealInfos;
 	}
-	
-	
+
 	@Override
-	public Map<String, Object> findKMBC(String jName, String clZbh,
-			String lpName,String date) {
-		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date);
+	public Map<String, Object> findKMBCQp(String clZbh, String date, String line) {
+		// TODO Auto-generated method stub
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill2( clZbh,date,line);
 		DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
@@ -1182,7 +2213,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				//计划班次，烂班班次，增加班次
 				tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
 				if(scheduleRealInfo.isSflj()){
-					addMileage += tempJhlc;
 					ljbc++;
 				}else{
 					if( !(scheduleRealInfo.getBcType().equals("in")
@@ -1203,12 +2233,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 							scheduleRealInfo.getBcType().equals("out")){
 						jcclc +=tempJhlc;
 					}
+					
 					//主任务 放空班次属于营运
 //					else if(scheduleRealInfo.getBcType().equals("venting")){
 //						ksgl += tempJhlc;
 //					}
 					else{
 						if(scheduleRealInfo.getStatus() != -1){
+							if(scheduleRealInfo.isSflj()){
+								addMileage += tempJhlc;
+							}
 							yygl += tempJhlc;
 						}
 					}	
@@ -1220,6 +2254,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 							if(childTaskPlan.isDestroy()){
 								remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 							}else{
+								if(scheduleRealInfo.isSflj()){
+									addMileage += tempJhlc;
+								}
 								ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 							}
 						}else{
@@ -1227,6 +2264,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 								remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 //								cjbc++;
 							}else{
+								if(scheduleRealInfo.isSflj()){
+									addMileage += tempJhlc;
+								}
 								yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 							}
 						}
@@ -1234,113 +2274,32 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				}
 			}
 		}
-		map.put("jhlc", format.format(jhlc));
-		map.put("remMileage", format.format(remMileage));
-		map.put("addMileage", format.format(addMileage));
-		map.put("yygl", format.format(yygl));
+		map.put("jhlc", format.format(jhlc+jcclc));
+		map.put("yygljh", format.format(jhlc));
+		map.put("ssgl", format.format(remMileage));
 		map.put("ksgl", format.format(ksgl));
-		map.put("realMileage", format.format(yygl+ksgl+jcclc));
+		map.put("yyglsj", format.format(yygl+remMileage));
 		map.put("jhbc", jhbc);
-		map.put("cjbc", cjbc);
-		map.put("ljbc", ljbc);
-		map.put("sjbc", jhbc-cjbc+ljbc);
 		map.put("jcclc", jcclc);
-		map.put("zkslc", format.format(ksgl+jcclc));
-		return map;
-	}
-
-	@Override
-	public List<Map<String, Object>> account(String line, String date,
-			String code,String xlName, String type) {
-		List<Object[]> lsitObj = scheduleRealInfoRepository.account(line,date,code);
-		List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
-		Map<String,Object> map;
-		int i = 1;
-		for(Object[] obj : lsitObj){
-			if(obj != null){
-				map = new HashMap<String,Object>();
-				map.put("num", i++);
-				map.put("xlName", xlName);
-				map.put("clZbh", obj[3]);
-				map.put("company", obj[0]);
-				map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1]+"")).toUpperCase());
-				map.put("requestTime", obj[2]);
-				listMap.add(map);
-			}
-		}
-		
-		if(type != null && type.length() != 0 && type.equals("export")){
-			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-					sdfSimple = new SimpleDateFormat("yyyyMMdd");
-			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-			Map<String,Object> m = new HashMap<String, Object>();
-			ReportUtils ee = new ReportUtils();
-			Map<String, Object> typeMap = new HashMap<String, Object>();
-			typeMap.put("0xA1", "请求恢复运营");
-			typeMap.put("0xA2", "申请调档");
-			typeMap.put("0xA3", "出场请求");
-			typeMap.put("0xA5", "进场请求");
-			typeMap.put("0xA7", "加油请求");
-			typeMap.put("0x50", "车辆故障");
-			typeMap.put("0x70", "路阻报告");
-			typeMap.put("0x60", "事故报告");
-			typeMap.put("0x11", "扣证纠纷");
-			typeMap.put("0x12", "报警");
-			for(Map<String, Object> map1 : listMap){
-				map1.put("requestText", typeMap.get(map1.get("requestType")));
-			}
-			try {
-				listI.add(listMap.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould\\account.xls",
-						path+"export\\驾驶员请求台账" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
-			} catch (Exception e) {
-				// TODO: handle exception
-				e.printStackTrace();
-			}
-		}
-		
-		return listMap;
-	}
-
-	@Override
-	public List<ScheduleRealInfo> correctForm(String line, String startDate,
-			String endDate, String lpName, String code, String type) {
-		List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line,startDate,endDate,lpName,code);
-		
-		if(type != null && type.length() != 0 && type.equals("export")){
-			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-					sdfSimple = new SimpleDateFormat("yyyyMMdd");
-			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-			Map<String,Object> m = new HashMap<String, Object>();
-			ReportUtils ee = new ReportUtils();
-			m.put("startDate", startDate);
-			m.put("endDate", endDate);
-			try {
-				listI.add(list.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould\\correctForm.xls",
-						path+"export\\" + URLEncoder.encode("修正报表", "UTF-8") + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
-			} catch (Exception e) {
-				// TODO: handle exception
-				e.printStackTrace();
-			}
-		}
-		return list;
+		map.put("ljgl", format.format(addMileage));
+		map.put("ssbc", cjbc);
+		map.put("ysgl", format.format(yygl));
+		map.put("sjbc", jhbc-cjbc+ljbc);
+		map.put("zgl", format.format(yygl+remMileage+ksgl+jcclc));
+		map.put("ljbc", ljbc);
+		return map;
 	}
 	@Override
-	public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
-			String lpName,String date,String type) {
+	public List<ScheduleRealInfo> queryListWaybillQp(String clZbh, String date, String line) {
+		// TODO Auto-generated method stub
 		List <ScheduleRealInfo> list=null;
-		if(type.equals("qp")){
-			list= scheduleRealInfoRepository.queryListWaybill2(jName,clZbh,lpName,date);
-		}else{
-			list= scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date);
-		}
-		for (int i = 0; i < list.size(); i++) {
-			ScheduleRealInfo s=list.get(i);
+		list= scheduleRealInfoRepository.queryListWaybill2(clZbh,date,line);
+	List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
+	for (int i = 0; i < list.size(); i++) {
+		ScheduleRealInfo s=list.get(i);
+		if(!(s.getBcType().equals("in")||s.getBcType().equals("out"))){
 			String remarks="";
 			if(s.getRemarks()!=null){
 				remarks +=s.getRemarks();
@@ -1357,703 +2316,61 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				}
 			}
 			s.setRemarks(remarks);
+			newList.add(s);
 		}
-		return list;
-	}
-
-	@Override
-	public Map<String, Object> removeChildTask(Long taskId) {
-		Map<String, Object> rs = new HashMap<>();
-		ChildTaskPlan chTask = cTaskPlanRepository.findOne(taskId);
-		
-		ScheduleRealInfo sch = dayOfSchedule.get(chTask.getSchedule().getId());
-		try {
-			
-			sch.getcTasks().remove(chTask);
-			scheduleRealInfoRepository.save(sch);
-			rs.put("status", ResponseCode.SUCCESS);
-		} catch (Exception e) {
-			logger.error("", e);
-			rs.put("status", ResponseCode.ERROR);
-		}
-		return rs;
-	}
-	
-	@Override
-	public List<Map<String, Object>> statisticsDaily(String line, String date,
-			String xlName) {
-		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
-		List<Map<String,Object>> lMap = new ArrayList<Map<String,Object>>();
-		DecimalFormat format = new DecimalFormat("0.00");
-		double jhlc = 0, tempJhlc = 0,childMileage = 0;
-		float sjgl = 0f,ssgl = 0f,ssgl_lz = 0f,ssgl_dm = 0f,ssgl_gz = 0f,ssgl_jf = 0f,ssgl_zs = 0f,ssgl_qr = 0f
-				,ssgl_qc = 0f,ssgl_kx = 0f,ssgl_qh = 0f,ssgl_yw = 0f,ssgl_other = 0f,ljgl = 0f;
-		//班次
-		int sj_0 = 6*60+31,sj_1 = 8*60+30,sj_2 = 16*60+1,sj_3 = 18*60;
-		int jhbc = 0,jhbc_m = 0,jhbc_a = 0;
-		int sjbc = 0,sjbc_m = 0,sjbc_a = 0;
-		int ljbc = 0,ljbc_m = 0,ljbc_a = 0;
-		int fzbc = 0,fzbc_m = 0,fzbc_a = 0;
-		int dtbc = 0,dtbc_m = 0,dtbc_a = 0;
-		int djg = 0,djg_m = 0,djg_a = 0,djg_time = 0;
-		Map<String,Object> map = new HashMap<String, Object>();
-		for(ScheduleRealInfo scheduleRealInfo: list){
-			if(scheduleRealInfo != null){
-				
-				if(!(scheduleRealInfo.getBcType().equals("in")
-							||scheduleRealInfo.getBcType().equals("out")) ){
-					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-					//计算实际里程，少驶里程，计划里程=实际里程+少驶里程
-					if(childTaskPlans.isEmpty()){
-						tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-						//临加公里
-						if(scheduleRealInfo.isSflj()){
-							ljgl += tempJhlc;
-						}else{
-							jhlc += tempJhlc;
-						}
-						if(scheduleRealInfo.getStatus() == 2){
-							sjgl += tempJhlc;
-						}else if(scheduleRealInfo.getStatus() == -1){
-							ssgl += tempJhlc;
-							if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("路阻") != -1){
-								ssgl_lz += tempJhlc;
-							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1){
-								ssgl_dm += tempJhlc;
-							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("故障") != -1){
-								ssgl_gz += tempJhlc;
-							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1){
-								ssgl_jf += tempJhlc;
-							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("肇事") != -1){
-								ssgl_zs += tempJhlc;
-							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺人") != -1){
-								ssgl_qr += tempJhlc;
-							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺车") != -1){
-								ssgl_qc += tempJhlc;
-							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("客稀") != -1){
-								ssgl_kx += tempJhlc;
-							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("气候") != -1){
-								ssgl_qh += tempJhlc;
-							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("援外") != -1){
-								ssgl_yw += tempJhlc;
-							}else{
-								ssgl_other += tempJhlc;
-							}
-						}
-					}else{
-						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-						while(it.hasNext()){
-							ChildTaskPlan childTaskPlan = it.next();
-							childMileage = childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-							jhlc += childMileage;
-							if(childTaskPlan.isDestroy()){
-								ssgl += childMileage;
-								if(childTaskPlan.getDestroyReason().equals("路阻")){
-									ssgl_lz += childTaskPlan.getMileage();
-								}else if(childTaskPlan.getDestroyReason().equals("吊慢")){
-									ssgl_dm += childTaskPlan.getMileage();
-								}else if(childTaskPlan.getDestroyReason().equals("故障")){
-									ssgl_gz += childTaskPlan.getMileage();
-								}else if(childTaskPlan.getDestroyReason().equals("纠纷")){
-									ssgl_jf += childTaskPlan.getMileage();
-								}else if(childTaskPlan.getDestroyReason().equals("肇事")){
-									ssgl_zs += childTaskPlan.getMileage();
-								}else if(childTaskPlan.getDestroyReason().equals("缺人")){
-									ssgl_qr += childTaskPlan.getMileage();
-								}else if(childTaskPlan.getDestroyReason().equals("缺车")){
-									ssgl_qc += childTaskPlan.getMileage();
-								}else if(childTaskPlan.getDestroyReason().equals("客稀")){
-									ssgl_kx += childTaskPlan.getMileage();
-								}else if(childTaskPlan.getDestroyReason().equals("气候")){
-									ssgl_qh += childTaskPlan.getMileage();
-								}else if(childTaskPlan.getDestroyReason().equals("援外")){
-									ssgl_yw += childTaskPlan.getMileage();
-								}else{
-									ssgl_other += childTaskPlan.getMileage();
-								}
-							}else{
-								sjgl += childMileage;
-							}
-						}
-					}
-					
-					//班次
-					jhbc++;
-					String[] fcsj = scheduleRealInfo.getFcsj().split(":");
-					String[] fcsjActual = (scheduleRealInfo.getFcsjActual()==null?"0:00":scheduleRealInfo.getFcsjActual()).split(":");
-					if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_1){
-						jhbc_m++;
-					}else if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_3){
-						jhbc_a++;
-					}
-					if(scheduleRealInfo.getStatus() == 2){
-						sjbc++;
-						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-							sjbc_m++;
-						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-							sjbc_a++;
-						}
-					}
-					if(scheduleRealInfo.isSflj()){
-						ljbc++;
-						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-							ljbc_m++;
-						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-							ljbc_a++;
-						}
-					}
-					if(scheduleRealInfo.getBcType().equals("venting")){
-						fzbc++;
-						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-							fzbc_m++;
-						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-							fzbc_a++;
-						}
-					}
-				}
-			}	
-		}
-		map.put("xlName", xlName);
-		map.put("jhlc", format.format(jhlc));
-		map.put("sjgl", format.format(sjgl));
-		map.put("ssgl", format.format(ssgl));
-		map.put("ssgl_lz", ssgl_lz==0?0:format.format(ssgl_lz));
-		map.put("ssgl_dm", ssgl_dm==0?0:format.format(ssgl_dm));
-		map.put("ssgl_gz", ssgl_gz==0?0:format.format(ssgl_gz));
-		map.put("ssgl_jf", ssgl_jf==0?0:format.format(ssgl_jf));
-		map.put("ssgl_zs", ssgl_zs==0?0:format.format(ssgl_zs));
-		map.put("ssgl_qr", ssgl_qr==0?0:format.format(ssgl_qr));
-		map.put("ssgl_qc", ssgl_qc==0?0:format.format(ssgl_qc));
-		map.put("ssgl_kx", ssgl_kx==0?0:format.format(ssgl_kx));
-		map.put("ssgl_qh", ssgl_qh==0?0:format.format(ssgl_qh));
-		map.put("ssgl_yw", ssgl_yw==0?0:format.format(ssgl_yw));
-		map.put("ssgl_other", ssgl_other==0?0:format.format(ssgl_other));
-		map.put("ljgl", ljgl==0?0:format.format(ljgl));
-		map.put("jhbc", jhbc);
-		map.put("jhbc_m", jhbc_m);
-		map.put("jhbc_a", jhbc_a);
-		map.put("sjbc", sjbc);
-		map.put("sjbc_m", sjbc_m);
-		map.put("sjbc_a", sjbc_a);
-		map.put("ljbc", ljbc);
-		map.put("ljbc_m", ljbc_m);
-		map.put("ljbc_a", ljbc_a);
-		map.put("fzbc", fzbc);
-		map.put("fzbc_m", fzbc_m);
-		map.put("fzbc_a", fzbc_a);
-		map.put("dtbc", dtbc);
-		map.put("dtbc_m", dtbc_m);
-		map.put("dtbc_a", dtbc_a);
-		map.put("djg", djg);
-		map.put("djg_m", djg_m);
-		map.put("djg_a", djg_a);
-		map.put("djg_time", djg_time);
-		lMap.add(map);
-		return lMap;
 	}
-	@Override
-	public Map<String,Object> scheduleDaily(String line, String date) {
-		Map<String,String> tempMap = null;
-		List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
-		Map<String, Object> map = new HashMap<String, Object>();
-		Double jhlc = 0.00;
-		Float sjgl = 0f,ssgl = 0f,ssgl_lz = 0f,ssgl_dm = 0f,ssgl_gz = 0f,ssgl_jf = 0f,ssgl_zs = 0f,ssgl_qr = 0f
-				,ssgl_qc = 0f,ssgl_kx = 0f,ssgl_qh = 0f,ssgl_yw = 0f,ssgl_other = 0f,ljgl = 0f;
-		int jhbc = 0;
-		for(ScheduleRealInfo scheduleRealInfo:scheduleRealInfos){
-			if(scheduleRealInfo != null){
-				//计算里程（包括子任务）
-				jhlc += scheduleRealInfo.getJhlc();
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				if(!childTaskPlans.isEmpty()){
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-					while(it.hasNext()){
-						ChildTaskPlan childTaskPlan = it.next();
-						//是否烂班，烂班就是少驶
-						if(!childTaskPlan.isDestroy()){
-							sjgl += childTaskPlan.getMileage();
-						}else{
-							ssgl += childTaskPlan.getMileage();
-							if(childTaskPlan.getDestroyReason().equals("路阻")){
-								ssgl_lz += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("吊慢")){
-								ssgl_dm += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("故障")){
-								ssgl_gz += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("纠纷")){
-								ssgl_jf += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("肇事")){
-								ssgl_zs += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("缺人")){
-								ssgl_qr += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("缺车")){
-								ssgl_qc += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("客稀")){
-								ssgl_kx += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("气候")){
-								ssgl_qh += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("援外")){
-								ssgl_yw += childTaskPlan.getMileage();
-							}else{
-								ssgl_other += childTaskPlan.getMileage();
-							}
-						}
-						//临加公里
-						if(childTaskPlan.getType1().equals("临加")){
-							ljgl += childTaskPlan.getMileage();
-						}
-					}
-				}
-				//班次
-				scheduleRealInfo.getFcsjT();
-				scheduleRealInfo.getFcsjActualTime();
-			}
-		}
-		map.put("jhlc", jhlc);
-		map.put("sjgl", sjgl);
-		map.put("ssgl", ssgl);
-		map.put("ssgl_lz", ssgl_lz);
-		map.put("ssgl_dm", ssgl_dm);
-		map.put("ssgl_gz", ssgl_gz);
-		map.put("ssgl_jf", ssgl_jf);
-		map.put("ssgl_zs", ssgl_zs);
-		map.put("ssgl_qr", ssgl_qr);
-		map.put("ssgl_qc", ssgl_qc);
-		map.put("ssgl_kx", ssgl_kx);
-		map.put("ssgl_qh", ssgl_qh);
-		map.put("ssgl_yw", ssgl_yw);
-		map.put("ssgl_other", ssgl_other);
-		map.put("ljgl", ljgl);
-		
-		map.put("jhbc", scheduleRealInfos.size());
-		return null;
-	}
-
-	@Override
-	public int countByLineCodeAndDate(String xlBm, String schDate) {
-		return scheduleRealInfoRepository.countByLineCodeAndDate(xlBm + "", schDate);
+	return newList;
 	}
 	@Override
-	public List<ScheduleRealInfo> findByLineCodeAndDate(String xlBm, String schDate) {
-		return scheduleRealInfoRepository.findByLineCodeAndDate(xlBm + "", schDate);
-	}
-
-	@Override
-	public void deleteByLineCodeAndDate(String xlBm, String schDate) {
-		scheduleRealInfoRepository.deleteByLineCodeAndDate(xlBm + "", schDate);
-	}
-
-	@Override
-	public Long getMaxId() {
-		return scheduleRealInfoRepository.getMaxId();
-	}
-
-	@Override
-	public List<ScheduleRealInfo> realScheduleList(String line, String date) {
-		/*List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);
-		List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
-		for(ScheduleRealInfo info:listInfo){
-			for(ScheduleRealInfo total:listTotal){
-				if(info.getjGh().equals(total.getjGh()) && info.getLpName().equals(total.getLpName()) && info.getClZbh().equals(total.getClZbh())){
-					
-				}
-			}
-		}*/
-		return scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
-	}
-
-
-	public List<Map<String,Object>> yesterdayDataList(String line,String date) {
-		//前一天日期
-//		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
-//		String date = "2016-09-20";
-		List<Map<String,Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date);
-//		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
-		for(int x=0;x<yesterdayDataList.size();x++){
-			String jName=yesterdayDataList.get(x).get("jGh").toString();
-			String clZbh=yesterdayDataList.get(x).get("clZbh").toString();
-			List<ScheduleRealInfo> lists=scheduleRealInfoRepository.queryListWaybill3(jName, clZbh, date);
-			double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0,jcclc=0;
-			float addMileage = 0l,remMileage = 0l;
-			Map<String,Object> map = new HashMap<String, Object>();
-			boolean fage=true;
-			for(ScheduleRealInfo scheduleRealInfo : lists){
-				if(fage){
-					//根据线路代码获取公司
-					Line li = lineRepository.findByLineCode(scheduleRealInfo.getXlBm());
-					yesterdayDataList.get(x).put("company", li.getCompany());
-					yesterdayDataList.get(x).put("bCompany", li.getBrancheCompany());
-					fage=false;
-				}
-				if(scheduleRealInfo != null){
-					//计划里程（主任务过滤掉临加班次），
-					//烂班里程（主任务烂班），
-					//临加里程（主任务临加），
-					//计划班次，烂班班次，增加班次
-					tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-					if(scheduleRealInfo.isSflj()){
-						addMileage += tempJhlc;
-					}else{
-						if( !(scheduleRealInfo.getBcType().equals("in")
-								||scheduleRealInfo.getBcType().equals("out")) ){
-							jhlc += tempJhlc;
-						}
-						
-						if(scheduleRealInfo.getStatus() == -1){
-							remMileage += tempJhlc;
-						}				
-					}
-					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-					//计算营运里程，空驶里程
-					if(childTaskPlans.isEmpty()){
-						if(scheduleRealInfo.getBcType().equals("in") || 
-								scheduleRealInfo.getBcType().equals("out")){
-							jcclc +=tempJhlc;
-						}
-						//主任务 放空班次属于营运
-//						else if(scheduleRealInfo.getBcType().equals("venting")){
-//							ksgl += tempJhlc;
-//						}
-						else{
-							if(scheduleRealInfo.getStatus() != -1){
-								yygl += tempJhlc;
+	public Map<String, Object> MapById(Long id) {
+		// TODO Auto-generated method stub
+				Map<String, Object> map=new HashMap<String, Object>();
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+				ScheduleRealInfo s=scheduleRealInfoRepository.findOne(id);
+				String xlbm=s.getXlBm();
+				String fcrq=s.getScheduleDateStr();
+				 
+				
+				map.put("xlName", s.getXlName());
+				map.put("clZbh", s.getClZbh());
+				map.put("fcsjActual", s.getFcsjActual());
+				map.put("zdzName", s.getZdzName());
+				map.put("scheduleDate", s.getScheduleDateStr());
+				String zdp="",zwdp="",wdp="";
+				
+				List<DutyEmployee> list= dutyEmployeeService.getDutyEmployee(xlbm, fcrq+"00:00", fcrq+"23:59");
+				try {
+					Long fcsj1=sdf.parse(fcrq+" 03:00").getTime();
+					Long fcsj2=sdf.parse(fcrq+" 11:00").getTime();
+					Long fcsj3=sdf.parse(fcrq+" 22:00").getTime();
+					for(int i=0;i<list.size();i++){
+						DutyEmployee t=list.get(i);
+						Long ts=t.getTs();
+						if(ts>fcsj1&&ts<fcsj2){
+							if(zdp.indexOf(t.getuName())==-1){
+								zdp +=t.getuName()+",";
 							}
-						}	
-					}else{
-						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-						while(it.hasNext()){
-							ChildTaskPlan childTaskPlan = it.next();
-							if(childTaskPlan.getMileageType().equals("empty")){
-								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();
-								}else{
-									yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-								}
-							}
-						}
-					}
-				}
-			}
-			
-			yesterdayDataList.get(x).put("totalKilometers", yygl+ksgl+jcclc);
-		
-		}
-		
-		/*	for(ScheduleRealInfo scheduleRealInfo:list){
-			if(scheduleRealInfo != null){
-				for(int i=0;i<yesterdayDataList.size();i++){
-					if(scheduleRealInfo.getXlBm().equals(yesterdayDataList.get(i).get("xlBm")) && scheduleRealInfo.getClZbh().equals(yesterdayDataList.get(i).get("clZbh"))
-							&& scheduleRealInfo.getjGh().equals(yesterdayDataList.get(i).get("jGh"))){
-						//根据线路代码获取公司
-						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）;有子任务的，忽略主任务，子任务的烂班
-						if(childTaskPlans.isEmpty()){
-							if(scheduleRealInfo.getStatus() == 2){
-								yesterdayDataList.get(i).put("totalKilometers", scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc()+(double)(yesterdayDataList.get(i).get("totalKilometers")==null?0.0:yesterdayDataList.get(i).get("totalKilometers")));
+						}else if(ts>fcsj2 && ts<fcsj3){
+							if(zwdp.indexOf(t.getuName())==-1){
+								zwdp +=t.getuName()+",";
 							}
 						}else{
-							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-							while(it.hasNext()){
-								ChildTaskPlan childTaskPlan = it.next();
-								if(!childTaskPlan.isDestroy()){
-									yesterdayDataList.get(i).put("totalKilometers", childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage()+(double)(yesterdayDataList.get(i).get("totalKilometers")==null?0.0:yesterdayDataList.get(i).get("totalKilometers")));
-								}
+							if(wdp.indexOf(t.getuName())==-1){
+								wdp +=t.getuName()+",";
 							}
 						}
-					}	
-				}
-			}
-		}*/
-		//增加顺序号
-		for(int i=0;i<yesterdayDataList.size();i++){
-			if(i == 0){
-				yesterdayDataList.get(i).put("seqNumber", 1);	
-			}else{
-				if(yesterdayDataList.get(i-1).get("clZbh").equals(yesterdayDataList.get(i).get("clZbh"))){
-					yesterdayDataList.get(i).put("seqNumber", 1+(int)yesterdayDataList.get(i-1).get("seqNumber"));
-				}else{
-					yesterdayDataList.get(i).put("seqNumber", 1);
-				}
-			}
-		}
-		return yesterdayDataList;
-	}
-	
-	/**
-	 * 批量调整人车
-	 */
-	@Override
-	public Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs) {
-		Map<String, Object> rs = new HashMap<>();
-		Set<ScheduleRealInfo> set = new HashSet<>();
-		
-		ScheduleRealInfo sch;
-		
-		for(ChangePersonCar cpc : cpcs){
-			
-			sch = dayOfSchedule.get(cpc.getSchId());
-			if(sch==null)
-				continue;
-			
-			if(StringUtils.isNotEmpty(cpc.getJsy())){
-				//换驾驶员
-				persoChange(sch, cpc.getJsy().split("/")[0]);
-			}
-			
-			//换售票员
-			if(StringUtils.isNotEmpty(cpc.getSpy())){
-				persoChangeSPY(sch, cpc.getSpy().split("/")[0]);
-			}
-			
-			//换车
-			if(StringUtils.isNotEmpty(cpc.getClZbh())){
-				set.add(sch);
-				set.addAll(dayOfSchedule.changeCar(sch, cpc.getClZbh()));
-			}
-			
-		}
-		rs.put("ts", set);
-		rs.put("status", ResponseCode.SUCCESS);
-		return rs;
-	}
-	
-	/**
-	 * 
-	 * @Title: persoChange 
-	 * @Description: TODO(班次换驾驶员) 
-	 */
-	public void persoChange(ScheduleRealInfo sch, String jGh){
-		if(sch.getjGh().equals(jGh))
-			return;
-		String jName = BasicData.allPerson.get(jGh);
-		if(StringUtils.isNotEmpty(jName)){
-			sch.setjGh(jGh);
-			sch.setjName(jName);
-		}
-	}
-	
-	/**
-	 * 
-	 * @Title: persoChange 
-	 * @Description: TODO(班次换售票员) 
-	 */
-	public void persoChangeSPY(ScheduleRealInfo sch, String sGh){
-		if(sch.getsGh().equals(sGh))
-			return;
-		String sName = BasicData.allPerson.get(sGh);
-		if(StringUtils.isNotEmpty(sName)){
-			sch.setsGh(sGh);
-			sch.setsName(sName);
-		}
-	}
-
-	/**
-	 * 批量待发调整
-	 */
-	@Override
-	public Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs) {
-		Map<String, Object> rs = new HashMap<>()
-				,tempMap = new HashMap<>();
-		List<ScheduleRealInfo> list = new ArrayList<>();
-		
-		ScheduleRealInfo sch,next;
-		for(DfsjChange dc : dfsjcs){
-			if(StringUtils.isEmpty(dc.getOld_dfsj()) || StringUtils.isEmpty(dc.getNew_dfsj()))
-				continue;
-			
-			/*sch = dayOfSchedule.get(dc.getSchId());
-			if(sch==null)
-				continue;
-			
-			sch.setDfsjAll(dc.getNew_dfsj());
-			//重新计算终点时间
-			sch.calcEndTime();
-			list.add(sch);*/
-			tempMap = outgoAdjust(dc.getSchId(),"", dc.getNew_dfsj());
-
-			if(tempMap.get("status").equals(ResponseCode.SUCCESS)){
-				list.addAll((Collection<? extends ScheduleRealInfo>) tempMap.get("ts"));
-			}
-			//next=dayOfSchedule.next(sch);
-			/*if(next.getQdzName().equals(sch.getZdzName())){
-				next.setQdzArrDateJH(sch.getZdsj());
-				list.add(next);
-			}*/
-		}
-		
-		rs.put("status", ResponseCode.SUCCESS);
-		rs.put("ts", list);
-		return rs;
-	}
-	
-
-	@Override
-	public Map<String, Object> findKMBC1(String jName, String clZbh,
-			  String date, String enddate) {
-		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill4(jName, clZbh, date, enddate);
-		DecimalFormat format = new DecimalFormat("0.00");
-//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
-//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
-		int jhbc = 0,cjbc = 0,ljbc = 0;
-		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0;
-		float addMileage = 0l,remMileage = 0l;
-		Map<String,Object> map = new HashMap<String, Object>();
-		for(ScheduleRealInfo scheduleRealInfo : list){
-			if(scheduleRealInfo != null){
-				//计划里程（主任务过滤掉临加班次），
-				//烂班里程（主任务烂班），
-				//临加里程（主任务临加），
-				//计划班次，烂班班次，增加班次
-				tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-				if(scheduleRealInfo.isSflj()){
-					addMileage += tempJhlc;
-					ljbc++;
-				}else{
-					jhlc += tempJhlc;
-					jhbc++;
-					if(scheduleRealInfo.getStatus() == -1){
-						remMileage += tempJhlc;
-						cjbc++;
-					}				
-				}
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				//计算营运里程，空驶里程
-				if(childTaskPlans.isEmpty()){
-					if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-							|| scheduleRealInfo.getBcType().equals("venting")){
-						ksgl += tempJhlc;
-					}else{
-						yygl += tempJhlc;
-					}	
-				}else{
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-					while(it.hasNext()){
-						ChildTaskPlan childTaskPlan = it.next();
-						if(childTaskPlan.getMileageType().equals("empty")){
-							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-						}else{
-							yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-						}
 					}
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-			}
-		}
-		map.put("jhlc", format.format(jhlc));
-		map.put("remMileage", format.format(remMileage));
-		map.put("addMileage", format.format(addMileage));
-		map.put("yygl", format.format(yygl));
-		map.put("ksgl", format.format(ksgl));
-		map.put("realMileage", format.format(yygl+ksgl));
-		map.put("jhbc", jhbc);
-		map.put("cjbc", cjbc);
-		map.put("ljbc", ljbc);
-		map.put("sjbc", jhbc-cjbc+ljbc);
-		return map;
-	}
-
-	/**
-	 * 调整班次类型
-	 * @param id
-	 * @param bcType
-	 * @param remarks
-     * @return
-	 */
-	@Override
-	public Map<String, Object> changeBcType(Long id, String bcType, String remarks) {
-		Map<String, Object> rs = new HashMap<>();
-
-		try {
-			ScheduleRealInfo sch = dayOfSchedule.get(id);
-			if(sch != null){
-				sch.setBcType(bcType);
-				sch.addRemarks(remarks);
-				//有时间记录一下相关变更数据
-				rs.put("status", ResponseCode.SUCCESS);
-				rs.put("t", sch);
-			}
-		} catch (Exception e) {
-			logger.error("", e);
-			rs.put("status", ResponseCode.ERROR);
-		}
-
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> historySave(ScheduleRealInfo sch) {
-		Map<String, Object> rs = new HashMap<>();
-		rs.put("status", ResponseCode.ERROR);
-
-		ScheduleRealInfo oldSch = super.findById(sch.getId());
-		//修改车辆
-		if(!oldSch.getClZbh().equals(sch.getClZbh())){
-			Set<String> allCar=BasicData.deviceId2NbbmMap.values();
-			if(!allCar.contains(sch.getClZbh())){
-				rs.put("msg", "无效的车辆自编号");
-				return rs;
-			}
-			else
-				oldSch.setClZbh(sch.getClZbh());
-		}
-
-		//修改驾驶员
-		if(!oldSch.getjGh().equals(sch.getjGh())){
-			Map<String, String> allPer = BasicData.allPerson;
-			if(!allPer.containsKey(sch.getjGh())){
-				rs.put("msg", "无效的驾驶员");
-				return rs;
-			}
-			else{
-				oldSch.setjGh(sch.getjGh());
-				oldSch.setjName(allPer.get(oldSch.getjGh()));
-			}
-		}
-
-		//修改售票员
-/*		if(!oldSch.getsGh().equals(sch.getsGh())){
-			Map<String, String> allPer = BasicData.allPerson;
-
-			if(StringUtils.isNotEmpty(sch.getsGh())){
-				if(!allPer.containsKey(sch.getsGh())){
-					rs.put("msg", "无效的售票员");
-					return rs;
-				}
-			}
-			oldSch.setsGh(sch.getsGh());
-			oldSch.setsName(allPer.get(oldSch.getsGh()));
-		}*/
-
-		//待发时间
-		oldSch.setDfsj(sch.getDfsj());
-		//实发时间
-		oldSch.setFcsjActual(sch.getFcsjActual());
-		//实际终点
-		oldSch.setZdsjActual(sch.getZdsjActual());
-		//备注
-		oldSch.setRemarks(sch.getRemarks());
-
-		scheduleRealInfoRepository.save(oldSch);
-		rs.put("status", ResponseCode.SUCCESS);
-		return rs;
-	}
-
-	@Override
-	public List<Map<String, Object>> yesterdayDataList(String line) {
-		// TODO Auto-generated method stub
-		return null;
+				map.put("zdp", zdp);
+				map.put("zwdp", zwdp);
+				map.put("wdp", wdp);
+				return map;
 	}
-}
+}
 \ No newline at end of file
@@ -17,6 +17,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.drools.compiler.lang.DRL5Expressions.type_return;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
@@ -1012,6 +1013,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String line = map.get("line").toString();
 		String date = map.get("date").toString();
 		String code = map.get("code").toString();
+		String type = map.get("type").toString();
 		if(date.length() == 0)
 			date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
@@ -1042,8 +1044,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			if(company.length() != 0){
 				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
 			}
-			sql += " order by fcsj";
-			
+			sql += " order by xl_name, fcsj";
+
 			list = jdbcTemplate.query(sql,
 					new RowMapper<Map<String, Object>>(){
 				@Override
@@ -1072,8 +1074,13 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			e.printStackTrace();
 		}
+		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+		List<String> keyList = new ArrayList<String>();
 		for(Map<String, Object> m : list){
 			String key = m.get("line") + "/" + m.get("clZbh") + "/" + m.get("jGh") + "/" + m.get("jName");
+			if(!keyList.contains(m.get("line").toString())){
+				keyList.add(m.get("line").toString());
+			}
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<Map<String, Object>>());
 			keyMap.get(key).add(m);
@@ -1120,7 +1127,58 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("sjf", sjf);
 			tempMap.put("wqr", wqr);
 			tempMap.put("workList", keyMap.get(key));
-			resList.add(tempMap);
+			tempList.add(tempMap);
+		}
+		
+		for(String key : keyList){
+			for(Map<String, Object> m : tempList){
+				if(key.equals(m.get("line").toString())){
+					resList.add(m);
+				}
+			}
+		}
+		
+		if(type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(resList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould\\commandState.xls",
+						path+"export\\指令状态分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
+		if(type.equals("export1")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			String jsy = map.get("jsy").toString();
+			try {
+				for(Map<String, Object> map1 : resList){
+					if(jsy.equals(map1.get("jsy").toString())){
+						List<Map<String, Object>> temp = (List<Map<String, Object>>)map1.get("workList");
+						listI.add(temp.iterator());
+						m.put("detail", "日期：" + map1.get("date") + "  公司：" + map1.get("company")
+								+ "  分公司：" + map1.get("subCompany") + "  线路：" + map1.get("line")
+								+ "  车辆：" + map1.get("clZbh") + "  人员：" + map1.get("jsy"));
+					}
+				}
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould\\commandState1.xls",
+						path+"export\\指令状态明细" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
 		}
 		return resList;