Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents 3296963a b648109b
Showing 38 changed files with 2445 additions and 403 deletions
src/main/java/com/bsth/controller/BusIntervalController.java
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/entity/LonLatName.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/BusIntervalService.java
src/main/java/com/bsth/service/SectionService.java
src/main/java/com/bsth/service/StationRouteService.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/impl/SectionServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTinfoDetailDynamicData.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/java/com/bsth/util/ClosestPoint.java
src/main/java/com/bsth/util/HttpClientUtils.java
@@ -52,5 +52,10 @@ public class BusIntervalController {
 	public List<Map<String,Object>> correctStatis(@RequestParam Map<String, Object> map){
 		return busIntervalService.correctStatis(map);
 	}
-	
+
+	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
+	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
+		return busIntervalService.exportWaybillMore(map);
+	}
+
 }
@@ -135,7 +135,16 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	@RequestMapping(value="getSectionCode" , method = RequestMethod.GET)
 	public long getSectionCode() {
 		return GetUIDAndCode.getSectionId();
-		
+	}
+
+	/**
+	 * @Description :TODO(把路段截取位双路名路段)
+	 *
+	 * @return int <sectionCode路段编码>
+	 */
+	@RequestMapping(value="doubleName" , method = RequestMethod.GET)
+	public Map<String, Object> doubleName(@RequestParam Map<String, Object> map) {
+		return service.doubleName(map);
 	}
  
 }
@@ -148,14 +148,28 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 		return service.stationCacheUpdate(map);
 	}
 	/**
+	 * @Description :TODO(更新内部编码)
+	 * @param stationCount,sectionCount 更新数
+	 */
+	@RequestMapping(value="updateStationAndSectionCode" , method = RequestMethod.GET)
+	public int updateStationAndSectionCode(@RequestParam Integer stationCount, Integer sectionCount) {
+		for(int i = 0; i <  stationCount; i++) {
+			GetUIDAndCode.getStationId();
+		}
+		for(int i = 0; i <  sectionCount; i++) {
+			GetUIDAndCode.getSectionId();
+		}
+		return 1;
+	}
+	/**
 	 * @Description :TODO(查询站点编码)
-	 * 
+	 *
 	 * @return int <stationCode站点编码>
 	 */
 	@RequestMapping(value="getStationCode" , method = RequestMethod.GET)
 	public long getStationCode() {
 		return GetUIDAndCode.getStationId();
-		
+
 	}
 	/**
 	 * @Description :TODO(查询站点编码)
 package com.bsth.controller;
  
+import com.bsth.entity.Station;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.StationRouteCache;
 import com.bsth.repository.StationRouteCacheRepository;
@@ -110,12 +111,20 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	}
  
 	/**
-	 * @Description :TODO(查询缓存站点的上一个缓存站点)
+	 * @Description :TODO(查询线路某方向下的站点序号与类型)
 	 */
 	@RequestMapping(value = "/findCacheUpStationRouteCode" , method = RequestMethod.GET)
 	public List<Map<String, Object>> findCacheUpStationRouteCode(@RequestParam Map<String, Object> map) {
 		return service.findCacheUpStationRouteCode(map);
 	}
+
+	/**
+	 * @Description :TODO(查询站点的下一个缓存站点)
+	 */
+	@RequestMapping(value = "/findDownStationRoute" , method = RequestMethod.GET)
+	public List<Map<String, Object>> findDownStationRoute(@RequestParam Map<String, Object> map) {
+		return service.findDownStationRoute(map);
+	}
  
 	/**
 	 * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
+package com.bsth.entity;
+
+public class LonLatName {
+    public String first_name;
+    public String second_name;
+    public String way_name;
+    public String location;
+
+    public String getFirst_name() {
+        return first_name;
+    }
+
+    public void setFirst_name(String first_name) {
+        this.first_name = first_name;
+    }
+
+    public String getSecond_name() {
+        return second_name;
+    }
+
+    public void setSecond_name(String second_name) {
+        this.second_name = second_name;
+    }
+
+    public String getWay_name() {
+        return way_name;
+    }
+
+    public void setWay_name(String way_name) {
+        this.way_name = way_name;
+    }
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+}
@@ -172,9 +172,13 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	void isRoadSpeedUpd(Integer isR,Integer line,Integer directions);
  
 	@Modifying
-	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+10) where line = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
+	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+100) where line = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
 	public void sectionUpdSectionRouteCode(Integer line,Integer dir,Integer routeCod);
-	
+
+	@Modifying
+	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+100) where line_code = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
+	public void sectionUpdSectionRouteCode(String lineCode,Integer dir,int routeCod);
+
 	@Modifying
 	@Query(value="UPDATE bsth_c_sectionroute set destroy = 1 where id = ?1", nativeQuery=true)
 	public void sectionRouteIsDestroyUpdBatch(Integer id);
@@ -102,8 +102,79 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 				"select  MAX(station_route_code) as stationRouteCode   from bsth_c_stationroute r  WHERE  " +
 					"r.line=?1 and r.directions =?2 and station_route_code< ?3 and r.destroy = 0  ) and t.line=?1 and t.directions = ?2 AND t.destroy = 0", nativeQuery=true)
 	List<Object[]> findUpStationRouteCode(Integer lineId,Integer direction,Integer stationRouteCode);
-	
-	
+
+	/**
+	 * @Description :TODO(查询下个站点)
+	 *
+	 * @param map <lineId:线路ID； direction：方向；stationRouteCode：站点编码>
+	 *
+	 * @return List<Map<String, Object>>
+	 */
+	@Query(value = "SELECT a.stationRouteLine," +
+			" a.stationRouteStation," +
+			" a.stationRouteCode," +
+			" a.stationRouteLIneCode," +
+			" a.stationRouteStationMark," +
+			" a.stationOutStationNmber," +
+			" a.stationRoutedirections," +
+			" a.stationRouteDistances," +
+			" a.stationRouteToTime," +
+			" a.staitonRouteFirstTime," +
+			" a.stationRouteEndTime," +
+			" a.stationRouteDescriptions," +
+			" a.stationRouteDestroy," +
+			" a.stationRouteVersions," +
+			" a.stationRouteCreateBy," +
+			" a.stationRouteCreateDate," +
+			" a.stationRouteUpdateBy," +
+			" a.stationRouteUpdateDate," +
+			" b.id AS stationId," +
+			" b.station_cod AS stationCode," +
+			" a.stationRouteName," +
+			" b.road_coding AS stationRoadCoding," +
+			" b.db_type AS stationDbType," +
+			" b.b_jwpoints AS stationJwpoints," +
+			" b.g_lonx AS stationGlonx," +
+			" b.g_laty AS stationGlaty," +
+			" b.x AS stationX," +
+			" b.y AS stationY," +
+			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
+			" ST_AsText(b.g_polygon_grid) AS stationGPloyonGrid, " +
+			" b.destroy AS stationDestroy," +
+			" b.radius AS stationRadius," +
+			" b.shapes_type AS stationShapesType," +
+			" b.versions AS stationVersions," +
+			" b.descriptions AS sttationDescriptions," +
+			" b.create_by AS stationCreateBy," +
+			" b.create_date AS stationCreateDate," +
+			" b.update_by AS stationUpdateBy," +
+			" b.update_date AS stationUpdateDate," +
+			" a.stationRouteId,b.station_name as zdmc "+
+			" FROM ( SELECT s.id AS stationRouteId," +
+			" s.line AS stationRouteLine," +
+			" s.station as stationRouteStation," +
+			" s.station_name AS stationRouteName," +
+			" s.station_route_code as stationRouteCode," +
+			" s.line_code AS stationRouteLIneCode," +
+			" s.station_mark AS stationRouteStationMark," +
+			" s.out_station_nmber AS stationOutStationNmber," +
+			" s.directions AS stationRoutedirections," +
+			" s.distances AS stationRouteDistances," +
+			" s.to_time AS stationRouteToTime," +
+			" s.first_time AS staitonRouteFirstTime," +
+			" s.end_time AS stationRouteEndTime," +
+			" s.descriptions AS stationRouteDescriptions," +
+			" s.destroy AS stationRouteDestroy," +
+			" s.versions AS stationRouteVersions," +
+			" s.create_by AS stationRouteCreateBy," +
+			" s.create_date AS stationRouteCreateDate," +
+			" s.update_by AS stationRouteUpdateBy," +
+			" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.station_route_code =(" +
+			"select  MIN(station_route_code) as stationRouteCode   from bsth_c_stationroute r  WHERE  " +
+			"r.line=?1 and r.directions =?2 and station_route_code > ?3 and r.destroy = 0  ) and s.line=?1 and s.directions = ?2 AND s.destroy = 0) a " +
+			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
+	List<Object[]> findDownStationRoute(Integer id,Integer direction,Integer stationRouteCode);
+
 	/**
 	 * @Description :TODO(站点中心点坐标查询)
 	 * 
@@ -95,4 +95,8 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
  
 	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
 	List<Dlb> queryListDlb(String rq,String nbbm,String jgh,String xlbm);
+
+	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and xlbm=?2",nativeQuery=true)
+	List<Dlb> queryDlbByRqXlbm(String rq, String xlbm);
+	
 }
@@ -81,6 +81,9 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
  
 	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
 	List<Ylb> queryListYlb(String rq,String nbbm,String jgh,String xlbm);
+
+	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and xlbm=?2",nativeQuery=true)
+	List<Ylb> queryYlbByRqXlbm(String rq,String xlbm);
  
 	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4 order by ?5 asc",nativeQuery=true)
 	List<Ylb> checkYlb(String rq,String nbbm,String jgh,String xlbm,String px);
@@ -19,4 +19,6 @@ public interface BusIntervalService {
 	List<Map<String, Object>> lbStatuAnaly(Map<String, Object> map);
  
 	List<Map<String, Object>> correctStatis(Map<String, Object> map);
+
+	Map<String, Object> exportWaybillMore(Map<String, Object> map);
 }
@@ -37,4 +37,6 @@ public interface SectionService extends BaseService&lt;Section, Integer&gt; {
 	Map<String, Object> sectionCacheUpdate(Map<String, Object> map);
  
 	Map<String, Object> sectionCutSaveLineLS(Map<String, Object> map);
+
+    Map<String,Object> doubleName(Map<String, Object> map);
 }
@@ -72,9 +72,18 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	  * @return List<Map<String, Object>> 
 	  */
 	 List<Map<String, Object>> findUpStationRouteCode(Map<String, Object> map);
-	 
+
 	 List<Map<String, Object>> findCacheUpStationRouteCode(Map<String, Object> map);
-	 
+
+	/**
+	 * @Description :TODO(查询下一个站点)
+	 *
+	 * @param map <站点路由id; direction：方向；stationRouteCode：站点编码>
+	 *
+	 * @return List<Map<String, Object>>
+	 */
+	List<Map<String, Object>> findDownStationRoute(Map<String, Object> map);
+
 	 /**
 	  * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
 	  * 
 package com.bsth.service.impl;
  
+import java.io.File;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -23,27 +27,62 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
  
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
+import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
+import com.bsth.entity.oil.Dlb;
+import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.DutyEmployee;
+import com.bsth.repository.CarsRepository;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.oil.DlbRepository;
+import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.BusIntervalService;
+import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.schedule.PeopleCarPlanService;
+import com.bsth.service.sys.DutyEmployeeService;
+import com.bsth.util.Arith;
+import com.bsth.util.ComparableChild;
+import com.bsth.util.ComparableReal;
+import com.bsth.util.ReportRelatedUtils;
 import com.bsth.util.ReportUtils;
+import com.bsth.util.TimeUtils;
 import com.google.gson.Gson;
  
  
 @Service
 public class BusIntervalServiceImpl implements BusIntervalService {
  
+    @Autowired
+    CulateMileageService culateService;
+
 	@Autowired
 	private PeopleCarPlanService peopleCarPlanService;
  
 	@Autowired
 	private ScheduleRealInfoRepository scheduleRealInfoRepository;
-	
+
+    @Autowired
+    DutyEmployeeService dutyEmployeeService;
+
+    @Autowired
+    LineRepository lineRepository;
+
+    @Autowired
+    YlbRepository ylbRepository;
+    
+    @Autowired
+    DlbRepository dlbRepository;
+
+    @Autowired
+    CarsRepository carsRepository;
+    
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
  
@@ -241,7 +280,55 @@ public class BusIntervalServiceImpl implements BusIntervalService {
  
 		return list;
 	}
-	
+
+	public Map<Long, Set<ChildTaskPlan>> getChildTaskPlans(Long schedule1, Long schedule2){
+		
+		Map<Long, Set<ChildTaskPlan>> schMap = new HashMap<Long, Set<ChildTaskPlan>>();
+		List<ChildTaskPlan> list = new ArrayList<ChildTaskPlan>();
+
+		String sql = "select id,cc_id,mileage_type,destroy,destroy_reason," +
+				" mileage,type1,type2,schedule from bsth_c_s_child_task" +
+				" where 1=1";
+		if(schedule1 != null && schedule1 > 0){
+			sql += " and schedule >= '"+schedule1+"'";
+		}
+		if(schedule2 != null && schedule2 > 0){
+			sql += " and schedule <= '"+schedule2+"'";
+		}
+
+		list = jdbcTemplate.query(sql,
+				new RowMapper<ChildTaskPlan>(){
+			@Override
+			public ChildTaskPlan mapRow(ResultSet rs, int rowNum) throws SQLException {
+				ChildTaskPlan ct = new ChildTaskPlan();
+				ct.setId(rs.getLong("id"));
+				ct.setCcId(rs.getLong("cc_id"));
+				ct.setMileageType(rs.getString("mileage_type"));
+				ct.setDestroy(rs.getBoolean("destroy"));
+				ct.setDestroyReason(rs.getString("destroy_reason"));
+				ct.setMileage(rs.getFloat("mileage"));
+				ct.setType1(rs.getString("type1"));
+				ct.setType2(rs.getString("type2"));
+				ScheduleRealInfo schedule = new ScheduleRealInfo();
+				schedule.setId(rs.getLong("schedule"));
+				ct.setSchedule(schedule);
+				if(ct.getCcId() == 0l){
+					ct.setCcId(null);
+				}
+				return ct;
+			}
+		});
+		
+		for(ChildTaskPlan ct : list){
+			Long id = ct.getSchedule().getId();
+			if(!schMap.containsKey(id))
+				schMap.put(id, new HashSet<ChildTaskPlan>());
+			schMap.get(id).add(ct);
+		}
+
+		return schMap;
+	}
+
 	@Override
 	public List<Map<String, Object>> getDir(Map<String, Object> map) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
@@ -1630,6 +1717,15 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
  
 		list = getSchedule(company, subCompany, line, startDate, endDate, model, sfqr==1?times:"", true);
+		long schedule1 = 0l, schedule2 = 0l;
+		for(ScheduleRealInfo schedule : list){
+			long id = schedule.getId();
+			if(schedule1 == 0l || schedule1 > id)
+				schedule1 = id;
+			if(schedule2 == 0l || schedule1 < id)
+				schedule2 = id;
+		}
+		Map<Long, Set<ChildTaskPlan>> cts = getChildTaskPlans(schedule1, schedule2);
  
 		String[] date1 = startDate.split("-");
 		String[] date2 = endDate.split("-");
@@ -1702,46 +1798,67 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					jhlc = jhlc.add(lc);
 				}
 				if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null
-						&& schedule.getStatus() != -1 && !schedule.isCcService()){
-					sjbc++;
-					sjlc = sjlc.add(lc);
-				} else if(schedule.getStatus() == -1 && !schedule.isCcService()){
+						&& schedule.getStatus() != -1){
+					if(!schedule.isCcService())
+						sjbc++;
+//					sjlc = sjlc.add(lc);
+				} else if(schedule.getStatus() == -1){
 					if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路阻") != -1){
 						lzbc++;
-						lzlc = lzlc.add(lc);
+//						lzlc = lzlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("吊慢") != -1){
 						dmbc++;
-						dmlc = dmlc.add(lc);
+//						dmlc = dmlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("故障") != -1){
 						gzbc++;
-						gzlc = gzlc.add(lc);
+//						gzlc = gzlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("纠纷") != -1){
 						jfbc++;
-						jflc = jflc.add(lc);
+//						jflc = jflc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("肇事") != -1){
 						zsbc++;
-						zslc = zslc.add(lc);
+//						zslc = zslc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺人") != -1){
 						qrbc++;
-						qrlc = qrlc.add(lc);
+//						qrlc = qrlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺车") != -1){
 						qcbc++;
-						qclc = qclc.add(lc);
+//						qclc = qclc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("客稀") != -1){
 						kxbc++;
-						kxlc = kxlc.add(lc);
+//						kxlc = kxlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("气候") != -1){
 						qhbc++;
-						qhlc = qhlc.add(lc);
+//						qhlc = qhlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("外援") != -1){
 						wybc++;
-						wylc = wylc.add(lc);
+//						wylc = wylc.add(lc);
 					} else {
 						qtbc++;
-						qtlc = qtlc.add(lc);
+//						qtlc = qtlc.add(lc);
 					}
 				}
+				if(cts.containsKey(schedule.getId())){
+					schedule.setcTasks(cts.get(schedule.getId()));
+				}
 			}
+			
+			sjlc = new BigDecimal(culateService.culateSjgl(keyMap.get(key)) + culateService.culateLjgl(keyMap.get(key)));
+			lzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "路阻"));
+			dmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "吊慢"));
+			gzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "故障"));
+			jflc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "纠纷"));
+			zslc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "肇事"));
+			qrlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "缺人"));
+			qclc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "缺车"));
+			kxlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "客稀"));
+			qhlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "气候"));
+			wylc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "援外"));
+			qtlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "配车")).add(
+					new BigDecimal(culateService.culateCJLC(keyMap.get(key), "保养"))).add(
+					new BigDecimal(culateService.culateCJLC(keyMap.get(key), "抽减"))).add(
+					new BigDecimal(culateService.culateCJLC(keyMap.get(key), "其他")));
+			
 			boolean flag = true;
 			if(jhlc.doubleValue() == 0d){
 				flag = false;
@@ -1754,42 +1871,42 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
 			tempMap.put("bcbfb", df.format(jhbc>0?(double)sjbc/jhbc*100:0)+"%");
-			tempMap.put("jhlc", jhlc.doubleValue());
-			tempMap.put("sjlc", sjlc.doubleValue());
+			tempMap.put("jhlc", df.format(jhlc.doubleValue()));
+			tempMap.put("sjlc", df.format(sjlc.doubleValue()));
 //			tempMap.put("lcbfb", df.format(flag?(double)sjlc/jhlc*100:0)+"%");
 			tempMap.put("lcbfb", df.format(flag?sjlc.divide(jhlc, 4, BigDecimal.ROUND_HALF_UP).doubleValue()*100:0)+"%");
 			tempMap.put("lzbc", lzbc);
-			tempMap.put("lzlc", lzlc.doubleValue());
+			tempMap.put("lzlc", df.format(lzlc.doubleValue()));
 			tempMap.put("lzbfb", df.format(jhbc>0?(double)lzbc/jhbc*100:0)+"%");
 			tempMap.put("dmbc", dmbc);
-			tempMap.put("dmlc", dmlc.doubleValue());
+			tempMap.put("dmlc", df.format(dmlc.doubleValue()));
 			tempMap.put("dmbfb", df.format(jhbc>0?(double)dmbc/jhbc*100:0)+"%");
 			tempMap.put("gzbc", gzbc);
-			tempMap.put("gzlc", gzlc.doubleValue());
+			tempMap.put("gzlc", df.format(gzlc.doubleValue()));
 			tempMap.put("gzbfb", df.format(jhbc>0?(double)gzbc/jhbc*100:0)+"%");
 			tempMap.put("jfbc", jfbc);
-			tempMap.put("jflc", jflc.doubleValue());
+			tempMap.put("jflc", df.format(jflc.doubleValue()));
 			tempMap.put("jfbfb", df.format(jhbc>0?(double)jfbc/jhbc*100:0)+"%");
 			tempMap.put("zsbc", zsbc);
-			tempMap.put("zslc", zslc.doubleValue());
+			tempMap.put("zslc", df.format(zslc.doubleValue()));
 			tempMap.put("zsbfb", df.format(jhbc>0?(double)zsbc/jhbc*100:0)+"%");
 			tempMap.put("qrbc", qrbc);
-			tempMap.put("qrlc", qrlc.doubleValue());
+			tempMap.put("qrlc", df.format(qrlc.doubleValue()));
 			tempMap.put("qrbfb", df.format(jhbc>0?(double)qrbc/jhbc*100:0)+"%");
 			tempMap.put("qcbc", qcbc);
-			tempMap.put("qclc", qclc.doubleValue());
+			tempMap.put("qclc", df.format(qclc.doubleValue()));
 			tempMap.put("qcbfb", df.format(jhbc>0?(double)qcbc/jhbc*100:0)+"%");
 			tempMap.put("kxbc", kxbc);
-			tempMap.put("kxlc", kxlc.doubleValue());
+			tempMap.put("kxlc", df.format(kxlc.doubleValue()));
 			tempMap.put("kxbfb", df.format(jhbc>0?(double)kxbc/jhbc*100:0)+"%");
 			tempMap.put("qhbc", qhbc);
-			tempMap.put("qhlc", qhlc.doubleValue());
+			tempMap.put("qhlc", df.format(qhlc.doubleValue()));
 			tempMap.put("qhbfb", df.format(jhbc>0?(double)qhbc/jhbc*100:0)+"%");
 			tempMap.put("wybc", wybc);
-			tempMap.put("wylc", wylc.doubleValue());
+			tempMap.put("wylc", df.format(wylc.doubleValue()));
 			tempMap.put("wybfb", df.format(jhbc>0?(double)wybc/jhbc*100:0)+"%");
 			tempMap.put("qtbc", qtbc);
-			tempMap.put("qtlc", qtlc.doubleValue());
+			tempMap.put("qtlc", df.format(qtlc.doubleValue()));
 			tempMap.put("qtbfb", df.format(jhbc>0?(double)qtbc/jhbc*100:0)+"%");
  
 			resList.add(tempMap);
@@ -1822,41 +1939,41 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			temp.put("jhbc", jhbc_);
 			temp.put("sjbc", sjbc_);
 			temp.put("bcbfb", df.format(jhbc_>0?(double)sjbc_/jhbc_*100:0)+"%");
-			temp.put("jhlc", jhlc_.doubleValue());
-			temp.put("sjlc", sjlc_.doubleValue());
+			temp.put("jhlc", df.format(jhlc_.doubleValue()));
+			temp.put("sjlc", df.format(sjlc_.doubleValue()));
 			temp.put("lcbfb", df.format(flag?sjlc_.divide(jhlc_, 4, BigDecimal.ROUND_HALF_UP).doubleValue()*100:0)+"%");
 			temp.put("lzbc", lzbc_);
-			temp.put("lzlc", lzlc_.doubleValue());
+			temp.put("lzlc", df.format(lzlc_.doubleValue()));
 			temp.put("lzbfb", df.format(jhbc_>0?(double)lzbc_/jhbc_*100:0)+"%");
 			temp.put("dmbc", dmbc_);
-			temp.put("dmlc", dmlc_.doubleValue());
+			temp.put("dmlc", df.format(dmlc_.doubleValue()));
 			temp.put("dmbfb", df.format(jhbc_>0?(double)dmbc_/jhbc_*100:0)+"%");
 			temp.put("gzbc", gzbc_);
-			temp.put("gzlc", gzlc_.doubleValue());
+			temp.put("gzlc", df.format(gzlc_.doubleValue()));
 			temp.put("gzbfb", df.format(jhbc_>0?(double)gzbc_/jhbc_*100:0)+"%");
 			temp.put("jfbc", jfbc_);
-			temp.put("jflc", jflc_.doubleValue());
+			temp.put("jflc", df.format(jflc_.doubleValue()));
 			temp.put("jfbfb", df.format(jhbc_>0?(double)jfbc_/jhbc_*100:0)+"%");
 			temp.put("zsbc", zsbc_);
-			temp.put("zslc", zslc_.doubleValue());
+			temp.put("zslc", df.format(zslc_.doubleValue()));
 			temp.put("zsbfb", df.format(jhbc_>0?(double)zsbc_/jhbc_*100:0)+"%");
 			temp.put("qrbc", qrbc_);
-			temp.put("qrlc", qrlc_.doubleValue());
+			temp.put("qrlc", df.format(qrlc_.doubleValue()));
 			temp.put("qrbfb", df.format(jhbc_>0?(double)qrbc_/jhbc_*100:0)+"%");
 			temp.put("qcbc", qcbc_);
-			temp.put("qclc", qclc_.doubleValue());
+			temp.put("qclc", df.format(qclc_.doubleValue()));
 			temp.put("qcbfb", df.format(jhbc_>0?(double)qcbc_/jhbc_*100:0)+"%");
 			temp.put("kxbc", kxbc_);
-			temp.put("kxlc", kxlc_.doubleValue());
+			temp.put("kxlc", df.format(kxlc_.doubleValue()));
 			temp.put("kxbfb", df.format(jhbc_>0?(double)kxbc_/jhbc_*100:0)+"%");
 			temp.put("qhbc", qhbc_);
-			temp.put("qhlc", qhlc_.doubleValue());
+			temp.put("qhlc", df.format(qhlc_.doubleValue()));
 			temp.put("qhbfb", df.format(jhbc_>0?(double)qhbc_/jhbc_*100:0)+"%");
 			temp.put("wybc", wybc_);
-			temp.put("wylc", wylc_.doubleValue());
+			temp.put("wylc", df.format(wylc_.doubleValue()));
 			temp.put("wybfb", df.format(jhbc_>0?(double)wybc_/jhbc_*100:0)+"%");
 			temp.put("qtbc", qtbc_);
-			temp.put("qtlc", qtlc_.doubleValue());
+			temp.put("qtlc", df.format(qtlc_.doubleValue()));
 			temp.put("qtbfb", df.format(jhbc_>0?(double)qtbc_/jhbc_*100:0)+"%");
  
 			resList.add(temp);
@@ -2257,10 +2374,422 @@ public class BusIntervalServiceImpl implements BusIntervalService {
         		resMap.put("xlname",BasicData.lineCode2NameMap.get(xlbm));
         	}
 		}
-      
+        
 		return resList;
 	}
  
-	
-	
+    @Override
+    public Map<String, Object> exportWaybillMore(Map<String, Object> map) {
+        String date = map.get("date").toString();
+        String line = map.get("line").toString();
+        ReportUtils ee = new ReportUtils();
+        List<List> strs = JSON.parseArray(map.get("strs").toString(), List.class);
+        String path = this.getClass().getResource("/").getPath() + "static/pages/forms/export/";
+        SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                sdfSimple = new SimpleDateFormat("yyyyMMdd");
+        int num = 0;
+        File file = null;
+        try {
+            while (true) {
+                String fileUrl = path + "行车路单" + sdfSimple.format(sdfMonth.parse(date));
+//                file = new File(fileUrl + (num == 0 ? "/" : "(" + num + ")/"));	//新建文件夹
+                file = new File(fileUrl + (num == 0 ? ".xls" : "(" + num + ").xls"));	//新建excel文件
+                if (file.exists()) {	//判断是否已存在重名
+                    num++;
+                } else {
+                    break;
+                }
+            }
+//            file.mkdirs();	//创建
+            
+            Map<String, List<Ylb>> ylbMap = new HashMap<String, List<Ylb>>();
+            Map<String, List<Dlb>> dlbMap = new HashMap<String, List<Dlb>>();
+            Map<String, List<Cars>> carMap = new HashMap<String, List<Cars>>();
+            List<ScheduleRealInfo> lists_line=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
+	        List<DutyEmployee> list2 = dutyEmployeeService.getDutyEmployee(line, date + "00:01", date + "23:59");
+	        List<Ylb> queryYlbByRqXlbm = ylbRepository.queryYlbByRqXlbm(date, line);
+	        List<Dlb> queryDlbByRqXlbm = dlbRepository.queryDlbByRqXlbm(date, line);
+	        List<Cars> findCars = carsRepository.findCars();
+	        String minfcsj="02:00";
+	        List<Line> lineList=lineRepository.findLineByCode(line);
+	        if(lineList.size()>0){
+	        	String sqlMinYysj="select start_opt from bsth_c_line_config where "
+    	         		+ " id = ("
+    	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+    	         		+ ")";
+    	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+	        }
+	        
+	        for(Ylb ylb : queryYlbByRqXlbm){
+	        	String key = sdfMonth.format(ylb.getRq()) + ylb.getXlbm();
+	        	if(!ylbMap.containsKey(key))
+	        		ylbMap.put(key, new ArrayList<Ylb>());
+	        	ylbMap.get(key).add(ylb);
+	        }
+	        for(Dlb dlb : queryDlbByRqXlbm){
+	        	String key = sdfMonth.format(dlb.getRq()) + dlb.getXlbm();
+	        	if(!dlbMap.containsKey(key))
+	        		dlbMap.put(key, new ArrayList<Dlb>());
+	        	dlbMap.get(key).add(dlb);
+	        }
+	        for(Cars car : findCars){
+	        	String key = car.getInsideCode();
+	        	if(!carMap.containsKey(key))
+	        		carMap.put(key, new ArrayList<Cars>());
+	        	carMap.get(key).add(car);
+	        }
+	        
+            List<File> files = new ArrayList<File>();
+            for (List<String> list : strs){
+                List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
+                String jName = list.get(0);
+                String clZbh = list.get(1);
+                String lpName = list.get(2);
+                String jGh =list.get(3);
+                for (int i = 0; i < lists_line.size(); i++) {
+                    ScheduleRealInfo s=lists_line.get(i);
+                    if(s.getjGh().equals(jGh) && s.getClZbh().equals(clZbh) && s.getLpName().equals(lpName)){
+                        newList.add(s);
+                    }
+                }
+                //——————————————————————————————————————————————————————
+                
+                ReportRelatedUtils rru = new ReportRelatedUtils();
+                List<Iterator<?>> list1 = new ArrayList<Iterator<?>>();
+                List<ScheduleRealInfo> scheduleRealInfos = newList;
+                List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
+//              List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
+				List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+				for (int i = 0; i < scheduleRealInfos.size(); i++) {
+					ScheduleRealInfo s=scheduleRealInfos.get(i);
+					Set<ChildTaskPlan> cts = s.getcTasks();
+					if(cts != null && cts.size() > 0){
+						lists.add(s);
+					}else{
+						if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+							lists.add(s);
+						}
+					}
+				}
+				DecimalFormat format = new DecimalFormat("0.00");
+				//计算里程和班次数，并放入Map里
+//				Map<String, Object> map = this.MapById(scheduleRealInfos.get(0).getId());
+				
+				//-----------------------------------------------------
+		        Map<String, Object> Map = new HashMap<String, Object>();
+		        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+//		        ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(scheduleRealInfos.get(0).getId());
+		        ScheduleRealInfo s = scheduleRealInfos.get(0);
+		        String xlbm = s.getXlBm();
+		        String fcrq = s.getScheduleDateStr();
+
+		        int type = 0;
+		        Double ccyl = 0.0;
+		        Double jcyl = 0.0;
+		        Double yh = 0.0;
+		        Double jzl = 0.0;
+		        Double zlc = 0.0;
+//		        List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
+//		        List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
+		        List<Ylb> listYlb = ylbMap.get(fcrq + xlbm);
+		        List<Dlb> listDlb = dlbMap.get(fcrq + xlbm);
+		        
+//		        List<Cars> listCars = carsRepository.findCarsByCode(s.getClZbh());
+		        List<Cars> listCars = carMap.get(s.getClZbh());
+				if (listCars != null && listCars.size() > 0) {
+					if(listCars.get(0).getSfdc()!=null){
+						if (listCars.get(0).getSfdc()) {
+							type = 1;
+							if(listDlb != null)
+							for (int i = 0; i < listDlb.size(); i++) {
+								Dlb d = listDlb.get(i);
+								if (d.getLp() == null) {
+									ccyl = Arith.add(ccyl, d.getCzcd());
+									jcyl = Arith.add(jcyl, d.getJzcd());
+									yh = Arith.add(yh, d.getHd());
+									jzl = Arith.add(jzl, d.getCdl());
+									zlc = Arith.add(zlc, d.getZlc());
+								} else {
+									if (d.getLp().equals(s.getLpName())) {
+										ccyl = Arith.add(ccyl, d.getCzcd());
+										jcyl = Arith.add(jcyl, d.getJzcd());
+										yh = Arith.add(yh, d.getHd());
+										jzl = Arith.add(jzl, d.getCdl());
+										zlc = Arith.add(zlc, d.getZlc());
+									}
+								}
+			
+							}
+						} else {
+							type = 0;
+							if(listYlb != null)
+							for (int i = 0; i < listYlb.size(); i++) {
+								Ylb y = listYlb.get(i);
+								if (y.getLp() == null) {
+									ccyl = Arith.add(ccyl, y.getCzyl());
+									jcyl = Arith.add(jcyl, y.getJzyl());
+									yh = Arith.add(yh, y.getYh());
+									jzl = Arith.add(jzl, y.getJzl());
+									zlc = Arith.add(zlc, y.getZlc());
+								} else {
+									if (y.getLp().equals(s.getLpName())) {
+										ccyl = Arith.add(ccyl, y.getCzyl());
+										jcyl = Arith.add(jcyl, y.getJzyl());
+										yh = Arith.add(yh, y.getYh());
+										jzl = Arith.add(jzl, y.getJzl());
+										zlc = Arith.add(zlc, y.getZlc());
+									}
+								}
+							}
+						}
+					}
+				}
+		        
+		        Map.put("jzl", jzl);
+		        Map.put("yh", yh);
+		        Map.put("ccyl", ccyl);
+		        Map.put("jcyl", jcyl);
+		        Map.put("type", type);
+		        Map.put("zlc", zlc);
+		        Map.put("xlName", s.getXlName());
+		        Map.put("clZbh", s.getClZbh());
+		        Map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh()));
+		        Map.put("fcsjActual", s.getFcsjActual());
+		        Map.put("zdzName", s.getZdzName());
+		        Map.put("scheduleDate", s.getScheduleDateStr());
+		        Map.put("lpName", s.getLpName());
+		        String zdp = "", zwdp = "", wdp = "";
+		        String zdpT = "", zwdpT = "", wdpT = "";
+		        String dbdp="";
+//		        List<DutyEmployee> list2 = dutyEmployeeService.getDutyEmployee(xlbm, fcrq + "00:01", fcrq + "23:59");
+		        try {
+		            Long fcsj1 = sdf.parse(fcrq + " 00:01").getTime();
+		            Long fcsj2 = sdf.parse(fcrq + " 11:00").getTime();
+		            Long fcsj3 = sdf.parse(fcrq + " 23:59").getTime();
+		            for (int i = 0; i < list2.size(); i++) {
+		                DutyEmployee t = list2.get(i);
+		                if(dbdp.indexOf(t.getuName()) == -1){
+		                    if(!(dbdp.length()>0)){
+		                        dbdp  =t.getuName();
+		                    }else{
+		                        dbdp +=","+t.getuName();
+		                    }
+		                }
+		                Long ts = t.getTs();
+		                if (ts > fcsj1 && ts < fcsj2) {
+		                    if (zdp.indexOf(t.getuName()) == -1) {
+		                        if (!(zdp.length() > 0)) {
+		                            zdpT = t.getuName() + "...";
+		                        }
+		                        zdp += t.getuName() + ",";
+
+		                    }
+		                } else if (ts > fcsj2 && ts < fcsj3) {
+		                    if (zwdp.indexOf(t.getuName()) == -1) {
+		                        if (!(zwdp.length() > 0)) {
+		                            zwdpT = t.getuName() + "...";
+		                        }
+		                        zwdp += t.getuName() + ",";
+		                    }
+		                } else {
+		                    if (wdp.indexOf(t.getuName()) == -1) {
+		                        if (!(wdp.length() > 0)) {
+		                            wdpT = t.getuName() + "...";
+		                        }
+		                        wdp += t.getuName() + ",";
+		                    }
+		                }
+		            }
+		        } catch (ParseException e) {
+		            // TODO Auto-generated catch block
+		            e.printStackTrace();
+		        }
+		        Map.put("zdp", zdp);
+		        Map.put("zwdp", zwdp);
+		        Map.put("wdp", wdp);
+		        Map.put("zdpT", zdpT);
+		        Map.put("zwdpT", zwdpT);
+		        Map.put("wdpT", wdpT);
+		        Map.put("dbdp", dbdp);
+				//-----------------------------------------------------
+
+		        Map.put("jhlc",Arith.add(culateService.culateJhgl(scheduleRealInfos),culateService.culateJhJccgl(scheduleRealInfos)));
+		        Map.put("remMileage",culateService.culateLbgl(scheduleRealInfos));
+		        Map.put("addMileage", culateService.culateLjgl(lists));
+		        double yygl=Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists));
+		        Map.put("yygl", yygl);
+		        double ksgl=Arith.add(culateService.culateKsgl(scheduleRealInfos),culateService.culateJccgl(lists));
+		        Map.put("ksgl",ksgl);
+		        Map.put("realMileage", Arith.add(yygl ,ksgl));
+		        Map.put("jhbc", culateService.culateJhbc(scheduleRealInfos,""));
+		        Map.put("cjbc", culateService.culateLbbc(scheduleRealInfos));
+		        Map.put("ljbc", culateService.culateLjbc(lists, ""));
+		        int sjbc =culateService.culateLjbc(lists, "")+culateService.culateSjbc(lists, "");
+		        Map.put("sjbc", sjbc);
+//				map=new HashMap<String,Object>();
+		        
+		        SimpleDateFormat sdf2=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+//		        String minfcsj="02:00";
+//		        List<Line> lineList=lineRepository.findLineByCode(newList.get(0).getXlBm());
+//		        if(lineList.size()>0){
+//		        	String sqlMinYysj="select start_opt from bsth_c_line_config where "
+//        	         		+ " id = ("
+//        	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+//        	         		+ ")";
+//        	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+//		        }
+        		String[] minSjs = minfcsj.split(":");
+        		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
+        		
+              
+        		for (int i = 0; i < scheduleRealInfos.size(); i++) {
+        			ScheduleRealInfo ss=scheduleRealInfos.get(i);
+        			String[] fcsj= ss.getFcsj().split(":");
+        			Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
+
+        			Long fscjT=0L;
+        			if(fcsjL<minSj){
+        				Calendar calendar = new GregorianCalendar();
+        				calendar.setTime(ss.getScheduleDate());
+        				calendar.add(calendar.DATE,1);
+        				ss.setScheduleDate(calendar.getTime());
+        				try {
+        					fscjT = sdf2.parse(sdf2.format(ss.getScheduleDate())+" "+ss.getFcsj()).getTime();
+        				} catch (ParseException e) {
+        					// TODO Auto-generated catch block
+        					e.printStackTrace();
+        				}
+
+        			}else{
+        				try {
+        					fscjT =sdf2.parse(ss.getScheduleDateStr()+" "+ss.getFcsj()).getTime();
+        				} catch (ParseException e) {
+        					// TODO Auto-generated catch block
+        					e.printStackTrace();
+        				};
+        			}
+        			ss.setFcsjT(fscjT);
+        		}
+        		List<ScheduleRealInfo> listSchedule = new ArrayList<ScheduleRealInfo>();
+        		Collections.sort(scheduleRealInfos, new ComparableReal());
+        		for (int i = 0; i < scheduleRealInfos.size(); i++) {
+        			ScheduleRealInfo ss = scheduleRealInfos.get(i);
+        			ss.setAdjustExps(i + 1 + "");
+        			String remarks = "";
+        			if (ss.getRemarks() != null) {
+        				remarks += ss.getRemarks();
+        			}
+
+        			Set<ChildTaskPlan> childTaskPlans = ss.getcTasks();
+        			if (!childTaskPlans.isEmpty()) {
+        				ss.setFcsjActual("");
+        				ss.setZdsjActual("");
+        				ss.setJhlc(0.0);
+        			}
+
+        			if (ss.isDestroy()) {
+        				ss.setFcsjActual("");
+        				ss.setZdsjActual("");
+        				ss.setJhlc(0.0);
+        				remarks += "(烂班)";
+        				ss.setRemarks(remarks);
+        			}
+
+        			listSchedule.add(ss);
+        			//计算营运里程，空驶里程
+        			if (!childTaskPlans.isEmpty()) {
+//                  	 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+        				List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
+        				Collections.sort(listit, new ComparableChild());
+        				for (int j = 0; j < listit.size(); j++) {
+        					ScheduleRealInfo t = new ScheduleRealInfo();
+        					ChildTaskPlan childTaskPlan = listit.get(j);
+        					if (childTaskPlan.isDestroy()) {
+        						t.setFcsjActual("");
+        						t.setZdsjActual("");
+        						t.setJhlc(0.0);
+        					} else {
+                              	t.setFcsjActual(childTaskPlan.getStartDate());
+                              	t.setZdsjActual(childTaskPlan.getEndDate());
+                              	t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+        					}
+        					t.setQdzName(childTaskPlan.getStartStationName());
+        					t.setZdzName(childTaskPlan.getEndStationName());
+        					t.setRemarks(childTaskPlan.getRemarks());
+        					t.setAdjustExps("子");
+        					t.setjGh("");
+        					t.setjName("");
+        					t.setsGh("");
+        					t.setsName("");
+        					listSchedule.add(t);
+        				}
+        			}
+        		}
+        		Map<String, Object> maps;
+        		for (ScheduleRealInfo scheduleRealInfo : listSchedule) {
+        			maps = new HashMap<String, Object>();
+        			try {
+        				scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
+        				scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
+        				maps = rru.getMapValue(scheduleRealInfo);
+        				maps.put("bcs", scheduleRealInfo.getAdjustExps());
+                 	    String zdsj = scheduleRealInfo.getZdsj();
+                 	    String zdsjActual = scheduleRealInfo.getZdsjActual();
+                 	    if (zdsj != null && zdsjActual != null &&
+                 	    		!zdsj.equals(zdsjActual) && 
+                 	    		!zdsj.equals("")&&
+                 	    		!zdsjActual.equals("")) {
+                        	 if (zdsj.compareTo(zdsjActual) > 0) {
+                        		 maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                        		 maps.put("slow", "");
+                        	 } else {
+                        		 maps.put("fast", "");
+                        		 maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                        	 }
+                 	    } else {
+                 	    	maps.put("fast", "");
+                 	    	maps.put("slow", "");
+                 	    }
+                 	    listMap.add(maps);
+        			} catch (Exception e) {
+        				e.printStackTrace();
+        			}
+        		}
+
+                String path1 = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                list1.add(listMap.iterator());
+                String xls="";
+                if(Map.get("type").toString().equals("0")){
+                	xls="waybill_minhang.xls";
+                }else{
+                	xls="waybill_minhang_dl.xls";
+                }
+                Map.put("sheetName", jName + "-" + clZbh + "-" + lpName);
+                ee.excelReplace(list1, new Object[]{Map}, path1 + "mould/"+xls,
+                        path1 + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
+                
+
+              	//————————————————————————————————————————————————
+                
+                File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
+                String fileName = file.getName();
+                files.add(temp);
+            }
+            for(int i = 1; i < files.size(); i++){
+            	File file1 = files.get(0);
+            	File file2 = files.get(i);
+            	ee.copySheetByFile(file2, file1, 0, 145);
+            }
+            File newFile = files.get(0);
+            newFile.renameTo(file);
+            
+        } catch (Exception e) {
+            // TODO: handle exception
+            e.printStackTrace();
+        }
+
+        map.put("fileName", file.getName());
+        return map;
+    }
+
 }
@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
+import com.bsth.util.RoadCutDoubleName;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -360,6 +361,129 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 		return resultMap;
 	}
  
+	/**
+	 * @Description :TODO(生成双路名路段)
+	 * @param map <lineId:线路ID； route：路段信息>
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> doubleName(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			// 路段点List
+			List<Point> bPointsList = new ArrayList<>();
+			// 截取后的路段
+			List<Map<String, String>> sectionArrayList = new ArrayList<>();
+			Integer lineId = Integer.parseInt(map.get("lineId").equals("") ? "" :map.get("lineId").toString());
+			String lineCode = map.get("lineCode").equals("") ? "" :map.get("lineCode").toString();
+			Integer directions = Integer.parseInt(map.get("directions").equals("") ? "" :map.get("directions").toString());
+			String sectionrouteCode = map.get("sectionrouteCode").equals("") ? "" :map.get("sectionrouteCode").toString();
+			Integer versions = Integer.parseInt(map.get("versions").equals("") ? "" :map.get("versions").toString());
+			String stationRouteBegin = map.get("stationRouteBegin").equals("") ? "" :map.get("stationRouteBegin").toString();
+			String stationRouteFinish = map.get("stationRouteFinish").equals("") ? "" :map.get("stationRouteFinish").toString();
+			String routes = map.get("route").equals("") ? "" :map.get("route").toString();
+			if(!routes.equals("")) {
+				String sectionStr = "";
+				// 转换成JSON数组
+				JSONArray sectionsArray = JSONArray.parseArray(routes);
+				// 遍历
+				for(int s = 0 ;s<sectionsArray.size();s++) {
+					String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
+					String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
+					if(s == sectionsArray.size()-1){
+						sectionStr += pointsLngStr+","+pointsLatStr;
+					} else {
+						sectionStr += pointsLngStr+","+pointsLatStr+";";
+					}
+				}
+				Map<String, Object> roads = RoadCutDoubleName.start(sectionStr);
+				if (!roads.isEmpty()) {
+					List bSectionList = (List) roads.get("bSections");
+					List roadName = (List) roads.get("roadName");
+					// 路段序号
+					Integer routeCode = 0;
+					if(!sectionrouteCode.equals("")){
+						String sectionrouteCodeArray[] =  sectionrouteCode.split("_");
+						routeCode = Integer.valueOf(sectionrouteCodeArray[0])+100;
+					}else {
+						routeCode = 100;
+					}
+					// 增加路段序号
+
+					for(int i = 0; i < bSectionList.size(); i++){
+						List<Location> bSection = new ArrayList<>();
+						bSectionList.get(i);
+						bSection = (List<Location>) bSectionList.get(i);
+
+						String sectionsBpoints = "";
+						// WGS线状图形坐标集合
+						String sectionsWJPpoints = "";
+						for (int j = 0; j < bSection.size(); j++) {
+							bSection.get(j);
+							Location point =  bSection.get(j);
+							String pointsLngStr = String.valueOf(point.getLng());
+							String pointsLatStr = String.valueOf(point.getLat());
+							/** to WGS坐标 */
+							Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
+							String WGSLngStr = String.valueOf(resultPoint.getLng());
+							String WGSLatStr = String.valueOf(resultPoint.getLat());
+							if(j == 0) {
+								sectionsBpoints = pointsLngStr + " " + pointsLatStr;
+								sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
+							}else {
+								sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
+								sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
+							}
+						}
+						// 获取当前最大Id
+						long sectionMaxId = GetUIDAndCode.getSectionId();
+						// 路段编码
+						String sectionCode = String.valueOf(sectionMaxId);
+						// 路段ID
+						int sectionId = (int)sectionMaxId;
+						String sectionName = roadName.get(i).toString();
+						// WGS坐标点集合
+						String gsectionVector = null;
+						if(!sectionsWJPpoints.equals("")) {
+							gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+						}
+						// 原坐标点集合
+						String bsectionVectorS = null;
+						if(!sectionsBpoints.equals("")) {
+							bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
+						}
+						repository.systemSave(sectionCode, sectionName, "", "", "", "", gsectionVector, bsectionVectorS, "", "", "", 0, 0, "", 0, "", 1, sectionId);
+
+						routeRepository.sectionUpdSectionRouteCode(lineId, directions,routeCode+i*100);
+						SectionRoute route = new SectionRoute();
+						Line line = lineRepository.findOne(lineId);
+						Section section = repository.findOne(sectionId);
+						route.setSectionrouteCode(routeCode+i*100);
+						route.setLineCode(lineCode);
+						route.setSectionCode(sectionCode);
+						route.setDirections(directions);
+						route.setVersions(versions);
+						route.setDestroy(0);
+						route.setLine(line);
+						route.setSection(section);
+						route.setIsRoadeSpeed(0);
+						routeRepository.save(route);
+					}
+					resultMap.put("status", ResponseCode.SUCCESS);
+					return resultMap;
+				} else {
+					resultMap.put("status", "Failure");
+					return resultMap;
+				}
+			}
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+		}
+		return resultMap;
+	}
+
 	private void sectionListCut(List<Point> bPointsList, List<Map<String, String>> sectionArrayList,
 			String bsectionVector, String bsectionVectorCutList) {
 		if(!bsectionVector.equals("")) {
@@ -480,6 +604,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 	 * @return Map<String, Object> <SUCCESS ; ERROR>
 	 */
 	@Override
+	@Transactional
 	public Map<String, Object> sectionUpdate(Map<String, Object> map) {
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		try {
@@ -539,32 +664,30 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			SectionRoute resultS = routeRepository.findOne(sectionRouteId);
 			int old_code = resultS.getSectionrouteCode();
 			if(sectionrouteCode!=null) {
-				int new_code = sectionrouteCode+100;
-				if(new_code==old_code){
-					sectionrouteCode = new_code;
-				}else {
-					sectionrouteCode = new_code-100+1;
-				}
-			 }else {
-				 sectionrouteCode = old_code;
-			 }
+				sectionrouteCode += 100;
+			}else {
+				sectionrouteCode = old_code;
+			}
+			routeRepository.sectionUpdSectionRouteCode(lineCode, directions,sectionrouteCode);
 			// 限速
 			Double speedLimit = map.get("speedLimit").equals("") ? null : Double.valueOf(map.get("speedLimit").toString());
 			// 版本
 			Integer version = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
 			// WGS坐标点集合
 			String gsectionVector = null;
-			if(!sectionsWJPpoints.equals(""))
+			if(!sectionsWJPpoints.equals("")) {
 				gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+			}
 			// 原坐标点集合
 			String bsectionVectorS = null;
-			if(!sectionsBpoints.equals(""))
-				 bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
+			if(!sectionsBpoints.equals("")) {
+				bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
+			}
 			Integer createBy = map.get("createBy").equals("") ? null : Integer.valueOf(map.get("createBy").toString());
 			String createDate = map.get("createDate").equals("") ? null : map.get("createDate").toString();
 			Integer updateBy = map.get("updateBy").equals("") ?null : Integer.valueOf(map.get("updateBy").toString());
 			Integer isRoadeSpeed = map.get("isRoadeSpeed").equals("") ? null : Integer.valueOf(map.get("isRoadeSpeed").toString());
-			SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss"); 
+			SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
 			Date date = new Date();
 			// 修改日期
 			String updateDate = formatter.format(date);
@@ -604,6 +727,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 	 * @Description :TODO(编辑缓存线路走向)
 	 */
 	@Override
+	@Transactional
 	public Map<String, Object> sectionCacheUpdate(Map<String, Object> map) {
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		try {
@@ -670,26 +794,29 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				}else {
 					sectionrouteCode = new_code-100+1;
 				}
-			 }else {
-				 sectionrouteCode = old_code;
-			 }
+			}else {
+				sectionrouteCode = old_code;
+			}
+			routeRepository.sectionUpdSectionRouteCode(lineCode, directions,sectionrouteCode);
 			// 限速
 			Double speedLimit = map.get("speedLimit").equals("") ? null : Double.valueOf(map.get("speedLimit").toString());
 			// 版本
 			Integer version = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
 			// WGS坐标点集合
 			String gsectionVector = null;
-			if(!sectionsWJPpoints.equals(""))
+			if(!sectionsWJPpoints.equals("")) {
 				gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+			}
 			// 原坐标点集合
 			String bsectionVectorS = null;
-			if(!sectionsBpoints.equals(""))
-				 bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
+			if(!sectionsBpoints.equals("")) {
+				bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
+			}
 			Integer createBy = map.get("createBy").equals("") ? null : Integer.valueOf(map.get("createBy").toString());
 			String createDate = map.get("createDate").equals("") ? null : map.get("createDate").toString();
 			Integer updateBy = map.get("updateBy").equals("") ?null : Integer.valueOf(map.get("updateBy").toString());
 			Integer isRoadeSpeed = map.get("isRoadeSpeed").equals("") ? null : Integer.valueOf(map.get("isRoadeSpeed").toString());
-			SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss"); 
+			SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
 			Date date = new Date();
 			// 修改日期
 			String updateDate = formatter.format(date);
@@ -742,7 +869,6 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
  
 	}
  
-	
 	/**
 	 * 新增路段信息
 	 * 
@@ -833,11 +959,11 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			Integer routeCode = null;
 			if(!sectionrouteCode.equals("")){
 				String sectionrouteCodeArray[] =  sectionrouteCode.split("_");
-				routeCode = Integer.valueOf(sectionrouteCodeArray[0])+1;
+				routeCode = Integer.valueOf(sectionrouteCodeArray[0])+100;
 			}else {
 				routeCode = 100;
 			}	
-			routeRepository.sectionUpdSectionRouteCode(lineId, directions,routeCode);
+			routeRepository.sectionUpdSectionRouteCode(lineId, directions, routeCode);
 			sectionRoute.setSectionrouteCode(routeCode);
 			sectionRoute.setLineCode(lineCode);
 			sectionRoute.setSection(section);
@@ -856,4 +982,5 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 		}
 		return resultMap;
 	}
+
 }
 \ No newline at end of file
@@ -544,7 +544,116 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}
 		return list;
 	}
-	
+
+	/**
+	 * @Description :TODO(查询下一个站点)
+	 *
+	 * @param map <lineId:线路ID； direction：方向；stationRouteCode：站点编码>
+	 *
+	 * @return List<Map<String, Object>>
+	 */
+	@Override
+	public List<Map<String, Object>> findDownStationRoute(Map<String, Object> map) {
+		Integer lineId = map.get("lineId").equals("") ? null : Integer.parseInt(map.get("lineId").toString());
+		Integer direction = map.get("direction").equals("") ? null : Integer.parseInt(map.get("direction").toString());
+		Integer stationRouteCode = map.get("stationRouteCode").equals("") ? null : Integer.parseInt(map.get("stationRouteCode").toString());
+		List<Object[]> objects = repository.findDownStationRoute(lineId, direction, stationRouteCode);
+		List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
+
+		int len = objects.size();
+
+		if(objects.size()>0) {
+
+			for(int i = 0 ; i < len; i++) {
+				Map<String, Object> tempM = new HashMap<String,Object>();
+
+				tempM.put("stationRouteLine", objects.get(i)[0]);
+
+				tempM.put("stationRouteStation", objects.get(i)[1]);
+
+				tempM.put("stationRouteCode", objects.get(i)[2]);
+
+				tempM.put("stationRouteLIneCode", objects.get(i)[3]);
+
+				tempM.put("stationRouteStationMark", objects.get(i)[4]);
+
+				tempM.put("stationOutStationNmber", objects.get(i)[5]);
+
+				tempM.put("stationRoutedirections", objects.get(i)[6]);
+
+				tempM.put("stationRouteDistances", objects.get(i)[7]);
+
+				tempM.put("stationRouteToTime", objects.get(i)[8]);
+
+				tempM.put("staitonRouteFirstTime", objects.get(i)[9]);
+
+				tempM.put("stationRouteEndTime", objects.get(i)[10]);
+
+				tempM.put("stationRouteDescriptions", objects.get(i)[11]);
+
+				tempM.put("stationRouteDestroy", objects.get(i)[12]);
+
+				tempM.put("stationRouteVersions", objects.get(i)[13]);
+
+				tempM.put("stationRouteCreateBy", objects.get(i)[14]);
+
+				tempM.put("stationRouteCreateDate", objects.get(i)[15]);
+
+				tempM.put("stationRouteUpdateBy", objects.get(i)[16]);
+
+				tempM.put("stationRouteUpdateDate", objects.get(i)[17]);
+
+				tempM.put("stationId", objects.get(i)[18]);
+
+				tempM.put("stationCode", objects.get(i)[19]);
+
+				tempM.put("stationRouteName", objects.get(i)[20]);
+
+				tempM.put("stationRoadCoding", objects.get(i)[21]);
+
+				tempM.put("stationDbType", objects.get(i)[22]);
+
+				tempM.put("stationJwpoints", objects.get(i)[23]);
+
+				tempM.put("stationGlonx", objects.get(i)[24]);
+
+				tempM.put("stationGlaty", objects.get(i)[25]);
+
+				tempM.put("stationX", objects.get(i)[26]);
+
+				tempM.put("stationY", objects.get(i)[27]);
+
+				tempM.put("stationBPolyonGrid", objects.get(i)[28]);
+
+				tempM.put("stationGPloyonGrid", objects.get(i)[29]);
+
+				tempM.put("stationDestroy", objects.get(i)[30]);
+
+				tempM.put("stationRadius", objects.get(i)[31]);
+
+				tempM.put("stationShapesType", objects.get(i)[32]);
+
+				tempM.put("stationVersions", objects.get(i)[33]);
+
+				tempM.put("sttationDescriptions", objects.get(i)[34]);
+
+				tempM.put("stationCreateBy", objects.get(i)[35]);
+
+				tempM.put("stationCreateDate", objects.get(i)[36]);
+
+				tempM.put("stationUpdateBy", objects.get(i)[37]);
+
+				tempM.put("stationUpdateDate", objects.get(i)[38]);
+
+				tempM.put("stationRouteId", objects.get(i)[39]);
+				tempM.put("zdmc", objects.get(i)[40]);
+
+				resultList.add(tempM);
+			}
+		}
+		return resultList;
+	}
+
 	 /**
 	  * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
 	  * 
@@ -742,10 +851,14 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 				// 将txt文件打包
 				File targetFile = PackTarGZUtils.compress(textFile, target);
-				
+
 				/*clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
-				
+
 				clientUtils.FTPUpLoadFromDisk(targetFile, targetFile.getName(), url, port, username, password, remotePath);
+
+				// 删除文件
+				textFile.delete();
+				targetFile.delete();
  
 				resultMap.put("status", ResponseCode.SUCCESS);
  
@@ -1313,7 +1426,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	/**
 	 * @Description :TODO(查询缓存路由)
 	 * 
-	 * @param map <line.id_eq:线路ID； directions_eq：方向>
+	 * @param map (line.id_eq:线路ID； directions_eq：方向)
 	 * 
 	 * @return List<Map<String, Object>>
 	 */
@@ -378,119 +378,194 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         }
     }
  
-    @Override
-    public DataToolsFile exportDynamicTTinfo(DTInfos dtInfos) throws ScheduleException {
-        try {
-            // 使用POI，创建xlsx文件
-            XSSFWorkbook wb = new XSSFWorkbook();
-            XSSFSheet sheet = wb.createSheet(WorkbookUtil.createSafeSheetName("时刻表信息"));
+    private void createDynamicTTinfoStatSheet(XSSFWorkbook wb, DTInfos dtInfos) {
+        XSSFSheet sheet = wb.createSheet(WorkbookUtil.createSafeSheetName("时刻表信息_统计"));
  
-            //-------------------------------- 1、路牌班次数据 -------------------------------//
-            List<LpObj> lpObjList = dtInfos.getLpObjList();
+        //-------------------------------- 1、路牌班次数据 -------------------------------//
+        List<LpObj> lpObjList = dtInfos.getLpObjList();
  
-            // 构建第一行数据
-            XSSFRow lpHeadRow = sheet.createRow((short) 0);
-            if (lpObjList.size() == 0) {
-                throw new RuntimeException("没有班次数据！");
-            }
-            int groupCount = lpObjList.get(0).getGroupCount(); // 获取总圈数
-            if (groupCount == 0) {
-                throw new RuntimeException("总圈数为0，有问题！");
-            }
+        // 构建第一行数据
+        XSSFRow lpHeadRow = sheet.createRow((short) 0);
+        if (lpObjList.size() == 0) {
+            throw new RuntimeException("没有班次数据！");
+        }
+        int groupCount = lpObjList.get(0).getGroupCount(); // 获取总圈数
+        if (groupCount == 0) {
+            throw new RuntimeException("总圈数为0，有问题！");
+        }
  
-            // 构造表头
-            PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short)0, "路牌", new Color(0x96b9d7));
-            Station station1 = stationService.findById(lpObjList.get(0).getStationRouteId1());
-            Station station2 = stationService.findById(lpObjList.get(1).getStationRouteId2());
-            for (int i = 0; i < groupCount; i++) {
-                PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (i * 2 + 1),
-                        station1.getStationName(), new Color(0x96b9d7));
-                PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (i * 2 + 2),
-                        station2.getStationName(), new Color(0x96b9d7));
+        // 构造表头
+        PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short)0, "路牌", new Color(0x96b9d7));
+        Station station1 = stationService.findById(lpObjList.get(0).getStationRouteId1());
+        Station station2 = stationService.findById(lpObjList.get(1).getStationRouteId2());
+        for (int i = 0; i < groupCount; i++) {
+            PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (i * 2 + 1),
+                    station1.getStationName(), new Color(0x96b9d7));
+            PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (i * 2 + 2),
+                    station2.getStationName(), new Color(0x96b9d7));
+        }
+        PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 1),
+                "路牌工时", new Color(0x96b9d7));
+        PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 2),
+                "营运班次数", new Color(0x96b9d7));
+
+        // 构建每个路牌的班次数据
+        for (int i = 0; i < lpObjList.size(); i++) {
+            LpObj lpObj = lpObjList.get(i);
+            XSSFRow lpRow = sheet.createRow((short) (i + 1));
+            PoiUtils.createStringXSSFCell(wb, lpRow, (short) 0, lpObj.getLpname());
+            for (int j = 0; j < groupCount; j++) {
+                PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (j * 2 + 1));
+                PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (j * 2 + 2));
             }
-            PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 1),
-                    "路牌工时", new Color(0x96b9d7));
-            PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 2),
-                    "营运班次数", new Color(0x96b9d7));
-
-            // 构建每个路牌的班次数据
-            for (int i = 0; i < lpObjList.size(); i++) {
-                LpObj lpObj = lpObjList.get(i);
-                XSSFRow lpRow = sheet.createRow((short) (i + 1));
-                PoiUtils.createStringXSSFCell(wb, lpRow, (short) 0, lpObj.getLpname());
-                for (int j = 0; j < groupCount; j++) {
-                    PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (j * 2 + 1));
-                    PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (j * 2 + 2));
-                }
-                for (BcObj bcObj : lpObj.getBcObjList()) {
+            for (BcObj bcObj : lpObj.getBcObjList()) {
+                if (bcObj.getBcType() == BcType.NORMAL) {
                     Cell cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 1));
-                    cell.setCellValue(bcObj.getFcsj());
+                    cell.setCellValue(bcObj.getFcsjDesc());
                 }
-                // 路牌工时/班次数
-                PoiUtils.createDoubleXSSFCell(wb, lpRow, (short) (groupCount * 2 + 1),
-                        lpObj.getZgs() / 60);
-                // 营运班次数
-                PoiUtils.createIntegerXSSFCell(wb, lpRow, (short) (groupCount * 2 + 2),
-                        lpObj.getZbc());
             }
+            // 路牌工时/班次数
+            PoiUtils.createDoubleXSSFCell(wb, lpRow, (short) (groupCount * 2 + 1),
+                    lpObj.getZgs() / 60);
+            // 营运班次数
+            PoiUtils.createIntegerXSSFCell(wb, lpRow, (short) (groupCount * 2 + 2),
+                    lpObj.getZbc());
+        }
  
-            // 自适应单元格长宽
-            sheet.autoSizeColumn(0);
-            for (int i = 0; i < groupCount; i++) {
-                sheet.autoSizeColumn(i * 2 + 1);
-                sheet.autoSizeColumn(i * 2 + 2);
-            }
-            sheet.autoSizeColumn(groupCount * 2 + 1);
-            sheet.autoSizeColumn(groupCount * 2 + 2);
+        // 自适应单元格长宽
+        sheet.autoSizeColumn(0);
+        for (int i = 0; i < groupCount; i++) {
+            sheet.autoSizeColumn(i * 2 + 1);
+            sheet.autoSizeColumn(i * 2 + 2);
+        }
+        sheet.autoSizeColumn(groupCount * 2 + 1);
+        sheet.autoSizeColumn(groupCount * 2 + 2);
  
-            // 锁定行首，列首
-            sheet.createFreezePane(1, 1);
+        // 锁定行首，列首
+        sheet.createFreezePane(1, 1);
  
-            //-------------------------------- 2、统计数据 -------------------------------//
-            List<StatInfo> statInfos = dtInfos.getStatInfoList();
+        //-------------------------------- 2、统计数据 -------------------------------//
+        List<StatInfo> statInfos = dtInfos.getStatInfoList();
  
-            // 创建总的统计数据格式
-            // 第一行 统计数据
-            // 第二行 序号，统计项目（8个单元格合并），统计数值
-            // 第三行开始数据，一共20行
+        // 创建总的统计数据格式
+        // 第一行 统计数据
+        // 第二行 序号，统计项目（8个单元格合并），统计数值
+        // 第三行开始数据，一共20行
  
-            int startrow = lpObjList.size() + 3;
-            for (int i = startrow; i <= startrow + 22; i++) {
-                XSSFRow xssfRow = sheet.createRow(i);
-                for (int j = 0; j < 10; j++) {
-                    PoiUtils.createStringXSSFCell(wb, xssfRow, (short) j, "");
+        int startrow = lpObjList.size() + 3;
+        for (int i = startrow; i <= startrow + 22; i++) {
+            XSSFRow xssfRow = sheet.createRow(i);
+            for (int j = 0; j < 10; j++) {
+                PoiUtils.createStringXSSFCell(wb, xssfRow, (short) j, "");
  
-                }
-            }
-            // 合并第一行
-            sheet.addMergedRegion(new CellRangeAddress(startrow, startrow, 0, 9));
-            sheet.getRow(startrow).getCell(0).setCellValue("统计数据");
-            // 合并第二行
-            sheet.getRow(startrow + 1).getCell(0).setCellValue("序号");
-            sheet.getRow(startrow + 1).getCell(1).setCellValue("统计项目");
-            sheet.getRow(startrow + 1).getCell(9).setCellValue("统计数值");
-            sheet.addMergedRegion(new CellRangeAddress(startrow + 1, startrow + 1, 1, 8));
-            // 处理后面具体统计行
-            for (int row = startrow + 2; row <= startrow + 2 + statInfos.size(); row++) {
-                sheet.addMergedRegion(new CellRangeAddress(row, row, 1, 8));
             }
+        }
+        // 合并第一行
+        sheet.addMergedRegion(new CellRangeAddress(startrow, startrow, 0, 9));
+        sheet.getRow(startrow).getCell(0).setCellValue("统计数据");
+        // 合并第二行
+        sheet.getRow(startrow + 1).getCell(0).setCellValue("序号");
+        sheet.getRow(startrow + 1).getCell(1).setCellValue("统计项目");
+        sheet.getRow(startrow + 1).getCell(9).setCellValue("统计数值");
+        sheet.addMergedRegion(new CellRangeAddress(startrow + 1, startrow + 1, 1, 8));
+        // 处理后面具体统计行
+        for (int row = startrow + 2; row <= startrow + 2 + statInfos.size(); row++) {
+            sheet.addMergedRegion(new CellRangeAddress(row, row, 1, 8));
+        }
+
+        for (int i = 0; i < statInfos.size(); i++) {
+            StatInfo statInfo = statInfos.get(i);
+
+            // 1、统计序号
+            PoiUtils.setIntegerStyleXSSFCellStyle(wb, sheet.getRow(startrow + 2 + i).getCell(0));
+            sheet.getRow(startrow + 2 + i).getCell(0).setCellValue(i);
+
+            // 2、统计项目
+            sheet.getRow(startrow + 2 + i).getCell(1).setCellValue(statInfo.getStatItem());
+
+            // 3、统计数值
+            PoiUtils.setDoubleStyleXSSFCellStyle(wb, sheet.getRow(startrow + 2 + i).getCell(9));
+            sheet.getRow(startrow + 2 + i).getCell(9).setCellValue(statInfo.getStatValue());
+        }
+
+    }
  
-            for (int i = 0; i < statInfos.size(); i++) {
-                StatInfo statInfo = statInfos.get(i);
+    private void createDynamicTTinfoSheet(XSSFWorkbook wb, DTInfos dtInfos) {
+        XSSFSheet sheet = wb.createSheet(WorkbookUtil.createSafeSheetName("时刻表信息"));
  
-                // 1、统计序号
-                PoiUtils.setIntegerStyleXSSFCellStyle(wb, sheet.getRow(startrow + 2 + i).getCell(0));
-                sheet.getRow(startrow + 2 + i).getCell(0).setCellValue(i);
+        //-------------------------------- 1、路牌班次数据 -------------------------------//
+        List<LpObj> lpObjList = dtInfos.getLpObjList();
+
+        // 构建第一行数据
+        XSSFRow lpHeadRow = sheet.createRow((short) 0);
+        if (lpObjList.size() == 0) {
+            throw new RuntimeException("没有班次数据！");
+        }
+        int groupCount = lpObjList.get(0).getGroupCount(); // 获取总圈数
+        if (groupCount == 0) {
+            throw new RuntimeException("总圈数为0，有问题！");
+        }
  
-                // 2、统计项目
-                sheet.getRow(startrow + 2 + i).getCell(1).setCellValue(statInfo.getStatItem());
+        // 构造表头，添加一个进场，添加一个出场
+        PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short)0, "路牌", new Color(0x96b9d7));
+        Station station1 = stationService.findById(lpObjList.get(0).getStationRouteId1());
+        Station station2 = stationService.findById(lpObjList.get(1).getStationRouteId2());
+        PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (1),
+                "出场", new Color(0x96b9d7));
+        for (int i = 1; i <= groupCount; i++) {
+            PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (i * 2),
+                    station1.getStationName(), new Color(0x96b9d7));
+            PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (i * 2 + 1),
+                    station2.getStationName(), new Color(0x96b9d7));
+        }
+        PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 2),
+                "进场", new Color(0x96b9d7));
+
+        // 构建每个路牌的班次数据
+        for (int i = 0; i < lpObjList.size(); i++) {
+            LpObj lpObj = lpObjList.get(i);
+            XSSFRow lpRow = sheet.createRow((short) (i + 1));
+            PoiUtils.createStringXSSFCell(wb, lpRow, (short) 0, lpObj.getLpname());
+            PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (1));
+            for (int j = 1; j <= groupCount; j++) {
+                PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (j * 2));
+                PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (j * 2 + 1));
+            }
+            PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (groupCount * 2 + 2));
  
-                // 3、统计数值
-                PoiUtils.setDoubleStyleXSSFCellStyle(wb, sheet.getRow(startrow + 2 + i).getCell(9));
-                sheet.getRow(startrow + 2 + i).getCell(9).setCellValue(statInfo.getStatValue());
+            for (BcObj bcObj : lpObj.getBcObjList()) {
+                if (bcObj.getBcType() == BcType.NORMAL) {
+                    Cell cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 2));
+                    cell.setCellValue(bcObj.getFcsj());
+                } else if (bcObj.getBcType() == BcType.OUT) {
+                    Cell cell = lpRow.getCell((short) (1));
+                    cell.setCellValue(bcObj.getFcsj());
+                } else if (bcObj.getBcType() == BcType.IN) {
+                    Cell cell = lpRow.getCell((short) (groupCount * 2 + 2));
+                    cell.setCellValue(bcObj.getFcsj());
+                }
             }
+        }
+
+        // 自适应单元格长宽
+        sheet.autoSizeColumn(0);
+        sheet.autoSizeColumn(1);
+        for (int i = 1; i <= groupCount; i++) {
+            sheet.autoSizeColumn(i * 2);
+            sheet.autoSizeColumn(i * 2 + 1);
+        }
+
+    }
+
+    @Override
+    public DataToolsFile exportDynamicTTinfo(DTInfos dtInfos) throws ScheduleException {
+        try {
+            // 使用POI，创建xlsx文件
+            XSSFWorkbook wb = new XSSFWorkbook();
+            this.createDynamicTTinfoSheet(wb, dtInfos);
+            this.createDynamicTTinfoStatSheet(wb, dtInfos);
  
-            // 最后内存写入文件
+            // wb内存写入文件
             String filepath = dataToolsProperties.getFileoutputDir() +
                     File.separator +
                     "动态时刻表-" +
@@ -58,6 +58,8 @@ public interface TTinfoDetailDynamicData {
         private BcType bcType;
         /** 发车时刻 */
         private String fcsj;
+        /** 用于统计的发车时间描述（把进出场，保养，吃饭时间写在一起） */
+        private String fcsjDesc;
  
         /** 第几圈（从1开始） */
         private Integer groupNo;
@@ -151,6 +153,22 @@ public interface TTinfoDetailDynamicData {
         public void setGroupBcNo(Integer groupBcNo) {
             this.groupBcNo = groupBcNo;
         }
+
+        public Boolean getUp() {
+            return isUp;
+        }
+
+        public void setUp(Boolean up) {
+            isUp = up;
+        }
+
+        public String getFcsjDesc() {
+            return fcsjDesc;
+        }
+
+        public void setFcsjDesc(String fcsjDesc) {
+            this.fcsjDesc = fcsjDesc;
+        }
     }
  
     public static class LpObj { // 路牌对象
@@ -1746,7 +1746,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("line", xlName);
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
-			tempMap.put("zdl", nf.format((float) sjbc / jhbc *100) + "%");
+			tempMap.put("zdl", (jhbc<1?"0":nf.format((float) sjbc / jhbc *100)) + "%");
+			
 			resList.add(tempMap);
 		}
  
@@ -1760,7 +1761,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			}
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
-			tempMap.put("zdl", nf.format((float) sjbc / jhbc * 100) + "%");
+			tempMap.put("zdl", (jhbc<1?"0":nf.format((float) sjbc / jhbc * 100)) + "%");
 			for(Map<String, Object> m : mapList){
 				m.put("no", ++i);
 				m.put("company", companyName);
+package com.bsth.util;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.bsth.util.TransGPS.Location;
+
+public class ClosestPoint {
+
+    public static Location getVerticalPoint(Location loc1, Location loc2, Location loc3) {
+        // 第一步：求得直线方程相关参数y=kx+b | kx-y+b=0
+        double k = (loc1.getLat() - loc2.getLat()) * 1.0 / (loc1.getLng() - loc2.getLng());// 坐标直线斜率k
+        double b = loc1.getLat() - k * loc1.getLng();// 坐标直线b
+        // 第一种： 设直线方程为ax+by+c=0,点坐标为(m,n)
+        // 则垂足为((b*b*m-a*b*n-a*c)/(a*a+b*b),(a*a*n-a*b*m-b*c)/(a*a+b*b))
+        Location loc4 = TransGPS.LocationMake(((-1) * (-1) * loc3.getLng() - k * (-1) * loc3.getLat() - k * b) / (k * k + (-1) * (-1)),
+                (k * k * loc3.getLat() - k * (-1) * loc3.getLng() - (-1) * b) / (k * k + (-1) * (-1)));
+        return loc4;
+    }
+
+    // 获取两点间距离
+    static double GetPointDistance(Location p1, Location p2) {
+        return Math.sqrt((p1.getLng() - p2.getLng()) * (p1.getLng() - p2.getLng()) + (p1.getLat() - p2.getLat()) * (p1.getLat() - p2.getLat()));
+    }
+
+    // 求点到线段距离的最近点
+    static Map<Double, List<Location>> GetNearestDistance(Location PA, Location PB, Location P3) {
+        Map<Double, List<Location>> point = new HashMap<>();
+        List<Location> locations = new ArrayList<>();
+        locations.add(PA);
+        locations.add(PB);
+        // 点在线段上
+        double a, b, c;
+        a = GetPointDistance(PB, P3);
+        if (a <= 0.000000001) {
+            locations.add(P3);
+            point.put(a, locations);
+            return point;
+        }
+        b = GetPointDistance(PA, P3);
+        if (b <= 0.000000001) {
+            locations.add(P3);
+            point.put(b, locations);
+            return point;
+        }
+        c = GetPointDistance(PA, PB);
+        if (c <= 0.000000001) {
+            locations.add(PA);
+            point.put(b, locations);// 如果PA和PB坐标相同，则退出函数，并返回距离
+            return point;
+        }
+        // 点和线段组成钝角三角形
+        if (a * a >= b * b + c * c) {
+            locations.add(PA);
+            point.put(b, locations);
+            return point;// 如果是钝角返回b
+        }
+        if (b * b >= a * a + c * c) {
+            locations.add(PB);
+            point.put(a, locations);// 如果是钝角返回a
+            return point;
+        }
+
+        // 点和线段组成锐角三角形
+        double l = (a + b + c) / 2; // 周长的一半
+        double s = Math.sqrt(l * (l - a) * (l - b) * (l - c)); // 海伦公式求面积，也可以用矢量求
+        Location location = getVerticalPoint(PA, PB, P3);
+        locations.add(location);
+        point.put(2 * s / c, locations);
+        return point;
+    }
+}
+package com.bsth.util;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * Created by panzhao on 2017/8/2.
+ */
+public class HttpClientUtils {
+
+    static Logger logger = LoggerFactory.getLogger(HttpClientUtils.class);
+    public static StringBuilder get(String url) throws Exception {
+
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+        StringBuilder stringBuffer = null;
+        try {
+            httpClient = HttpClients.createDefault();
+            HttpGet get = new HttpGet(url);
+            //超时时间
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setConnectTimeout(10500).setConnectionRequestTimeout(7000)
+                    .setSocketTimeout(10500).build();
+            get.setConfig(requestConfig);
+            get.addHeader("Content-Encoding", "gzip");
+            response = httpClient.execute(get);
+            stringBuffer = getResult(response.getEntity());
+        } catch (Exception e) {
+            logger.error("", e);
+        } finally {
+            if (null != httpClient)
+                httpClient.close();
+            if (null != response)
+                response.close();
+        }
+        return stringBuffer;
+    }
+
+    /**
+     * raw post data
+     * @param url
+     * @param data
+     * @return
+     */
+    public static StringBuilder post(String url, String data) throws Exception {
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+        StringBuilder stringBuffer = null;
+        try {
+            httpClient = HttpClients.createDefault();
+            HttpPost post = new HttpPost(url);
+
+            post.setHeader("Accept", "application/json");
+            post.setHeader("Content-Type", "application/json");
+            //超时时间
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
+                    .setSocketTimeout(3500).build();
+            post.setConfig(requestConfig);
+            post.setEntity((new StringEntity(data, "UTF-8")));
+
+            response = httpClient.execute(post);
+            stringBuffer = getResult(response.getEntity());
+        } catch (Exception e) {
+            logger.error("", e);
+        } finally {
+            if (null != httpClient)
+                httpClient.close();
+            if (null != response)
+                response.close();
+        }
+        return stringBuffer;
+    }
+
+    private static StringBuilder getResult(HttpEntity entity) throws IOException {
+        StringBuilder stringBuffer = null;
+        if (null != entity) {
+            BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+            stringBuffer = new StringBuilder();
+            String str = "";
+            while ((str = br.readLine()) != null)
+                stringBuffer.append(str);
+        }
+        return stringBuffer;
+    }
+}
+package com.bsth.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.entity.LonLatName;
+import com.bsth.util.TransGPS.Location;
+import com.bsth.util.TransGPS;
+
+import java.net.URLEncoder;
+import java.util.*;
+
+public class RoadCutDoubleName {
+
+	// 存放获取交点的经纬度，路段名字
+	static ArrayList<LonLatName> al = new ArrayList<LonLatName>();
+
+	public static Map<String, Object> start(String sectionStr) throws Exception {
+
+		al.clear();
+		// 存放过滤后返还会来的list集合
+		ArrayList dl = new ArrayList();
+
+		String fy = URLEncoder.encode("|", "utf-8");
+		String lL = baiduToGoogle(sectionStr);
+		String[] lonLat = lL.split(";");
+
+		int number = 0;
+		if (lonLat.length % 20 == 0) {
+			number = lonLat.length / 20;
+		} else {
+			number = lonLat.length / 20 + 1;
+		}
+		int middle = 0;
+		int max = 20;
+		if (lonLat.length >= 20) {
+			for (int NOT = 1; NOT <= number; NOT++) {
+				String Ol = "";
+				if (NOT < number) {
+					for (int min = middle; min < max; min++) {
+						if (min < max - 1) {
+							Ol += lonLat[min] + fy;
+						} else {
+							Ol += lonLat[min];
+						}
+					}
+					dl = getData(Ol,al);
+					middle = max;
+					max += 20;
+				} else {
+					for (int min = middle; min < lonLat.length; min++) {
+						if (min < lonLat.length - 1) {
+							Ol += lonLat[min] + fy;
+						} else {
+							Ol += lonLat[min];
+						}
+					}
+					dl = getData(Ol,al);
+				}
+			}
+		} else {
+			String Ol = "";
+			for (int min = middle; min < lonLat.length; min++) {
+				if (min < lonLat.length - 1) {
+					Ol += lonLat[min] + fy;
+				} else {
+					Ol += lonLat[min];
+				}
+			}
+			dl = getData(Ol,al);
+		}
+		// 将原有的经纬度数组转换为list集合
+		ArrayList<Location> el = new ArrayList<>();
+		for (int j = 0; j < lonLat.length; j++) {
+			String lon[] = lonLat[j].split(",");
+			Location point = new Location();
+			point.setLng(Double.valueOf(lon[0]));
+			point.setLat(Double.valueOf(lon[1]));
+			el.add(point);
+		}
+		ArrayList<Location> gl = new ArrayList<>();
+		for (int k = 0; k < dl.size(); k += 4) {
+			Location point = new Location();
+			String object = (String) dl.get(k);
+			String[] split = object.split(",");
+			point.setLng(Double.valueOf(split[0]));
+			point.setLat(Double.valueOf(split[1]));
+			gl.add(point);
+		}
+		// 将做过处理的百度坐标与过滤后的交点坐标存入，传给垂足获取方法
+		ArrayList fl = new ArrayList();
+		// 路的坐标点
+		fl.add(0, el);
+		// 路的交点
+		fl.add(1, gl);
+		List returnData = returnData(fl);
+		ArrayList<Location> pointList = new ArrayList<>();
+		for (int x = 0; x < returnData.size(); x++) {
+			List<Location> aList = new ArrayList<>();
+			aList = (List<Location>) returnData.get(x);
+			for (int z = 0; z < aList.size(); z++) {
+				Location point = new Location();
+				Location location = aList.get(z);
+				point.setLng(location.getLng());
+				point.setLat(location.getLat());
+				pointList.add(point);
+			}
+		}
+		/*
+		 * 垂足返还的数据中每三条为一个交点，第一经纬度为前，第二为后，第三为原交点的垂足
+		 * 下面循环会将返还的数据按前经纬度与返还数据的第一经纬度相匹配 将返还数据的第三个经纬度按顺序插入进去
+		 */
+		// lonLat:转换为高德的坐标点数组
+		for (int t = 0; t < pointList.size(); t += 3) {
+			Location pl = (Location) pointList.get(t);
+			Location newPl = (Location) pointList.get(t + 1);
+			// 判断切点是否添加成功
+			boolean type = false;
+			// pointList:包含前后垂足的集合，每三个一个轮回
+			for (int o = 0; o < el.size() - 1; o++) {
+				Location location1 = el.get(o);
+				Location location2 = el.get(o + 1);
+				if (location1.getLng() == pl.getLng() && location1.getLat() == pl.getLat()
+						&& location2.getLng() == newPl.getLng() && location2.getLat() == newPl.getLat()) {
+					if (o < el.size() - 1) {
+						// el:存放原始坐标Location对象的集合
+						el.add(o + 1, (Location) pointList.get(t + 2));
+						type = true;
+						break;
+					} else {
+						el.add(o, (Location) pointList.get(t + 2));
+						type = true;
+						break;
+					}
+				}
+			}
+			// 防止在同一线段下的两个切点会只添加一个
+			if (!type) {
+				for (int o = 0; o < el.size(); o++) {
+					Location location = el.get(o);
+					if (location.getLng() == newPl.getLng() && location.getLat() == newPl.getLat()) {
+						el.add(o, (Location) pointList.get(t + 2));
+						type = true;
+						break;
+					}
+				}
+			}
+		}
+		// 通过返还的垂足数据，将原有的中间点给替换掉
+		int w = 0;
+		for (int q = 2; q < pointList.size(); q += 3) {
+			Location pL = (Location) pointList.get(q);
+			dl.set(w, pL.getLng() + "," + pL.getLat());
+			w += 4;
+		}
+		// 对替换后的location进行路名拼接，十个点则应拼接出九个路段路名
+		// 若location获取的路名不符合规则，则返还“(-)”
+		int maxOne = 2;
+		int maxTwo = 6;
+		int minOne = 1;
+		int minTwo = 5;
+		String theMainRoad = "";
+		String theFirstRoad = "";
+		String theSecondRoad = "";
+		List<String> roadName = new ArrayList<>();
+		for (int d = maxTwo; d < dl.size();) {
+			boolean buff = false;
+			// 若两段路名中含有相同的路名，则此路名作为主路名
+			for (int h = minOne; h <= maxOne; h++) {
+				for (int f = minTwo; f <= maxTwo; f++) {
+					if (dl.get(h).equals(dl.get(f))) {
+						theMainRoad = dl.get(h).toString();
+						buff = true;
+						break;
+					} else {
+						theMainRoad = "";
+					}
+				}
+				if (buff) {
+					break;
+				}
+			}
+			// 获取主路名后，将主路名不为空的进行拼接
+			// 规则为:两段路名的firstName和secondName不与主路名相同
+			// 存入roadName列表且按数序包含无法进行拼接的路名返回值为“(-)”
+			for (int h = minOne; h <= maxOne; h++) {
+				for (int f = minTwo; f <= maxTwo; f++) {
+					if (!theMainRoad.equals("")) {
+						if (!dl.get(h).equals(theMainRoad)) {
+							theFirstRoad = dl.get(h).toString();
+							if (!dl.get(f).equals(theMainRoad)) {
+								theSecondRoad = dl.get(f).toString();
+							}
+						}
+					} else {
+						theFirstRoad = "";
+						theSecondRoad = "";
+					}
+				}
+			}
+			minOne += 4;
+			minTwo += 4;
+			maxOne += 4;
+			maxTwo += 4;
+			d = maxTwo;
+			roadName.add(theMainRoad + "(" + theFirstRoad + "-" + theSecondRoad + ")");
+		}
+		// 将所有经纬度列表进行重复过滤
+		for (int i = 0; i < el.size() - 1; i++) {
+			Location location = el.get(i);
+			for (int j = i + 1; j < el.size(); j++) {
+				Location location2 = el.get(j);
+				if (location.getLng() == location2.getLng() && location.getLat() == location2.getLat()) {
+					el.remove(j);
+					break;
+				}
+			}
+		}
+		// 用来区分此线路的开始是否等于location的第一个点
+		boolean buff = false;
+		//将路名roadName与路段roadNumber添加进theFrontDesk返还给前台
+		Map<String, Object> theFrontDesk = new HashMap<>();
+		// 若坐标组的第一个坐标与交点的第一个不相同，就说明实际规划出的线路条数+1
+		// 此方法的作用就是用来避免线路名称与线路不对称
+		if(dl.size() != 0) {
+			String firstLocation = (String) dl.get(0);
+			String[] firstLocationSplit = firstLocation.split(",");
+			Location firstOfAll = el.get(0);
+			if (firstOfAll.getLng() != Double.valueOf(firstLocationSplit[0])
+					&& firstOfAll.getLat() != Double.valueOf(firstLocationSplit[1])) {
+				roadName.add(0, "(-)");
+				buff = true;
+			}
+			String lastLocation = (String) dl.get(dl.size() - 4);
+			String[] lastLocationSplit = lastLocation.split(",");
+			Location lastOfAll = el.get(el.size() - 1);
+			if (lastOfAll.getLng() != Double.valueOf(lastLocationSplit[0])
+					&& lastOfAll.getLat() != Double.valueOf(lastLocationSplit[1])) {
+				roadName.add(roadName.size(), "(-)");
+			}
+			//切分路段，有两种情况，路段的第一个经纬度既是切点，则从第二个点开始计算
+			//路段的前几个点是多余的点 则将其保留，并且上面的方法就是用来防止第一个路段路名错误
+			List roadNumber = new ArrayList();
+			if (buff) {
+				int logo = 0;
+				for (int j = 0; j < dl.size(); j += 4) {
+					List wayNumber = new ArrayList();
+					String object = (String) dl.get(j);
+					String[] split = object.split(",");
+					for (int i = logo; i < el.size(); i++) {
+						Location location = el.get(i);
+						wayNumber.add(el.get(i));
+						if (location.getLng() == Double.valueOf(split[0])
+								&& location.getLat() == Double.valueOf(split[1])) {
+							logo = i;
+							roadNumber.add(wayNumber);
+							break;
+						}
+						if(i == el.size()-1){
+							logo = i;
+							roadNumber.add(wayNumber);
+						}
+					}
+				}
+			}else{
+				int logo = 0;
+				for (int j = 4; j < dl.size(); j += 4) {
+					List wayNumber = new ArrayList();
+					String object = (String) dl.get(j);
+					String[] split = object.split(",");
+					for (int i = logo; i < el.size(); i++) {
+						Location location = el.get(i);
+						wayNumber.add(el.get(i));
+						if (location.getLng() == Double.valueOf(split[0])
+								&& location.getLat() == Double.valueOf(split[1])) {
+							logo = i;
+							roadNumber.add(wayNumber);
+							break;
+						}
+						if(i == el.size()-1){
+							logo = i;
+							roadNumber.add(wayNumber);
+						}
+					}
+				}
+			}
+			List bSections = googleToBaidu(roadNumber);
+			//将路名roadName与路段roadNumber添加进theFrontDesk返还给前台
+//			List theFrontDesk = new ArrayList();
+			theFrontDesk.put("roadName",roadName);
+			theFrontDesk.put("bSections",bSections);
+			for(int i =0;i<bSections.size();i++){
+				List<Location> rn = new ArrayList<>();
+				rn = (List<Location>) bSections.get(i);
+				System.out.println("第"+(i+1)+"条路");
+				System.out.println(roadName.get(i));
+				for(int j=0;j<rn.size();j++){
+					Location object = (Location) rn.get(j);
+					System.out.println(object.getLng()+" "+object.getLat()+";");
+				}
+			}
+		}
+
+        return theFrontDesk;
+	}
+
+	public static ArrayList<LonLatName> getData(String Ol,ArrayList<LonLatName> al) throws Exception {
+		// 将去重后的list列表添加进来
+		ArrayList cl = new ArrayList();
+		StringBuilder sb = HttpClientUtils.get("http://restapi.amap.com/v3/geocode/regeo?output=json&location=" + Ol
+				+ "&key=ae7b43460cab274a8702b55640f9a5a7&radius=0&extensions=all&batch=true&roadlevel=1");
+		JSONObject jsonarr = JSON.parseObject(sb.toString());
+		JSONArray regeocodes = jsonarr.getJSONArray("regeocodes");
+
+		for (int a = 0; a < regeocodes.size(); a++) {
+			LonLatName lln = new LonLatName();
+			JSONObject json = (JSONObject) regeocodes.get(a);
+			JSONArray roadinters = json.getJSONArray("roadinters");
+			JSONArray roads = json.getJSONArray("roads");
+			JSONObject jsonObject = roadinters.getJSONObject(0);
+			JSONObject roadsObject = roads.getJSONObject(0);
+			lln.setFirst_name(jsonObject.getString("first_name"));
+			lln.setSecond_name(jsonObject.getString("second_name"));
+			lln.setLocation(jsonObject.getString("location"));
+			lln.setWay_name(roadsObject.getString("name"));
+			al.add(lln);
+		}
+		int a = 0;
+		for (int b = 1; b < al.size(); b++) {
+			if (al.get(b).getWay_name().equals(al.get(b).getFirst_name())
+					|| al.get(b).getWay_name().equals(al.get(b).getSecond_name())) {
+				if (b == 1) {
+					cl.add(al.get(a).getLocation());
+					cl.add(al.get(a).getFirst_name());
+					cl.add(al.get(a).getSecond_name());
+					cl.add(al.get(a).getWay_name());
+				}
+				if (!al.get(a).getLocation().equals(al.get(b).getLocation())) {
+
+					cl.add(al.get(b).getLocation());
+					cl.add(al.get(b).getFirst_name());
+					cl.add(al.get(b).getSecond_name());
+					cl.add(al.get(b).getWay_name());
+					a = b;
+				}
+			}
+		}
+		return cl;
+	}
+
+	// 处理所有的切点（用每个切点去匹配到整条路段上最近的点）
+	public static List returnData(ArrayList twoList) {
+//		List<Location> aList = new ArrayList<>();
+//		List<Location> wip = new ArrayList<>();
+		// 路的坐标点
+		List<Location> aList = (List<Location>) twoList.get(0);
+		// 路的交点
+		List<Location> wip = (List<Location>) twoList.get(1);
+		List<List<Location>> list = new ArrayList<>();
+		for (int j = 0; j < wip.size(); j++) {
+			Map<Double, List<Location>> points = new HashMap<>();
+			for (int i = 1; i < aList.size(); i++) {
+				// 获取最近点为切点
+				points.putAll(ClosestPoint.GetNearestDistance(aList.get(i - 1), aList.get(i), wip.get(j)));
+			}
+			// points 为返回的所有切点的集合
+			Object[] obj = points.keySet().toArray();
+			Arrays.sort(obj);
+			list.add(j,points.get(obj[0]));
+		}
+		return list;
+	}
+
+	// 百度坐标解密位高德
+	public static String baiduToGoogle(String sectionStr) {
+		String gdLL="";
+//		String lL = "121.531301,31.211823;121.532438,31.213784;121.532438,31.213784;121.535025,31.213764;121.535095,31.213765;121.535702,31.213757;121.536388,31.21375;121.537383,31.213699;121.53802,31.213711;121.538408,31.213709;121.538478,31.21371;121.538955,31.213699;121.540289,31.213714;121.540826,31.213724;121.541543,31.213718;121.542867,31.213552;121.542976,31.213534;121.543245,31.213489;121.544787,31.213256;121.546102,31.213059;121.546221,31.213041;121.546898,31.212892;121.547445,31.212691;121.547724,31.212566;121.54855,31.212099;121.549466,31.211432;121.550113,31.210802;121.550402,31.210576;121.551437,31.20911;121.551486,31.209031;121.551795,31.208585;121.552282,31.207861;121.552641,31.207316;121.5528,31.207088;121.552959,31.20685;121.553009,31.20678;121.553357,31.206235;121.553626,31.205898;121.553696,31.205939;121.553696,31.205936;121.554105,31.206171;121.555941,31.207121;121.555941,31.207121;121.556021,31.207202;121.556719,31.207589;121.557458,31.208006;121.557538,31.208116;121.557538,31.208116;121.558047,31.208401;121.559076,31.208909;121.559625,31.209182;121.559865,31.209304;121.560744,31.209599;121.560904,31.20966;121.562362,31.209967;121.563621,31.210132;121.563951,31.210132;121.56675,31.210135;121.569371,31.210191;121.570593,31.210377;121.573087,31.211114;121.573437,31.211241;121.57461,31.211763;121.577197,31.21297;121.577458,31.213077;121.577458,31.213077;121.57805,31.213351;121.57805,31.213351;121.58085,31.214638;121.58097,31.214686;121.58097,31.214686;121.583581,31.21581;121.584605,31.216194;121.584967,31.216339;121.585961,31.216703;121.586393,31.216806;121.587398,31.217059;121.588342,31.217293;121.588744,31.217386;121.58998,31.217694;121.590814,31.217889;121.590915,31.217918;121.591548,31.218056;121.591648,31.218084;121.593065,31.218388;121.593517,31.21854;121.59393,31.218762;121.594704,31.219287;121.596986,31.220814;121.59766,31.221212;121.598001,31.221375;121.600474,31.222169;121.600544,31.222198;121.600574,31.222207;121.600685,31.222245;121.603348,31.223057;121.605639,31.223607;121.605638,31.223607;121.605648,31.223537;121.605698,31.222176;121.605787,31.221004;121.606055,31.216939;121.606324,31.213734;121.606373,31.212813;121.606522,31.21086;121.606611,31.210048;121.606621,31.209968;121.606772,31.209986;121.606772,31.209985;121.608479,31.210248;121.60864,31.210265;121.60864,31.210265;121.60871,31.210014";
+		System.out.println(sectionStr);
+		String lonLat[] = sectionStr.split(";");
+		for (int a = 0; a < lonLat.length; a++) {
+			String[] split = lonLat[a].split(",");
+			Location locationMake = TransGPS.LocationMake(Double.valueOf(split[0]), Double.valueOf(split[1]));
+			Location gd_decrypt = TransGPS.bd_decrypt(locationMake);
+			if (a < lonLat.length - 1) {
+				gdLL += gd_decrypt.getLng() + "," + gd_decrypt.getLat() + ";";
+			} else {
+				gdLL += gd_decrypt.getLng() + "," + gd_decrypt.getLat();
+			}
+
+		}
+
+		return gdLL;
+	}
+
+	// 高德坐标加密位百度
+	public static List googleToBaidu(List list) {
+		List roadNumber = new ArrayList();
+		for(int i =0;i<list.size();i++){
+			String lL = "";
+			List wayNumber = new ArrayList();
+			List<Location> rn = new ArrayList<>();
+			rn = (List<Location>) list.get(i);
+			for(int j=0;j<rn.size();j++){
+				Location object = (Location) rn.get(j);
+				if(j<rn.size()-1){
+					lL += object.getLng()+","+object.getLat()+";";
+				}else{
+					lL += object.getLng()+","+object.getLat();
+				}
+			}
+			String lonLat[] = lL.split(";");
+			for (int a = 0; a < lonLat.length; a++) {
+				String[] split = lonLat[a].split(",");
+				Location locationMake = TransGPS.LocationMake(Double.valueOf(split[0]), Double.valueOf(split[1]));
+				Location bd_encrypt = TransGPS.bd_encrypt(locationMake);
+				wayNumber.add(bd_encrypt);
+			}
+			roadNumber.add(wayNumber);
+		}
+
+		return roadNumber;
+	}
+}
 \ No newline at end of file
@@ -24,7 +24,25 @@
 				return cb && cb(gs_d);
 		});
 	}
-	initCompanySelect2(function(array) {
+    // 营运公司Map[key(businessCode)] = 名字
+    var companyMap = new Map();
+    // 分公司Map[key(upCode+_+businessCode)] = 名字
+    var branchMap = new Map();
+    initCompanySelect2(function(array) {
+        $.each(array, function() {
+            companyMap[this.businessCode] = this.businessName;
+            // companyMap.put(this.businessCode.toString(), this.businessName);
+            if(this.businessCode != null || this.businessCode !=''){
+                /** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
+                $get('/business/all', {upCode_eq: this.businessCode}, function(array){
+                    // 遍历array
+                    $.each(array, function(i,d){
+                        branchMap[this.upCode+"_"+this.businessCode] = this.businessName;
+                        // branchMap.put(this.upCode+"_"+this.businessCode, this.businessName);
+                    });
+                });
+            }
+        });
 		// 公司下拉options属性值
 		var options = '<option value="">请选择...</option>';
 		// 遍历array
@@ -202,6 +220,10 @@
 			$.get('/carpark',params,function(result){
 				// 添加序号
 				result.content.page =  page;
+                $.each(result.content, function(i, data) {
+                    result.content[i].gsmc = companyMap[data.company];
+                    result.content[i].fgsmc = branchMap[data.cgsbm];
+                });
 				// 把数据填充到模版中
 				var tbodyHtml = template('carpark_list_table_temp',{list:result.content});
 				$('#datatable_carpark tbody').html(tbodyHtml);
@@ -114,7 +114,8 @@
 				{{obj.area}}
 			</td>
 			<td>
-				{{if obj.company == '55'}}
+				{{obj.gsmc}}
+				<!--{{if obj.company == '55'}}
 					上南公司
 				{{else if obj.company == '22'}}
 					金高公司
@@ -124,10 +125,11 @@
 					南汇公司
 				{{else if obj.company == '77'}}
 					闵行公司
-				{{/if}}
+				{{/if}}-->
 			</td>
 			<td>
-				{{if obj.company == '55'}}
+				{{obj.fgsmc}}
+				<!--{{if obj.company == '55'}}
  
 					{{if obj.brancheCompany == '1'}}
 						上南二分公司
@@ -179,7 +181,7 @@
 						南汇公司
 					{{/if}}
  
-				{{/if}}
+				{{/if}}-->
 			</td>
 			<td>
 				{{obj.versions}}
@@ -44,7 +44,25 @@
 			setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
 		},200);
 	}
+	// 营运公司Map[key(businessCode)] = 名字
+	var companyMap = new Map();
+	// 分公司Map[key(upCode+_+businessCode)] = 名字
+	var branchMap = new Map();
 	initCompanySelect2(function(array) {
+        $.each(array, function() {
+            companyMap[this.businessCode] = this.businessName;
+            // companyMap.put(this.businessCode.toString(), this.businessName);
+            if(this.businessCode != null || this.businessCode !=''){
+                /** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
+                $get('/business/all', {upCode_eq: this.businessCode}, function(array){
+                    // 遍历array
+                    $.each(array, function(i,d){
+                        branchMap[this.upCode+"_"+this.businessCode] = this.businessName;
+                        // branchMap.put(this.upCode+"_"+this.businessCode, this.businessName);
+                    });
+                });
+            }
+        });
 		// 公司下拉options属性值
 		var options = '<option value="">请选择...</option>';
 		// 遍历array
@@ -184,7 +202,11 @@
 			$.get('/line',params,function(result){
 				// 添加序号
 				result.content.page =  page;
-				// 把数据填充到模版中
+                $.each(result.content, function(i, data) {
+                    result.content[i].gsmc = companyMap[data.company];
+                    result.content[i].fgsmc = branchMap[data.cgsbm];
+				});
+                // 把数据填充到模版中
 				var tbodyHtml = template('line_list_temp',{list:result.content});
 				// 把渲染好的模版html文本追加到表格中
 				$('#datatable_line tbody').html(tbodyHtml);
@@ -232,7 +232,8 @@
 				{{obj.name}}
 			</td>
 			<td>
-				{{if obj.company == '55'}}
+				{{obj.gsmc}}
+				<!--{{if obj.company == '55'}}
 					上南公司
 				{{else if obj.company == '22'}}
 					金高公司
@@ -242,10 +243,11 @@
 					南汇公司
 				{{else if obj.company == '77'}}
 					闵行公司
-				{{/if}}
+				{{/if}}-->
 			</td>
 			<td>
-				{{if obj.company == '55'}}
+				{{obj.fgsmc}}
+				<!--{{if obj.company == '55'}}
  
 					{{if obj.brancheCompany == '1'}}
 						上南二分公司
@@ -299,7 +301,7 @@
 						航头枢纽站
 					{{/if}}
  
-				{{/if}}
+				{{/if}}-->
 			</td>
 			<td>
 				{{if obj.nature == 'lj'}}
@@ -347,6 +349,7 @@
 				<a href="/pages/base/lineinformation/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
 			<td>
+				<a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看</a>
 				<a href="javascript:window.localStorage.setItem('geo_data_edit_line_code' , '{{obj.lineCode}}');window.localStorage.removeItem('geo_data_edit_line_version');window.location.href='/pages/base/geo_data_edit/uk3_wrap.html';" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
 			<td>
@@ -34,7 +34,25 @@
 			setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
 		},200);
 	}
+	// 营运公司Map[key(businessCode)] = 名字
+	var companyMap = new Map();
+	// 分公司Map[key(upCode+_+businessCode)] = 名字
+	var branchMap = new Map();
 	initCompanySelect2(function(array) {
+		$.each(array, function() {
+			companyMap[this.businessCode] = this.businessName;
+			// companyMap.put(this.businessCode.toString(), this.businessName);
+			if(this.businessCode != null || this.businessCode !=''){
+				/** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
+				$get('/business/all', {upCode_eq: this.businessCode}, function(array){
+					// 遍历array
+					$.each(array, function(i,d){
+						branchMap[this.upCode+"_"+this.businessCode] = this.businessName;
+						// branchMap.put(this.upCode+"_"+this.businessCode, this.businessName);
+					});
+				});
+			}
+		});
 		// 公司下拉options属性值
 		var options = '<option value="">请选择...</option>';
 		// 遍历array
@@ -161,10 +179,12 @@
 			// 添加序号
 			result.content.page =  page;
 			// 把数据填充到模版中
-			$.each(result.content, function(){
-				this.startDateStr=moment(this.startDate).format('YYYY-MM-DD HH:mm:ss');
-				this.endDateStr=moment(this.endDate).format('YYYY-MM-DD HH:mm:ss');
-			})
+            $.each(result.content, function(i, data) {
+                result.content[i].gsmc = companyMap[data.line.company];
+                result.content[i].fgsmc = branchMap[data.line.cgsbm];
+                data.startDateStr=moment(data.startDate).format('YYYY-MM-DD HH:mm:ss');
+                data.endDateStr=moment(data.endDate).format('YYYY-MM-DD HH:mm:ss');
+            });
  
 			var tbodyHtml = template('lineversions_list_temp',{list:result.content});
 			$('#datatable_lineversions tbody').html(tbodyHtml);
@@ -118,7 +118,8 @@
 				{{obj.line.name}}
 			</td>
 			<td>
-				{{if obj.line.company == '55'}}
+				{{obj.gsmc}}
+				<!--{{if obj.line.company == '55'}}
 					上南公司
 				{{else if obj.line.company == '22'}}
 					金高公司
@@ -128,10 +129,11 @@
 					南汇公司
 				{{else if obj.line.company == '77'}}
 					闵行公司
-				{{/if}}
+				{{/if}}-->
 			</td>
 			<td>
-				{{if obj.line.company == '55'}}
+				{{obj.fgsmc}}
+				<!--{{if obj.line.company == '55'}}
  
 					{{if obj.line.brancheCompany == '1'}}
 						上南二分公司
@@ -185,7 +187,7 @@
 						航头枢纽站
 					{{/if}}
  
-				{{/if}}
+				{{/if}}-->
 			</td>
 			<td>
 				{{obj.startDateStr}}
 #bmap_basic{
 	min-width: 100%;
-	width: calc(100% + 26px); 
-	margin-top: -28px;
+	/*width: calc(100% + 26px); */
+	margin-top: -10px;
 	border: 2px solid #fdfdfd;
 	min-height: 1200px;
 	height:100%;
@@ -10,6 +10,7 @@
  
 html,body{
 	overflow:hidden;
+	height: 99%;
 }
  
 .rm3_image {
@@ -27,67 +28,64 @@ html,body{
 }
  
 .protlet-box{
-	
-	position: absolute; 
-	
-	top: 40px;
-	
+	position: absolute;
+	top: 30px;
 	margin-left: 10px;
-	
 	overflow: hidden;
-	
 	width: 380px;
-	
 	height: auto;
-	
 	background:transparent;
-	
 	border:0px solid;
-	
 	box-shadow: 0 12px 15px 0 rgba(204, 204, 204, 0.33),0 17px 50px 0 rgba(204, 204, 204, 0.33);
+	border-radius: 6px !important;box-shadow: 10px 10px 5px #888888;
 }
  
-.BMap_pop div:nth-child(1) ,
-.BMap_pop div:nth-child(2) ,
-.BMap_pop div:nth-child(3) ,
-.BMap_pop div:nth-child(4) ,
-.BMap_pop div:nth-child(5) ,
-.BMap_pop div:nth-child(6) ,
-.BMap_pop div:nth-child(7) {
-	
-	border:0px solid rgb(255, 255, 255) !important;
-	background-color:#3B3F51 !important;
-	
+.help-block{
+	color:#000;
+	font-size: 15px;
 }
  
-.BMap_pop div:nth-child(3){
-	
-	width:23px !important;
-	
-}
+/*.BMap_pop div:nth-child(1) ,*/
+/*.BMap_pop div:nth-child(2) ,*/
+/*.BMap_pop div:nth-child(3) ,*/
+/*.BMap_pop div:nth-child(4) ,*/
+/*.BMap_pop div:nth-child(5) ,*/
+/*.BMap_pop div:nth-child(6) ,*/
+/*.BMap_pop div:nth-child(7) {*/
+	/**/
+	/*border:0px solid rgb(255, 255, 255) !important;*/
+	/*background-color:#3B3F51 !important;*/
+	/**/
+/*}*/
  
-.BMap_pop div:nth-child(7) {
-	
-	width:23px !important;
-	
-	height:24px !important;
-	
-}
+/*.BMap_pop div:nth-child(3){*/
+	/**/
+	/*width:23px !important;*/
+	/**/
+/*}*/
  
-.BMap_pop div:nth-child(5) {
-	
-	height:24px !important;
-	
-}
+/*.BMap_pop div:nth-child(7) {*/
+	/**/
+	/*width:23px !important;*/
+	/**/
+	/*height:24px !important;*/
+	/**/
+/*}*/
+
+/*.BMap_pop div:nth-child(5) {*/
+	/**/
+	/*height:24px !important;*/
+	/**/
+/*}*/
  
 /* 图片以后在弄，先隐藏div */
-.BMap_pop div:nth-child(8) {
-	
-	height:0px !important;
-	/*  background:url('/pages/base/stationroute/css/img/iw3-1.png') no-repeat !important; */
-	/* background-image:url('/pages/base/stationroute/css/img/windowinfo_b.jpg')  !important;  */
-	
-}
+/*.BMap_pop div:nth-child(8) {*/
+	/**/
+	/*height:0px !important;*/
+	/*!*  background:url('/pages/base/stationroute/css/img/iw3-1.png') no-repeat !important; *!*/
+	/*!* background-image:url('/pages/base/stationroute/css/img/windowinfo_b.jpg')  !important;  *!*/
+	/**/
+/*}*/
  
 .BMap_pop {
  
+<!-- 生成双路名路段路段 -->
+<div class="modal fade" id="doublename_road_mobal" role="basic" aria-hidden="true" style="margin-top:10%">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+                <h4 class="modal-title">选择生成路段的位置</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal" role="form" id="edit_section__form" action="/module" method="post">
+                    <div class="alert alert-danger display-hide"> <button class="close" data-close="alert"></button>
+                        请选择上一路段!
+                    </div>
+                    <input type="hidden" name="versions" id="versionsInput">
+                    <input type="hidden" name="directions" id="directionsSection">
+                    <input type="hidden" name="lineId" id="lineId">
+                    <input type="hidden" name="lineCode" id="lineCodeInput">
+                    <input type="hidden" name="bsectionVector" id="bsectionVectorInput" />
+                    <input type="hidden" name="dbType" id="dbTypeInput" value="b"/>
+                    <!-- 路段序号 -->
+                    <div class="form-body">
+                        <div class="form-group">
+                            <label class="control-label col-md-3">
+                                上一路段:
+                            </label>
+                            <div class="col-md-8">
+                                <select name="sectionrouteCode" id="sectionrouteCodeSelect"></select>
+                                <span class="help-block">说明:选择的路段将作为本站序号的参考，成为选择路段的下一个路段。 </span>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn default" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-primary" id="editSectionButton">提交数据</button>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+
+    $('#doublename_road_mobal').on('doubleNameRoadMobal_show', function(e,params,map_,ajaxd,fun){
+        // 方向
+        var dir = params.directions;
+        var lineId = params.lineId;
+
+        // 获取路段号元素，并添加下拉属性值
+        ajaxd.getStation(lineId,dir,function(treeData) {
+            var array = treeData[0].children[1].children,paramsD =new Array();
+            paramsD.push({'id':'启始路段（默认在所有路段的前面）','text':'启始路段（默认在所有路段的前面）'});
+            // 记录最后一个路段
+            var endRoad = 0;
+            // 遍历.
+            $.each(array, function(i, g){
+                // 判断.
+                if(g.sectionName!='' || g.sectionName != null) {
+                    var ptions_v = g.sectionrouteCode;
+                    if(endRoad < ptions_v)
+                        endRoad = ptions_v;
+                    // 添加拼音检索下拉框格式数据数组.
+                    paramsD.push({'id':ptions_v,
+                        'text':g.sectionName + '(' + ptions_v + ')' + '  --' + fun.dirdmToName(g.sectionrouteDirections)});
+                }
+            });
+            // 初始化上一个路段拼音检索下拉框.
+            initPinYinSelect2($('#sectionrouteCodeSelect'),paramsD,function(selector) {
+                if(endRoad != 0)
+                    $('#sectionrouteCodeSelect').select2('val',endRoad);
+                else
+                    $('#sectionrouteCodeSelect').select2('val','启始路段（默认在所有路段的前面）');
+            });
+        });
+        // 显示mobal
+        $('#doublename_road_mobal').modal({show : true,backdrop: 'static',keyboard: false});
+        // 当调用 hide 实例方法时触发
+        $('#doublename_road_mobal').on('hide.bs.modal', function () {
+            closeMobleSetClean();
+        });
+        function closeMobleSetClean() {
+            // 清除地图覆盖物
+            map_.clearMarkAndOverlays();
+            fun.resjtreeDate(lineId,dir);
+            fun.editAChangeCssRemoveDisabled();
+            ajaxd.getSectionRouteInfo(lineId,dir,function(data) {
+                fun.linePanlThree(lineId,data,dir);
+            });
+        }
+        // 编辑表单元素
+        var form = $('#edit_section__form');
+        // 获取错误提示元素
+        var error = $('.alert-danger', form);
+        // 提交数据按钮事件
+        $('#editSectionButton').on('click', function() {
+            // 表单提交
+            form.submit();
+        });
+        // 表单验证
+        form.validate({
+            errorElement : 'span',
+            errorClass : 'help-block help-block-error',
+            focusInvalid : false,
+           /* rules : {
+                'sectionrouteCode': {required : true}// 路由序号  必填项
+            },*/
+            invalidHandler : function(event, validator) {
+                error.show();
+                App.scrollTo(error, -200);
+            },
+            highlight : function(element) {
+                $(element).closest('.form-group').addClass('has-error');
+            },
+            unhighlight : function(element) {
+                $(element).closest('.form-group').removeClass('has-error');
+            },
+            success : function(label) {
+                label.closest('.form-group').removeClass('has-error');
+            },
+            submitHandler : function(f) {
+                var data = form.serializeJSON();
+                if(data.sectionrouteCode=='启始路段（默认在所有路段的前面）') {
+                    params.sectionrouteCode = '';
+                } else {
+                    params.sectionrouteCode = data.sectionrouteCode;
+                }
+                // 获取版本
+                $.get("/lineVersions/findCurrentVersion", {"lineId" : lineId}, function (versions) {
+                    params.versions = versions;
+                    // 生成路段
+                    $.get('/section/doubleName',params,function (resuntDate) {
+                        debugger
+                        if(resuntDate.status=='SUCCESS') {
+                            // 弹出添加成功提示消息
+                            layer.msg('生成成功...');
+                        } else if (resuntDate.status=='Failure') {
+                            layer.msg('抱歉，选取的路段太短，无法生成双路段！');
+                        } else {
+                            // 弹出添加失败提示消息
+                            layer.msg('生成失败...');
+                        }
+                        $('#doublename_road_mobal').modal('hide');
+                        var dir = params.directions;
+                        // 刷行左边树
+                        fun.resjtreeDate(lineId,dir);
+                        closeMobleSetClean();
+                    });
+                });
+
+            }
+        });
+    });
+</script>
 \ No newline at end of file
@@ -49,6 +49,7 @@
 <script type="text/javascript">
 $('#edit_select_mobal').on('editSelectMobal_show', function(e, map_,drw,ajaxd,editStationObj,lineObj,fun,dir_){
 	var sel = fun.getCurrSelNode(dir_);
+    debugger
 	var Station = sel[0].original;
 	// 显示选择修改方式弹出层
 	$('#edit_select_mobal').modal({show : true,backdrop: 'static',keyboard: false});
@@ -117,21 +118,16 @@ $(&#39;#edit_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,drw,ajaxd,ed
 			var editStationName = params.stationNamebootbox;
  
 			if(params.editselect==0){
-				layer.confirm('重绘站点，会修改站点编码，影响已做好的排班和线路文件。请谨慎使用，谢谢！', {
-					btn: ['绘制','取消'] //按钮
-				}, function(index){
-					$('#downLine').addClass('btn disabled');
-					$('.btn-circle').addClass('disabled');
-					$('#upLine').addClass('btn disabled');
-					editStationObj.setEitdStation(Station);
-					editStationObj.setEitdStationName(editStationName);
-					
-					map_.clearMarkAndOverlays();
-					// 打开绘制工具
-					drw.openDrawingManager();
-					map_.localtionPoint(editStationName); 
-					layer.close(index)
-				});	
+				$('#downLine').addClass('btn disabled');
+				$('.btn-circle').addClass('disabled');
+				$('#upLine').addClass('btn disabled');
+				editStationObj.setEitdStation(Station);
+				editStationObj.setEitdStationName(editStationName);
+
+				map_.clearMarkAndOverlays();
+				// 打开绘制工具
+				drw.openDrawingManager();
+				map_.localtionPoint(editStationName);
 			}else if(params.editselect==1){
 				$('#downLine').addClass('btn disabled');
 				$('.btn-circle').addClass('disabled');
@@ -141,7 +137,7 @@ $(&#39;#edit_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,drw,ajaxd,ed
  
 				// 弹出添加失败提示消息,2秒关闭（如果不配置，默认是3秒）
 				var mindex = layer.msg('编辑完图形后,请双击图形区域保存',{ offset: '126px',
-					  shift: 0,time: 10000});
+					  shift: 0,time: 3000});
 				// 编辑图形
 				map_.editShapes(editStationName,stationShapesTypeV,mindex);
 			}
@@ -19,11 +19,16 @@ $(function(){
  
 	// 上行站点其它规划点击事件
 	$('.upManual').on('click',function() {
-		// 加载其它规划选择弹出层mobal页面
+        //　加载模板手动添加站点页面
+        $.get('addstationstemplate.html', function(m){
+            $(pjaxContainer).append(m);
+            $('#add_station_template_mobal').trigger('AddStationTempMobal.show', [WorldsBMap,GetAjaxData,directionUpValue,LineObj,PublicFunctions]);
+        });
+		/*// 加载其它规划选择弹出层mobal页面
 		$.get('add_manual_select.html', function(m){
 			$(pjaxContainer).append(m);
 			$('#add_manual_mobal').trigger('AddManualMobal.show', [WorldsBMap,GetAjaxData,directionUpValue,LineObj,PublicFunctions]);
-		});
+		});*/
  
 	});
  
@@ -187,11 +192,16 @@ $(function(){
  
 	// 下行站点其它规划点击事件
 	$('.downManual').on('click',function() {
-		// 加载其它规划选择弹出层mobal页面
+        //　加载模板手动添加站点页面
+        $.get('addstationstemplate.html', function(m){
+            $(pjaxContainer).append(m);
+            $('#add_station_template_mobal').trigger('AddStationTempMobal.show', [WorldsBMap,GetAjaxData,directionDownValue,LineObj,PublicFunctions]);
+        });
+		/*// 加载其它规划选择弹出层mobal页面
 		$.get('add_manual_select.html', function(m){
 			$(pjaxContainer).append(m);
 			$('#add_manual_mobal').trigger('AddManualMobal.show', [WorldsBMap,GetAjaxData,directionDownValue,LineObj,PublicFunctions]);
-		});
+		});*/
 	});
  
 	// 下行站点新增事件
@@ -161,7 +161,7 @@ var PublicFunctions = function () {
 					/** 直接保存 @param：<lineNameV：线路名称；directionData：方向（0：上行；1：下行）> */
 					PublicFunctions.systemLineStation(lineNameV,directionData);
 				}
-				
+
 			},
  
 			/** 直接保存 @param：<lineNameV：线路名称；directionData：方向（0：上行；1：下行）> */
@@ -170,33 +170,6 @@ var PublicFunctions = function () {
 				WorldsBMap.lineInfoPanl(lineNameV,directionData,function(BusLine){
 					// 如果线路信息不为空
 					if(BusLine) {
-						/*if(BusLine.zB.length == 0){
-							
-							layer.confirm('系统生成该线路【'+lineNameV+'】时获取站点与路段异常！请联系管理员或者检查网络连接是否异常！', {
-								btn : [ '确认' ]
-							}, function(index) {
-								
-								// 关闭弹出层
-								layer.closeAll();
-								
-								// 上行
-								if(directionData==0){
-									
-									// 显示上行规划
-									$('#upToolsMobal').show();
-								
-								// 下行
-								}else if(directionData==1){
-									
-									// 显示下行规划
-									$('#downToolsMobal').show();
-									
-								}
-								
-								return ;
-							});
-							
-						}*/
 						// 获取公交线几何对象, 仅当结果自动添加到地图上时有效
 						var Polygon = BusLine.getPolyline();
 						// 返回多边型的点数组（自1.2新增）
@@ -277,10 +250,42 @@ var PublicFunctions = function () {
 									}
 								})
 							});
-							
-							
 						});
-					}
+						// 关闭弹出层
+						layer.closeAll();
+						// 上行
+						if(directionData==0){
+							$('#stationDown').removeClass('active');
+							$('#stationDown').removeClass('in');
+							$('#stationDown').addClass('fade');
+							$('#stationUp').addClass('active in');
+							$('#downLine').parent().removeClass('active');
+							$('#upLine').parent().addClass('active');
+						// 下行
+						}else if(directionData==1){
+							$('#stationUp').removeClass('active');
+							$('#stationUp').removeClass('in');
+							$('#stationUp').addClass('fade');
+							$('#stationDown').addClass('active in');
+							$('#upLine').parent().removeClass('active');
+							$('#downLine').parent().addClass('active');
+						}
+                    } else {
+                        layer.msg('百度地图中没有此线路,无法系统规划！');
+                        setTimeout(function() {
+                            // 关闭弹出层
+                            layer.closeAll();
+                            // 上行
+                            if(directionData==0){
+                                // 显示上行规划
+                                $('#upToolsMobal').show();
+                                // 下行
+                            }else if(directionData==1){
+                                // 显示下行规划
+                                $('#downToolsMobal').show();
+                            }
+                        }, 3000);
+                    }
 				});
 			},
  
@@ -484,7 +489,6 @@ var PublicFunctions = function () {
 			  		}
 					// 路段数据长度
 					var dataLen = data.length;
-					//debugger;
 					// 如果大于零
 					if(dataLen>0) {
 						// 编辑路段数据
@@ -222,43 +222,30 @@ var WorldsBMap = function () {
  
 				// 如果不为空
 				if(objStation) {
-					
 					// 获取中心点坐标字符串
 					var testpointStr = objStation.stationBJwpoints;
-					
 					// 按空格切割中心点坐标字符串
 					var BJwpointsPolygon = testpointStr.split(' ');
-					
 					// 中心点坐标
 					var pointPolygon = new BMap.Point(BJwpointsPolygon[0], BJwpointsPolygon[1]);
-					
 					// 获取多边形坐标字符串
 					var stationBPolygonGrid = objStation.stationBPolygonGrid;
-					
 					// 截取多边形坐标字符串
 					var stationBPolygonGridStr = stationBPolygonGrid.substring(9,stationBPolygonGrid.length-2);
-					
 					// 按逗号切割
 					var pointPolygonArray = stationBPolygonGridStr.split(',');
-					
 					// 多边形坐标集合
 					var polygonP = [];
-					
 					for(var v = 0;v<pointPolygonArray.length;v++) {
-						
 						polygonP.push(new BMap.Point(pointPolygonArray[v].split(" ")[0],pointPolygonArray[v].split(" ")[1]));
-						
 					}
  
 					// 画多边形
 					polygon = new BMap.Polygon(polygonP, {
-						
 						// 线条显色
 			  			strokeColor : "blue",
-			  			
 			  			// 边线的宽度，以像素为单位。
 			  			strokeWeight : 2,
-			  			
 			  			// 边线透明度，取值范围0 - 1。
 			  			strokeOpacity : 0.5
 			  		});
@@ -268,80 +255,62 @@ var WorldsBMap = function () {
  
 					// 信息窗口属性
 					var opts_polygon = {
-			  				
 		  					// 信息窗口宽度
 		  					width : 200,
-		  					
 		  					// 信息窗口高度
-		  					height : 400,
-		  					
-		  					// 信息窗位置偏移值。	
-		  					offset: new BMap.Size(500,20),
-		  					
+		  					height : 300,
+		  					// 信息窗位置偏移值。
+		  					// offset: new BMap.Size(500,20),
 		  					//标题
-		  					title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
-		  					
+		  					// title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
 		  					//设置不允许信窗发送短息
 		  					enableMessage : false,
-		  					
 		  					//是否开启点击地图关闭信息窗口
 		  					enableCloseOnClick : false
 		  			};
-			  		
+
 					var markTypeStr = '';
-					
 					if(objStation.stationRouteStationMark=='B') {
-						
 						markTypeStr='起点站';
-						
 					}else if(objStation.stationRouteStationMark=='Z') {
-						
 						markTypeStr ='中途站';
-						
-						
 					}else if(objStation.stationRouteStationMark=='E') {
-						
 						markTypeStr='终点站';
-						
 					}
-			  		
-			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
-								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
-								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
-								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
-								objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
-					
-					// 创建信息窗口
+					var point = objStation.stationBJwpoints.split(" ")
+                    var htm =  '<span style="color: #ff8355;font-size: 20px;">' + objStation.stationStationName + '</span>' +
+								'<span class="help-block" >站点编码：' + objStation.stationStationCod + '</span>' +
+								'<span class="help-block" >站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
+								'<span class="help-block" >站点类型：' + markTypeStr + '</span>' +
+								'<span class="help-block" >经度：&nbsp&nbsp' + point[0] + '</span>' +
+								'<span class="help-block" >纬度：&nbsp&nbsp' + point[1] + '</span>' +
+								'<span class="help-block" >到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
+								'<span class="help-block" >到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
+								'<span class="help-block" >缓冲区形状：' + (objStation.stationShapesType == "r"?"圆形":"多边形")  + '</span>' +
+								'<span class="help-block" >版本号：&nbsp&nbsp' + objStation.stationRouteVersions + '</span>' +
+                                '<div style="">' +
+                                    '<button style="float:left; background: #ff8355; color: #fff; padding-bottom:5px; font-size: 9px;"  class="btn " ' +
+                                        'id="editStation" onclick="WorldsBMap.editStation('+objStation.stationRouteDirections+')">修改站点</button>' +
+                                    '<button style="float:right; background: #ff8355; color: #fff; padding-bottom:5px; font-size: 9px;"  class="btn " ' +
+                                        'id="addBetweenStationRoad" onclick="WorldsBMap.addBetweenStationRoad('+objStation.stationRouteId+')">添加站点间路段</button>' +
+                                '</div>';
+
+                    // 创建信息窗口
 					var infoWindow_target = new BMap.InfoWindow(htm, opts_polygon);
 				  	// 自定义标注物图片
 			  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
-			  	  	
 			  	  	// 创建点
 		  			marker = new BMap.Marker(pointPolygon,{icon : icon_target}); 
-		  			
 		  			// 把标注添物加到地图上
 		  			mapBValue.addOverlay(marker);
-		  	  		
 		  	  		// 是否在平移过程中禁止动画。（自1.2新增）
 		  	  		var PanOptions_ ={noAnimation :true};
-		  	  		
 		  	  		// 将地图的中心点更改为给定的点。
 		  	  		mapBValue.panTo(pointPolygon,PanOptions_);
-		  	  		
 		  	  		// 将地图在水平位置上移动x像素，垂直位置上移动y像素。
 		  	  		mapBValue.panBy(10,-150,PanOptions_);
-		  	  		
 		  	  		//开启信息窗口
 		  	  		mapBValue.openInfoWindow(infoWindow_target,pointPolygon);
-					
 				}
  
 			},
@@ -399,61 +368,50 @@ var WorldsBMap = function () {
  
 			  		// 信息窗口参数属性
 			  		var opts = {
-			  				
 		  					// 信息窗口宽度
 		  					width : 200,
-		  					
 		  					// 信息窗口高度
-		  					height : 450,
-		  					
+		  					height : 330,
 		  					// 信息窗位置偏移值。
-		  					offset: new BMap.Size(500,120),
-		  					
+		  					// offset: new BMap.Size(500,120),
 		  					//标题
-		  					title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
-		  					
+		  					// title : '<h4 style="color:#ff8355">'+objStation.stationStationName+'站详情</h4>',
 		  					//设置不允许信窗发送短息
 		  					enableMessage : false,
-		  					
 		  					//是否开启点击地图关闭信息窗口
 		  					enableCloseOnClick : false,
-		  					
 		  					// 是否开启信息窗口打开时地图自动移动（默认开启）。(自 1.1 新增)
 		  					enableAutoPan:false
 		  			};
  
 			  		var markTypeStr = '';
-					
 					if(objStation.stationRouteStationMark=='B') {
-						
 						markTypeStr='起点站';
-						
 					}else if(objStation.stationRouteStationMark=='Z') {
-						
 						markTypeStr ='中途站';
-						
-						
 					}else if(objStation.stationRouteStationMark=='E') {
-						
 						markTypeStr='终点站';
-						
 					}
-			  		
-			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
-								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
-								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
-								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
-								objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
-			  		
-			  		// 创建信息窗口
+                    var point1 = objStation.stationBJwpoints.split(" ");
+			  		var htm =  '<span style="color: #ff8355;font-size: 20px;">' + objStation.stationStationName + '</span>' +
+                       			'<span class="help-block" >站点编码：' + objStation.stationStationCod + '</span>' +
+								'<span class="help-block" >站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
+								'<span class="help-block" >站点类型：' + markTypeStr + '</span>' +
+								'<span class="help-block" >经度：&nbsp&nbsp' + point1[0] + '</span>' +
+								'<span class="help-block" >纬度：&nbsp&nbsp' + point1[1] + '</span>' +
+								'<span class="help-block" >到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
+								'<span class="help-block" >到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
+								'<span class="help-block" >缓冲区形状：' + (objStation.stationShapesType == "r"?"圆形":"多边形")  + '</span>' +
+								'<span class="help-block" >半径&nbsp&nbsp：' + objStation.stationRadius + '</span>' +
+								'<span class="help-block" >版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
+								'<div style="">' +
+                                    '<button style="float:left; background: #ff8355; color: #fff; padding-bottom:5px; font-size: 9px;"  class="btn " ' +
+                                        'id="editStation" onclick="WorldsBMap.editStation('+objStation.stationRouteDirections+')">修改站点</button>' +
+                                    '<button style="float:right; background: #ff8355; color: #fff; padding-bottom:5px; font-size: 9px;"  class="btn " ' +
+                                        'id="addBetweenStationRoad" onclick="WorldsBMap.addBetweenStationRoad('+objStation.stationRouteId+')">添加站点间路段</button>' +
+                                '</div>';
+
+                    // 创建信息窗口
 			  		var infoWindow_target = new BMap.InfoWindow(htm, opts);
 				  	// 自定义标注物图片
 			  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
@@ -664,6 +622,65 @@ var WorldsBMap = function () {
 		  		mapBValue.panTo(polyline_center,PanOptions_);
 		  		mapBValue.panBy(500,-510,PanOptions_);
 		  		mapBValue.setZoom(14);
+
+                // 信息窗口属性
+                var opts_polygon = {
+                    // 信息窗口宽度
+                    width : 200,
+                    // 信息窗口高度
+                    height : 300,
+                    // 信息窗位置偏移值。
+                    // offset: new BMap.Size(500,20),
+                    //标题
+                    // title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
+                    //设置不允许信窗发送短息
+                    enableMessage : false,
+                    //是否开启点击地图关闭信息窗口
+                    enableCloseOnClick : false
+                };
+
+                // var markTypeStr = '';
+                // if(objStation.stationRouteStationMark=='B') {
+                //     markTypeStr='起点站';
+                // }else if(objStation.stationRouteStationMark=='Z') {
+                //     markTypeStr ='中途站';
+                // }else if(objStation.stationRouteStationMark=='E') {
+                //     markTypeStr='终点站';
+                // }
+                // var point = objStation.stationBJwpoints.split(" ")
+                // var htm =  '<span style="color: #ff8355;font-size: 20px;">' + objStation.stationStationName + '</span>' +
+                //     '<span class="help-block" >站点编码：' + objStation.stationStationCod + '</span>' +
+                //     '<span class="help-block" >站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
+                //     '<span class="help-block" >站点类型：' + markTypeStr + '</span>' +
+                //     '<span class="help-block" >经度：&nbsp&nbsp' + point[0] + '</span>' +
+                //     '<span class="help-block" >纬度：&nbsp&nbsp' + point[1] + '</span>' +
+                //     '<span class="help-block" >到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
+                //     '<span class="help-block" >到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
+                //     '<span class="help-block" >缓冲区形状：' + (objStation.stationShapesType == "r"?"圆形":"多边形")  + '</span>' +
+                //     '<span class="help-block" >版本号：&nbsp&nbsp' + objStation.stationRouteVersions + '</span>' +
+                //     '<div style="display: flex">' +
+                //     '<span><button style="background: #ff8355; color: #fff; padding-bottom:5px; font-size: 9px;"  class="btn btn-circle" ' +
+                //     'id="editStation" onclick="WorldsBMap.editStation('+objStation.stationRouteDirections+')">修改站点</button></span>' +
+                //     '<span><button style="background: #ff8355; color: #fff; padding-bottom:5px; font-size: 9px;"  class="btn btn-circle" ' +
+                //     'id="addBetweenStationRoad" onclick="WorldsBMap.addBetweenStationRoad('+objStation.stationRouteId+')">添加站点间路段</button></span>' +
+                //     '</div>';
+                //
+                // // 创建信息窗口
+                // var infoWindow_target = new BMap.InfoWindow(htm, opts_polygon);
+                // // 自定义标注物图片
+                // var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
+                // // 创建点
+                // marker = new BMap.Marker(pointPolygon,{icon : icon_target});
+                // // 把标注添物加到地图上
+                // mapBValue.addOverlay(marker);
+                // // 是否在平移过程中禁止动画。（自1.2新增）
+                // var PanOptions_ ={noAnimation :true};
+                // // 将地图的中心点更改为给定的点。
+                // mapBValue.panTo(pointPolygon,PanOptions_);
+                // // 将地图在水平位置上移动x像素，垂直位置上移动y像素。
+                // mapBValue.panBy(10,-150,PanOptions_);
+                // //开启信息窗口
+                // mapBValue.openInfoWindow(infoWindow_target,pointPolygon);
 			},
  
  
@@ -1003,6 +1020,84 @@ var WorldsBMap = function () {
 				busline.getBusList(lineNameValue);
  
 			},
+            editStation : function(dir) {
+                // $.get("/stationroute/findStationRouteInfo",{"id":stationRouteId},function (route) {
+                    $.get('edit_select.html', function(m){
+                        $(pjaxContainer).append(m);
+                        $('#edit_select_mobal').trigger('editSelectMobal_show', [WorldsBMap,DrawingManagerObj,GetAjaxData,EditStationObj,LineObj,PublicFunctions,dir]);
+                    });
+                // });
+            },
+			addBetweenStationRoad : function (stationRouteId) {
+                $.get("/stationroute/findStationRouteInfo",{"id":stationRouteId},function (route) {
+                    var stationRouteBegin = route[0];
+                    // 查询下一个站点
+                    $.get("/stationroute/findDownStationRoute",{"lineId":stationRouteBegin.stationRouteLine, "direction":stationRouteBegin.stationRoutedirections, "stationRouteCode":stationRouteBegin.stationRouteCode},function (stationRoute) {
+                        var stationRouteFinish = stationRoute[0];
+
+                    	if(stationRouteFinish){
+                            var pointBegin = stationRouteBegin.stationJwpoints.split(" ");
+                            var pointFinish = stationRouteFinish.stationJwpoints.split(" ")
+                            console.log(pointFinish);
+                            var sectionList = [];
+                            // 两个站点的坐标
+                            var poiOne =  new BMap.Point(pointBegin[0],pointBegin[1]);
+                            var poiTwo =  new BMap.Point(pointFinish[0],pointFinish[1]);
+                            // 路径规划保存按钮
+                            var label = new BMap.Label("保存路段", {
+                                offset: new BMap.Size(13, -53)
+                            });
+                            label.setStyle({
+                                color: '#fff',
+                                background:"url(/pages/base/stationroute/css/img/bg.png)",
+                                border: '0px solid',
+                                textAlign: "center",
+                                height: "28px",
+                                lineHeight: "26px",
+                                width: "80px",
+                                maxWidth: "none"
+                            });
+                            label.addEventListener('click', function () {
+                            	var params = {};
+                                params.lineId = stationRouteBegin.stationRouteLine;
+                                params.lineCode = stationRouteBegin.stationRouteLIneCode;
+                                params.directions = stationRouteBegin.stationRoutedirections;
+                                params.stationRouteBegin = stationRouteBegin.stationRouteName;
+                                params.stationRouteFinish = stationRouteFinish.stationRouteName;
+                                params.route = $("#routePlanning").val();
+                               $.get('doublename_road.html', function(m){
+                                    $(pjaxContainer).append(m);
+                                    $('#doublename_road_mobal').trigger('doubleNameRoadMobal_show', [params,WorldsBMap,GetAjaxData,PublicFunctions]);
+                                });
+                            });
+                            // 路径规划
+                            var transit = new BMap.DrivingRoute(mapBValue, {renderOptions: {map: mapBValue,enableDragging : true},onPolylinesSet: searchPolylinesSet});
+                            function searchPolylinesSet(results){
+                                if (transit.getStatus() == BMAP_STATUS_SUCCESS){
+                                    var sectionArrayList = [];
+                                    for (i = 0; i < results.length; i++){
+                                        sectionArrayList =  sectionArrayList.concat(results[i].getPolyline().getPath());
+                                    }
+                                    sectionList = sectionArrayList;//JSON.stringify()
+                                    $("#routePlanning").val(JSON.stringify(sectionArrayList));
+                                    var pointMap = new Map();
+                                    pointMap = sectionArrayList[sectionArrayList.length-1];
+                                    var pointLabel =  new BMap.Point(pointMap.lng,pointMap.lat);
+                                    label.enableMassClear();
+                                    label.setPosition(pointLabel);
+                                    mapBValue.addOverlay(label);
+                                }
+                            }
+                            transit.search(poiOne,poiTwo);
+                            transit.disableAutoViewport();
+                        } else {
+                    		layer.msg("您选择的站点后没有站点了，不能生成站点间路段！")
+						}
+
+                    });
+                });
+
+            },
  
 			clearMarkAndOverlays : function() {
  
@@ -37,7 +37,7 @@ var StationTreeData = function(){
 				// 百度地图画圆
 				WorldsBMap.pointsCircle(data);
  
-			// 如果是多变行
+			// 如果是多边形
 			}else if(shapesTypeT == 'd') {
  
 				// 百度地图画多边形
@@ -2,7 +2,9 @@
 <div class="portlet-body">
 	<!-- 地图 -->
 	<div id="bmap_basic" class="bmaps"></div>
-	<div class="portlet box protlet-box" style="top:20px;border-radius: 6px !important;box-shadow: 10px 10px 5px #888888;">
+	<!-- 路径规划路段 -->
+	<input class="hand" id="routePlanning" />
+	<div class="portlet box protlet-box">
 		<!-- 左边标题栏 -->
 		<div class="portlet-title" style="background-color:#12527f;">
 			<div class="caption">
@@ -13,7 +15,7 @@
 			</div>
 		</div>
 		<!-- 左边栏 -->
-		<div class="portlet-body" id="scrllmouseEvent"  style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 420px;">
+		<div class="portlet-body" id="scrllmouseEvent"  style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 520px;">
 			<div class="row">
 				<!-- 上下行栏 -->
 				<div class="col-md-3 col-sm-3 col-xs-3">
@@ -50,9 +52,9 @@
 			                                                    <a href="javascript:;" id="addUpStation"><i class="fa fa-plus"></i>  添加站点</a>
 			                                                </li>
 			                                                <li class="divider"> </li>
-			                                                <li>
+			                                                <!--<li>
 			                                                    <a href="javascript:;" id="editUpStation"><i class="fa fa-pencil"></i> 修改站点</a>
-			                                                </li>
+			                                                </li>-->
 			                                                <li class="divider"> </li>
 			                                                <li>
 			                                                    <a href="javascript:;" id="deleteUpStation"><i class="fa fa-close"></i>  撤销站点</a>
@@ -105,11 +107,11 @@
 						                        </a>
 	                                             <ul class="dropdown-menu pull-right" style="min-width:100px">
 	                                                <li>
-	                                                	<a class="upSystem" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-wrench"></i> 系统规划</a>
+	                                                    <a class="upManual" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-pencil"></i> 手动添加站点</a>
 	                                                </li>
 	                                                <li class="divider"> </li>
 	                                                <li>
-	                                                    <a class="upManual" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-pencil"></i> 其它方式</a>
+	                                                	<a class="upSystem" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-wrench"></i> 系统规划</a>
 	                                                </li>
 	                                             </ul>
 											 </div>
@@ -150,9 +152,9 @@
 			                                                    <a href="javascript:;" id="addDownStation"><i class="fa fa-plus"></i>  添加站点</a>
 			                                                </li>
 			                                                <li class="divider"> </li>
-			                                                <li>
+			                                                <!--<li>
 			                                                    <a href="javascript:;" id="editDownStation"><i class="fa fa-pencil"></i> 修改站点</a>
-			                                                </li>
+			                                                </li>-->
 			                                                <li class="divider"> </li>
 			                                                <li>
 			                                                    <a href="javascript:;" id="deleteDownStation"><i class="fa fa-close"></i>  撤销站点</a>
@@ -201,11 +203,11 @@
 						                     </a>
                                              <ul class="dropdown-menu pull-right" style="min-width:100px">
                                                 <li>
-                                                	<a class="downSystem" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-wrench"></i> 系统规划</a>
+                                                    <a class="downManual" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-pencil"></i> 手动添加站点</a>
                                                 </li>
                                                 <li class="divider"> </li>
                                                 <li>
-                                                    <a class="downManual" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-pencil"></i> 其它方式</a>
+                                                	<a class="downSystem" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-wrench"></i> 系统规划</a>
                                                 </li>
                                              </ul>
 										 </div>
@@ -139,6 +139,7 @@ var Main_v2 = function() {
         var z;
         var oInternalLp;
         var oInternalBc;
+        var oInternalBc_temp;
         var oLp;
         var iZbc;
         var iZgs;
@@ -185,19 +186,58 @@ var Main_v2 = function() {
                 aFcsj.push("(" + oStartBc.getFcTimeObj().format("HH:mm") + ")");
                 oStartBc._$_fcsj_desc = aFcsj.join("");
  
+                oLp.bcObjList.push({ // 出场班次
+                    "bcsj": oTempBc.getBcTime(), // 班次时间
+                    "ssj": oTempBc.getStopTime(), // 停站时间
+                    "eatsj": oTempBc.fnGetEatTime(), // 吃饭时间
+
+                    "tccid": oTempBc._$_tccid, // 停车场id
+                    "qdzid": oTempBc._$_qdzid, // 起点站id
+                    "zdzid": oTempBc._$_zdzid, // 终点站id
+
+                    "isUp": oTempBc._$_isUp, // 是否上行
+
+                    "bcType": oTempBc._$_bcType, // 班次类型
+                    "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
+
+                    "groupNo": -1, // 第几圈
+                    "groupBcNo": -1 // 圈里第几个班次
+
+                });
+
                 aFcsj = [];
  
                 oEndBc = oInternalLp.getBc(
                     oInternalLp.fnGetBcChainInfo(0)["e_q"],
                     oInternalLp.fnGetBcChainInfo(0)["e_b"]
                 );
-                aFcsj.push("(" + oStartBc.getFcTimeObj().format("HH:mm") + ")");
+                aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")");
                 oTempBc = _factory.createBcObj(
                     oLp, "in", true, 1,
                     oEndBc.getArrTimeObj(),
                     _paramObj
                 );
                 aFcsj.push("(进" + oTempBc.getFcTimeObj().format("HH:mm") + ")");
+
+                oLp.bcObjList.push({ // 进场班次
+                    "bcsj": oTempBc.getBcTime(), // 班次时间
+                    "ssj": oTempBc.getStopTime(), // 停站时间
+                    "eatsj": oTempBc.fnGetEatTime(), // 吃饭时间
+
+                    "tccid": oTempBc._$_tccid, // 停车场id
+                    "qdzid": oTempBc._$_qdzid, // 起点站id
+                    "zdzid": oTempBc._$_zdzid, // 终点站id
+
+                    "isUp": oTempBc._$_isUp, // 是否上行
+
+                    "bcType": oTempBc._$_bcType, // 班次类型
+                    "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
+
+                    "groupNo": -2, // 第几圈
+                    "groupBcNo": -2 // 圈里第几个班次
+
+                });
+
                 oTempBc = _factory.createBcObj(
                     oLp, "lc", true, 1,
                     oEndBc.getArrTimeObj(),
@@ -226,13 +266,32 @@ var Main_v2 = function() {
                 aFcsj.push("(" + oStartBc.getFcTimeObj().format("HH:mm") + ")");
                 oStartBc._$_fcsj_desc = aFcsj.join("");
  
+                oLp.bcObjList.push({ // 出场班次
+                    "bcsj": oTempBc.getBcTime(), // 班次时间
+                    "ssj": oTempBc.getStopTime(), // 停站时间
+                    "eatsj": oTempBc.fnGetEatTime(), // 吃饭时间
+
+                    "tccid": oTempBc._$_tccid, // 停车场id
+                    "qdzid": oTempBc._$_qdzid, // 起点站id
+                    "zdzid": oTempBc._$_zdzid, // 终点站id
+
+                    "isUp": oTempBc._$_isUp, // 是否上行
+
+                    "bcType": oTempBc._$_bcType, // 班次类型
+                    "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
+
+                    "groupNo": -1, // 第几圈
+                    "groupBcNo": -1 // 圈里第几个班次
+
+                });
+
                 aFcsj = [];
  
                 oEndBc = oInternalLp.getBc(
                     oInternalLp.fnGetBcChainInfo(0)["e_q"],
                     oInternalLp.fnGetBcChainInfo(0)["e_b"]
                 );
-                aFcsj.push("(" + oStartBc.getFcTimeObj().format("HH:mm") + ")");
+                aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")");
                 oTempBc = _factory.createBcObj(
                     oLp, "in", true, 1,
                     oEndBc.getArrTimeObj(),
@@ -267,13 +326,33 @@ var Main_v2 = function() {
                     oInternalLp.fnGetBcChainInfo(1)["e_q"],
                     oInternalLp.fnGetBcChainInfo(1)["e_b"]
                 );
-                aFcsj.push("(" + oStartBc.getFcTimeObj().format("HH:mm") + ")");
+                aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")");
                 oTempBc = _factory.createBcObj(
                     oLp, "in", true, 1,
                     oEndBc.getArrTimeObj(),
                     _paramObj
                 );
                 aFcsj.push("(进" + oTempBc.getFcTimeObj().format("HH:mm") + ")");
+
+                oLp.bcObjList.push({ // 进场班次
+                    "bcsj": oTempBc.getBcTime(), // 班次时间
+                    "ssj": oTempBc.getStopTime(), // 停站时间
+                    "eatsj": oTempBc.fnGetEatTime(), // 吃饭时间
+
+                    "tccid": oTempBc._$_tccid, // 停车场id
+                    "qdzid": oTempBc._$_qdzid, // 起点站id
+                    "zdzid": oTempBc._$_zdzid, // 终点站id
+
+                    "isUp": oTempBc._$_isUp, // 是否上行
+
+                    "bcType": oTempBc._$_bcType, // 班次类型
+                    "fcsj": oTempBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
+
+                    "groupNo": -2, // 第几圈
+                    "groupBcNo": -2 // 圈里第几个班次
+
+                });
+
                 oTempBc = _factory.createBcObj(
                     oLp, "lc", true, 1,
                     oEndBc.getArrTimeObj(),
@@ -289,7 +368,12 @@ var Main_v2 = function() {
                     oInternalBc = oInternalLp.getBc(j, z);
                     if (oInternalBc) {
                         if (oInternalBc.fnGetEatTime() > 0) {
-                            oInternalBc._$_fcsj_desc = "(吃" + oInternalBc.getFcTimeObj().format("HH:mm") + ")";
+                            // 吃饭班次是下一个班次开始吃，和本班次方向相反
+                            oInternalBc_temp = oInternalLp.getBc(
+                                z == 1 ? j + 1 : j,
+                                z == 1 ? 0 : 1);
+
+                            oInternalBc_temp._$_fcsj_desc = "(吃" + oInternalBc_temp.getFcTimeObj().format("HH:mm") + ")";
                         }
  
                         oLp.bcObjList.push({
@@ -304,7 +388,8 @@ var Main_v2 = function() {
                             "isUp": oInternalBc._$_isUp, // 是否上行
  
                             "bcType": oInternalBc._$_bcType, // 班次类型
-                            "fcsj": oInternalBc._$_fcsj_desc || oInternalBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
+                            "fcsj": oInternalBc._$_fcsjObj.format("HH:mm"), // 发车时间描述
+                            "fcsjDesc" : oInternalBc._$_fcsj_desc || oInternalBc._$_fcsjObj.format("HH:mm"),
  
                             "groupNo": j, // 第几圈
                             "groupBcNo": z // 圈里第几个班次
@@ -361,8 +361,9 @@
 					}
 				});
 			});
-			$get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
+// 			$get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
 // 				window.open("/downloadFile/downloadList?fileName="+result.fileName);	//下载压缩包
+			$get('/busInterval/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
 				window.open("/downloadFile/download?fileName="+result.fileName);
 		   		layer.close(i);
 			});